From 99c5c10cfb72d312f5a724da6c59ead200ed31f2 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Wed, 22 Oct 2014 18:54:14 +0200 Subject: [PATCH] osgeo4w: package pdbs in nightly build --- ms-windows/osgeo4w/package-nightly.cmd | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index 593e40633c1a..be529e61246d 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -57,7 +57,8 @@ set CMAKE_OPT=^ -G "Visual Studio 9 2008" ^ -D BUILDNAME="OSGeo4W-Nightly-VC9" ^ -D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^ - -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" + -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^ + -D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb goto devenv :devenv_x86_64 @@ -76,12 +77,13 @@ set CMAKE_OPT=^ -D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^ -D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^ -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /Zi /MP /Od /D NDEBUG /D QGISDEBUG" ^ + -D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^ -D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^ -D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE :devenv set PYTHONPATH= -path %PF86%\CMake 2.8\bin;%PATH%;c:\cygwin\bin +path %PF86%\CMake\bin;%PF86%\CMake 2.8\bin;%PATH%;c:\cygwin\bin PROMPT qgis%VERSION%$g @@ -258,6 +260,11 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS etc/preremove/%PACKAGENAME%.bat if errorlevel 1 (echo tar failed & goto error) +if not exist %ARCH%\release\qgis\%PACKAGENAME%-pdb mkdir %ARCH%\release\qgis\%PACKAGENAME%-pdb +tar -C %BUILDDIR% -cjf %ARCH%/release/qgis/%PACKAGENAME%-pdb/%PACKAGENAME%-pdb-%VERSION%-%PACKAGE%.tar.bz2 ^ + apps/%PACKAGENAME%/pdb +if errorlevel 1 (echo tar failed & goto error) + goto end :usage