[mapguide-commits] r7866 - in trunk/Installer: . Bootstrapper Installers/MapGuide Libraries/MapGuide Web Extensions Support/Web/x64 Support/Web/x64/configs/Apache2/conf Support/Web/x86 Support/Web/x86/configs/Apache2/conf
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Sep 22 07:00:01 PDT 2013
Author: jng
Date: 2013-09-22 07:00:01 -0700 (Sun, 22 Sep 2013)
New Revision: 7866
Added:
trunk/Installer/Support/Web/x64/httpd-2.4.6-x64-VC11.zip
trunk/Installer/Support/Web/x64/php-5.5.3-x64-VC11.zip
trunk/Installer/Support/Web/x86/httpd-2.4.6-x86-VC11.zip
trunk/Installer/Support/Web/x86/php-5.5.3-x86-VC11.zip
Removed:
trunk/Installer/Bootstrapper/vcredist_2008_x64.exe
trunk/Installer/Bootstrapper/vcredist_2008_x86.exe
trunk/Installer/Bootstrapper/vcredist_2010_x64.exe
trunk/Installer/Bootstrapper/vcredist_2010_x86.exe
trunk/Installer/Support/Web/x64/apache-tomcat-7.0.23-windows-x64.zip
trunk/Installer/Support/Web/x64/httpd-2.2.21-x64-vc10.zip
trunk/Installer/Support/Web/x64/php-5.3.8-x64-vc10.zip
trunk/Installer/Support/Web/x86/apache-tomcat-7.0.23-windows-x86.zip
trunk/Installer/Support/Web/x86/httpd-2.2.21-x86-vc10.zip
trunk/Installer/Support/Web/x86/php-5.3.8-x86-vc10.zip
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Features.xml
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
trunk/Installer/Support/Web/x64/mod_jk.so
trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
trunk/Installer/Support/Web/x86/mod_jk.so
trunk/Installer/build.bat
Log:
RFC 138: Merge installer sandbox changes to trunk.
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2013-09-22 14:00:01 UTC (rev 7866)
@@ -49,75 +49,7 @@
Push $R0
ClearErrors
-;
-; NOTE: We're keeping the VC2008 redist check here as some PHP extensions are built against MSVCR90
-;
-CheckVC2008Install:
-;
-; http://social.msdn.microsoft.com/Forums/en-US/vcgeneral/thread/639e2cfd-bb61-425b-a087-a2442df23402
-;
-!if ${CPU} = "x64"
- SetRegView 64
- ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
- IfErrors InstallVC2008Redist CheckVC2010Install
-!else
- SetRegView 32
- ; Reg key for 32-bit OS
- ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
- IfErrors CheckVS2008Wow32Registry CheckVC2010Install
-
-CheckVS2008Wow32Registry:
- SetRegView 64
- ; Reg key for 64-bit OS (WoW32)
- ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0\RED\1033" "SP"
- IfErrors InstallVC2008Redist CheckVC2010Install
-!endif
-InstallVC2008Redist:
- Banner::show /NOUNLOAD "Installing Visual C++ 2008 Redistributable"
- Banner::getWindow /NOUNLOAD
-!if ${CPU} = "x64"
- File /r "${INSTALLER_OUTPUT}\vcredist_2008_x64.exe"
- ExecWait '"$OUTDIR\vcredist_2008_x64.exe" /q:a"'
-!else
- File /r "${INSTALLER_OUTPUT}\vcredist_2008_x86.exe"
- ExecWait '"$OUTDIR\vcredist_2008_x86.exe" /q:a'
-!endif
- Banner::destroy
-
-CheckVC2010Install:
-;
-; http://blogs.msdn.com/b/astebner/archive/2010/05/05/10008146.aspx
-;
-!if ${CPU} = "x64"
- SetRegView 64
- ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x64" "Installed"
- IfErrors InstallVC2010Redist BeginInstall
-!else
- SetRegView 32
- ; Reg key for 32-bit OS
- ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
- IfErrors CheckVS2010Wow32Registry BeginInstall
-
-CheckVS2010Wow32Registry:
- SetRegView 64
- ; Reg key for 64-bit OS (WoW32)
- ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
- IfErrors InstallVC2010Redist BeginInstall
-!endif
-
-InstallVC2010Redist:
- Banner::show /NOUNLOAD "Installing Visual C++ 2010 Redistributable"
- Banner::getWindow /NOUNLOAD
-!if ${CPU} = "x64"
- File /r "${INSTALLER_OUTPUT}\vcredist_2010_x64.exe"
- ExecWait '"$OUTDIR\vcredist_2010_x64.exe" /passive /norestart'
-!else
- File /r "${INSTALLER_OUTPUT}\vcredist_2010_x86.exe"
- ExecWait '"$OUTDIR\vcredist_2010_x86.exe" /passive /norestart'
-!endif
- Banner::destroy
-
BeginInstall:
; Install VC 2012 redist. Not going to check here. I think we can trust the vcredist install to not trample over anything
Banner::show /NOUNLOAD "Installing Visual C++ 2012 Redistributable"
@@ -140,12 +72,8 @@
; Delete the MGOS installer and any other extracted after completion
Delete "$OUTDIR\${OUTNAME}.msi"
!if ${CPU} = "x64"
- Delete "$OUTDIR\vcredist_2008_x64.exe"
- Delete "$OUTDIR\vcredist_2010_x64.exe"
Delete "$OUTDIR\vcredist_2012_x64.exe"
!else
- Delete "$OUTDIR\vcredist_2008_x86.exe"
- Delete "$OUTDIR\vcredist_2010_x86.exe"
Delete "$OUTDIR\vcredist_2012_x86.exe"
!endif
Deleted: trunk/Installer/Bootstrapper/vcredist_2008_x64.exe
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Bootstrapper/vcredist_2008_x86.exe
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Bootstrapper/vcredist_2010_x64.exe
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Bootstrapper/vcredist_2010_x86.exe
===================================================================
(Binary files differ)
Modified: trunk/Installer/Features.xml
===================================================================
--- trunk/Installer/Features.xml 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Features.xml 2013-09-22 14:00:01 UTC (rev 7866)
@@ -2,7 +2,7 @@
<FeatureMap>
<DirectorySearch Name=".svn" Suffix="_SVNMETADATA" />
<IdentifierOverride Pattern="Server\bin\mgserver.exe" Identifier="MGSERVER_EXE" />
- <IdentifierOverride Pattern="Apache2\bin\httpd.exe" Identifier="HTTPD_EXE" />
+ <IdentifierOverride Pattern="Apache24\bin\httpd.exe" Identifier="HTTPD_EXE" />
<IdentifierOverride Pattern="Tomcat\bin\service.bat" Identifier="TOMCAT_SERVICE_BAT" />
<IdentifierOverride Pattern="Tomcat\bin\tomcat7.exe" Identifier="TOMCAT_EXE" />
</FeatureMap>
\ No newline at end of file
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2013-09-22 14:00:01 UTC (rev 7866)
@@ -46,8 +46,8 @@
</Property>
<Property Id="MGSERVER_IP" Secure="yes" Value="127.0.0.1" />
<Property Id="APACHE_PORT" Secure="yes" Value="8008" />
- <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.21" />
- <Property Id="PHP_VERSION" Secure="yes" Value="5.3.8" />
+ <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.6" />
+ <Property Id="PHP_VERSION" Secure="yes" Value="5.5.3" />
<Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.6" />
<Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide26AppPool">
<RegistrySearch
@@ -930,9 +930,11 @@
<Custom
Action="RemoveApacheServiceCA"
Before="RemoveFiles">MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature=2</Custom>
+ <!--
<Custom
Action="RemoveTomcatServiceCA"
Before="RemoveFiles">MGWEB_CONFIG="APACHE" AND &WebExtTomcatFeature>2</Custom>
+ -->
</InstallExecuteSequence>
</Product>
</Wix>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2013-09-22 14:00:01 UTC (rev 7866)
@@ -20,8 +20,10 @@
<CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
<CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
<CustomAction Id="StartApacheServiceCA" Execute="deferred" Return="ignore" FileKey="HTTPD_EXE" ExeCommand="-k start -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <!--
<CustomAction Id="RemoveTomcatServiceCA" Execute="immediate" Return="ignore" FileKey="TOMCAT_EXE" ExeCommand="//DS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
<CustomAction Id="InstallTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="TOMCAT_SERVICE_BAT" ExeCommand="install TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
<CustomAction Id="StartTomcatServiceCA" Execute="deferred" Return="ignore" FileKey="TOMCAT_EXE" ExeCommand="//RS//TomcatMapGuide[MG_VERSION_MAJOR_MINOR]" />
- </Fragment>
+ -->
+ </Fragment>
</Wix>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2013-09-22 14:00:01 UTC (rev 7866)
@@ -56,7 +56,7 @@
</CreateFolder>
</Component>
</Directory>
- <Directory Id="APACHELOCATION" Name="Apache2" />
+ <Directory Id="APACHELOCATION" Name="Apache24" />
<Directory Id="PHPLOCATION" Name="Php">
<Component Id="WebExtPhpComponent" Win64="$(var.Win64)" Guid="88814E96-07DC-4fb7-A993-F31FC1E000CB" Feature="WebExtPhpFeature">
<CreateFolder />
Deleted: trunk/Installer/Support/Web/x64/apache-tomcat-7.0.23-windows-x64.zip
===================================================================
(Binary files differ)
Modified: trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf 2013-09-22 14:00:01 UTC (rev 7866)
@@ -151,10 +151,9 @@
#LoadModule auth_digest_module modules/mod_auth_digest.so
#LoadModule authn_anon_module modules/mod_authn_anon.so
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
LoadModule authn_file_module modules/mod_authn_file.so
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_user_module modules/mod_authz_user.so
@@ -167,6 +166,7 @@
LoadModule dir_module modules/mod_dir.so
LoadModule env_module modules/mod_env.so
#LoadModule expires_module modules/mod_expires.so
+LoadModule filter_module modules/mod_filter.so
#LoadModule file_cache_module modules/mod_file_cache.so
#LoadModule headers_module modules/mod_headers.so
LoadModule imagemap_module modules/mod_imagemap.so
@@ -192,7 +192,7 @@
#LoadModule usertrack_module modules/mod_usertrack.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
#LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module "%MG_WEB_PHP%/php5apache2_2.dll"
+LoadModule php5_module "%MG_WEB_PHP%/php5apache2_4.dll"
LoadModule mgmapagent_module modules/mod_mgmapagent.so
#
@@ -300,8 +300,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
@@ -356,8 +355,7 @@
# viewed by Web clients.
#
<Files ~ "^\.ht">
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
#
@@ -367,17 +365,6 @@
TypesConfig conf/mime.types
#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value. If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
# The mod_mime_magic module allows the server to use various hints from the
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
@@ -503,8 +490,7 @@
<Directory "%MG_WEB_APACHE%/icons">
Options Indexes MultiViews
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -517,8 +503,7 @@
<Directory "%MG_WEB_APACHE%/manual">
Options Indexes
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
<Files *.html>
SetHandler type-map
@@ -545,8 +530,7 @@
<Directory "%MG_WEB_APACHE%/cgi-bin">
AllowOverride None
Options None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -996,13 +980,11 @@
<Directory "%MG_WEB_ROOT%">
AllowOverride All
Options All -Indexes
- Order allow,deny
- Allow from all
+ Require all granted
# Restrict access via HTTP to webconfig.ini
<Files webconfig.ini>
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
# Apache MapAgent Module
@@ -1027,6 +1009,7 @@
</Directory>
#Disable the AcceptEx call
-Win32DisableAcceptEx
+AcceptFilter http none
+AcceptFilter https none
-%MG_INCLUDE_TOMCAT%
+%MG_INCLUDE_TOMCAT%
\ No newline at end of file
Deleted: trunk/Installer/Support/Web/x64/httpd-2.2.21-x64-vc10.zip
===================================================================
(Binary files differ)
Copied: trunk/Installer/Support/Web/x64/httpd-2.4.6-x64-VC11.zip (from rev 7827, sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x64/httpd-2.4.6-x64-VC11.zip)
===================================================================
(Binary files differ)
Modified: trunk/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Support/Web/x64/php-5.3.8-x64-vc10.zip
===================================================================
(Binary files differ)
Copied: trunk/Installer/Support/Web/x64/php-5.5.3-x64-VC11.zip (from rev 7827, sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x64/php-5.5.3-x64-VC11.zip)
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Support/Web/x86/apache-tomcat-7.0.23-windows-x86.zip
===================================================================
(Binary files differ)
Modified: trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf 2013-09-22 14:00:01 UTC (rev 7866)
@@ -151,10 +151,9 @@
#LoadModule auth_digest_module modules/mod_auth_digest.so
#LoadModule authn_anon_module modules/mod_authn_anon.so
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
LoadModule authn_file_module modules/mod_authn_file.so
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_user_module modules/mod_authz_user.so
@@ -167,6 +166,7 @@
LoadModule dir_module modules/mod_dir.so
LoadModule env_module modules/mod_env.so
#LoadModule expires_module modules/mod_expires.so
+LoadModule filter_module modules/mod_filter.so
#LoadModule file_cache_module modules/mod_file_cache.so
#LoadModule headers_module modules/mod_headers.so
LoadModule imagemap_module modules/mod_imagemap.so
@@ -192,7 +192,7 @@
#LoadModule usertrack_module modules/mod_usertrack.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
#LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module "%MG_WEB_PHP%/php5apache2_2.dll"
+LoadModule php5_module "%MG_WEB_PHP%/php5apache2_4.dll"
LoadModule mgmapagent_module modules/mod_mgmapagent.so
#
@@ -300,8 +300,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
@@ -356,8 +355,7 @@
# viewed by Web clients.
#
<Files ~ "^\.ht">
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
#
@@ -367,17 +365,6 @@
TypesConfig conf/mime.types
#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value. If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
# The mod_mime_magic module allows the server to use various hints from the
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
@@ -503,8 +490,7 @@
<Directory "%MG_WEB_APACHE%/icons">
Options Indexes MultiViews
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -517,8 +503,7 @@
<Directory "%MG_WEB_APACHE%/manual">
Options Indexes
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
<Files *.html>
SetHandler type-map
@@ -545,8 +530,7 @@
<Directory "%MG_WEB_APACHE%/cgi-bin">
AllowOverride None
Options None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -996,13 +980,11 @@
<Directory "%MG_WEB_ROOT%">
AllowOverride All
Options All -Indexes
- Order allow,deny
- Allow from all
+ Require all granted
# Restrict access via HTTP to webconfig.ini
<Files webconfig.ini>
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
# Apache MapAgent Module
@@ -1027,6 +1009,7 @@
</Directory>
#Disable the AcceptEx call
-Win32DisableAcceptEx
+AcceptFilter http none
+AcceptFilter https none
-%MG_INCLUDE_TOMCAT%
+%MG_INCLUDE_TOMCAT%
\ No newline at end of file
Deleted: trunk/Installer/Support/Web/x86/httpd-2.2.21-x86-vc10.zip
===================================================================
(Binary files differ)
Copied: trunk/Installer/Support/Web/x86/httpd-2.4.6-x86-VC11.zip (from rev 7827, sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/httpd-2.4.6-x86-VC11.zip)
===================================================================
(Binary files differ)
Modified: trunk/Installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)
Deleted: trunk/Installer/Support/Web/x86/php-5.3.8-x86-vc10.zip
===================================================================
(Binary files differ)
Copied: trunk/Installer/Support/Web/x86/php-5.5.3-x86-VC11.zip (from rev 7827, sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/php-5.5.3-x86-VC11.zip)
===================================================================
(Binary files differ)
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2013-09-22 13:39:45 UTC (rev 7865)
+++ trunk/Installer/build.bat 2013-09-22 14:00:01 UTC (rev 7866)
@@ -80,12 +80,13 @@
rem ==================================================
rem Web dependencies
rem ==================================================
-SET HTTPD_VERSION=2.2.21
-SET PHP_VERSION=5.3.8
-SET TOMCAT_VERSION=7.0.23
-SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-vc10.zip
-SET TOMCAT_PACKAGE=apache-tomcat-%TOMCAT_VERSION%-windows-%PLATFORM_CLR%.zip
-SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-vc10.zip
+SET HTTPD_VERSION=2.4.6
+SET PHP_VERSION=5.5.3
+SET TOMCAT_VERSION=7.0.42
+SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
+SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%
+SET TOMCAT_PACKAGE=%MG_OEM%\LinuxApt\%TOMCAT_PACKAGE_NAME%.tar.gz
+SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-VC11.zip
:study_params
if (%1)==() goto start_build
@@ -180,15 +181,19 @@
popd
echo [prepare] Unpack Apache httpd
pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
-7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
+7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web"
popd
echo [prepare] Unpack Tomcat
pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
-copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
+copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache24\modules"
REM we unpack to root because Tomcat is the root dir in the zip file
-7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
+7z x "%TOMCAT_PACKAGE%" -y -o"%MG_SOURCE%\Web"
popd
pushd "%MG_SOURCE%\Web"
+if exist %TOMCAT_PACKAGE_NAME%.tar (
+ 7z x %TOMCAT_PACKAGE_NAME%.tar -y
+ del %TOMCAT_PACKAGE_NAME%.tar
+)
if exist Tomcat (
xcopy /S /Y apache-tomcat-%TOMCAT_VERSION%\*.* Tomcat
rd /S /Q apache-tomcat-%TOMCAT_VERSION%
@@ -206,9 +211,9 @@
echo [prepare] Php config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Apache2" "%MG_SOURCE%\Web\Apache24" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 mapagent so
-copy /Y "%MG_BUILD_MAPAGENT%" "%MG_SOURCE%\Web\Apache2\modules"
+copy /Y "%MG_BUILD_MAPAGENT%" "%MG_SOURCE%\Web\Apache24\modules"
echo [prepare] FDO providers.xml
copy /Y "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
@@ -366,7 +371,7 @@
%PARAFFIN% -dir %MG_SOURCE%\CS-Map\Dictionaries -alias $(var.MgSource)\CS-Map\Dictionaries -custom CSMAPDICTFILES -dirref CSMAPLOCATION -ext ASC -ext C -ext CNT -ext GID -ext HLP -ext MAK -ext NMK -ext VCPROJ -ext USER %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
echo [generate]: Web - Apache
-%PARAFFIN% -dir %MG_SOURCE%\Web\Apache2 -alias $(var.MgSource)\Web\Apache2 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
+%PARAFFIN% -dir %MG_SOURCE%\Web\Apache24 -alias $(var.MgSource)\Web\Apache24 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
echo [generate]: Web - Php TS
%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs
More information about the mapguide-commits
mailing list