This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 45d624d Embedd manifest file
45d624d is described below
commit 45d624df2a8c2b3a2aca33500b8aa3d3d08a09ed
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 13:01:19 2020 +0200
Embedd manifest file
---
native/iis/Makefile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/native/iis/Makefile b/native/iis/Makefile
index f46844c..d92a1d4 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -34,6 +34,7 @@ MACHINE = AMD64
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDRES = $(WORKDIR)\$(PROJECT).res
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDMFT = $(BUILDBIN).manifest
PCRELIB = .\pcre\$(WORKDIR)\pcre.lib
WORKDIR = $(BUILD_CPU)_RELEASE
@@ -71,7 +72,7 @@ OBJECTS = \
$(WORKDIR)\jk_util.obj \
$(WORKDIR)\jk_worker.obj
-all : pcre $(WORKDIR) $(BUILDBIN)
+all : $(WORKDIR) $(PCRELIB) $(BUILDBIN)
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -86,15 +87,18 @@ $(BUILDRES): ..\common\jk.rc
$(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES)
..\common\jk.rc
$(PCRELIB):
- cd .\pcre
+ @cd .\pcre
$(MAKE)
- cd ..
+ @cd ..
+
$(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS)
/def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
+ @if exist $(BUILDMFT) \
+ $(MT) -nologo -manifest $(BUILDMFT)
-outputresource:$(BUILDBIN);2
clean:
@$(CLEANTARGET)
- cd .\pcre
+ @cd .\pcre
$(MAKE) clean
- cd ..
+ @cd ..
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
