[mapguide-commits] r6517 - in trunk: Installer/Support/Web/x64/configs/Php Installer/Support/Web/x86/configs/Php MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-02-16 08:44:13 -0800 (Thu, 16 Feb 2012)
New Revision: 6517

Modified:
   trunk/Installer/Support/Web/x64/configs/Php/php.ini
   trunk/Installer/Support/Web/x86/configs/Php/php.ini
   trunk/MgDev/build.bat
   trunk/MgDev/build64.bat
Log:
Update build scripts and default php.ini to enable running of the PHP web tier unit test suite against a freshly prepared build.

Modified: trunk/Installer/Support/Web/x64/configs/Php/php.ini
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Php/php.ini	2012-02-15 17:39:10 UTC (rev 6516)
+++ trunk/Installer/Support/Web/x64/configs/Php/php.ini	2012-02-16 16:44:13 UTC (rev 6517)
@@ -621,7 +621,7 @@
 extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
-;extension=php_curl.dll
+extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
@@ -660,8 +660,8 @@
 ;extension=php_zip.dll
 extension=php_MapGuideApiEnvConfig.dll
 extension=php_MapGuideApi.dll
+extension=php_SQLitePhpApi.dll
 
-
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
 ;;;;;;;;;;;;;;;;;;;

Modified: trunk/Installer/Support/Web/x86/configs/Php/php.ini
===================================================================
--- trunk/Installer/Support/Web/x86/configs/Php/php.ini	2012-02-15 17:39:10 UTC (rev 6516)
+++ trunk/Installer/Support/Web/x86/configs/Php/php.ini	2012-02-16 16:44:13 UTC (rev 6517)
@@ -621,7 +621,7 @@
 extension=php_mbstring.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
-;extension=php_curl.dll
+extension=php_curl.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
@@ -660,8 +660,8 @@
 ;extension=php_zip.dll
 extension=php_MapGuideApiEnvConfig.dll
 extension=php_MapGuideApi.dll
+extension=php_SQLitePhpApi.dll
 
-
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
 ;;;;;;;;;;;;;;;;;;;

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2012-02-15 17:39:10 UTC (rev 6516)
+++ trunk/MgDev/build.bat	2012-02-16 16:44:13 UTC (rev 6517)
@@ -351,6 +351,8 @@
 %XCOPY% "%MG_WEB_SRC%\mapviewerjava" "%MG_OUTPUT_WEB%\www\mapviewerjava" /EXCLUDE:%TYPEBUILD%_excludes.txt
 echo [install]: Web Tier - mapviewerjava - WEB-INF
 %XCOPY% "%MG_WEB_SRC%\WEB-INF" "%MG_OUTPUT_WEB%\www\WEB-INF" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
+REM Required for Web Tier unit tests
+copy /Y "%MG_OEM%\SQLite\bin\win32\%TYPEBUILD%\php_SQLitePhpApi.dll" "%MG_OUTPUT_WEB%\Php\ext"
 echo [install]: Web Tier - fusion
 call build_fusion.bat
 %XCOPY% "%MG_OEM%\fusion_build" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:%CONFIGURATION%_excludes.txt
@@ -417,8 +419,8 @@
 echo                                doc
 echo ************************************************************************
 :quit
-REM SET TYPEACTION=
-REM SET TYPEBUILD=
+SET TYPEACTION=build
+SET TYPEBUILD=Release
 REM SET MG_OUTPUT=
 REM SET MG_BUILD_COMPONENT=
 REM SET MG_DEV=

Modified: trunk/MgDev/build64.bat
===================================================================
--- trunk/MgDev/build64.bat	2012-02-15 17:39:10 UTC (rev 6516)
+++ trunk/MgDev/build64.bat	2012-02-16 16:44:13 UTC (rev 6517)
@@ -383,6 +383,8 @@
 %XCOPY% "%MG_WEB_SRC%\mapviewerjava" "%MG_OUTPUT_WEB%\www\mapviewerjava" /EXCLUDE:%CONFIGURATION%_excludes.txt
 echo [install]: Web Tier - mapviewerjava - WEB-INF
 %XCOPY% "%MG_WEB_SRC%\WEB-INF" "%MG_OUTPUT_WEB%\www\WEB-INF" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
+REM Required for Web Tier unit tests
+copy /Y "%MG_OEM%\SQLite\bin\win64\%TYPEBUILD%\php_SQLitePhpApi.dll" "%MG_OUTPUT_WEB%\Php\ext"
 echo [install]: Web Tier - fusion
 call build_fusion.bat
 %XCOPY% "%MG_OEM%\fusion_build" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:%CONFIGURATION%_excludes.txt
@@ -449,8 +451,8 @@
 echo                                doc
 echo ************************************************************************
 :quit
-REM SET TYPEACTION=
-REM SET TYPEBUILD=
+SET TYPEACTION=build
+SET TYPEBUILD=Release64
 REM SET MG_OUTPUT=
 REM SET MG_BUILD_COMPONENT=
 REM SET MG_DEV=