Changeset 4744

Timestamp:

Feb 14, 2014 9:09:11 AM (11 years ago)

Author:

nanang

Message:

More pjsua2 API (re #1519): added simple tool to check and remove-if-necessary deprecated gcc option '-mno-cygwin' in building pjsua2 python binding on MinGW.

Location:

pjproject/trunk/pjsip-apps/src/swig/python

Files:

• . (modified) (1 prop)
• Makefile (modified) (3 diffs)
• cc_mingw.c (added)
• helper.mak (modified) (1 diff)
• setup.py (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/swig/python

@@ -4 +4 @@
 pjsua2_wrap.h
 _pjsua2.pyd
+*.exe

@@ -4 +4 @@
 pjsua2_wrap.h
 _pjsua2.pyd
+*.exe

pjproject/trunk/pjsip-apps/src/swig/python/Makefile

@@ -4 +4 @@
 ifeq ($(OS),Windows_NT)
   PYTHON_SETUP_FLAGS += --compiler=mingw32
+  GCC_EXE=gcc.exe
+else
+  GCC_EXE=
 endif
 
@@ -12 +15 @@
 all: $(PYTHON_SO)
 
-$(PYTHON_SO): pjsua2_wrap.cpp setup.py
+$(PYTHON_SO): pjsua2_wrap.cpp setup.py $(GCC_EXE)
         python setup.py build $(PYTHON_SETUP_FLAGS)
+
+gcc.exe: cc_mingw.c
+        gcc -o gcc.exe cc_mingw.c
+        cp gcc.exe g++.exe
 
 pjsua2_wrap.cpp: ../pjsua2.i ../symbols.i Makefile $(SRCS)
@@ -20 +27 @@
 clean distclean realclean:
         rm -rf $(PYTHON_SO) pjsua2_wrap.cpp pjsua2_wrap.h pjsua2.py build *.pyc
+        rm -f gcc.exe g++.exe
 
 install:

pjproject/trunk/pjsip-apps/src/swig/python/helper.mak

@@ -3 +3 @@
 lib_dir:
         @for token in `echo $(APP_LDFLAGS)`; do \
-                echo $$token | grep L | sed 's/-L//'; \
+                echo $$token | grep \\-L | sed 's/-L//'; \
         done
 
 inc_dir:
         @for token in `echo $(APP_CFLAGS)`; do \
-                echo $$token | grep I | sed 's/-I//'; \
+                echo $$token | grep \\-I | sed 's/-I//'; \
         done
 

pjproject/trunk/pjsip-apps/src/swig/python/setup.py

@@ -99 +99 @@
         extra_link_args += ["-framework", "AudioUnit"]
 
+# MinGW specific action: put current working dir to PATH, so Python distutils
+# will invoke our dummy gcc/g++ instead, which is in the current working dir.
+if platform.system()=='Windows' and os.environ["MSYSTEM"].find('MINGW')!=-1:
+    os.environ["PATH"] = "." + os.pathsep + os.environ["PATH"]
 
 setup(name="pjsua2", 

@@ -4 +4 @@
 pjsua2_wrap.h
 _pjsua2.pyd
+*.exe