[mapguide-commits] r9931 - sandbox/jng/vanilla_swig

[svn_mapguide at osgeo.org]

Author: jng
Date: 2022-05-20 02:58:51 -0700 (Fri, 20 May 2022)
New Revision: 9931

Modified:
   sandbox/jng/vanilla_swig/prepare_webtier_components.bat
Log:
On windows, the necessary PHP headers are already checked in to Oem/php thus it is no longer necessary to use the LinuxApt tarball as the source of PHP headers. prepare_webtier_components.bat has been updated to remove the need to extract the PHP tarball in LinuxApt

Modified: sandbox/jng/vanilla_swig/prepare_webtier_components.bat
===================================================================
--- sandbox/jng/vanilla_swig/prepare_webtier_components.bat	2022-05-20 09:30:30 UTC (rev 9930)
+++ sandbox/jng/vanilla_swig/prepare_webtier_components.bat	2022-05-20 09:58:51 UTC (rev 9931)
@@ -1,7 +1,6 @@
 @echo off
 SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
 SET HTTPD_VER=2.4.52
-SET PHP_VER=5.6.40
 pushd Oem\LinuxApt
 :check_httpd
 if not exist httpd-%HTTPD_VER% goto unpack_httpd
@@ -16,42 +15,9 @@
 if not exist httpd-%HTTPD_VER%\include\http_core.h goto unpack_httpd
 if not exist httpd-%HTTPD_VER%\include\apr_strings.h goto unpack_httpd
 if not exist httpd-%HTTPD_VER%\include\apr_tables.h goto unpack_httpd
-goto check_php
+goto done
 :unpack_httpd
 if not exist httpd-%HTTPD_VER%.tar "%SEVENZ%" x httpd-%HTTPD_VER%.tar.bz2
 "%SEVENZ%" x -y httpd-%HTTPD_VER%.tar
-:check_php
-rem *sigh* there is not a 100% reliable way to nuke a directory in windows from the cmd line to make way 
-rem for a new MapGuide build, meaning we could have empty PHP directories from a previous build that would 
-rem pass the previous iteration of this check to determine if PHP needs to be unpacked. So check for the specific
-rem headers that we know we are going to be using and if a single one of these headers cannot be found then
-rem do the archive unpacking
-if not exist php-%PHP_VER% goto unpack_php
-if not exist php-%PHP_VER%\ext goto unpack_php
-if not exist php-%PHP_VER%\ext\standard goto unpack_php
-if not exist php-%PHP_VER%\ext\standard\info.h goto unpack_php
-if not exist php-%PHP_VER%\main goto unpack_php
-if not exist php-%PHP_VER%\main\php.h goto unpack_php
-if not exist php-%PHP_VER%\main\php_ini.h goto unpack_php
-if not exist php-%PHP_VER%\main\config.w32.h goto unpack_php
-if not exist php-%PHP_VER%\main\win95nt.h goto unpack_php
-if not exist php-%PHP_VER%\TSRM goto unpack_php
-if not exist php-%PHP_VER%\TSRM\readdir.h goto unpack_php
-if not exist php-%PHP_VER%\Zend goto unpack_php
-if not exist php-%PHP_VER%\Zend\zend.h goto unpack_php
-if not exist php-%PHP_VER%\Zend\zend_exceptions.h goto unpack_php
-if not exist php-%PHP_VER%\Zend\zend_API.h goto unpack_php
-goto patch_php_headers
-:unpack_php
-if not exist php-%PHP_VER%.tar "%SEVENZ%" x php-%PHP_VER%.tar.bz2
-"%SEVENZ%" x -y 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\
-copy /Y ..\php\Zend\*.h php-%PHP_VER%\Zend\
-:patch_httpd_headers
-echo Patching HTTPD headers
-copy /Y ..\httpd\include\*.h httpd-%HTTPD_VER%\include\
 :done
 popd