[Mobies-commit] [commit] r4232 - in UDM/trunk: . lib src/UdmPython

[endre at redhat3.isis.vanderbilt.edu]

Author: endre
Date: Fri Jan 10 23:45:19 2014
New Revision: 4232

Log:
python udm.so module compilation on Mac OS X

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

Modified: UDM/trunk/Makefile.OSX
==============================================================================
--- UDM/trunk/Makefile.OSX	Mon Jan  6 00:43:32 2014	(r4231)
+++ UDM/trunk/Makefile.OSX	Fri Jan 10 23:45:19 2014	(r4232)
@@ -33,6 +33,7 @@
 	echo "export UDM_PATH="$(UDMHOME) >>set-env.sh
 	echo "export JUNIT="$(JUNIT) >> set-env.sh
 	echo "export JUNITDIR="$(JUNITDIR) >> set-env.sh
+	echo "export VERSIONER_PYTHON_PREFER_32_BIT="$(VERSIONER_PYTHON_PREFER_32_BIT) >> set-env.sh
 
 	chmod +x set-env.sh
 

Modified: UDM/trunk/Makefile.OSX.incl
==============================================================================
--- UDM/trunk/Makefile.OSX.incl	Mon Jan  6 00:43:32 2014	(r4231)
+++ UDM/trunk/Makefile.OSX.incl	Fri Jan 10 23:45:19 2014	(r4232)
@@ -9,10 +9,11 @@
 #ARCH=x86_64
 CFLAGS=-c -arch $(ARCH)
 BCFLAGS=-arch $(ARCH)
-
+# we need to run Python in 32bit mode as well
+VERSIONER_PYTHON_PREFER_32_BIT=yes
 
 #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/
+PYTHON=/System/Library/Frameworks/Python.framework/Versions/2.7
 JDK_INCLUDE=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/
 
 #################################################
@@ -40,7 +41,9 @@
 #.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)
+LIBBOOST_PYTHON_DIR=$(BOOST)/bin.v2/libs/python/build/darwin-4.2.1/release/threading-multi
+LIBBOOST_PYTHON=$(LIBBOOST_PYTHON_DIR)/libboost_python.dylib
+DYLDLIBRARYPATH=$(UDMHOME)/lib:$(XERCESCROOT)/lib:$(XALANCROOT)/lib:$(PCRE)/.libs:$(CPPUNITLIBS):$(LIBBOOST_PYTHON_DIR)
 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
+INCLUDE=-I $(UDMHOME)/include -I $(UDMHOME)/src -I $(UDMHOME)/src/UdmOclPat/GOCL/Include/ -I $(MINIZIP) -I $(XERCES)/include -I $(BOOST) -I $(XERCESCROOT)/include -I $(XALANCROOT)/src -I $(XALANCROOT)/nls/include

Modified: UDM/trunk/lib/Makefile.OSX
==============================================================================
--- UDM/trunk/lib/Makefile.OSX	Mon Jan  6 00:43:32 2014	(r4231)
+++ UDM/trunk/lib/Makefile.OSX	Fri Jan 10 23:45:19 2014	(r4232)
@@ -1,6 +1,6 @@
 include ../Makefile.OSX.incl
 
-all:libUdm libUdmSwig
+all:libUdm libUdmSwig udm.so
 
 libUdm:
 	$(CC) -dynamiclib  -arch $(ARCH) -o libUdm.dylib \
@@ -21,7 +21,11 @@
 
 libUdmSwig:
 	$(CC) -dynamiclib -arch $(ARCH) -o libUdmSwig.dylib ../src/UdmSwig/UdmSwigMain.o ../src/UdmSwig/UdmSwig_wrap_sed.o -lUdm -L .
+
+udm.so:../src/UdmPython/UdmPython.o
+	$(CC) -dynamiclib -arch $(ARCH) -install_name $@ -L$(PYTHON)/lib -L$(PYTHON)/lib/python2.7/config -o $@ $<  $(LIBBOOST_PYTHON)  -lpython2.7 -lUdm -L .    -headerpad_max_install_names 
+
 	
 
 clean:
-	rm -f libUdm.dylib libUdmSwig.dylib
+	rm -f libUdm.dylib libUdmSwig.dylib udm.so

Modified: UDM/trunk/src/UdmPython/Makefile.OSX
==============================================================================
--- UDM/trunk/src/UdmPython/Makefile.OSX	Mon Jan  6 00:43:32 2014	(r4231)
+++ UDM/trunk/src/UdmPython/Makefile.OSX	Fri Jan 10 23:45:19 2014	(r4232)
@@ -2,10 +2,13 @@
 
 SOURCES=UdmPython.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
+ADDCFLAGS=-ftemplate-depth-128  -fno-inline -dynamic -fexceptions -fPIC
 
 all: $(SOURCES) $(OBJECTS)
 
 .cpp.o:
-	$(CC) $(CFLAGS) $(INCLUDE) $< -o $@
+	$(CC) $(CFLAGS) $(ADDCFLAGS) $(INCLUDE) $< -o $@ -I$(PYTHON)/include/python2.7/
 clean: 
 	rm -f *.o
+
+