From: Guenter Knauf <fuankg@apache.org>
Date: Thu, 13 Dec 2012 10:35:57 +0000 (+0000)
Subject: Added copying of .swf CGI to Windows install target.
X-Git-Tag: 2.5.0-alpha~6018
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8e999d05392005d5f2580409f1eacd564718c7a;p=thirdparty%2Fapache%2Fhttpd.git

Added copying of .swf CGI to Windows install target.
Moved fixing of shebang to separate target so that it is
no longer executed by default and CGIs remain inactive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421203 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.win b/Makefile.win
index b81517431a5..81ba86dd8fc 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1044,21 +1044,9 @@ BEGIN {
 		INSTALL_DIR="$(INSTDIR)\bin\iconv"
 	cd ..\..
 !ENDIF
-	copy docs\cgi-examples\printenv.vbs "$(INSTDIR)\cgi-bin\printenv.vbs" <.y
 	copy docs\cgi-examples\printenv "$(INSTDIR)\cgi-bin\printenv.pl" <.y
-	-awk -f <<script.awk "docs/cgi-examples/printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
-    BEGIN { 
-	if ( "perl -e \"print $$^X;\"" | getline perlroot ) {
-	    gsub( /\\/, "/", perlroot );
-	    print "#!" perlroot;
-	}
-    }
-    {
-	if ( $$0 !~ /^#!/ ) {
-	    print $$0;
-	}
-    }
-<<
+	copy docs\cgi-examples\printenv.vbs "$(INSTDIR)\cgi-bin\printenv.vbs" <.y
+	copy docs\cgi-examples\printenv.wsf "$(INSTDIR)\cgi-bin\printenv.wsf" <.y
 	xcopy docs\error 	"$(INSTDIR)\error" /s /d < .a
 	xcopy docs\docroot 	"$(INSTDIR)\htdocs" /d < .a
 	xcopy docs\icons 	"$(INSTDIR)\icons" /s /d < .a
@@ -1131,3 +1119,44 @@ BEGIN {
 <<
 	del .y
 	del .a
+
+_fixshebang: _install
+	-awk -f <<script.awk "docs/cgi-examples/printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
+    BEGIN { 
+	if ( "perl -e \"print $$^X;\"" | getline perlroot ) {
+	    gsub( /\\/, "/", perlroot );
+	    print "#!" perlroot;
+	}
+    }
+    {
+	if ( $$0 !~ /^#!/ ) {
+	    print $$0;
+	}
+    }
+<<
+	-cscript -nologo <<script.vbs "docs/cgi-examples/printenv.vbs" "$(INSTDIR)\cgi-bin\printenv.vbs"
+    Dim fso, f, c
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set f = fso.OpenTextFile(WScript.Arguments(0), 1)
+    f.SkipLine
+    c = f.ReadAll
+    f.Close
+    Set f = fso.OpenTextFile(WScript.Arguments(1), 2, TRUE)
+    f.WriteLine "'!" & Replace(WScript.FullName, "\", "/") & " -nologo"
+    f.Write c
+    f.Close
+<<
+	-cscript -nologo <<script.vbs "docs/cgi-examples/printenv.wsf" "$(INSTDIR)\cgi-bin\printenv.wsf"
+    Dim fso, f, c
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set f = fso.OpenTextFile(WScript.Arguments(0), 1)
+    f.SkipLine
+    c = f.ReadAll
+    f.Close
+    Set f = fso.OpenTextFile(WScript.Arguments(1), 2, TRUE)
+    f.WriteLine "'!" & Replace(WScript.FullName, "\", "/") & " -nologo"
+    f.Write c
+    f.Close
+<<
+
+