Merge branch 'master' into Skyline/work/20250111_update_covershots

ProteoWizard · Jan 15, 2025 · 3489898 · 3489898
2 parents 5e276f3 + b8edf2a
commit 3489898
Show file tree

Hide file tree

Showing 18 changed files with 1,363 additions and 1,235 deletions.
diff --git a/Jamroot.jam b/Jamroot.jam
@@ -588,7 +588,7 @@ path-constant BOOST_SOURCE : $(boost_src) ;
 path-constant ZLIB_SOURCE : $(zlib_src) ;
 path-constant GD_SOURCE : $(PWIZ_LIBRARIES_PATH)/libgd-2.1.0alpha ;
 path-constant PNG_SOURCE : $(PWIZ_LIBRARIES_PATH)/libpng-1.5.6 ;
-path-constant FREETYPE_SOURCE : $(PWIZ_LIBRARIES_PATH)/freetype-2.4.7 ;
+path-constant FREETYPE_SOURCE : $(PWIZ_LIBRARIES_PATH)/freetype-VER-2-13-3 ;
 path-constant EXPAT_SOURCE : $(PWIZ_LIBRARIES_PATH)/expat-2.0.1 ;
 
 using ext-boost : $(BOOST_VERSION:J=.) : $(BOOST_SOURCE) : <zlib-src-location>$(ZLIB_SOURCE) ;
@@ -1732,7 +1732,6 @@ constant .common-sources :
     $(.common-src-exclusions)
 
     $(PWIZ_ROOT_PATH)/Jamroot.jam
-    $(PWIZ_ROOT_PATH)/NOTICE
     $(PWIZ_ROOT_PATH)/LICENSE
     $(PWIZ_ROOT_PATH)/quickbuild.bat
     $(PWIZ_ROOT_PATH)/quickbuild.sh

diff --git a/clean.bat b/clean.bat
@@ -22,11 +22,12 @@ IF EXIST libraries\boost_1_54_0 rmdir /s /q libraries\boost_1_54_0
 IF EXIST libraries\boost_1_56_0 rmdir /s /q libraries\boost_1_56_0
 IF EXIST libraries\boost_1_67_0 rmdir /s /q libraries\boost_1_67_0
 IF EXIST libraries\boost_1_76_0 rmdir /s /q libraries\boost_1_76_0
+IF EXIST libraries\boost_1_86_0 rmdir /s /q libraries\boost_1_86_0
 IF EXIST libraries\gd-2.0.33 rmdir /s /q libraries\gd-2.0.33
 IF EXIST libraries\zlib-1.2.3 rmdir /s /q libraries\zlib-1.2.3
 IF EXIST libraries\libgd-2.1.0alpha rmdir /s /q libraries\libgd-2.1.0alpha
 IF EXIST libraries\libpng-1.5.6 rmdir /s /q libraries\libpng-1.5.6
-IF EXIST libraries\freetype-2.4.7 rmdir /s /q libraries\freetype-2.4.7
+IF EXIST libraries\freetype-VER-2-13-3 rmdir /s /q libraries\freetype-VER-2-13-3
 IF EXIST libraries\hdf5-1.8.7 rmdir /s /q libraries\hdf5-1.8.7
 IF EXIST libraries\fftw-3.1.2 rmdir /s /q libraries\fftw-3.1.2
 IF EXIST libraries\expat-2.0.1 rmdir /s /q libraries\expat-2.0.1

diff --git a/clean.sh b/clean.sh
@@ -12,7 +12,7 @@ if [ -d libraries/gd-2.0.33 ]; then rm -fr libraries/gd-2.0.33; fi;
 if [ -d libraries/zlib-1.2.3 ]; then rm -fr libraries/zlib-1.2.3; fi;
 if [ -d libraries/libgd-2.1.0alpha ]; then rm -fr libraries/libgd-2.1.0alpha; fi;
 if [ -d libraries/libpng-1.5.6 ]; then rm -fr libraries/libpng-1.5.6; fi;
-if [ -d libraries/freetype-2.4.7 ]; then rm -fr libraries/freetype-2.4.7; fi;
+if [ -d libraries/freetype-VER-2-13-3 ]; then rm -fr libraries/freetype-VER-2-13-3; fi;
 if [ -d libraries/hdf5-1.8.7 ]; then rm -fr libraries/hdf5-1.8.7; fi;
 if [ -d libraries/fftw-3.1.2 ]; then rm -fr libraries/fftw-3.1.2; fi;
 if [ -d libraries/expat-2.0.1 ]; then rm -fr libraries/expat-2.0.1; fi;

diff --git a/libraries/boost_aux/tools/bcp/Jamfile.v2 b/libraries/boost_aux/tools/bcp/Jamfile.v2
@@ -4,14 +4,12 @@
 
 exe bcp
     :
-    add_path.cpp bcp_imp.cpp copy_path.cpp file_types.cpp
+    add_dependent_lib.cpp add_path.cpp bcp_imp.cpp copy_path.cpp file_types.cpp
     fileview.cpp main.cpp path_operations.cpp scan_cvs_path.cpp 
     licence_info.cpp scan_licence.cpp output_licence_info.cpp
     /boost/filesystem//boost_filesystem
     /boost/regex//boost_regex
-    /boost/test//boost_prg_exec_monitor
     :
-    <define>BOOST_REGEX_NO_LIB=1
     :
     release
     ;