Skip to content

Commit a7bf496

Browse files
jef-njef-n
committedOct 20, 2013
osgeo4w: merge 32 and 64 bit packaging scripts
·
ltr-3_40archive/master_2
1 parent 249526b commit a7bf496

File tree

4 files changed

+180
-621
lines changed

4 files changed

+180
-621
lines changed
 

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

Lines changed: 84 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@echo off
12
REM ***************************************************************************
23
REM package-nightly.cmd
34
REM ---------------------
@@ -12,48 +13,78 @@ REM * the Free Software Foundation; either version 2 of the License, or *
1213
REM * (at your option) any later version. *
1314
REM * *
1415
REM ***************************************************************************
15-
@echo off
1616
set GRASS_VERSION=6.4.3
1717

18-
set BUILDDIR=%CD%\build
19-
REM set BUILDDIR=%TEMP%\qgis_unstable
20-
set LOG=%BUILDDIR%\build.log
21-
22-
if not exist "%BUILDDIR%" mkdir %BUILDDIR%
23-
if not exist "%BUILDDIR%" goto error
24-
2518
set VERSION=%1
2619
set PACKAGE=%2
2720
set PACKAGENAME=%3
28-
if "%VERSION%"=="" goto error
29-
if "%PACKAGE%"=="" goto error
30-
if "%PACKAGENAME%"=="" set PACKAGENAME=qgis-dev
21+
set ARCH=%4
22+
if "%VERSION%"=="" goto usage
23+
if "%PACKAGE%"=="" goto usage
24+
if "%PACKAGENAME%"=="" goto usage
25+
if "%ARCH%"=="" goto usage
3126

32-
path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES%\CMake 2.8\bin
33-
set PYTHONPATH=
27+
set BUILDDIR=%CD%\build-nightly-%ARCH%
28+
set LOG=%BUILDDIR%\build.log
3429

35-
if "%PROGRAMFILES%"=="" set PROGRAMFILES=C:\Programme
36-
set VS90COMNTOOLS=%PROGRAMFILES%\Microsoft Visual Studio 9.0\Common7\Tools\
37-
call "%PROGRAMFILES%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
30+
if "%OSGEO4W_ROOT%"=="" (
31+
if "%ARCH%"=="x86" (
32+
set OSGEO4W_ROOT=C:\OSGeo4W
33+
) else (
34+
set OSGEO4W_ROOT=C:\OSGeo4W64
35+
)
36+
)
3837

39-
if "%OSGEO4W_ROOT%"=="" set OSGEO4W_ROOT=%PROGRAMFILES%\OSGeo4W
40-
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" goto error
38+
if not exist "%BUILDDIR%" mkdir %BUILDDIR%
39+
if not exist "%BUILDDIR%" (echo "could not create build directory %BUILDDIR%" & goto error)
4140

41+
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" (echo "o4w_env.bat not found" & goto error)
4242
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
4343

4444
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
4545
set LIB_DIR=%O4W_ROOT%
4646

47+
if "%ARCH%"=="x86" goto devenv_x86
48+
goto devenv_x86_64
49+
50+
:devenv_x86
51+
if "%PROGRAMFILES(X86)%"=="" set "PROGRAMFILES(X86)"=%PROGRAMFILES%
52+
set VS90COMNTOOLS=%PROGRAMFILES(X86)%\Microsoft Visual Studio 9.0\Common7\Tools\
53+
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
54+
4755
set DEVENV=
4856
if exist "%DevEnvDir%\vcexpress.exe" set DEVENV=vcexpress
4957
if exist "%DevEnvDir%\devenv.exe" set DEVENV=devenv
50-
if "%DEVENV%"=="" goto error
58+
59+
set CMAKE_OPT=^
60+
-G "Visual Studio 9 2008" ^
61+
-D BUILDNAME="OSGeo4W-Nightly-VC9" ^
62+
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
63+
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
64+
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
65+
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG"
66+
goto devenv
67+
68+
:devenv_x86_64
69+
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
70+
71+
set DEVENV=devenv
72+
set CMAKE_OPT=^
73+
-G "Visual Studio 10 Win64" ^
74+
-D BUILDNAME="OSGeo4W-Nightly-VC10-64" ^
75+
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
76+
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
77+
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /Zi /MP /Od /D NDEBUG /D QGISDEBUG" ^
78+
-D SETUPAPI_LIBRARY="%PROGRAMFILES(X86)%/Microsoft SDKs/Windows/v7.0A/Lib/x64/SetupAPI.Lib"
79+
80+
:devenv
81+
set PYTHONPATH=
82+
path %PROGRAMFILES(X86)%\CMake 2.8\bin;%PATH%;c:\cygwin\bin
83+
if "%DEVENV%"=="" (echo "DEVENV not found" & goto error)
5184

5285
PROMPT qgis%VERSION%$g
5386

5487
set BUILDCONF=RelWithDebInfo
55-
REM set BUILDCONF=Release
56-
5788

5889
cd ..\..
5990
set SRCDIR=%CD%
@@ -70,7 +101,7 @@ REM try renaming the logfile to see if it's locked
70101
REM
71102

72103
if exist build.tmp del build.tmp
73-
if exist build.tmp goto error
104+
if exist build.tmp (echo "could not remove build.tmp" & goto error)
74105

75106
ren build.log build.tmp
76107
if exist build.log goto locked
@@ -90,7 +121,7 @@ goto error
90121
:build
91122
echo Logging to %LOG%
92123
echo BEGIN: %DATE% %TIME%>>%LOG% 2>&1
93-
if errorlevel 1 goto error
124+
if errorlevel 1 (echo "could not write to log %LOG%" & goto error)
94125

95126
set >buildenv.log
96127

@@ -103,8 +134,7 @@ set LIB=%LIB%;%OSGEO4W_ROOT%\lib
103134
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
104135
set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
105136

106-
cmake -G "Visual Studio 9 2008" ^
107-
-D BUILDNAME="OSGeo4W-Nightly-VC9" ^
137+
cmake %CMAKE_OPT% ^
108138
-D SITE="qgis.org" ^
109139
-D PEDANTIC=TRUE ^
110140
-D WITH_QSPATIALITE=TRUE ^
@@ -114,54 +144,57 @@ cmake -G "Visual Studio 9 2008" ^
114144
-D WITH_GLOBE=TRUE ^
115145
-D WITH_TOUCH=TRUE ^
116146
-D WITH_ORACLE=TRUE ^
147+
-D WITH_GRASS=TRUE ^
148+
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
117149
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
118150
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
119151
-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
120152
-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
121153
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
122154
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
123155
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
124-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
125156
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
126157
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
127158
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
128-
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
129-
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
130159
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
131160
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
132161
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
133-
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^
134162
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
135163
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
136164
%SRCDIR%>>%LOG% 2>&1
137-
if errorlevel 1 goto error
165+
if errorlevel 1 (echo "cmake failed" & goto error)
138166

139167
REM bail out if python or grass was not found
140168
grep -Eq "^(Python not being built|Could not find GRASS)" %LOG%
141-
if not errorlevel 1 goto error
169+
if not errorlevel 1 (echo "python or grass not found" & goto error)
142170

143171
:skipcmake
144172

145173
echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1
146174
%DEVENV% qgis%VERSION%.sln /Project ZERO_CHECK /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
147-
if errorlevel 1 goto error
175+
if errorlevel 1 (echo "ZERO_CHECK failed" & goto error)
148176

149177
echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1
150178
%DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
151-
if errorlevel 1 goto error
179+
if errorlevel 1 (echo "ALL_BUILD failed" & goto error)
180+
181+
if not exist ..\skiptests (
182+
echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
183+
%DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
184+
if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
185+
)
152186

153-
echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
154-
%DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
155-
REM if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
187+
set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%
156188

157-
if exist %OSGEO4W_ROOT%\apps\%PACKAGENAME% (
189+
if exist %PKGDIR% (
158190
echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
159-
rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
191+
rmdir /s /q %PKGDIR%
192+
if errorlevel 1 (echo "could not remove package directory %PKGDIR%" & goto error)
160193
)
161194

162195
echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
163196
%DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
164-
if errorlevel 1 goto error
197+
if errorlevel 1 (echo INSTALL failed & goto error)
165198

166199
:package
167200
echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
@@ -174,16 +207,17 @@ sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassve
174207
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' qgis.reg.tmpl >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.reg.tmpl
175208

176209
REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
177-
REM if errorlevel 1 goto error
210+
REM if errorlevel 1 (echo creation of qgisconfig.py.tmpl failed & goto error)
178211

179-
REM del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
212+
REM del %PKGDIR%\python\qgis\qgisconfig.py
180213

181214
touch exclude
182215

183-
move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
184-
move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
216+
move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
217+
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
185218

186-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
219+
if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAGENAME%
220+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
187221
--exclude-from exclude ^
188222
apps/%PACKAGENAME% ^
189223
bin/%PACKAGENAME%-bin.exe ^
@@ -195,10 +229,15 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
195229
etc/postinstall/%PACKAGENAME%.bat ^
196230
etc/preremove/%PACKAGENAME%.bat ^
197231
>>%LOG% 2>&1
198-
if errorlevel 1 goto error
232+
if errorlevel 1 (echo tar failed & goto error)
199233

200234
goto end
201235

236+
:usage
237+
echo usage: %0 version package packagename arch
238+
echo sample: %0 2.1.0 38 qgis-dev x86_64
239+
exit
240+
202241
:error
203242
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
204243
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1

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

Lines changed: 0 additions & 202 deletions
This file was deleted.

‎ms-windows/osgeo4w/package.cmd

Lines changed: 96 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@echo off
12
REM ***************************************************************************
23
REM package.cmd
34
REM ---------------------
@@ -12,47 +13,74 @@ REM * the Free Software Foundation; either version 2 of the License, or *
1213
REM * (at your option) any later version. *
1314
REM * *
1415
REM ***************************************************************************
15-
@echo off
1616
set GRASS_VERSION=6.4.3
1717

18-
set BUILDDIR=%CD%\build
19-
REM set BUILDDIR=%TEMP%\qgis_unstable
20-
set LOG=%BUILDDIR%\build.log
21-
22-
if not exist "%BUILDDIR%" mkdir %BUILDDIR%
23-
if not exist "%BUILDDIR%" goto error
24-
2518
set VERSION=%1
2619
set PACKAGE=%2
2720
set PACKAGENAME=%3
28-
if "%VERSION%"=="" goto error
29-
if "%PACKAGE%"=="" goto error
30-
if "%PACKAGENAME%"=="" set PACKAGENAME=qgis
21+
set ARCH=%4
22+
if "%VERSION%"=="" goto usage
23+
if "%PACKAGE%"=="" goto usage
24+
if "%PACKAGENAME%"=="" goto usage
25+
if "%ARCH%"=="" goto usage
3126

32-
path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES%\CMake 2.8\bin
33-
set PYTHONPATH=
27+
set BUILDDIR=%CD%\build-%ARCH%
28+
set LOG=%BUILDDIR%\build.log
3429

35-
set VS90COMNTOOLS=%PROGRAMFILES%\Microsoft Visual Studio 9.0\Common7\Tools\
36-
call "%PROGRAMFILES%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
30+
if "%OSGEO4W_ROOT%"=="" (
31+
if "%ARCH%"=="x86" (
32+
set OSGEO4W_ROOT=C:\OSGeo4W
33+
) else (
34+
set OSGEO4W_ROOT=C:\OSGeo4W64
35+
)
36+
)
37+
38+
if not exist "%BUILDDIR%" mkdir %BUILDDIR%
39+
if not exist "%BUILDDIR%" (echo "could not create build directory %BUILDDIR%" & goto error)
3740

38-
if "%OSGEO4W_ROOT%"=="" set OSGEO4W_ROOT=%PROGRAMFILES%\OSGeo4W
39-
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" goto error
41+
if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" (echo "o4w_env.bat not found" & goto error)
4042
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
41-
path %PATH%;c:\cygwin\bin
4243

4344
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
4445
set LIB_DIR=%O4W_ROOT%
4546

47+
if "%ARCH%"=="x86" goto devenv_x86
48+
goto devenv_x86_64
49+
50+
:devenv_x86
51+
if "%PROGRAMFILES(X86)%"=="" set "PROGRAMFILES(X86)"=%PROGRAMFILES%
52+
set VS90COMNTOOLS=%PROGRAMFILES(X86)%\Microsoft Visual Studio 9.0\Common7\Tools\
53+
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
54+
4655
set DEVENV=
4756
if exist "%DevEnvDir%\vcexpress.exe" set DEVENV=vcexpress
4857
if exist "%DevEnvDir%\devenv.exe" set DEVENV=devenv
49-
if "%DEVENV%"=="" goto error
5058

51-
PROMPT qgis%VERSION%$g
59+
set CMAKE_OPT=^
60+
-G "Visual Studio 9 2008" ^
61+
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
62+
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
63+
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib
64+
goto devenv
5265

53-
set BUILDCONF=RelWithDebInfo
54-
REM set BUILDCONF=Release
66+
:devenv_x86_64
67+
call "%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
68+
69+
set DEVENV=devenv
70+
set CMAKE_OPT=^
71+
-G "Visual Studio 10 Win64" ^
72+
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
73+
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
74+
-D SETUPAPI_LIBRARY="%PROGRAMFILES(X86)%/Microsoft SDKs/Windows/v7.0A/Lib/x64/SetupAPI.Lib"
75+
76+
:devenv
77+
set PYTHONPATH=
78+
path %PROGRAMFILES(X86)%\CMake 2.8\bin;%PATH%;c:\cygwin\bin
79+
if "%DEVENV%"=="" (echo "DEVENV not found" & goto error)
80+
81+
PROMPT qgis%VERSION%$g
5582

83+
set BUILDCONF=Release
5684

5785
cd ..\..
5886
set SRCDIR=%CD%
@@ -69,7 +97,7 @@ REM try renaming the logfile to see if it's locked
6997
REM
7098

7199
if exist build.tmp del build.tmp
72-
if exist build.tmp goto error
100+
if exist build.tmp (echo "could not remove build.tmp" & goto error)
73101

74102
ren build.log build.tmp
75103
if exist build.log goto locked
@@ -89,7 +117,7 @@ goto error
89117
:build
90118
echo Logging to %LOG%
91119
echo BEGIN: %DATE% %TIME%>>%LOG% 2>&1
92-
if errorlevel 1 goto error
120+
if errorlevel 1 (echo "could not write to log %LOG%" & goto error)
93121

94122
set >buildenv.log
95123

@@ -102,14 +130,16 @@ set LIB=%LIB%;%OSGEO4W_ROOT%\lib
102130
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
103131
set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
104132

105-
cmake -G "Visual Studio 9 2008" ^
133+
cmake %CMAKE_OPT% ^
106134
-D PEDANTIC=TRUE ^
107135
-D WITH_QSPATIALITE=TRUE ^
108136
-D WITH_MAPSERVER=TRUE ^
109137
-D MAPSERVER_SKIP_ECW=TRUE ^
110138
-D WITH_GLOBE=TRUE ^
111139
-D WITH_TOUCH=TRUE ^
112140
-D WITH_ORACLE=TRUE ^
141+
-D WITH_GRASS=TRUE ^
142+
-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^
113143
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
114144
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
115145
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
@@ -118,43 +148,42 @@ cmake -G "Visual Studio 9 2008" ^
118148
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
119149
-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
120150
-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
121-
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
122151
-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
123152
-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^
124153
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
125-
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
126-
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
127154
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
128155
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
129156
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
130-
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
131157
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
132158
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
133159
%SRCDIR%>>%LOG% 2>&1
134-
if errorlevel 1 goto error
160+
if errorlevel 1 (echo "cmake failed" & goto error)
135161

136162
REM bail out if python or grass was not found
137163
grep -Eq "^(Python not being built|Could not find GRASS)" %LOG%
138-
if not errorlevel 1 goto error
164+
if not errorlevel 1 (echo "python or grass not found" & goto error)
139165

140166
:skipcmake
141167

142168
echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1
143169
%DEVENV% qgis%VERSION%.sln /Project ZERO_CHECK /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
144-
if errorlevel 1 goto error
170+
if errorlevel 1 (echo "ZERO_CHECK failed" & goto error)
145171

146172
echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1
147173
%DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
148-
if errorlevel 1 goto error
174+
if errorlevel 1 (echo "ALL_BUILD failed" & goto error)
175+
176+
set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%
149177

150-
if exist %OSGEO4W_ROOT%\apps\%PACKAGENAME% (
178+
if exist %PKGDIR% (
151179
echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
152-
rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
180+
rmdir /s /q %PKGDIR%
181+
if errorlevel 1 (echo "could not remove package directory %PKGDIR%" & goto error)
153182
)
154183

155184
echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
156185
%DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
157-
if errorlevel 1 goto error
186+
if errorlevel 1 (echo INSTALL failed & goto error)
158187

159188
:package
160189
echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
@@ -174,19 +203,19 @@ if not exist %OSGEO4W_ROOT%\httpd.d mkdir %OSGEO4W_ROOT%\httpd.d
174203
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%GRASS_VERSION%/g' httpd.conf.tmpl >%OSGEO4W_ROOT%\httpd.d\httpd_%PACKAGENAME%.conf.tmpl
175204

176205
REM sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
177-
REM if errorlevel 1 goto error
206+
REM if errorlevel 1 (echo creation of qgisconfig.py.tmpl failed & goto error)
178207

179-
REM del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
208+
REM del %PKGDIR%\python\qgis\qgisconfig.py
180209

181210
touch exclude
182211

183-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 ^
212+
for %%i in ("" "-common" "-server" "-devel" "-grass-plugin" "-globe-plugin" "-oracle-provider") do (
213+
if not exist %ARCH%\release\qgis\%PACKAGENAME%%%i mkdir %ARCH%\release\qgis\%PACKAGENAME%%%i
214+
)
215+
216+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 ^
184217
--exclude-from exclude ^
185218
--exclude "*.pyc" ^
186-
"apps/%PACKAGENAME%/bin/Microsoft.VC90.CRT.manifest" ^
187-
"apps/%PACKAGENAME%/bin/msvcm90.dll" ^
188-
"apps/%PACKAGENAME%/bin/msvcp90.dll" ^
189-
"apps/%PACKAGENAME%/bin/msvcr90.dll" ^
190219
"apps/%PACKAGENAME%/bin/qgispython.dll" ^
191220
"apps/%PACKAGENAME%/bin/qgis_analysis.dll" ^
192221
"apps/%PACKAGENAME%/bin/qgis_networkanalysis.dll" ^
@@ -216,9 +245,9 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 ^
216245
"apps/%PACKAGENAME%/crssync.exe" ^
217246
"etc/postinstall/%PACKAGENAME%-common.bat" ^
218247
>>%LOG% 2>&1
219-
if errorlevel 1 goto error
248+
if errorlevel 1 (echo tar common failed & goto error)
220249

221-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 ^
250+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-server/%PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 ^
222251
--exclude-from exclude ^
223252
--exclude "*.pyc" ^
224253
"apps/%PACKAGENAME%/bin/qgis_mapserv.fcgi.exe" ^
@@ -228,11 +257,12 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 ^
228257
"etc/postinstall/%PACKAGENAME%-server.bat" ^
229258
"etc/preremove/%PACKAGENAME%-server.bat" ^
230259
>>%LOG% 2>&1
231-
if errorlevel 1 goto error
260+
if errorlevel 1 (echo tar server failed & goto error)
261+
262+
move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
263+
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
232264

233-
move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
234-
move %OSGEO4W_ROOT%\apps\%PACKAGENAME%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
235-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
265+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
236266
--exclude-from exclude ^
237267
--exclude "*.pyc" ^
238268
"bin/%PACKAGENAME%-browser-bin.exe" ^
@@ -266,9 +296,9 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
266296
"etc/postinstall/%PACKAGENAME%.bat" ^
267297
"etc/preremove/%PACKAGENAME%.bat" ^
268298
>>%LOG% 2>&1
269-
if errorlevel 1 goto error
299+
if errorlevel 1 (echo tar desktop failed & goto error)
270300

271-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
301+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-grass-plugin/%PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
272302
--exclude-from exclude ^
273303
--exclude "*.pyc" ^
274304
"apps/%PACKAGENAME%/grass" ^
@@ -278,43 +308,44 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz
278308
"apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
279309
"apps/%PACKAGENAME%/plugins/libgrass_gis.%GRASS_VERSION%.dll" ^
280310
>>%LOG% 2>&1
281-
if errorlevel 1 goto error
311+
if errorlevel 1 (echo tar grass-plugin failed & goto error)
282312

283-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
313+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-globe-plugin/%PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
284314
--exclude-from exclude ^
285315
--exclude "*.pyc" ^
286316
"apps/%PACKAGENAME%/globe" ^
287317
"apps/%PACKAGENAME%/plugins/globeplugin.dll" ^
288318
>>%LOG% 2>&1
289-
if errorlevel 1 goto error
319+
if errorlevel 1 (echo tar globe-plugin failed & goto error)
290320

291-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-oracle-provider-%VERSION%-%PACKAGE%.tar.bz2 ^
321+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-oracle-provider/%PACKAGENAME%-oracle-provider-%VERSION%-%PACKAGE%.tar.bz2 ^
292322
"apps/%PACKAGENAME%/plugins/oracleprovider.dll" ^
293323
apps/qt4/plugins/sqldrivers/qsqlocispatial.dll ^
294324
>>%LOG% 2>&1
295-
if errorlevel 1 goto error
325+
if errorlevel 1 (echo tar oracle-provider failed & goto error)
296326

297-
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2 ^
327+
tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-devel/%PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2 ^
298328
--exclude-from exclude ^
299329
--exclude "*.pyc" ^
300330
"apps/%PACKAGENAME%/FindQGIS.cmake" ^
301331
"apps/%PACKAGENAME%/include/" ^
302332
"apps/%PACKAGENAME%/lib/" ^
303333
>>%LOG% 2>&1
304-
if errorlevel 1 goto error
334+
if errorlevel 1 (echo tar devel failed & goto error)
305335

306336
goto end
307337

338+
:usage
339+
echo usage: %0 version package packagename arch
340+
echo sample: %0 2.0.1 3 qgis x86
341+
exit
342+
308343
:error
309344
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
310345
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1
311-
if exist %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2
312-
if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2
313-
if exist %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-server-%VERSION%-%PACKAGE%.tar.bz2
314-
if exist %PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-devel-%VERSION%-%PACKAGE%.tar.bz2
315-
if exist %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2
316-
if exist %PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-globe-plugin-%VERSION%-%PACKAGE%.tar.bz2
317-
if exist %PACKAGENAME%-oracle-provider-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-oracle-provider-%VERSION%-%PACKAGE%.tar.bz2
346+
for %%i in ("" "-common" "-server" "-devel" "-grass-plugin" "-globe-plugin" "-oracle-provider") do (
347+
if exist %ARCH%\release\qgis\%PACKAGENAME%%%i\%PACKAGENAME%%%i-%VERSION%-%PACKAGE%.tar.bz2 del %ARCH%\release\qgis\%PACKAGENAME%%%i\%PACKAGENAME%%%i-%VERSION%-%PACKAGE%.tar.bz2
348+
)
318349

319350
:end
320351
echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1

‎ms-windows/osgeo4w/package64.cmd

Lines changed: 0 additions & 309 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.