From c7844d9ef2a9ae8388cc607356bf9ed1248916c7 Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Thu, 20 Apr 2017 21:17:55 +0000 Subject: [PATCH] add custom build step in abs to place an copy of ms/applink.c in proper location. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1792152 13f79535-47bb-0310-9956-ffa450edef68 --- support/abs.dsp | 27 +++++++++++++++++++++++++++ support/abs.mak | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/support/abs.dsp b/support/abs.dsp index 99eafd3057..bb407eb19b 100644 --- a/support/abs.dsp +++ b/support/abs.dsp @@ -111,6 +111,33 @@ SOURCE=.\ab.c # End Source File # Begin Source File +SOURCE=../include\ap_release.h + +!IF "$(CFG)" == "abs - Win32 Release" + +# Begin Custom Build - Create applink.c from ms/applink.c +InputPath=../include\ap_release.h + +"..\srclib\openssl\include\openssl\applink.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + IF EXIST ..\srclib\openssl\ms\applink.c type ..\srclib\openssl\ms\applink.c > ..\srclib\openssl\include\openssl\applink.c + +# End Custom Build + +!ELSEIF "$(CFG)" == "abs - Win32 Debug" + +# Begin Custom Build - Create applink.c from ms/applink.c +InputPath=../include\ap_release.h + +"..\srclib\openssl\include\openssl\applink.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + IF EXIST ..\srclib\openssl\ms\applink.c type ..\srclib\openssl\ms\applink.c > ..\srclib\openssl\include\openssl\applink.c + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\build\win32\httpd.rc # End Source File # End Target diff --git a/support/abs.mak b/support/abs.mak index f9893bfe6a..81da635fdd 100644 --- a/support/abs.mak +++ b/support/abs.mak @@ -48,11 +48,11 @@ OutDir=.\Release !IF "$(RECURSE)" == "0" -ALL : "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" +ALL : "..\srclib\openssl\include\openssl\applink.c" "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" !ELSE -ALL : "aprutil - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" +ALL : "aprutil - Win32 Release" "apr - Win32 Release" "..\srclib\openssl\include\openssl\applink.c" "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" !ENDIF @@ -147,11 +147,11 @@ OutDir=.\Debug !IF "$(RECURSE)" == "0" -ALL : "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" +ALL : "..\srclib\openssl\include\openssl\applink.c" "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" !ELSE -ALL : "aprutil - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" +ALL : "aprutil - Win32 Debug" "apr - Win32 Debug" "..\srclib\openssl\include\openssl\applink.c" "$(OUTDIR)\abs.exe" "$(DS_POSTBUILD_DEP)" !ENDIF @@ -323,6 +323,32 @@ CPP_SWITCHES=/nologo /MDd /W3 /Zi /Od /I "../srclib/apr/include" /I "../srclib/a << +!ENDIF + +SOURCE=../include\ap_release.h + +!IF "$(CFG)" == "abs - Win32 Release" + +InputPath=../include\ap_release.h + +"..\srclib\openssl\include\openssl\applink.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < ..\srclib\openssl\include\openssl\applink.c +<< + + +!ELSEIF "$(CFG)" == "abs - Win32 Debug" + +InputPath=../include\ap_release.h + +"..\srclib\openssl\include\openssl\applink.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < ..\srclib\openssl\include\openssl\applink.c +<< + + !ENDIF SOURCE=..\build\win32\httpd.rc -- 2.50.1