diff --git a/build/tools/msvs/build2005.bat b/build/tools/msvs/build2005.bat deleted file mode 100755 index dd588e0f30..0000000000 --- a/build/tools/msvs/build2005.bat +++ /dev/null @@ -1,47 +0,0 @@ -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM - -cd c:\wxWidgets-%1.%2.%3\build\msw - -rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder -rem -rem Open a Visual Studio 2005 command prompt. -rem -rem cd \wxwidgets-x.y.z\build\msw -rem build2005 -rem -rem ======================================================== - -rem Set the path if necessary. - -set INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\include;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\INCLUDE;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\INCLUDE\gl;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\INCLUDE\crt; -set LIB=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib\X64 -set LIBPATH=C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib\AMD64 - -rem Remove the existing destination folders if the exist so that a complete rebuild occurs. - -rmdir vc80_mswudll /s /q -rmdir vc80_mswuddll /s /q -rmdir ..\..\lib\vc80_dll /s /q - -rem Delete the build output files from the last run, if any. - -del 2005x86_Debug.txt -del 2005x86_Release.txt - -nmake -f makefile.vc BUILD=debug SHARED=1 OFFICIAL_BUILD=1 COMPILER_VERSION=80 >> 2005x86_Debug.txt - -nmake -f makefile.vc BUILD=release SHARED=1 OFFICIAL_BUILD=1 COMPILER_VERSION=80 >> 2005x86_Release.txt - -goto End - -:ERR_NOPARM - @echo. - @echo ERROR: NO PARAMETER SUPPLIED - @echo MajorVers MinorVers BuildVers - -:End - -cd c:\wxWidgets diff --git a/build/tools/msvs/build2008.bat b/build/tools/msvs/build2008.bat deleted file mode 100755 index 98f33e4c8b..0000000000 --- a/build/tools/msvs/build2008.bat +++ /dev/null @@ -1,66 +0,0 @@ -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM - -cd c:\wxWidgets-%1.%2.%3\build\msw - -rem ================ VS 2008 Official Build =============== -rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder -rem -rem Open a Windows SDK V6.1 command prompt. -rem -rem cd \wxwidgets-x.y.z\build\msw -rem build2008 -rem -rem ======================================================== - - -rem Remove the existing destination folders if the exist so that a complete rebuild occurs. - -rmdir vc90_mswudll /s /q -rmdir vc90_mswuddll /s /q -rmdir ..\..\lib\vc90_dll /s /q -rmdir vc90_mswudll_x64 /s /q -rmdir vc90_mswuddll_x64 /s /q -rmdir ..\..\lib\vc90_x64_dll /s /q - -rem Delete the build output files from the last run, if any. - -del 2008x86_Debug.txt -del 2008x86_Release.txt -del 2008x64_Debug.txt -del 2008x64_Release.txt - -rem 32 bit debug build -rem ------------------ - -call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X86 /Debug -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 >> 2008x86_Debug.txt - -rem 32 bit release build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X86 /Release -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 >> 2008x86_Release.txt - - -rem 64 bit debug build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X64 /Debug -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2008x64_Debug.txt - -rem 64 bit release build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X64 /Release -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=90 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2008x64_Release.txt - -goto End - -:ERR_NOPARM - @echo. - @echo ERROR: NO PARAMETER SUPPLIED - @echo MajorVers MinorVers BuildVers - -:End - -cd c:\wxWidgets diff --git a/build/tools/msvs/build2010.bat b/build/tools/msvs/build2010.bat deleted file mode 100755 index 6cdec9e53c..0000000000 --- a/build/tools/msvs/build2010.bat +++ /dev/null @@ -1,65 +0,0 @@ -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM - -cd c:\wxWidgets-%1.%2.%3\build\msw - -rem ================ VS 2010 Official Build =============== -rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder -rem -rem Open a Windows SDK V7.1 command prompt. -rem -rem cd \wxwidgets-x.y.z\build\msw -rem build2010 -rem -rem ======================================================== - -rem Remove the existing destination folders if the exist so that a complete rebuild occurs. - -rmdir vc100_mswuddll /s /q -rmdir vc100_mswuddll_x64 /s /q -rmdir vc100_mswudll /s /q -rmdir vc100_mswudll_x64 /s /q - -rmdir ..\..\lib\vc100_dll /s /q -rmdir ..\..\lib\vc100_x64_dll /s /q - -rem Delete the build output files from the last run, if any. - -del 2010x86_Debug.txt -del 2010x86_Release.txt -del 2010x64_Debug.txt -del 2010x64_Release.txt - - -rem 64 bit release build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Release -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2010x64_Release.txt - -rem 32 bit release build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X86 /Release -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 >> 2010x86_Release.txt - -rem 64 bit debug build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Debug -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2010x64_Debug.txt - -rem 64 bit release build -rem ------------------ -call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X86 /Debug -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=100 OFFICIAL_BUILD=1 >> 2010x86_Debug.txt - -goto End - -:ERR_NOPARM - @echo. - @echo ERROR: NO PARAMETER SUPPLIED - @echo MajorVers MinorVers BuildVers - -:End - -cd c:\wxWidgets diff --git a/build/tools/msvs/build2012.bat b/build/tools/msvs/build2012.bat deleted file mode 100755 index 9e3d1fb77d..0000000000 --- a/build/tools/msvs/build2012.bat +++ /dev/null @@ -1,64 +0,0 @@ -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM - -cd c:\wxWidgets-%1.%2.%3\build\msw - -rem ================ VS 2012 Official Build =============== -rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder -rem -rem Open a Visual Studio 2012 Developer command prompt. -rem -rem cd \wxwidgets-x.y.z\build\msw -rem build2012 -rem -rem ======================================================== - -rem Remove the existing destination folders if the exist so that a complete rebuild occurs. - -rmdir vc110_mswuddll /s /q -rmdir vc110_mswuddll_x64 /s /q -rmdir vc110_mswudll /s /q -rmdir vc110_mswudll_x64 /s /q - -rmdir ..\..\lib\vc110_dll /s /q -rmdir ..\..\lib\vc110_x64_dll /s /q - -rem Delete the build output files from the last run, if any. - -del 2012x86_Debug.txt -del 2012x86_Release.txt -del 2012x64_Debug.txt -del 2012x64_Release.txt - -call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" - -rem 64 bit release build -rem ------------------ -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2012x64_Release.txt - -rem 64 bit debug build -rem ------------------ -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2012x64_Debug.txt - -call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat" - -rem 32 bit release build -rem ------------------ -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 >> 2012x86_Release.txt - -rem 32 bit debug build -rem ------------------ -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=110 OFFICIAL_BUILD=1 >> 2012x86_Debug.txt - -goto End - -:ERR_NOPARM - @echo. - @echo ERROR: NO PARAMETER SUPPLIED - @echo MajorVers MinorVers BuildVers - -:End - -cd c:\wxWidgets diff --git a/build/tools/msvs/build2013.bat b/build/tools/msvs/build2013.bat deleted file mode 100755 index 6f917648ff..0000000000 --- a/build/tools/msvs/build2013.bat +++ /dev/null @@ -1,64 +0,0 @@ -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM - -cd c:\wxWidgets-%1.%2.%3\build\msw - -rem ================ VS 2013 Official Build =============== -rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder -rem -rem Open a Visual Studio 2013 Developer command prompt. -rem -rem cd \wxwidgets-x.y.z\build\msw -rem build2013 -rem -rem ======================================================== - -rem Remove the existing destination folders if the exist so that a complete rebuild occurs. - -rmdir vc120_mswuddll /s /q -rmdir vc120_mswuddll_x64 /s /q -rmdir vc120_mswudll /s /q -rmdir vc120_mswudll_x64 /s /q - -rmdir ..\..\lib\vc120_dll /s /q -rmdir ..\..\lib\vc120_x64_dll /s /q - -rem Delete the build output files from the last run, if any. - -del 2013x86_Debug.txt -del 2013x86_Release.txt -del 2013x64_Debug.txt -del 2013x64_Release.txt - -call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" - -rem 64 bit release build -rem ------------------ -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2013x64_Release.txt - -rem 64 bit debug build -rem ------------------ -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2013x64_Debug.txt - -call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" - -rem 32 bit release build -rem ------------------ -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 >> 2013x86_Release.txt - -rem 32 bit debug build -rem ------------------ -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=120 OFFICIAL_BUILD=1 >> 2013x86_Debug.txt - -goto End - -:ERR_NOPARM - @echo. - @echo ERROR: NO PARAMETER SUPPLIED - @echo MajorVers MinorVers BuildVers - -:End - -cd c:\wxWidgets diff --git a/build/tools/msvs/build2015.bat b/build/tools/msvs/build2015.bat deleted file mode 100755 index df0c4a9b38..0000000000 --- a/build/tools/msvs/build2015.bat +++ /dev/null @@ -1,64 +0,0 @@ -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM - -cd c:\wxWidgets-%1.%2.%3\build\msw - -rem ================ VS 2015 Official Build =============== -rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder -rem -rem Open a Visual Studio 2015 Developer command prompt. -rem -rem cd \wxwidgets-x.y.z\build\msw -rem build2015 -rem -rem ======================================================== - -rem Remove the existing destination folders if the exist so that a complete rebuild occurs. - -rmdir vc140_mswuddll /s /q -rmdir vc140_mswuddll_x64 /s /q -rmdir vc140_mswudll /s /q -rmdir vc140_mswudll_x64 /s /q - -rmdir ..\..\lib\vc140_dll /s /q -rmdir ..\..\lib\vc140_x64_dll /s /q - -rem Delete the build output files from the last run, if any. - -del 2015x86_Debug.txt -del 2015x86_Release.txt -del 2015x64_Debug.txt -del 2015x64_Release.txt - -call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 - -rem 64 bit release build -rem ------------------ -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2015x64_Release.txt - -rem 64 bit debug build -rem ------------------ -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> 2015x64_Debug.txt - -call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - -rem 32 bit release build -rem ------------------ -nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> 2015x86_Release.txt - -rem 32 bit debug build -rem ------------------ -nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=140 OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> 2015x86_Debug.txt - -goto End - -:ERR_NOPARM - @echo. - @echo ERROR: NO PARAMETER SUPPLIED - @echo MajorVers MinorVers BuildVers - -:End - -cd c:\wxWidgets diff --git a/build/tools/msvs/buildall.bat b/build/tools/msvs/buildall.bat new file mode 100755 index 0000000000..e8b7a31021 --- /dev/null +++ b/build/tools/msvs/buildall.bat @@ -0,0 +1,5 @@ +start cmd /k Call officialbuild.bat vc140 +start cmd /k Call officialbuild.bat vc120 +start cmd /k Call officialbuild.bat vc110 +start cmd /k Call officialbuild.bat vc100 +start cmd /E:ON /V:ON /T:0E /K Call officialbuild.bat vc90 \ No newline at end of file diff --git a/build/tools/msvs/getversion.bat b/build/tools/msvs/getversion.bat new file mode 100644 index 0000000000..5e9889e978 --- /dev/null +++ b/build/tools/msvs/getversion.bat @@ -0,0 +1,3 @@ +set wxMAJOR_VERSION=3 +set wxMINOR_VERSION=1 +set wxRELEASE_NUMBER=1 diff --git a/build/tools/msvs/officialbuild.bat b/build/tools/msvs/officialbuild.bat new file mode 100755 index 0000000000..7e61e96682 --- /dev/null +++ b/build/tools/msvs/officialbuild.bat @@ -0,0 +1,183 @@ +ECHO OFF + +if "%1" == "" goto ERR_NOPARM + +set curr_dir=%cd% + +cd ..\..\msw + +rem ================ wxWidgets Official Build =============== +rem +rem Open a command prompt and run this from the build\tools\msvs folder. +rem Specify the compiler version to use. +rem +rem ======================================================== + +set compvers="Unknown" + +if "%1" == "vc140" ( + @echo Building for vc140 / vs2015 + set comp=140 + set compvers=vc140 + call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat" +) +if "%1" == "vs2015" ( + @echo Building for vc140 / vs2015 + set comp=140 + set compvers=vc140 + call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat" +) +if "%1" == "vc120" ( + @echo Building for vc120 / vs2013 + set comp=120 + set compvers=vc120 + call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat" +) +if "%1" == "vs2013" ( + @echo Building for vc120 / vs2013 + set comp=120 + set compvers=vc120 + call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat" +) +if "%1" == "vc110" ( + @echo Building for vc110 / vs2012 + set comp=110 + set compvers=vc110 + call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\VsDevCmd.bat" +) +if "%1" == "vs2012" ( + @echo Building for vc110 / vs2012 + set comp=110 + set compvers=vc110 + call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\VsDevCmd.bat" +) +if "%1" == "vc100" ( + @echo Building for vc100 / vs2010 + set comp=100 + set compvers=vc100 + call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" +) +if "%1" == "vs2010" ( + @echo Building for vc100 / vs2010 + set comp=100 + set compvers=vc100 + call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" +) +if "%1" == "vc90" ( + @echo Building for vc90 / vs2008 + set comp=90 + set compvers=vc90 +) +if "%1" == "vs2008" ( + @echo Building for vc90 / vs2008 + set comp=90 + set compvers=vc90 +) + +if %compvers% == "Unknown" goto ERR_UNKNOWNCOMP + +if %compvers% == "vc90" ( +@echo ============================================================ +@echo This will only succeed if run from a SDK 6.1 command prompt. +@echo ============================================================ +) + +@echo Removing the existing destination so that a complete rebuild occurs. + +rmdir %compvers%_mswuddll /s /q +rmdir %compvers%_mswuddll_x64 /s /q +rmdir %compvers%_mswudll /s /q +rmdir %compvers%_mswudll_x64 /s /q + +rmdir ..\..\lib\%compvers%_dll /s /q +rmdir ..\..\lib\%compvers%_x64_dll /s /q + +@echo Delete the build output files from the last run. + +del %compvers%x86_Debug.txt +del %compvers%x86_Release.txt +del %compvers%x64_Debug.txt +del %compvers%x64_Release.txt + +if "%compvers%" == "vc140" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 +if "%compvers%" == "vc120" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" +if "%compvers%" == "vc110" call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat" +if "%compvers%" == "vc100" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Release +if "%compvers%" == "vc100" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Release +if "%compvers%" == "vc90" call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X64 /Release + +@echo 64 bit release build + +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Release.txt + +if ERRORLEVEL 1 goto ERR_BUILD + +@echo 64 bit debug build + +if "%compvers%" == "vc100" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X64 /Debug +if "%compvers%" == "vc90" call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X64 /Debug + +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Debug.txt + +if ERRORLEVEL 1 goto ERR_BUILD + +if "%compvers%" == "vc140" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +if "%compvers%" == "vc120" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" +if "%compvers%" == "vc110" call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat" +if "%compvers%" == "vc100" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X86 /Release +if "%compvers%" == "vc90" call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X86 /Release + +@echo 32 bit release build + +nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Release.txt + +if ERRORLEVEL 1 goto ERR_BUILD + +@echo 32 bit debug build + +if "%compvers%" == "vc100" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /X86 /Debug +if "%compvers%" == "vc90" call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /X86 /Debug + +nmake -f makefile.vc BUILD=debug SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Debug.txt + +if ERRORLEVEL 1 goto ERR_BUILD + +@echo Building Packages + +cd %curr_dir% + +call package %compvers% + +goto End + +:ERR_BUILD + +goto End + @echo. + @echo BUILD ERROR + +:ERR_UNKNOWNCOMP + @echo. + @echo UNKNOWN COMPILER VERSION + goto VERSIONS + +goto End + +:ERR_NOPARM + @echo. + @echo ERROR: NO PARAMETER SUPPLIED + goto VERSIONS + +:VERSIONS + @echo. + @echo Compiler Version: One of - + @echo vc140 or vs2015 + @echo vc120 or vs2013 + @echo vc110 or vs2012 + @echo vc100 or vs2010 + +:End + +@echo Finished. + +cd %curr_dir% diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat index c026158890..793e5d2765 100755 --- a/build/tools/msvs/package.bat +++ b/build/tools/msvs/package.bat @@ -1,155 +1,88 @@ -rem ============= VS Binaries Packaging Script ============= +rem ================ VS Official Build Package Tool =============== rem -rem Copy this file to the \wxwidgets-x.y.z\build\msw folder +rem This is used to assemble the official build binaries into +rem three 7zip files for one compiler version. It is normally +rem run by the makepackages.bat tool but can be run from the command line. rem -rem Open a command prompt. +rem Do not run this until after the official packages have +rem been built. rem -rem cd \wxwidgets-x.y.z\build\msw -rem package major minor revision +rem Open a command prompt. Switch to the build\tools\msvs +rem directory. +rem +rem package major minor revision compilerversion +rem for example: package 3 1 0 vc140 rem rem ======================================================== -if "%1" == "" goto ERR_NOPARM -if "%2" == "" goto ERR_NOPARM -if "%3" == "" goto ERR_NOPARM +call getversion.bat -rem Add path info if necessary. +if "%1" == "" goto ERR_NOPARM path=%path%;"C:\Program Files\7-Zip" -set wxMajor=%1 -set wxMinor=%2 -set wxBuild=%3 +rem Add path to fciv (the sha tool) if it is not already +rem in the path. -set wxPath=\wxWidgets-%wxMajor%.%wxMinor%.%wxBuild% -set wxLibVers=%1%2 +set VCver=%1 -if "%2" == "9" set wxDLLVers=%1%2%3 -if NOT "%2" == "9" set wxDLLVers=%1%2 +rem packages will be located in wx install folder\packages -rem Switch to install directory so 7z files are relative to the folder. +set packagePath=build\msw\packages -cd %wxPath% +rem Change to wx root folder -rem Package the VS 2005 files. -rem -------------------------- +set curr_dir1=%cd% +cd ..\..\.. + +mkdir %packagePath% + +set wxLibVers=%wxMAJOR_VERSION%%wxMINOR_VERSION% + +set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION% +if "%wxMINOR_VERSION%" == "1" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER% +if "%wxMINOR_VERSION%" == "3" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER% +if "%wxMINOR_VERSION%" == "5" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER% +if "%wxMINOR_VERSION%" == "7" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER% +if "%wxMINOR_VERSION%" == "9" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER% + +if "%1" == "sha" goto SHA rem Get rid of any files from the last run. -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleasePDB.7z +del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z +del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z +del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z +del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z +del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z +del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z -rem 7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_Dev.7z lib\vc80_dll\mswud lib\vc80_dll\mswu lib\vc80_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc80_dll\wxbase%wxDllVers%ud_*.pdb lib\vc80_dll\wxMSW%wxDllVers%ud_*.dll lib\vc80_dll\wxbase%wxDllVers%u*.dll lib\vc80_dll\*.lib -rem 7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleaseDLL.7z lib\vc80_dll\wxMSW%wxDllVers%u_*.dll lib\vc80_dll\wxbase%wxDllVers%u_*.dll -rem 7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc80_ReleasePDB.7z lib\vc80_dll\wxMSW%wxDllVers%u_*.pdb lib\vc80_dll\wxbase%wxDllVers%u_*.pdb +rem Package the 32 bit files -rem Package the VS 2008 32 bit files. -rem --------------------------------- +7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z lib\%VCver%_dll\mswud lib\%VCver%_dll\mswu lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u*.dll lib\%VCver%_dll\*.lib +7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%u_*.pdb -rem Get rid of any files from the last run. +rem Package the 64 bit files -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleasePDB.7z +7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z lib\%VCver%_x64_dll\mswud lib\%VCver%_x64_dll\mswu lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\*.lib +7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.dll +7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.pdb -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_Dev.7z lib\vc90_dll\mswud lib\vc90_dll\mswu lib\vc90_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc90_dll\wxbase%wxDllVers%ud_*.pdb lib\vc90_dll\wxMSW%wxDllVers%ud_*.dll lib\vc90_dll\wxbase%wxDllVers%ud_*.dll lib\vc90_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleaseDLL.7z lib\vc90_dll\wxMSW%wxDllVers%u_*.dll lib\vc90_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_ReleasePDB.7z lib\vc90_dll\wxMSW%wxDllVers%u_*.pdb lib\vc90_dll\wxbase%wxDllVers%u*_.pdb +del %packagePath%\%VCver%_sha1.txt -rem Package the VS 2010 32 bit files. -rem ---------------------------------- +fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt +fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt +fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt +fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt +fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt +fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt -rem Get rid of any files from the last run. +goto End -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_Dev.7z lib\vc100_dll\mswud lib\vc100_dll\mswu lib\vc100_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc100_dll\wxbase%wxDllVers%ud_*.pdb lib\vc100_dll\wxMSW%wxDllVers%ud_*.dll lib\vc100_dll\wxbase%wxDllVers%ud_*.dll lib\vc100_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleaseDLL.7z lib\vc100_dll\wxMSW%wxDllVers%u_*.dll lib\vc100_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_ReleasePDB.7z lib\vc100_dll\wxMSW%wxDllVers%u_*.pdb lib\vc100_dll\wxbase%wxDllVers%u_*.pdb - -rem Package the VS 2012 32 bit files. -rem ---------------------------------- - -rem Get rid of any files from the last run. - -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_Dev.7z lib\vc110_dll\mswud lib\vc110_dll\mswu lib\vc110_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc110_dll\wxbase%wxDllVers%ud_*.pdb lib\vc110_dll\wxMSW%wxDllVers%ud_*.dll lib\vc110_dll\wxbase%wxDllVers%ud_*.dll lib\vc110_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleaseDLL.7z lib\vc110_dll\wxMSW%wxDllVers%u_*.dll lib\vc110_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_ReleasePDB.7z lib\vc110_dll\wxMSW%wxDllVers%u_*.pdb lib\vc110_dll\wxbase%wxDllVers%u_*.pdb - -rem Package the VS 2013 32 bit files. -rem ---------------------------------- - -rem Get rid of any files from the last run. - -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_Dev.7z lib\vc120_dll\mswud lib\vc120_dll\mswu lib\vc120_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc120_dll\wxbase%wxDllVers%ud_*.pdb lib\vc120_dll\wxMSW%wxDllVers%ud_*.dll lib\vc120_dll\wxbase%wxDllVers%ud_*.dll lib\vc120_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleaseDLL.7z lib\vc120_dll\wxMSW%wxDllVers%u_*.dll lib\vc120_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_ReleasePDB.7z lib\vc120_dll\wxMSW%wxDllVers%u_*.pdb lib\vc120_dll\wxbase%wxDllVers%u_*.pdb - - -rem Package the VS 2008 64 bit files. -rem --------------------------------- - -rem Get rid of any files from the last run. - -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_Dev.7z lib\vc90_x64_dll\mswud lib\vc90_x64_dll\mswu lib\vc90_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc90_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc90_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc90_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc90_x64_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleaseDLL.7z lib\vc90_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc90_x64_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc90_x64_ReleasePDB.7z lib\vc90_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc90_x64_dll\wxbase%wxDllVers%u_*.pdb - -rem Package the VS 2010 64 bit files. -rem --------------------------------- - -rem Get rid of any files from the last run. - -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_Dev.7z lib\vc100_x64_dll\mswud lib\vc100_x64_dll\mswu lib\vc100_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc100_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc100_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc100_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc100_x64_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleaseDLL.7z lib\vc100_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc100_x64_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc100_x64_ReleasePDB.7z lib\vc100_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc100_x64_dll\wxbase%wxDllVers%u_*.pdb - -rem Package the VS 2012 64 bit files. -rem --------------------------------- - -rem Get rid of any files from the last run. - -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_Dev.7z lib\vc110_x64_dll\mswud lib\vc110_x64_dll\mswu lib\vc110_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc110_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc110_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc110_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc110_x64_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleaseDLL.7z lib\vc110_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc110_x64_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc110_x64_ReleasePDB.7z lib\vc110_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc110_x64_dll\wxbase%wxDllVers%u_*.pdb - - -rem Package the VS 2013 64 bit files. -rem --------------------------------- - -rem Get rid of any files from the last run. - -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_Dev.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleaseDLL.7z -del %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleasePDB.7z - -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_Dev.7z lib\vc120_x64_dll\mswud lib\vc120_x64_dll\mswu lib\vc120_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\vc120_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\vc120_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\vc120_x64_dll\wxbase%wxDllVers%ud_*.dll lib\vc120_x64_dll\*.lib -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleaseDLL.7z lib\vc120_x64_dll\wxMSW%wxDllVers%u_*.dll lib\vc120_x64_dll\wxbase%wxDllVers%u_*.dll -7z a -t7z %wxPath%\wxMSW-%wxMajor%.%wxMinor%.%wxBuild%%4_vc120_x64_ReleasePDB.7z lib\vc120_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\vc120_x64_dll\wxbase%wxDllVers%u_*.pdb +:SHA +fciv %packagePath% -type *.7z -sha1 -wp >> %packagePath%\sha1.txt goto End @@ -160,4 +93,4 @@ goto End :End -cd \wxWidgets +cd %curr_dir1%