Skip to content

Commit d2c2049

Browse files
jef-njef-n
committedOct 6, 2016
osgeo4w: switch to ninja
·
ltr-3_40final-3_0_0
1 parent b4f3126 commit d2c2049

File tree

2 files changed

+28
-23
lines changed

2 files changed

+28
-23
lines changed
 

‎ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,35 +52,36 @@ if not "%PROGRAMFILES(X86)%"=="" set PF86=%PROGRAMFILES(X86)%
5252
if "%PF86%"=="" set PF86=%PROGRAMFILES%
5353
if "%PF86%"=="" (echo PROGRAMFILES not set & goto error)
5454

55-
if "%ARCH%"=="x86" goto devenv_x86
56-
goto devenv_x86_64
55+
if "%ARCH%"=="x86" goto cmake_x86
56+
goto cmake_x86_64
5757

58-
:devenv_x86
58+
:cmake_x86
5959
set GRASS6_VERSION=6.4.4
6060
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
6161
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
6262
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
63+
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin
6364

6465
set CMAKE_OPT=^
65-
-G "Visual Studio 10" ^
6666
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
6767
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
6868
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^
69-
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb
70-
goto devenv
69+
-D CMAKE_PDB_OUTPUT_DIRECTORY_RELWITHDEBINFO=%BUILDDIR%\apps\%PACKAGENAME%\pdb ^
70+
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex_i.lib
71+
goto cmake
7172

72-
:devenv_x86_64
73+
:cmake_x86_64
7374
set GRASS6_VERSION=6.4.3
7475
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
7576
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
7677
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
78+
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin\amd64
7779

7880
set SETUPAPI_LIBRARY=%PF86%\Microsoft SDKs\Windows\v7.0A\Lib\x64\SetupAPI.Lib
7981
if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\Lib\x64\SetupAPI.lib
8082
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
8183

8284
set CMAKE_OPT=^
83-
-G "Visual Studio 10 Win64" ^
8485
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
8586
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
8687
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
@@ -89,7 +90,7 @@ set CMAKE_OPT=^
8990
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
9091
-D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE
9192

92-
:devenv
93+
:cmake
9394
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass70 --config path`) do set GRASS70_PATH=%%a
9495
for %%i in ("%GRASS70_PATH%") do set GRASS70_VERSION=%%~nxi
9596
set GRASS70_VERSION=%GRASS70_VERSION:grass-=%
@@ -153,7 +154,10 @@ if errorlevel 1 goto error
153154
set LIB=%LIB%;%OSGEO4W_ROOT%\lib
154155
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
155156

156-
cmake %CMAKE_OPT% ^
157+
cmake -G Ninja ^
158+
-D CMAKE_CXX_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
159+
-D CMAKE_C_COMPILER="%CMAKE_COMPILER_PATH:\=/%/cl.exe" ^
160+
-D CMAKE_LINKER="%CMAKE_COMPILER_PATH:\=/%/link.exe" ^
157161
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Nightly-VC10-%ARCH%" ^
158162
-D SITE="%SITE%" ^
159163
-D PEDANTIC=TRUE ^
@@ -195,7 +199,8 @@ cmake %CMAKE_OPT% ^
195199
-D WITH_INTERNAL_MOCK=FALSE ^
196200
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
197201
-D WITH_INTERNAL_FUTURE=FALSE ^
198-
%SRCDIR%
202+
%CMAKE_OPT% ^
203+
%SRCDIR:\=/%
199204
if errorlevel 1 (echo cmake failed & goto error)
200205

201206
:skipcmake
@@ -244,7 +249,7 @@ if exist "%PKGDIR%" (
244249
)
245250

246251
echo INSTALL: %DATE% %TIME%
247-
cmake --build %BUILDDIR% --target INSTALL --config %BUILDCONF%
252+
cmake --build %BUILDDIR% --target install --config %BUILDCONF%
248253
if errorlevel 1 (echo INSTALL failed & goto error)
249254

250255
:package

‎ms-windows/osgeo4w/package.cmd

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ if not "%PROGRAMFILES(X86)%"=="" set PF86=%PROGRAMFILES(X86)%
5252
if "%PF86%"=="" set PF86=%PROGRAMFILES%
5353
if "%PF86%"=="" (echo PROGRAMFILES not set & goto error)
5454

55-
if "%ARCH%"=="x86" goto devenv_x86
56-
goto devenv_x86_64
55+
if "%ARCH%"=="x86" goto cmake_x86
56+
goto cmake_x86_64
5757

58-
:devenv_x86
58+
:cmake_x86
5959
set GRASS6_VERSION=6.4.4
6060
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
6161
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x86 /Release
6262
path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin
63+
set CMAKE_COMPILER_PATH=%PF86%\Microsoft Visual Studio 10.0\VC\bin
6364

6465
set CMAKE_OPT=^
65-
-G "Visual Studio 10" ^
6666
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
6767
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib
68-
goto devenv
68+
goto cmake
6969

70-
:devenv_x86_64
70+
:cmake_x86_64
7171
set GRASS6_VERSION=6.4.3
7272
call "%PF86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
7373
if exist "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" call "c:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.Cmd" /x64 /Release
@@ -78,14 +78,13 @@ if not exist "%SETUPAPI_LIBRARY%" set SETUPAPI_LIBRARY=%PROGRAMFILES%\Microsoft
7878
if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)
7979

8080
set CMAKE_OPT=^
81-
-G "Visual Studio 10 Win64" ^
8281
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
8382
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
8483
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
8584
-D SETUPAPI_LIBRARY="%SETUPAPI_LIBRARY%" ^
8685
-D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE
8786

88-
:devenv
87+
:cmake
8988
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass70 --config path`) do set GRASS70_PATH=%%a
9089
for %%i in ("%GRASS70_PATH%") do set GRASS70_VERSION=%%~nxi
9190
set GRASS70_VERSION=%GRASS70_VERSION:grass-=%
@@ -149,7 +148,7 @@ if errorlevel 1 goto error
149148
set LIB=%LIB%;%OSGEO4W_ROOT%\lib
150149
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
151150

152-
cmake %CMAKE_OPT% ^
151+
cmake -G Ninja ^
153152
-D BUILDNAME="%PACKAGENAME%-%VERSION%%SHA%-Release-VC10-%ARCH%" ^
154153
-D SITE="%SITE%" ^
155154
-D PEDANTIC=TRUE ^
@@ -189,7 +188,8 @@ cmake %CMAKE_OPT% ^
189188
-D WITH_INTERNAL_PYTZ=FALSE ^
190189
-D WITH_INTERNAL_SIX=FALSE ^
191190
-D WITH_INTERNAL_FUTURE=FALSE ^
192-
%SRCDIR%
191+
%CMAKE_OPT% ^
192+
%SRCDIR:\=/%
193193
if errorlevel 1 (echo cmake failed & goto error)
194194

195195
:skipcmake
@@ -229,7 +229,7 @@ if exist "%PKGDIR%" (
229229
)
230230

231231
echo INSTALL: %DATE% %TIME%
232-
cmake --build %BUILDDIR% --target INSTALL --config %BUILDCONF%
232+
cmake --build %BUILDDIR% --target install --config %BUILDCONF%
233233
if errorlevel 1 (echo INSTALL failed & goto error)
234234

235235
echo PACKAGE: %DATE% %TIME%

1 commit comments

Comments
 (1)

NathanW2 commented on Oct 6, 2016

@NathanW2
NathanW2
on Oct 6, 2016
Member

Nice!

Please sign in to comment.