diff options
| author | Guenter Knauf <fuankg@apache.org> | 2012-12-13 10:35:57 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2012-12-13 10:35:57 +0000 |
| commit | c8e999d05392005d5f2580409f1eacd564718c7a (patch) | |
| tree | f868e75af60c17d1c321a5bb835a5bdbc0049c6a /Makefile.win | |
| parent | d55905538466ac243c112f0ee81ccd484267dff9 (diff) | |
| download | httpd-c8e999d05392005d5f2580409f1eacd564718c7a.tar.gz | |
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
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 57 |
1 files changed, 43 insertions, 14 deletions
diff --git a/Makefile.win b/Makefile.win index b81517431a..81ba86dd8f 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 +<< + + |