From a1f0cb7aec5741b6ec6a3882eb3a39218e6b658d Mon Sep 17 00:00:00 2001 From: nulano Date: Sat, 21 Sep 2019 00:43:47 +0200 Subject: [PATCH 1/6] disable nmake copyright message (cherry picked from commit c743dbba73b0dfa54c3bf5ad98682dac956777cc) --- winbuild/build_dep.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py index a640d4279..d1cd3387a 100644 --- a/winbuild/build_dep.py +++ b/winbuild/build_dep.py @@ -143,8 +143,8 @@ setlocal cd /D %%OPENJPEG%%%(inc_dir)s %%CMAKE%% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -G "NMake Makefiles" . -nmake -f Makefile clean -nmake -f Makefile +nmake -nologo -f Makefile clean +nmake -nologo -f Makefile copy /Y /B bin\* %%INCLIB%% mkdir %%INCLIB%%\openjpeg-%(op_ver)s copy /Y /B src\lib\openjp2\*.h %%INCLIB%%\openjpeg-%(op_ver)s @@ -164,9 +164,9 @@ setlocal + vc_setup(compiler, bit) + r""" cd /D %%JPEG%% -nmake -f makefile.vc setup-vc6 -nmake -f makefile.vc clean -nmake -f makefile.vc libjpeg.lib +nmake -nologo -f makefile.vc setup-vc6 +nmake -nologo -f makefile.vc clean +nmake -nologo -f makefile.vc libjpeg.lib copy /Y /B *.dll %%INCLIB%% copy /Y /B *.lib %%INCLIB%% copy /Y /B j*.h %%INCLIB%% @@ -175,8 +175,8 @@ endlocal rem Build zlib setlocal cd /D %%ZLIB%% -nmake -f win32\Makefile.msc clean -nmake -f win32\Makefile.msc zlib.lib +nmake -nologo -f win32\Makefile.msc clean +nmake -nologo -f win32\Makefile.msc zlib.lib copy /Y /B *.dll %%INCLIB%% copy /Y /B *.lib %%INCLIB%% copy /Y /B zlib.lib %%INCLIB%%\z.lib @@ -191,7 +191,7 @@ setlocal + r""" cd /D %%WEBP%% rd /S /Q %%WEBP%%\output\release-static -nmake -f Makefile.vc CFG=release-static RTLIBCFG=static OBJDIR=output all +nmake -nologo -f Makefile.vc CFG=release-static RTLIBCFG=static OBJDIR=output all copy /Y /B output\release-static\%(webp_platform)s\lib\* %%INCLIB%% mkdir %%INCLIB%%\webp copy /Y /B src\webp\*.h %%INCLIB%%\\webp @@ -206,8 +206,8 @@ rem do after building jpeg and zlib copy %%~dp0\nmake.opt %%TIFF%% cd /D %%TIFF%% -nmake -f makefile.vc clean -nmake -f makefile.vc lib +nmake -nologo -f makefile.vc clean +nmake -nologo -f makefile.vc lib copy /Y /B libtiff\*.dll %%INCLIB%% copy /Y /B libtiff\*.lib %%INCLIB%% copy /Y /B libtiff\tiff*.h %%INCLIB%% @@ -320,7 +320,7 @@ cd /D %%GHOSTSCRIPT%% set WIN64="" """ script += r""" -nmake -f psi/msvc.mak +nmake -nologo -f psi/msvc.mak copy /Y /B bin\ C:\Python27\ endlocal """ From 7e3389c65966d15ef27efc23203e230e0bf4cd0c Mon Sep 17 00:00:00 2001 From: nulano Date: Sat, 21 Sep 2019 01:24:03 +0200 Subject: [PATCH 2/6] keep echo on (cherry picked from commit b8ffa18f91e015528b91ad4413b5f6b21dfa0a46) --- winbuild/build_dep.py | 1 + 1 file changed, 1 insertion(+) diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py index d1cd3387a..59a344964 100644 --- a/winbuild/build_dep.py +++ b/winbuild/build_dep.py @@ -114,6 +114,7 @@ def setup_compiler(compiler): return ( r"""setlocal EnableDelayedExpansion call "%%ProgramFiles%%\Microsoft SDKs\Windows\%(env_version)s\Bin\SetEnv.Cmd" /Release %(env_flags)s +echo on set INCLIB=%%INCLIB%%\%(inc_dir)s """ # noqa: E501 % compiler From a6ac71a524ce61d952949e12013cd46ede97ec49 Mon Sep 17 00:00:00 2001 From: nulano Date: Sat, 21 Sep 2019 01:31:59 +0200 Subject: [PATCH 3/6] release build of libjpeg (cherry picked from commit 540fd06ef1cfc4acfe83e7a848ae72f17ae3536d) --- winbuild/build_dep.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py index 59a344964..5720efb1a 100644 --- a/winbuild/build_dep.py +++ b/winbuild/build_dep.py @@ -167,7 +167,7 @@ setlocal cd /D %%JPEG%% nmake -nologo -f makefile.vc setup-vc6 nmake -nologo -f makefile.vc clean -nmake -nologo -f makefile.vc libjpeg.lib +nmake -nologo -f makefile.vc nodebug=1 libjpeg.lib copy /Y /B *.dll %%INCLIB%% copy /Y /B *.lib %%INCLIB%% copy /Y /B j*.h %%INCLIB%% From 82468971015305db2bcb7b9717eddd4557a3a9cb Mon Sep 17 00:00:00 2001 From: nulano Date: Sat, 21 Sep 2019 02:42:20 +0200 Subject: [PATCH 4/6] openjp2 release build (cherry picked from commit 0c0b868139dc5ebecde803a952ae58c31aee12a9) --- winbuild/build_dep.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py index 5720efb1a..7fea57772 100644 --- a/winbuild/build_dep.py +++ b/winbuild/build_dep.py @@ -143,7 +143,7 @@ setlocal @echo on cd /D %%OPENJPEG%%%(inc_dir)s -%%CMAKE%% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -G "NMake Makefiles" . +%%CMAKE%% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" . nmake -nologo -f Makefile clean nmake -nologo -f Makefile copy /Y /B bin\* %%INCLIB%% From cf9529bbe60f3e077d0b22c03b7c823963aceee3 Mon Sep 17 00:00:00 2001 From: nulano Date: Sat, 21 Sep 2019 20:03:24 +0200 Subject: [PATCH 5/6] keep echo on --- winbuild/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winbuild/build.py b/winbuild/build.py index e080736b5..0617022dc 100755 --- a/winbuild/build.py +++ b/winbuild/build.py @@ -84,7 +84,8 @@ def vc_setup(compiler, bit): arch = "x86" if bit == 32 else "x86_amd64" script = ( r""" -call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %s""" +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %s +echo on""" % arch ) return script From 768a6cb95a0a82268d4dfe7687b053cee1470530 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 22 Sep 2019 15:32:50 +1000 Subject: [PATCH 6/6] Removed now redundant echo ons --- winbuild/build_dep.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py index 7fea57772..487329db8 100644 --- a/winbuild/build_dep.py +++ b/winbuild/build_dep.py @@ -67,7 +67,6 @@ def extract_openjpeg(compiler): r""" rem build openjpeg setlocal -@echo on cd %%BUILD%% mkdir %%INCLIB%%\openjpeg-2.0 copy /Y /B openjpeg-2.0.0-win32-x86\include\openjpeg-2.0 %%INCLIB%%\openjpeg-2.0 @@ -140,7 +139,6 @@ setlocal """ + vc_setup(compiler, bit) + r""" -@echo on cd /D %%OPENJPEG%%%(inc_dir)s %%CMAKE%% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" .