Changeset 6156

Timestamp:

Feb 4, 2020 11:14:21 AM (5 years ago)

Author:

riza

Message:

Close #2105: Add option to specify SWIG bindings.

Location:

pjproject/trunk/pjsip-apps/src/swig

Files:

• Makefile (modified) (2 diffs)
• csharp/Makefile (modified) (1 diff)
• java/Makefile (modified) (1 diff)
• python/Makefile (modified) (1 diff)

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

@@ -3 +3 @@
 ifneq ($(findstring android,$(TARGET_NAME)),)
     # no python for android
-    DIRS = java csharp
+    LANG = java csharp
 else
     ifneq ($(findstring ios,$(TARGET_NAME)),)
-        DIRS = csharp
+        LANG = csharp
     else
-        DIRS = python java
+        LANG = python java
     endif
 endif
 
-export SWIG_FLAGS=-I../../../../pjlib/include \
-                   -I../../../../pjlib-util/include \
-                   -I../../../../pjmedia/include \
-                   -I../../../../pjsip/include \
-                   -I../../../../pjnath/include -c++ 
-export SRC_DIR=../../../../pjsip/include
-export SRCS=$(SRC_DIR)/pjsua2/endpoint.hpp $(SRC_DIR)/pjsua2/types.hpp
+CMD_is_java := $(findstring java, $(MAKECMDGOALS))
+CMD_is_python := $(findstring python, $(MAKECMDGOALS))
+CMD_is_csharp := $(findstring csharp, $(MAKECMDGOALS))
+CMD_is_lang := $(or $(CMD_is_java), $(CMD_is_python), $(CMD_is_csharp))
 
-.PHONY: all clean dep depend distclean print realclean install uninstall
+.PHONY: all clean dep depend distclean print realclean install uninstall csharp java python
 
 all: symbols.i
+        
+all clean dep depend distclean print realclean install uninstall: $(LANG)
 
-all clean dep depend distclean print realclean install uninstall:
-        for dir in $(DIRS); do \
-                if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
-                    true; \
-                else \
-                    exit 1; \
-                fi; \
-        done
-
-csharp:
-        $(MAKE) $(MAKE_FLAGS) -C csharp $@
+java python csharp:
+ifeq ($(CMD_is_lang),)
+        $(MAKE) $(MAKE_FLAGS) -C $@ $(MAKECMDGOALS)
+else
+        $(MAKE) $(MAKE_FLAGS) -C $@
+endif
 
 symbols.i: symbols.lst
@@ -41 +35 @@
 symbol symbols:
         python importsym.py
-

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

@@ -9 +9 @@
     endif
 endif
+SWIG_FLAGS=-I../../../../pjlib/include \
+                   -I../../../../pjlib-util/include \
+                   -I../../../../pjmedia/include \
+                   -I../../../../pjsip/include \
+                   -I../../../../pjnath/include -c++ 
+SRC_DIR=../../../../pjsip/include
+SRCS=$(SRC_DIR)/pjsua2/endpoint.hpp $(SRC_DIR)/pjsua2/types.hpp
 
 SWIG_FLAGS += -w312

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

@@ -1 +1 @@
 include ../../../../build.mak
 include ../../../../build/common.mak
+
+SWIG_FLAGS=-I../../../../pjlib/include \
+                   -I../../../../pjlib-util/include \
+                   -I../../../../pjmedia/include \
+                   -I../../../../pjsip/include \
+                   -I../../../../pjnath/include -c++ 
+SRC_DIR=../../../../pjsip/include
+SRCS=$(SRC_DIR)/pjsua2/endpoint.hpp $(SRC_DIR)/pjsua2/types.hpp
 
 ifneq ($(findstring android,$(TARGET_NAME)),)

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

@@ -18 +18 @@
   GCC_EXE=
 endif
+
+SWIG_FLAGS=-I../../../../pjlib/include \
+                   -I../../../../pjlib-util/include \
+                   -I../../../../pjmedia/include \
+                   -I../../../../pjsip/include \
+                   -I../../../../pjnath/include -c++ 
+SRC_DIR=../../../../pjsip/include
+SRCS=$(SRC_DIR)/pjsua2/endpoint.hpp $(SRC_DIR)/pjsua2/types.hpp
 
 #USE_THREADS = -threads -DSWIG_NO_EXPORT_ITERATOR_METHODS