Changeset 4619 for pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python

Timestamp:

Oct 16, 2013 9:19:08 AM (11 years ago)

Author:

nanang

Message:

Re #1519:

• allow build on mingw32
• fixed tests

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python

Files:

• . (modified) (1 prop)
• Makefile (modified) (2 diffs)
• helper.mak (modified) (1 diff)
• setup.py (modified) (3 diffs)
• test.py (modified) (2 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python

@@ -3 +3 @@
 build
 pjsua2_wrap.h
+_pjsua2.pyd

@@ -3 +3 @@
 build
 pjsua2_wrap.h
+_pjsua2.pyd

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python/Makefile

@@ -1 +1 @@
 PYTHON_SO=_pjsua2.so
+
+PYTHON_SETUP_FLAGS = --inplace 
+ifeq ($(OS),Windows_NT)
+  PYTHON_SETUP_FLAGS += --compiler=mingw32
+endif
 
 .PHONY: all
@@ -6 +11 @@
 
 $(PYTHON_SO): pjsua2_wrap.cpp setup.py
-        python setup.py build_ext --inplace
+        python setup.py build_ext $(PYTHON_SETUP_FLAGS)
 
 pjsua2_wrap.cpp: ../pjsua2.i $(SRCS)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python/helper.mak

@@ -16 +16 @@
         done
 
+target_name:
+        $(TARGET_NAME)
+        

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python/setup.py

@@ -62 +62 @@
 #print 'PJ_VERSION = "'+ pj_version + '"'
 
+# Get targetname
+f = os.popen("make --no-print-directory -f helper.mak target_name")
+pj_target_name = f.read().rstrip("\r\n")
+f.close()
 
 # Fill in pj_inc_dirs
@@ -78 +82 @@
 
 # Fill in pj_libs
-pj_libs = ['pjsua2-x86_64-unknown-linux-gnu']                      ### <--- xxxx HARDCODED xxxx
+pj_libs = ['pjsua2-' + pj_target_name]
 f = os.popen("make --no-print-directory -f helper.mak libs")
 for line in f:
@@ -84 +88 @@
 f.close()
 
-# Mac OS X depedencies
+# Fill in extra link args
+extra_link_args = ['-static-libstdc++']
 if platform.system() == 'Darwin':
-    extra_link_args = ["-framework", "CoreFoundation", 
-                       "-framework", "AudioToolbox"]
+    # Mac OS X depedencies
+    extra_link_args += ["-framework", "CoreFoundation", 
+                        "-framework", "AudioToolbox"]
     # OS X Lion support
     if platform.mac_ver()[0].startswith("10.7"):
         extra_link_args += ["-framework", "AudioUnit"]
-else:
-    extra_link_args = []
+
 
 setup(name="pjsua2", 

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python/test.py

@@ -8 +8 @@
 def ua_data_test():
         #
-        # CredInfo
+        # AuthCredInfo
         #
         print "UA data types test.."
         the_realm = "pjsip.org"
-        ci = pj.CredInfo()
+        ci = pj.AuthCredInfo()
         ci.realm = the_realm
         ci.dataType = 20
@@ -58 +58 @@
                 assert e.status == 70013
                 assert e.reason == "Invalid operation (PJ_EINVALIDOP)"
-                assert e.title == "Endpoint::testException()"
+                #assert e.title == "Endpoint::testException()"
         assert got_exception
 

@@ -3 +3 @@
 build
 pjsua2_wrap.h
+_pjsua2.pyd