Changeset 31428 for main/trunk/greenstone2/runtime-src

Timestamp:

2017-02-17T20:52:19+13:00 (7 years ago)

Author:

ak19

Message:

Removing commented out code related to older sed version of modifying httpd's win32.mak files. Current version uses awk.

File:

• main/trunk/greenstone2/runtime-src/packages/apache-httpd/adjust-winmak-files.bat (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/packages/apache-httpd/adjust-winmak-files.bat

@@ -68 +68 @@
     set NAMES=
     for /r "%~1" %%P in ("%~2") do (
-        
-        rem set /a "counter +=1"
-        rem echo counter: !counter!
         
         set filename=%%~fP
-        echo file: Modifying win32.mak file !filename! to refer to unique tempfile .bat files to avoid race conditions.
-        
-        rem echo Writing tempfile!counter! into
-        rem echo file: !filename!       
-        
-        rem copy "!filename!" "!filename!.tmp"      
-        rem sed "s@tempfile[0-9]*\.bat@tempfile!counter!.bat@g" "!filename!.tmp" > "!filename!"
-        rem del "!filename!.tmp"
-        
-        rem copy "!filename!" "!filename!.tmp"
-        rem sed "s@/MD@/MT@g" "!filename!.tmp" > "!filename!"
-        rem del "!filename!.tmp"
+        echo file: Modifying win32.mak file !filename! to refer to unique tempfile .bat files to avoid race conditions.     
         
         rem http://stackoverflow.com/questions/4462954/sed-increment-number
@@ -94 +80 @@
     )
 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