[Mobies-commit] [commit] r4219 - in UDM/trunk: . bin src/UdmSwig

[endre at redhat3.isis.vanderbilt.edu]

Author: endre
Date: Tue Dec 17 03:19:38 2013
New Revision: 4219

Log:
MAC OS X changes in Makefiles

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

Modified: UDM/trunk/Makefile.OSX
==============================================================================
--- UDM/trunk/Makefile.OSX	Sat Dec 14 14:05:57 2013	(r4218)
+++ UDM/trunk/Makefile.OSX	Tue Dec 17 03:19:38 2013	(r4219)
@@ -1,6 +1,8 @@
+include Makefile.OSX.incl
+
 SUBDIRS = src lib bin
 
-all:
+all:	env	
 	@for dir in $(SUBDIRS);\
 	do \
 		echo "\nInvoking make in subdir: " $${dir};\
@@ -13,4 +15,13 @@
 		echo "\nInvoking make clean in subdir: " $${dir};\
 		$(MAKE) clean -C $${dir} $@ -f Makefile.OSX ;\
 	done
+	rm -f set-env.sh
+
+
+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
+	chmod +x set-env.sh
 

Modified: UDM/trunk/Makefile.OSX.incl
==============================================================================
--- UDM/trunk/Makefile.OSX.incl	Sat Dec 14 14:05:57 2013	(r4218)
+++ UDM/trunk/Makefile.OSX.incl	Tue Dec 17 03:19:38 2013	(r4219)
@@ -1,5 +1,8 @@
 #CC=gcc
 CC=g++
+
+#Xerces binary was available only for i386
+#Therefore the whole package is compiled for i386
 ARCH=i386
 #ARCH=x86_64
 CFLAGS=-c -arch $(ARCH)
@@ -9,6 +12,7 @@
 #to be configured by the user
 #already on a Mac with XCode
 PYTHON=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/
+JDK_INCLUDE=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/
 
 #packages that are downloaded/installed manually 
 UDMHOME=~/trunk
@@ -16,6 +20,12 @@
 BOOST=~/devtools/boost_1_55_0
 ANTLR=~/devtools/pccts/bin/antlr
 DLG=~/devtools/pccts/bin/dlg
+SWIGDIR=~/devtools/swig-2.0.11
+PCRE=~/devtools/pcre-8.33
+XERCESCROOT=~/devtools/xerces-c_2_8_0-x86-macosx-gcc_4_0
+XALANCROOT=~/devtools/xalan-c-1.11/c
 #end of section configured by user
 
+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/bin/Makefile.OSX
==============================================================================
--- UDM/trunk/bin/Makefile.OSX	Sat Dec 14 14:05:57 2013	(r4218)
+++ UDM/trunk/bin/Makefile.OSX	Tue Dec 17 03:19:38 2013	(r4219)
@@ -14,9 +14,9 @@
 UdmOclPat:
 	$(CC) $(BCFLAGS) ../src/UdmOclPat/UdmPat.o -o UdmOclPat -lUdm -L../lib
 UdmToXmi:
-	$(CC) $(BCFLAGS) ../src/UdmToXmi/UdmToXmi.o ../src/UdmXmi/XSLT.o ../src/UdmXmi/Transform.o -o UdmToXmi -lUdm -L../lib -lxalan-c -L$(XALANCROOT)/lib -lxerces-c -L$(XERCESCROOT)/lib
+	$(CC) $(BCFLAGS) ../src/UdmToXmi/UdmToXmi.o ../src/UdmXmi/XSLT.o ../src/UdmXmi/Transform.o -o UdmToXmi -lUdm -L../lib -lxalan-c -L $(XALANCROOT)/lib -lxerces-c -L $(XERCESCROOT)/lib
 XmiToUdm:
-	$(CC) $(BCFLAGS) ../src/XmiToUdm/XmiToUdm.o ../src/UdmXmi/XSLT.o ../src/UdmXmi/Transform.o -o XmiToUdm -lUdm -L../lib -lxalan-c -L$(XALANCROOT)/lib -lxerces-c -L$(XERCESCROOT)/lib
+	$(CC) $(BCFLAGS) ../src/XmiToUdm/XmiToUdm.o ../src/UdmXmi/XSLT.o ../src/UdmXmi/Transform.o -o XmiToUdm -lUdm -L../lib -lxalan-c -L $(XALANCROOT)/lib -lxerces-c -L $(XERCESCROOT)/lib
 
 
 clean:

Modified: UDM/trunk/src/UdmSwig/Makefile.OSX
==============================================================================
--- UDM/trunk/src/UdmSwig/Makefile.OSX	Sat Dec 14 14:05:57 2013	(r4218)
+++ UDM/trunk/src/UdmSwig/Makefile.OSX	Tue Dec 17 03:19:38 2013	(r4219)
@@ -1,11 +1,21 @@
 include ../../Makefile.OSX.incl
 
-SOURCES=UdmSwigMain.cpp
+SOURCES=UdmSwigMain.cpp UdmSwig_wrap.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
 
 all: $(SOURCES) $(OBJECTS)
 
+
+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
+
 .cpp.o:
-	$(CC) $(CFLAGS) $(INCLUDE) $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDE) -I$(JDK_INCLUDE) $< -o $@
 clean: 
-	rm -f *.o
+	rm -f *.o UdmSwig_wrap.cpp build_UdmSwig_wrap.sh