run crssync on coordinate system test and run osgeo4w test as nightly

qgis · Apr 19, 2012 · 5895f56 · 5895f56
1 parent 9c3556a
commit 5895f56
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -87,6 +87,8 @@ set LIB=%LIB%;%OSGEO4W_ROOT%\lib
 set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
 
 cmake -G "Visual Studio 9 2008" ^
+	-D BUILDNAME="OSGeo4W-Nightly-VC9" ^
+	-D SITE="qgis.org" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_SPATIALITE=TRUE ^
 	-D WITH_MAPSERVER=TRUE ^
@@ -135,7 +137,7 @@ echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1
 if errorlevel 1 goto error 
 
 echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
-%DEVENV% qgis%VERSION%.sln /Project Experimental /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
+%DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 REM if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
 
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1

diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt
@@ -1,7 +1,5 @@
-# override default path where built files are put to allow running qgis without installing
-SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIBEXEC_SUBDIR})
-
 ADD_EXECUTABLE(crssync main.cpp)
+
 INCLUDE_DIRECTORIES(
   ../core
   ${GDAL_INCLUDE_DIR}
@@ -14,5 +12,7 @@ TARGET_LINK_LIBRARIES(crssync
   ${GDAL_LIBRARY}
 )
 
+ADD_CUSTOM_TARGET(synccrsdb COMMAND crssync)
+
 INSTALL(CODE "MESSAGE(\"Installing crssync ...\")")
 INSTALL(TARGETS crssync RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
diff --git a/src/crssync/main.cpp b/src/crssync/main.cpp
@@ -40,15 +40,6 @@ int main( int argc, char ** argv )
 {
   QgsApplication a( argc, argv, false );
 
-#if defined(Q_WS_MACX)
-  // If we're on Mac, we have the resource library way above us...
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
-#elif defined(Q_WS_WIN)
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/" QGIS_DATA_SUBDIR );
-#else
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/../" QGIS_DATA_SUBDIR );
-#endif
-
   std::cout << "Synchronizing CRS database with PROJ definitions." << std::endl;
 
   CPLPushErrorHandler( showError );

diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
@@ -89,9 +89,9 @@ ADD_QGIS_TEST(rendererstest testqgsrenderers.cpp)
 ADD_QGIS_TEST(maprenderertest testqgsmaprenderer.cpp)
 ADD_QGIS_TEST(geometrytest testqgsgeometry.cpp)
 ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp)
+ADD_DEPENDENCIES(qgis_coordinatereferencesystemtest synccrsdb)
 ADD_QGIS_TEST(pointtest testqgspoint.cpp)
 ADD_QGIS_TEST(searchstringtest testqgssearchstring.cpp)
 ADD_QGIS_TEST(vectorlayertest testqgsvectorlayer.cpp)
 ADD_QGIS_TEST(rulebasedrenderertest testqgsrulebasedrenderer.cpp)
 ADD_QGIS_TEST(ziplayertest testziplayer.cpp)
-