[hydra-commits] beagles: branch ice/slice-translator-versioning r669 - in /ice/branches/slice...
SVN commits to the Hydra project
hydra-commits at lists.digium.com
Thu Jun 10 09:07:37 CDT 2010
Author: beagles
Date: Thu Jun 10 09:07:36 2010
New Revision: 669
URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=669
Log:
Initial add of windows makefiles (needs further edits) and clean rule
on root makefile for test.
Added:
ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak (with props)
ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak (with props)
ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak (with props)
Modified:
ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile
Modified: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile?view=diff&rev=669&r1=668&r2=669
==============================================================================
--- ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile (original)
+++ ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile Thu Jun 10 09:07:36 2010
@@ -40,4 +40,7 @@
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
+clean::
+ rm -f Test.cpp Test.h
+
include .depend
Added: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak?view=auto&rev=669
==============================================================================
--- ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak (added)
+++ ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak Thu Jun 10 09:07:36 2010
@@ -1,0 +1,41 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..
+
+SERVER = server.exe
+
+TARGETS = $(SERVER)
+
+OBJS = Test.obj \
+ TestI.obj
+
+SOBJS = Server.obj
+
+SRCS = $(OBJS:.obj=.cpp) \
+ $(SOBJS:.obj=.cpp) \
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = $(SLICE2CPPFLAGS)
+CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(GENERATE_PDB)" == "yes"
+SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
+!endif
+
+$(SERVER): $(SOBJS) $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend.mak
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/Makefile.mak
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak?view=auto&rev=669
==============================================================================
--- ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak (added)
+++ ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak Thu Jun 10 09:07:36 2010
@@ -1,0 +1,47 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = ..\client1.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj \
+ AllTests.obj \
+ Test.obj
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = $(SLICE2CPPFLAGS) -DVERSION1
+CPPFLAGS = -DVERSION1 -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(GENERATE_PDB)" == "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+Client.obj: ..\Client.cpp Test.h
+
+AllTests.obj: ..\AllTests.cpp Test.h
+
+Test.obj: Test.cpp Test.h
+
+Test.cpp: ..\Test.ice
+ del /q Test.h Test.cpp
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) $^
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend.mak
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version1/Makefile.mak
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak?view=auto&rev=669
==============================================================================
--- ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak (added)
+++ ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak Thu Jun 10 09:07:36 2010
@@ -1,0 +1,47 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir = ..\..\..\..
+
+CLIENT = ..\client1.exe
+
+TARGETS = $(CLIENT)
+
+OBJS = Client.obj \
+ AllTests.obj \
+ Test.obj
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+SLICE2CPPFLAGS = $(SLICE2CPPFLAGS) -DVERSION1
+CPPFLAGS = -DVERSION1 -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+
+!if "$(GENERATE_PDB)" == "yes"
+CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
+!endif
+
+Client.obj: ..\Client.cpp Test.h
+
+AllTests.obj: ..\AllTests.cpp Test.h
+
+Test.obj: Test.cpp Test.h
+
+Test.cpp: ..\Test.ice
+ del /q Test.h Test.cpp
+ $(SLICE2CPP) $(SLICE2CPPFLAGS) $^
+
+$(CLIENT): $(OBJS)
+ $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+ @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
+ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
+
+clean::
+ del /q Test.cpp Test.h
+
+!include .depend.mak
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: ice/branches/slice-translator-versioning/cpp/test/Ice/versioning/version2/Makefile.mak
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the asterisk-scf-commits
mailing list