activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r719243 - /activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win
Date Thu, 20 Nov 2008 14:48:21 GMT
Author: tabish
Date: Thu Nov 20 06:48:21 2008
New Revision: 719243

URL: http://svn.apache.org/viewvc?rev=719243&view=rev
Log:
Updates for the new Release.  Set version number and release artifact Id.

Modified:
    activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win   (contents, props changed)

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win?rev=719243&r1=719242&r2=719243&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win Thu Nov 20 06:48:21 2008
@@ -48,7 +48,7 @@
 !ENDIF
 
 PREFIX=..\ActiveMQ-CPP
-CONFIG=Debug
+CONFIG=Release
 VERBOCITY=Normal
 
 !IF [$(COMSPEC) /c cl /nologo /? \
@@ -58,6 +58,10 @@
 ARCH=Win32
 !ENDIF
 
+!IF "$(CONFIG)" == "Debug" || "$(CONFIG)" == "DebugDLL"
+POSTFIX="d"
+!ENDIF
+
 !MESSAGE ARCH          = $(ARCH)
 !MESSAGE CONFIG        = $(CONFIG)
 !MESSAGE VERBOCITY     = $(VERBOCITY)
@@ -99,16 +103,12 @@
 
 
 checkamq:
-	cd test
-	 $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
-		OUTDIR=$(LIBSOSPATH) check
-	 $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
-		OUTDIR=$(ARCHOSPATH) check
-	 cd ..
+	cd vs2005-build\$(CONFIG)
+	.\vs2005-activemq-unittests.exe
+	cd ..\..\
 
 check: checkamq
 
-
 install:
 	echo Y >.y
 	echo A >.A
@@ -116,16 +116,18 @@
 	@if NOT EXIST "$(PREFIX)\bin\."		mkdir "$(PREFIX)\bin"
 	@if NOT EXIST "$(PREFIX)\include\."	mkdir "$(PREFIX)\include"
 	@if NOT EXIST "$(PREFIX)\lib\."		mkdir "$(PREFIX)\lib"
-	copy CHANGES "$(PREFIX)\CHANGES.txt" <.y
-	copy LICENSE "$(PREFIX)\LICENSE.txt" <.y
-	copy NOTICE  "$(PREFIX)\NOTICE.txt"  <.y
-	xcopy src\main\*.h		"$(PREFIX)\include\" /d < .a
-	copy $(LIBSOSPATH)\apr-1.lib		"$(PREFIX)\lib\" <.y
-	copy $(LIBSOSPATH)\apr-1.pdb		"$(PREFIX)\lib\" <.y
-	copy $(ARCHOSPATH)\libapr-1.lib		"$(PREFIX)\lib\" <.y
-	copy $(ARCHOSPATH)\libapr-1.exp		"$(PREFIX)\lib\" <.y
-	copy $(ARCHOSPATH)\libapr-1.dll		"$(PREFIX)\bin\" <.y
-	copy $(ARCHOSPATH)\libapr-1.pdb		"$(PREFIX)\bin\" <.y
+	copy RELEASE_NOTES.txt "$(PREFIX)\RELEASE_NOTES.txt" <.y
+	copy LICENSE.txt "$(PREFIX)\LICENSE.txt" <.y
+	copy NOTICE.txt  "$(PREFIX)\NOTICE.txt"  <.y
+	xcopy src\main\*.h		"$(PREFIX)\include\" /s /d < .a
+!IF "$(CONFIG)" == "Debug" || "$(CONFIG)" == "Release"
+	copy .\vs2005-build\$(CONFIG)\libactivemq-cpp$(POSTFIX).lib		"$(PREFIX)\lib\" <.y
+!ELSE
+	copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).lib		"$(PREFIX)\lib\" <.y
+	copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).exp		"$(PREFIX)\lib\" <.y
+	copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).dll		"$(PREFIX)\bin\" <.y
+	copy .\vs2005-build\$(CONFIG)\activemq-cpp$(POSTFIX).pdb		"$(PREFIX)\bin\" <.y
+!ENDIF
 	del .y
 	del .a
 

Propchange: activemq/activemq-cpp/tags/activemq-cpp-2.2.2/Makefile.win
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/activemq-cpp/trunk/Makefile.win:718699-719242



Mime
View raw message