Index: main/trunk/greenstone2/runtime-src/packages/apache-httpd/adjust-winmak-files.bat
===================================================================
--- main/trunk/greenstone2/runtime-src/packages/apache-httpd/adjust-winmak-files.bat	(revision 31421)
+++ main/trunk/greenstone2/runtime-src/packages/apache-httpd/adjust-winmak-files.bat	(revision 31421)
@@ -0,0 +1,99 @@
+:: This file ports the changes Sam made to the release-kit (using ant tasks) for compiling the GS2 release
+:: See changeset http://trac.greenstone.org/changeset/22490
+:: (Also http://trac.greenstone.org/browser/main/trunk/ant-tasks/src/org/greenstone/anttasks/RegexSearchReplace.java
+:: http://trac.greenstone.org/browser/main/trunk/ant-tasks/src/org/greenstone/anttasks/InsertUniqueValue.java)
+:: This script performs 2 steps: 
+:: replace all occurrences of "tempfile" in .mak files within httpd-2.2.11 with "tempfile$counter"
+:: replace all occurrences of "/MD" in .mak files within httpd-2.2.11 with "/MT"
+
+:: http://www.theverge.com/2016/3/30/11331014/microsoft-windows-linux-ubuntu-bash
+:: "Microsoft is adding the Linux command line to Windows 10" Mar 30, 2016
+
+
+@echo off
+
+:: pass in the httpd folder to this script, e.g. httpd-2.2.11
+if [%1]==[] echo ERROR: Extracted httpd folder name not specified. Unable to adjust win .mak files&& goto :eof
+if not exist "%~dp0%1" echo ERROR: Extracted httpd folder %~dp0%1 doesn't exist. Unable to adjust win .mak files&& goto :eof
+
+setlocal enableextensions enabledelayedexpansion
+set httpdfolder=%1
+
+:: http://stackoverflow.com/questions/4419868/what-is-the-current-directory-in-a-batch-file
+pushd "%CD%"
+cd /d "%~dp0"
+
+:: Use sed to regex search and replace text files
+:: http://stackoverflow.com/questions/1115508/batch-find-and-edit-lines-in-txt-file
+:: (Instead of sed can also use FindRepl.bat from http://www.dostips.com/forum/viewtopic.php?t=4697)
+:: First add SED to PATH:
+set PATH=..\..\..\bin\windows;%PATH%
+
+:: Incrementing http://stackoverflow.com/questions/21697199/how-to-increment-variable-under-dos
+:: http://stackoverflow.com/questions/2913231/how-do-i-increment-a-dos-variable-in-a-for-f-loop
+:: http://stackoverflow.com/questions/17605767/create-list-or-arrays-in-windows-batch
+set counter=0
+
+:: http://stackoverflow.com/questions/2951063/windows-bat-file-how-to-recursively-list-all-files-of-type-mp3
+:: "This batch file demonstrates how to extract elements of a filename from the variable in a for loop.
+:: Save this as listfiles.bat, then run "listfiles some\folder *.mp3".
+:: I set up the file finding as a subroutine in the batch file so you can insert it into your own scripts."
+
+call :rsr-files %httpdfolder% *.mak
+::echo PATHS: %PATHS%
+::echo NAMES: %NAMES%
+
+popd
+endlocal
+goto :eof
+
+:: ************************ SUBROUTINES **********************************************
+
+:: append counter to tempfile.bat references in the current .mak file of loop
+:: And change any occurrence of /MD to /MT in each .mak file too
+:: Digit wildcard doesn't work for me in sed regex here, and although the any char wildcard
+:: works it may be too greedy. Fortunately, character classes for digits works.
+:: To check this script has worked, check httpd-2.2.11/modules/ssl/mod_ssl.mak to make sure
+:: occurrences of "tempfile.bat" have a number suffix before the extension and that there's
+:: no occurrence of /MD (or /MDd) only of /MT (and /MTd).
+:: See https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx for /MD, /MDd, /MT, /MTd
+		
+:rsr-files
+    set PATHS=
+    set NAMES=
+    for /r "%~1" %%P in ("%~2") do (
+		rem set PATHS=!PATHS! "%%~fP"
+		rem set NAMES=!NAMES! "%%~nP%%~xP"
+		
+		
+		set /a "counter +=1"
+		rem echo counter: !counter!
+        
+		set filename=%%~fP
+		
+		echo Writing tempfile!counter! into
+		echo file: !filename!		
+		
+		
+		copy "!filename!" "!filename!.tmp"
+		sed "s@tempfile[0-9]*\.bat@tempfile!counter!.bat@g" "!filename!.tmp" > "!filename!"
+		del "!filename!.tmp"
+        
+		copy "!filename!" "!filename!.tmp"
+		sed "s@/MD@/MT@g" "!filename!.tmp" > "!filename!"
+		del "!filename!.tmp"
+		
+    )
+goto :eof
+
+
+
+
+:: copy httpd-2.2.11\libhttpd.mak httpd-2.2.11\libhttpd.mak.tmp
+
+:: Use batch cmd 'type' to view files without file locking and for viewing locked files: http://www.robvanderwoude.com/type.php
+rem type httpd-2.2.11\libhttpd.mak.tmp | sed "s/tempfile/tempfile1/g" > httpd-2.2.11\libhttpd.mak
+:: Alternatively:
+rem sed "s/tempfile/tempfile%counter%/g" httpd-2.2.11\libhttpd.mak.tmp > httpd-2.2.11\libhttpd.mak
+
+:: del httpd-2.2.11\libhttpd.mak.tmp
