[fdo-commits] r2456 - trunk
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Fri Feb 9 16:30:43 EST 2007
Author: gregboone
Date: 2007-02-09 16:30:43 -0500 (Fri, 09 Feb 2007)
New Revision: 2456
Modified:
trunk/checkoutsvn.bat
trunk/createtarzipfiles.bat
trunk/packchanges.bat
trunk/packchanges.wsf
Log:
Update FDO 3.3.0 build scripts
Modified: trunk/checkoutsvn.bat
===================================================================
--- trunk/checkoutsvn.bat 2007-02-09 18:45:18 UTC (rev 2455)
+++ trunk/checkoutsvn.bat 2007-02-09 21:30:43 UTC (rev 2456)
@@ -31,7 +31,8 @@
SET ARCENABLECHK=no
SET RDBMSENABLECHK=no
SET GDALENABLECHK=no
-SET KINGENABLECHK=no
+SET KINGENABLECHK=no
+SET OGRENABLECHK=no
if (%FDO_SVN_SOURCEDIR%)==() SET FDO_SVN_SOURCEDIR=trunk
if (%FDO_SVN_DESTDIR%)==() SET FDO_SVN_DESTDIR=%cd%
@@ -86,6 +87,7 @@
SET UTILENABLECHK=no
SET GDALENABLECHK=no
SET KINGENABLECHK=no
+ SET OGRENABLECHK=no
:stp0_get_with
if not "%2"=="providers" goto stp1_get_with
SET FDOPROVIDERSENABLECHK=yes
@@ -106,6 +108,7 @@
SET RDBMSENABLECHK=no
SET GDALENABLECHK=no
SET KINGENABLECHK=no
+ SET OGRENABLECHK=no
goto next_param
:stp2_get_with
if not "%2"=="fdocore" goto stp3_get_with
@@ -155,9 +158,13 @@
SET GDALENABLECHK=yes
goto next_param
:stp13_get_with
-if not "%2"=="king" goto custom_error
+if not "%2"=="king" goto stp14_get_with
SET KINGENABLECHK=yes
goto next_param
+:stp14_get_with
+if not "%2"=="ogr" goto custom_error
+ SET OGRENABLECHK=yes
+ goto next_param
:get_source
if (%2)==() goto custom_error
@@ -186,7 +193,7 @@
if not exist "%FDO_SVN_DESTDIR%" mkdir "%FDO_SVN_DESTDIR%"
:checkout_all
-if "%FDOALLENABLECHK%"=="no" goto checkout_core
+if "%FDOALLENABLECHK%"=="no" goto checkout_core
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR% "%FDO_SVN_DESTDIR%" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
@@ -226,7 +233,7 @@
if errorlevel 1 goto error
:checkout_providers
-if "%FDOPROVIDERSENABLECHK%"=="no" goto checkout_shp
+if "%FDOPROVIDERSENABLECHK%"=="no" goto checkout_shp
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers "%FDO_SVN_DESTDIR%\Providers" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
@@ -246,41 +253,47 @@
if errorlevel 1 goto error
:checkout_wfs
-if "%WFSENABLECHK%"=="no" goto checkout_wms
+if "%WFSENABLECHK%"=="no" goto checkout_wms
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/WFS
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/WFS "%FDO_SVN_DESTDIR%\Providers\WFS" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
:checkout_wms
-if "%WMSENABLECHK%"=="no" goto checkout_arcsde
+if "%WMSENABLECHK%"=="no" goto checkout_arcsde
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/WMS
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/WMS "%FDO_SVN_DESTDIR%\Providers\WMS" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
:checkout_arcsde
-if "%ARCENABLECHK%"=="no" goto checkout_generic
+if "%ARCENABLECHK%"=="no" goto checkout_generic
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/ArcSDE
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/ArcSDE "%FDO_SVN_DESTDIR%\Providers\ArcSDE" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
:checkout_generic
-if "%RDBMSENABLECHK%"=="no" goto checkout_gdal
+if "%RDBMSENABLECHK%"=="no" goto checkout_gdal
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/GenericRdbms
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/GenericRdbms "%FDO_SVN_DESTDIR%\Providers\GenericRdbms" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
:checkout_gdal
-if "%GDALENABLECHK%"=="no" goto checkout_king
+if "%GDALENABLECHK%"=="no" goto checkout_king
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/GDAL
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/GDAL "%FDO_SVN_DESTDIR%\Providers\GDAL" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
-
+
:checkout_king
-if "%KINGENABLECHK%"=="no" goto end
+if "%KINGENABLECHK%"=="no" goto checkout_ogr
echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/KingOracle
svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/KingOracle "%FDO_SVN_DESTDIR%\Providers\KingOracle" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
if errorlevel 1 goto error
+:checkout_ogr
+if "%OGRENABLECHK%"=="no" goto end
+echo Checking out https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/OGR
+svn checkout https://osgeo.org/svn/fdo/%FDO_SVN_SOURCEDIR%/Providers/OGR "%FDO_SVN_DESTDIR%\Providers\OGR" --username %FDO_SVN_USERNAME% --password %FDO_SVN_PASSWORD%
+if errorlevel 1 goto error
+
:end
exit /B 0
@@ -316,9 +329,10 @@
echo wms,
echo arcsde,
echo rdbms,
-echo gdal,
-echo king
+echo gdal,
+echo king,
+echo ogr
echo User: -u[ser]=user id
echo Password: -p[assword]=user password
echo **************************************************************
-exit /B 0
+exit /B 0
Modified: trunk/createtarzipfiles.bat
===================================================================
--- trunk/createtarzipfiles.bat 2007-02-09 18:45:18 UTC (rev 2455)
+++ trunk/createtarzipfiles.bat 2007-02-09 21:30:43 UTC (rev 2456)
@@ -26,6 +26,8 @@
SET ARCSDEENABLE=yes
SET RDBMSENABLE=yes
SET GDALENABLE=yes
+SET KINGENABLE=yes
+SET OGRENABLE=yes
SET SHOWHELP=no
SET FDOTARZIPFOLDER=OpenSource_FDO
SET FDOBUILDNUMBER=GXXX
@@ -55,7 +57,7 @@
if (%2)==() goto custom_error
if "%DEFMODIFY%"=="yes" goto stp1_get_with
- SET DEFMODIFY=yes
+ SET DEFMODIFY=yes
SET FDOCOREENABLE=no
SET SHPENABLE=no
SET SDFENABLE=no
@@ -64,6 +66,8 @@
SET ARCSDEENABLE=no
SET RDBMSENABLE=no
SET GDALENABLE=no
+ SET KINGENABLE=no
+ SET OGRENABLE=no
:stp1_get_with
if not "%2"=="sdf" goto stp2_get_with
SET SDFENABLE=yes
@@ -93,7 +97,15 @@
SET GDALENABLE=yes
goto next_param
:stp8_get_with
-if not "%2"=="providers" goto stp9_get_with
+if not "%2"=="king" goto stp9_get_with
+ SET KINGENABLE=yes
+ goto next_param
+:stp9_get_with
+if not "%2"=="ogr" goto stp10_get_with
+ SET OGRENABLE=yes
+ goto next_param
+:stp10_get_with
+if not "%2"=="providers" goto stp11_get_with
SET FDOCOREENABLE=no
SET SHPENABLE=yes
SET SDFENABLE=yes
@@ -102,8 +114,10 @@
SET ARCSDEENABLE=yes
SET RDBMSENABLE=yes
SET GDALENABLE=yes
- goto next_param
-:stp9_get_with
+ SET KINGENABLE=yes
+ SET OGRENABLE=yes
+ goto next_param
+:stp11_get_with
if not "%2"=="all" goto custom_error
SET FDOCOREENABLE=yes
SET SHPENABLE=yes
@@ -113,6 +127,8 @@
SET ARCSDEENABLE=yes
SET RDBMSENABLE=yes
SET GDALENABLE=yes
+ SET KINGENABLE=yes
+ SET OGRENABLE=yes
goto next_param
:get_build
@@ -207,7 +223,7 @@
7z a -airy -bd -tzip "fdordbms-3.3.0_%FDOBUILDNUMBER%.zip" "%FDOTARZIPFOLDER%"
deltree /Y "%FDOTARZIPFOLDER%"
:start_zip_gdal
-if "%GDALENABLE%"=="no" goto end
+if "%GDALENABLE%"=="no" goto start_zip_king
mkdir "%FDOTARZIPFOLDER%\Providers\GDAL"
svn export "%FDOSVNROOT%\Providers\GDAL" "%FDOTARZIPFOLDER%\Providers\GDAL" --force
pushd "%FDOTARZIPFOLDER%"
@@ -216,6 +232,26 @@
if exist "fdogdal-3.3.0_%FDOBUILDNUMBER%.zip" del /q /f "fdogdal-3.3.0_%FDOBUILDNUMBER%.zip"
7z a -airy -bd -tzip "fdogdal-3.3.0_%FDOBUILDNUMBER%.zip" "%FDOTARZIPFOLDER%"
deltree /Y "%FDOTARZIPFOLDER%"
+:start_zip_king
+if "%KINGENABLE%"=="no" goto start_zip_ogr
+ mkdir "%FDOTARZIPFOLDER%\Providers\KingOracle"
+ svn export "%FDOSVNROOT%\Providers\KingOracle" "%FDOTARZIPFOLDER%\Providers\KingOracle" --force
+ pushd "%FDOTARZIPFOLDER%"
+ if exist .svn del /q /f /s .svn
+ popd
+ if exist "fdoking-3.3.0_%FDOBUILDNUMBER%.zip" del /q /f "fdoking-3.3.0_%FDOBUILDNUMBER%.zip"
+ 7z a -airy -bd -tzip "fdoking-3.3.0_%FDOBUILDNUMBER%.zip" "%FDOTARZIPFOLDER%"
+ deltree /Y "%FDOTARZIPFOLDER%"
+:start_zip_ogr
+if "%OGRENABLE%"=="no" goto end
+ mkdir "%FDOTARZIPFOLDER%\Providers\OGR"
+ svn export "%FDOSVNROOT%\Providers\OGR" "%FDOTARZIPFOLDER%\Providers\OGR" --force
+ pushd "%FDOTARZIPFOLDER%"
+ if exist .svn del /q /f /s .svn
+ popd
+ if exist "fdoogr-3.3.0_%FDOBUILDNUMBER%.zip" del /q /f "fdoogr-3.3.0_%FDOBUILDNUMBER%.zip"
+ 7z a -airy -bd -tzip "fdoogr-3.3.0_%FDOBUILDNUMBER%.zip" "%FDOTARZIPFOLDER%"
+ deltree /Y "%FDOTARZIPFOLDER%"
:end
echo End Build
@@ -240,7 +276,7 @@
echo Help: -h[elp]
echo InFolder: -i[npath]=input source svn checkout folder
echo OutFolder: -o[utpath]=destination folder for exported svn files
-echo WithModule: -w[ith]=all(default), fdo, providers, shp, sdf, wfs, wms, arcsde, rdbms, gdal
+echo WithModule: -w[ith]=all(default), fdo, providers, shp, sdf, wfs, wms, arcsde, rdbms, gdal, king, ogr
echo BuildNumber: -b[uild]=User-Defined build number appended to the end of the tar.gz files
echo **************************************************************************
Modified: trunk/packchanges.bat
===================================================================
--- trunk/packchanges.bat 2007-02-09 18:45:18 UTC (rev 2455)
+++ trunk/packchanges.bat 2007-02-09 21:30:43 UTC (rev 2456)
@@ -21,6 +21,7 @@
if "%1"=="-h" goto help_show
if "%1"=="-help" goto help_show
+
SET CHANGENAME=%1
echo Please wait... Scanning changes!
@@ -31,55 +32,77 @@
echo $(.)>> FilesChanges.log
svn status -q >> FilesChanges.log
+
pushd Thirdparty
echo $(Thirdparty)>> ..\FilesChanges.log
svn status -q >> ..\FilesChanges.log
popd
+
pushd Fdo
echo $(Fdo)>> ..\FilesChanges.log
svn status -q >> ..\FilesChanges.log
popd
+
pushd Utilities
echo $(Utilities)>> ..\FilesChanges.log
svn status -q >> ..\FilesChanges.log
popd
+
pushd www
echo $(www)>> ..\FilesChanges.log
svn status -q >> ..\FilesChanges.log
popd
+
pushd Providers\ArcSDE
echo $(ArcSDE)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
pushd Providers\GenericRdbms
echo $(GenericRdbms)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
pushd Providers\GDAL
echo $(GDAL)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
pushd Providers\SDF
echo $(SDF)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
pushd Providers\SHP
echo $(SHP)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
pushd Providers\WFS
echo $(WFS)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
pushd Providers\WMS
echo $(WMS)>> ..\..\FilesChanges.log
svn status -q >> ..\..\FilesChanges.log
popd
+
+pushd Providers\KingOracle
+echo $(KingOracle)>> ..\..\FilesChanges.log
+svn status -q >> ..\..\FilesChanges.log
+popd
+
+pushd Providers\OGR
+echo $(OGR)>> ..\..\FilesChanges.log
+svn status -q >> ..\..\FilesChanges.log
+popd
+
echo end>> FilesChanges.log
echo Please wait... Creating zip file!
cscript //Nologo //job:pack packchanges.wsf
-echo End action
+
exit /B 0
:custom_error
Modified: trunk/packchanges.wsf
===================================================================
--- trunk/packchanges.wsf 2007-02-09 18:45:18 UTC (rev 2455)
+++ trunk/packchanges.wsf 2007-02-09 21:30:43 UTC (rev 2456)
@@ -91,6 +91,14 @@
oinfFile.WriteLine("*")
oinfFile.WriteLine("******WMS******")
activeRelPath = "Providers/WMS/"
+ Case "$(KingOracle)"
+ oinfFile.WriteLine("*")
+ oinfFile.WriteLine("******KingOracle******")
+ activeRelPath = "Providers/KingOracle/"
+ Case "$(OGR)"
+ oinfFile.WriteLine("*")
+ oinfFile.WriteLine("******OGR******")
+ activeRelPath = "Providers/OGR/"
Case Else
modLine = Left(lineFile, 7)
If not Instr(modLine, "M") = 0 Then
More information about the fdo-commits
mailing list