Return-Path: Delivered-To: apmail-ws-sandesha-dev-archive@www.apache.org Received: (qmail 51509 invoked from network); 24 Oct 2007 09:27:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Oct 2007 09:27:50 -0000 Received: (qmail 70163 invoked by uid 500); 24 Oct 2007 09:27:37 -0000 Delivered-To: apmail-ws-sandesha-dev-archive@ws.apache.org Received: (qmail 69969 invoked by uid 500); 24 Oct 2007 09:27:37 -0000 Mailing-List: contact sandesha-dev-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list sandesha-dev@ws.apache.org Received: (qmail 69958 invoked by uid 500); 24 Oct 2007 09:27:37 -0000 Delivered-To: apmail-ws-sandesha-cvs@ws.apache.org Received: (qmail 69955 invoked by uid 99); 24 Oct 2007 09:27:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2007 02:27:37 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2007 09:27:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E760F1A9832; Wed, 24 Oct 2007 02:27:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587828 - in /webservices/sandesha/trunk/c/build/win32: configure.in makefile Date: Wed, 24 Oct 2007 09:27:26 -0000 To: sandesha-cvs@ws.apache.org From: nandika@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071024092726.E760F1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nandika Date: Wed Oct 24 02:27:25 2007 New Revision: 587828 URL: http://svn.apache.org/viewvc?rev=587828&view=rev Log: makefile updated to embed manifest Modified: webservices/sandesha/trunk/c/build/win32/configure.in webservices/sandesha/trunk/c/build/win32/makefile Modified: webservices/sandesha/trunk/c/build/win32/configure.in URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build/win32/configure.in?rev=587828&r1=587827&r2=587828&view=diff ============================================================================== --- webservices/sandesha/trunk/c/build/win32/configure.in (original) +++ webservices/sandesha/trunk/c/build/win32/configure.in Wed Oct 24 02:27:25 2007 @@ -7,3 +7,6 @@ #CRUNTIME Library (Use /MD or /MT ) CRUNTIME=/MD +# Visual Studio version +VC_VERSION_2005_OR_ABOVE=1 + Modified: webservices/sandesha/trunk/c/build/win32/makefile URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build/win32/makefile?rev=587828&r1=587827&r2=587828&view=diff ============================================================================== --- webservices/sandesha/trunk/c/build/win32/makefile (original) +++ webservices/sandesha/trunk/c/build/win32/makefile Wed Oct 24 02:27:25 2007 @@ -20,7 +20,7 @@ #compiler options CC = @cl.exe -CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" /w /nologo $(CRUNTIME) \ +CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" /w /nologo \ /I$(AXIS2_BIN_DIR)\include /I$(SANDESHASRC)\include #linker options @@ -47,13 +47,27 @@ #debug symbols !if "$(DEBUG)" == "1" -CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 -LDFLAGS = $(LDFLAGS) /DEBUG +CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 $(CRUNTIME)d +LDFLAGS = $(LDFLAGS) /DEBUG !else -CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 +CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 $(CRUNTIME) LDFLAGS = $(LDFLAGS) /LIBPATH:$(MYSQL_BIN_DIR)\lib\opt !endif +###################### +MT=mt.exe +MT="$(MT)" + +!if "$(VC_VERSION_2005_OR_ABOVE)" == "0" +_VC_MANIFEST_EMBED_EXE= +_VC_MANIFEST_EMBED_DLL= +!else +_VC_MANIFEST_EMBED_EXE= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;2 +!endif +####################### + + #create the directory structure distdir: @@ -250,6 +264,7 @@ $(SANDESHADISTDIR)\modules\sandesha2\$(SANDESHA_DLL).dll : $(SANDESHA2_OBJS) $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_OBJS) /DLL /OUT:$(SANDESHADISTDIR)\modules\sandesha2\$(SANDESHA_DLL).dll \ /IMPLIB:$(SANDESHADISTDIR)\modules\sandesha2\$(SANDESHA_DLL).lib + -@$(_VC_MANIFEST_EMBED_DLL) sandesha2: $(SANDESHADISTDIR)\modules\sandesha2\$(SANDESHA_DLL).dll @@ -260,45 +275,68 @@ ### sample clients -rm_ping_1_0: +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_0.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_ping_1_0\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_ping_1_0\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_ping_1_0\*.obj $(SANDESHA_DLL).lib \ /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_0.exe + -@$(_VC_MANIFEST_EMBED_EXE) -rm_ping_1_1: +rm_ping_1_0: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_0.exe + + +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_1.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_ping_1_1\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_ping_1_1\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_ping_1_0\*.obj $(SANDESHA_DLL).lib \ - /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_1.exe + /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_1.exe + -@$(_VC_MANIFEST_EMBED_EXE) -rm_echo_1_0: +rm_ping_1_1: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_ping_1_1.exe + +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_0.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_echo_1_0\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_echo_1_0\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_echo_1_0\*.obj $(SANDESHA_DLL).lib \ /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_0.exe + -@$(_VC_MANIFEST_EMBED_EXE) + +rm_echo_1_0: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_0.exe -rm_echo_1_1: + +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_1.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_echo_1_1\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_echo_1_1\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_echo_1_1\*.obj \ - $(SANDESHA_DLL).lib /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_1.exe + $(SANDESHA_DLL).lib /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_1.exe + -@$(_VC_MANIFEST_EMBED_EXE) + +rm_echo_1_1: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_1_1.exe -rm_mtom_1_0: +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_mtom_1_0.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_mtom_1_0\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_mtom_1_0\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_mtom_1_0\*.obj $(SANDESHA_DLL).lib \ /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_mtom_1_0.exe - -rm_echo_single_1_0: + -@$(_VC_MANIFEST_EMBED_EXE) +rm_mtom_1_0: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_mtom_1_0.exe + +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_0.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_echo_single_1_0\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_echo_single_1_0\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_echo_single_1_0\*.obj $(SANDESHA_DLL).lib \ - /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_0.exe + /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_0.exe + -@$(_VC_MANIFEST_EMBED_EXE) +rm_echo_single_1_0: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_0.exe -rm_echo_single_1_1: +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_1.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_echo_single_1_1\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_echo_single_1_1\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_echo_single_1_1\*.obj \ $(SANDESHA_DLL).lib /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_1.exe - -rm_report: + -@$(_VC_MANIFEST_EMBED_EXE) +rm_echo_single_1_1: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_echo_single_1_1.exe + +$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_report.exe : $(CC) $(CFLAGS) $(SANDESHASRC)\samples\rm_report\*.c /Fo$(SANDESHA2_INTDIR)\samples\rm_report\ /c $(LD) $(LDFLAGS) $(LIBS) $(SANDESHA2_INTDIR)\samples\rm_report\*.obj \ $(SANDESHA_DLL).lib /OUT:$(SANDESHADISTDIR)\bin\samples\sandesha2\rm_report.exe + -@$(_VC_MANIFEST_EMBED_EXE) + +rm_report: $(SANDESHADISTDIR)\bin\samples\sandesha2\rm_report.exe all_clients: rm_ping_1_0 rm_ping_1_1 rm_echo_1_1 rm_echo_1_0 rm_mtom_1_0 rm_echo_single_1_0 rm_echo_single_1_1 rm_report --------------------------------------------------------------------- To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org For additional commands, e-mail: sandesha-dev-help@ws.apache.org