[Mobies-commit] [commit] r4229 - in UDM/trunk: . lib src/UdmSwig

Sun Jan 5 23:41:58 CST 2014

Author: endre
Date: Sun Jan  5 23:41:58 2014
New Revision: 4229

Log:
additional OS X 10.9.1 changes…

Modified:
   UDM/trunk/Makefile.OSX
   UDM/trunk/Makefile.OSX.incl
   UDM/trunk/lib/Makefile.OSX
   UDM/trunk/src/UdmSwig/Makefile.OSX

Modified: UDM/trunk/Makefile.OSX
==============================================================================

--- UDM/trunk/Makefile.OSX	Sun Jan  5 23:41:52 2014	(r4228)
+++ UDM/trunk/Makefile.OSX	Sun Jan  5 23:41:58 2014	(r4229)
@@ -1,6 +1,6 @@
 include Makefile.OSX.incl
 
-SUBDIRS = src lib bin judm samples
+SUBDIRS = src lib bin judm samples tests
 
 all:	env	
 	@for dir in $(SUBDIRS);\
@@ -17,14 +17,22 @@
 	done
 	rm -f set-env.sh
 
+test:
+	$(MAKE) test -C tests -f Makefile.OSX
+	$(MAKE) test -C judm -f Makefile.OSX
+	
+
 
 
 env:
 	rm -f set-env.sh
 	echo "export PCRE_LIBS="$(PCRE)"/.libs/" >>set-env.sh 
 	echo "export SWIG_LIB="$(SWIGLIB) >> set-env.sh
-	echo "export DYLD_LIBRARY_PATH="$(UDMHOME)"/lib:"$(XERCESCROOT)"/lib:"$(XALANCROOT)"/lib:"$(PCRE)"/.libs" >>set-env.sh
+	echo "export DYLD_LIBRARY_PATH="$(DYLDLIBRARYPATH) >>set-env.sh
 	echo "export JVMD32="$(JVMD32) >>set-env.sh
 	echo "export UDM_PATH="$(UDMHOME) >>set-env.sh
+	echo "export JUNIT="$(JUNIT) >> set-env.sh
+	echo "export JUNITDIR="$(JUNITDIR) >> set-env.sh
+
 	chmod +x set-env.sh
 

Modified: UDM/trunk/Makefile.OSX.incl
==============================================================================
--- UDM/trunk/Makefile.OSX.incl	Sun Jan  5 23:41:52 2014	(r4228)
+++ UDM/trunk/Makefile.OSX.incl	Sun Jan  5 23:41:58 2014	(r4229)
@@ -1,8 +1,6 @@
 #CC=gcc
 CC=g++
 
-# ANT build tool is already on MAC OS X with XCODE
-ANT=ant
 
 #Xerces binary was available only for i386
 #Xerces source does not compile in MACOSX with --arch x86_64
@@ -22,6 +20,8 @@
 #section to be configured by the user
 #################################################
 UDMHOME=~/trunk
+ANT=~/devtools/apache-ant-1.9.3/bin/ant
+JUNITDIR=~/devtools/junit
 MINIZIP=~/devtools
 BOOST=~/devtools/boost_1_55_0
 ANTLR=~/devtools/pccts/bin/antlr
@@ -30,13 +30,17 @@
 PCRE=~/devtools/pcre-8.33
 XERCESCROOT=~/devtools/xerces-c_2_8_0-x86-macosx-gcc_4_0
 XALANCROOT=~/devtools/xalan-c-1.11/c
+CPPUNIT=~/devtools/cppunit-1.12.1
 #JAVA 1.6.0 is needed in order to have a JVM which is capable to load 32bit shared libraries (UdmSwig) (-d32 flag)
 #UdmSwig is a shared library compiled with i386
 JVMD32=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/java
 ###################################
 #end of section configured by user#
 ###################################
-
+#.jar and -javadoc.jar extensions will be added by judm/Makefile
+JUNIT=junit-4.11
+CPPUNITLIBS=$(CPPUNIT)/src/cppunit/.libs
+DYLDLIBRARYPATH=$(UDMHOME)/lib:$(XERCESCROOT)/lib:$(XALANCROOT)/lib:$(PCRE)/.libs:$(CPPUNITLIBS)
 SWIGLIB=$(SWIGDIR)/lib
 SWIG=$(SWIGDIR)/swig
 INCLUDE=-I $(UDMHOME)/include -I $(UDMHOME)/src -I $(UDMHOME)/src/UdmOclPat/GOCL/Include/ -I $(MINIZIP) -I $(XERCES)/include -I $(BOOST) -I $(PYTHON) -I $(XERCESCROOT)/include -I $(XALANCROOT)/src -I $(XALANCROOT)/nls/include

Modified: UDM/trunk/lib/Makefile.OSX
==============================================================================
--- UDM/trunk/lib/Makefile.OSX	Sun Jan  5 23:41:52 2014	(r4228)
+++ UDM/trunk/lib/Makefile.OSX	Sun Jan  5 23:41:58 2014	(r4229)
@@ -20,7 +20,7 @@
 	-lz -lxerces-c -lstdc++ -L $(XERCESCROOT)/lib
 
 libUdmSwig:
-	$(CC) -dynamiclib -arch $(ARCH) -o libUdmSwig.dylib ../src/UdmSwig/UdmSwigMain.o ../src/UdmSwig/UdmSwig_wrap.o -lUdm -L .
+	$(CC) -dynamiclib -arch $(ARCH) -o libUdmSwig.dylib ../src/UdmSwig/UdmSwigMain.o ../src/UdmSwig/UdmSwig_wrap_sed.o -lUdm -L .
 	
 
 clean:

Modified: UDM/trunk/src/UdmSwig/Makefile.OSX
==============================================================================
--- UDM/trunk/src/UdmSwig/Makefile.OSX	Sun Jan  5 23:41:52 2014	(r4228)
+++ UDM/trunk/src/UdmSwig/Makefile.OSX	Sun Jan  5 23:41:58 2014	(r4229)
@@ -1,21 +1,27 @@
 include ../../Makefile.OSX.incl
 
-SOURCES=UdmSwigMain.cpp UdmSwig_wrap.cpp
+SOURCES=UdmSwigMain.cpp UdmSwig_wrap_sed.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
 
 all: $(SOURCES) $(OBJECTS)
 
 
-UdmSwig_wrap.cpp:build_UdmSwig_wrap.sh
-	./build_UdmSwig_Wrap.sh
+#UdmSwig_wrap.cpp:build_UdmSwig_wrap.sh
+#	./build_UdmSwig_Wrap.sh
 
-build_UdmSwig_wrap.sh:
-	rm -f build_UdmSwig_wrap.sh
-	echo "source ../../set-env.sh" > build_UdmSwig_wrap.sh
-	echo $(SWIG)" -java -package edu.vanderbilt.isis.udm.swig -outdir ../../judm/src/UdmSwig/edu/vanderbilt/isis/udm/swig/ -v -c++ -o UdmSwig_wrap.cpp UdmSwig.i " >> build_UdmSwig_wrap.sh
-	chmod +x build_UdmSwig_wrap.sh
+
+#Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)A
+#does not like std::vector< bool >::const_reference result;
+#unfortunately this is generated code by SWIG, so no other choice than this replace hack.... 
+
+
+UdmSwig_wrap_sed.cpp:UdmSwig_wrap.cpp
+	sed 's/std::vector< bool >::const_reference result;/bool result;/' < $<  > $@ 
+
+UdmSwig_wrap.cpp:
+	DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) SWIG_LIB=$(SWIGLIB) $(SWIG) -java -package edu.vanderbilt.isis.udm.swig -outdir ../../judm/src/UdmSwig/edu/vanderbilt/isis/udm/swig/ -v -c++ -o UdmSwig_wrap.cpp UdmSwig.i
 
 .cpp.o:
 	$(CC) $(CFLAGS) $(INCLUDE) -I$(JDK_INCLUDE) $< -o $@
 clean: 
-	rm -f *.o UdmSwig_wrap.cpp build_UdmSwig_wrap.sh
+	rm -f *.o UdmSwig_wrap.cpp UdmSwig_wrap_sed.cpp
