[mapguide-commits] r7822 - sandbox/jng/webtier_upgrade_v2/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Aug 30 02:04:29 PDT 2013
Author: jng
Date: 2013-08-30 02:04:29 -0700 (Fri, 30 Aug 2013)
New Revision: 7822
Added:
sandbox/jng/webtier_upgrade_v2/MgDev/prepare_webtier_components.bat
Modified:
sandbox/jng/webtier_upgrade_v2/MgDev/build.bat
sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment.bat
sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment64.bat
Log:
build script updates:
- Add new prepare_webtier_components.bat. This does the following
- Extracts httpd/php tarballs from Oem\LinuxApt
- Overlays these extracted directories with patched/extra headers from Oem\php and Oem\httpd
- Update setenvironment.bat/setenvironment64.bat to set the following environment variables:
- PHP_SRC: The PHP source directory
- PHP_LIB: The PHP directory containing php5ts.lib
- HTTPD_SRC: The httpd source directory
- HTTPD_LIB: The directory containing the .lib files for httpd
- Update build.bat to use new install location for mod_mgmapagent.so
Modified: sandbox/jng/webtier_upgrade_v2/MgDev/build.bat
===================================================================
--- sandbox/jng/webtier_upgrade_v2/MgDev/build.bat 2013-08-30 08:52:25 UTC (rev 7821)
+++ sandbox/jng/webtier_upgrade_v2/MgDev/build.bat 2013-08-30 09:04:29 UTC (rev 7822)
@@ -313,8 +313,8 @@
call build_fusion.bat
%XCOPY% "%MG_OEM%\fusion_build" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:%CONFIGURATION%_excludes.txt
echo [install]: Web Tier - Apache module
-if not exist "%MG_OUTPUT_WEB%\Apache2\modules" mkdir "%MG_OUTPUT_WEB%\Apache2\modules"
-%XCOPY% /F "%MG_BUILD_MAPAGENT%" "%MG_OUTPUT_WEB%\Apache2\modules"
+if not exist "%MG_OUTPUT_WEB%\Apache24\modules" mkdir "%MG_OUTPUT_WEB%\Apache24\modules"
+%XCOPY% /F "%MG_BUILD_MAPAGENT%" "%MG_OUTPUT_WEB%\Apache24\modules"
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
Added: sandbox/jng/webtier_upgrade_v2/MgDev/prepare_webtier_components.bat
===================================================================
--- sandbox/jng/webtier_upgrade_v2/MgDev/prepare_webtier_components.bat (rev 0)
+++ sandbox/jng/webtier_upgrade_v2/MgDev/prepare_webtier_components.bat 2013-08-30 09:04:29 UTC (rev 7822)
@@ -0,0 +1,29 @@
+ at echo off
+SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
+SET HTTPD_VER=2.4.6
+SET PHP_VER=5.5.3
+pushd Oem\LinuxApt
+if exist httpd-%HTTPD_VER% (
+ echo httpd already unpacked. Nothing to do here.
+ goto check_php
+)
+:unpack_httpd
+if not exist httpd-%HTTPD_VER%.tar "%SEVENZ%" x httpd-%HTTPD_VER%.tar.bz2
+if not exist httpd-%HTTPD_VER% "%SEVENZ%" x httpd-%HTTPD_VER%.tar
+:check_php
+if exist php-%PHP_VER% (
+ echo PHP already unpacked. Nothing to do here
+ goto patch_php_headers
+)
+:unpack_php
+if not exist php-%PHP_VER%.tar "%SEVENZ%" x php-%PHP_VER%.tar.bz2
+if not exist php-%PHP_VER% "%SEVENZ%" x php-%PHP_VER%.tar
+:patch_php_headers
+echo Patching PHP headers
+copy /Y ..\php\main\*.h php-%PHP_VER%\main
+copy /Y ..\php\TSRM\*.h php-%PHP_VER%\TSRM
+:patch_httpd_headers
+echo Patching HTTPD headers
+copy /Y ..\httpd\include\*.h httpd-%HTTPD_VER%\include
+:done
+popd
Modified: sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment.bat
===================================================================
--- sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment.bat 2013-08-30 08:52:25 UTC (rev 7821)
+++ sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment.bat 2013-08-30 09:04:29 UTC (rev 7822)
@@ -91,6 +91,27 @@
SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
rem ==================================================
+rem PHP/httpd env vars for Visual Studio
+rem ==================================================
+
+rem Comment out this line if you intend to build against a different version of PHP/httpd
+rem Be sure to change the paths below as well if that's the case
+call prepare_webtier_components.bat
+
+rem Set the env vars that VS will reference
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.3
+SET PHP_LIB=%MG_OEM%\php\Release_TS
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.6
+SET HTTPD_LIB=%MG_OEM%\httpd\lib
+rem Sanity checks
+if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory
+if not exist "%PHP_LIB%\php5ts.lib" echo Environment variable PHP_LIB does not point to a valid directory (%PHP_LIB%). Could not find php5ts.lib in this directory. Please edit setenvironment64.bat to ensure PHP_LIB points to a valid directory
+if not exist "%HTTPD_SRC%" echo Environment variable HTTPD_SRC does not point to a valid directory (%HTTPD_SRC%). Please edit setenvironment64.bat to ensure HTTPD_SRC points to a valid directory
+if not exist "%HTTPD_LIB%\libhttpd.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libhttpd.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
+if not exist "%HTTPD_LIB%\libapr-1.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libapr-1.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
+if not exist "%HTTPD_LIB%\libaprutil-1.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libaprutil-1.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
+
+rem ==================================================
rem MSBuild Settings
rem ==================================================
@@ -113,6 +134,10 @@
SET ANT=ant
echo ======== Environment Variable Summary =============
+echo PHP_SRC = %PHP_SRC%
+echo PHP_LIB = %PHP_LIB%
+echo HTTPD_SRC = %HTTPD_SRC%
+echo HTTPD_LIB = %HTTPD_LIB%
echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
echo Deployment Directory for Web: %MG_OUTPUT_WEB%
Modified: sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment64.bat
===================================================================
--- sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment64.bat 2013-08-30 08:52:25 UTC (rev 7821)
+++ sandbox/jng/webtier_upgrade_v2/MgDev/setenvironment64.bat 2013-08-30 09:04:29 UTC (rev 7822)
@@ -95,7 +95,27 @@
IF "%ANT_HOME%" == "" SET ANT_HOME=C:\apache-ant-1.8.3
SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
+rem ==================================================
+rem PHP/httpd env vars for Visual Studio
+rem ==================================================
+rem Comment out this line if you intend to build against a different version of PHP/httpd
+rem Be sure to change the paths below as well if that's the case
+call prepare_webtier_components.bat
+
+rem Set the env vars that VS will reference
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.3
+SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.6
+SET HTTPD_LIB=%MG_OEM%\httpd\lib64
+rem Sanity checks
+if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory
+if not exist "%PHP_LIB%\php5ts.lib" echo Environment variable PHP_LIB does not point to a valid directory (%PHP_LIB%). Could not find php5ts.lib in this directory. Please edit setenvironment64.bat to ensure PHP_LIB points to a valid directory
+if not exist "%HTTPD_SRC%" echo Environment variable HTTPD_SRC does not point to a valid directory (%HTTPD_SRC%). Please edit setenvironment64.bat to ensure HTTPD_SRC points to a valid directory
+if not exist "%HTTPD_LIB%\libhttpd.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libhttpd.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
+if not exist "%HTTPD_LIB%\libapr-1.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libapr-1.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
+if not exist "%HTTPD_LIB%\libaprutil-1.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libaprutil-1.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
+
rem ==================================================
rem MSBuild Settings
rem ==================================================
@@ -119,6 +139,10 @@
SET ANT=ant
echo ======== Environment Variable Summary =============
+echo PHP_SRC = %PHP_SRC%
+echo PHP_LIB = %PHP_LIB%
+echo HTTPD_SRC = %HTTPD_SRC%
+echo HTTPD_LIB = %HTTPD_LIB%
echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
echo Deployment Directory for Web: %MG_OUTPUT_WEB%
More information about the mapguide-commits
mailing list