Changeset 4575

Timestamp:

Jul 26, 2013 9:16:37 AM (11 years ago)

Author:

nanang

Message:

JNI projects:

• separate makefile for Android and desktop/development
• simplify build process for Android (upload pregenerated SWIG interface)
• removed main loop for Android sample app

Location:

pjproject/branches/projects/jni/pjsip-apps/src/jni

Files:

• Makefile (modified) (1 diff)
• jni/Android.mk (modified) (5 diffs)
• jni/output (added)
• jni/output/bin (added)
• jni/output/callbacks.cpp (added)
• jni/output/callbacks.h (added)
• jni/output/pjsua.i (added)
• src/org/pjsip/hello/MainActivity.java (modified) (1 diff)
• src/org/pjsip/hello/hello.java (modified) (9 diffs)

pjproject/branches/projects/jni/pjsip-apps/src/jni/Makefile

@@ -1 @@
-include jni/Android.mk
+# $Id: Makefile 4563 2013-07-15 05:34:14Z bennylp $
+
+# Get PJ build settings
+include ../../../build.mak
+include $(PJDIR)/build/common.mak
+
+# Get JDK location
+ifeq ("$(JAVA_HOME)","")
+  # Get javac location to determine JDK location
+  JAVAC_PATH = $(shell which javac)
+  ifeq ("$(JAVAC_PATH)","")
+    $(error Cannot determine JDK location using 'which' command. Please define JAVA_HOME envvar)
+  endif
+
+  JAVAC_PATH := $(realpath $(JAVAC_PATH))
+  JAVA_BIN := $(dir $(JAVAC_PATH))
+  JAVA_HOME := $(patsubst %/bin/,%,$(JAVA_BIN))
+endif
+
+# OS specific
+ifeq ($(OS),Windows_NT)
+MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
+MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
+else
+MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,-soname,pjsua.so
+MY_JNI_LIB       = $(MY_PACKAGE_BIN)/libpjsua.so
+MY_JNI_CFLAGS    := -fPIC
+endif
+
+# Env settings, e.g: path to SWIG, JDK, java(.exe), javac(.exe)
+MY_SWIG          = swig
+MY_JDK           = $(JAVA_HOME)
+MY_JAVA          = $(MY_JDK)/bin/java
+MY_JAVAC         = $(MY_JDK)/bin/javac
+MY_JNI_CFLAGS    := $(MY_JNI_CFLAGS) -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 \
+                   -I$(MY_JDK)/include/linux -I.
+
+# Build settings
+MY_CFLAGS        = $(PJ_CFLAGS) $(MY_JNI_CFLAGS)
+MY_LDFLAGS       = $(PJ_LDFLAGS) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) -static-libstdc++
+
+# Output/intermediate path settings
+MY_PACKAGE       = org.pjsip.pjsua
+MY_OUT_DIR       = jni/output
+MY_SWIG_IF       = $(MY_OUT_DIR)/pjsua.i
+MY_SWIG_FLAG     = -c++ -I$(MY_OUT_DIR) # -debug-tmsearch -debug-tmused # -Wall
+MY_SWIG_WRAPPER  = $(MY_OUT_DIR)/pjsua_wrap
+MY_PACKAGE_SRC   = src/$(subst .,/,$(MY_PACKAGE))
+MY_PACKAGE_BIN   = $(MY_OUT_DIR)/bin
+
+TEST_PACKAGE     = org.pjsip.hello
+TEST_SRC         = src/$(subst .,/,$(TEST_PACKAGE))
+
+jni: $(MY_JNI_LIB) java
+
+clean:
+        rm -f $(MY_OUT_DIR)/*.*
+        rm -rf $(MY_PACKAGE_SRC)
+
+$(MY_SWIG_IF).tmp: jni/swig_gen.py
+        @mkdir -p $(MY_OUT_DIR)
+        python jni/swig_gen.py > $(MY_SWIG_IF).tmp
+
+$(MY_SWIG_IF): jni/header.i $(MY_SWIG_IF).tmp
+        cat jni/header.i > $(MY_SWIG_IF)
+        cat $(MY_SWIG_IF).tmp >> $(MY_SWIG_IF)
+
+$(MY_SWIG_WRAPPER).cpp: $(MY_SWIG_IF) jni/callbacks.i jni/my_typemaps.i
+        @# Cleanup java outdir first, to remove any old/deprecated java files
+        rm -rf $(MY_PACKAGE_SRC)
+        @mkdir -p $(MY_PACKAGE_SRC)
+        $(MY_SWIG) $(MY_SWIG_FLAG) -o $(MY_SWIG_WRAPPER).cpp -package $(MY_PACKAGE) \
+                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF) > $(MY_SWIG_WRAPPER)-tm.log
+
+$(MY_JNI_LIB): $(MY_SWIG_WRAPPER).cpp
+        @mkdir -p $(MY_PACKAGE_BIN)
+        $(PJ_CXX) -shared -o $(MY_JNI_LIB) $(MY_SWIG_WRAPPER).cpp $(MY_OUT_DIR)/callbacks.cpp \
+                $(MY_CFLAGS) $(MY_LDFLAGS)
+
+java: $(TEST_SRC)/hello.java
+        @mkdir -p $(MY_PACKAGE_BIN)
+        $(MY_JAVAC) -d $(MY_PACKAGE_BIN) $(MY_PACKAGE_SRC)/*.java
+        $(MY_JAVAC) -d $(MY_PACKAGE_BIN) -classpath "$(MY_PACKAGE_BIN)" $(TEST_SRC)/hello.java
+
+test: $(MY_PACKAGE_BIN)/hello.class
+        @# Need to specify classpath and library path, alternatively, they can be set via
+        @# CLASSPATH and java.library.path env settings
+        $(MY_JAVA) -cp $(MY_PACKAGE_BIN) -Djava.library.path="$(MY_PACKAGE_BIN)" hello

pjproject/branches/projects/jni/pjsip-apps/src/jni/jni/Android.mk

@@ -18 +18 @@
 endif
 
-# OS specific
-ifeq ($(OS),Windows_NT)
-MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
-MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
-else
 MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,-soname,pjsua.so
 MY_JNI_LIB       = $(MY_PACKAGE_BIN)/libpjsua.so
 MY_JNI_CFLAGS    := -fPIC
-endif
 
 # Env settings, e.g: path to SWIG, JDK, java(.exe), javac(.exe)
@@ -44 +38 @@
 MY_OUT_DIR       = jni/output
 MY_SWIG_IF       = $(MY_OUT_DIR)/pjsua.i
-MY_SWIG_FLAG     = -c++ -I$(MY_OUT_DIR) # -debug-tmsearch -debug-tmused # -Wall
+MY_SWIG_FLAG     = -c++ -I$(MY_OUT_DIR)
 MY_SWIG_WRAPPER  = $(MY_OUT_DIR)/pjsua_wrap
 MY_PACKAGE_SRC   = src/$(subst .,/,$(MY_PACKAGE))
@@ -65 +59 @@
 
 clean:
-        rm -rf $(MY_OUT_DIR)
+        rm -rf $(MY_SWIG_WRAPPER).*
         rm -rf $(MY_PACKAGE_SRC)
-
-$(MY_SWIG_IF).tmp: jni/swig_gen.py
-        @mkdir -p $(MY_OUT_DIR)
-        python jni/swig_gen.py > $(MY_SWIG_IF).tmp
-
-$(MY_SWIG_IF): jni/header.i $(MY_SWIG_IF).tmp
-        cat jni/header.i > $(MY_SWIG_IF)
-        cat $(MY_SWIG_IF).tmp >> $(MY_SWIG_IF)
 
 $(MY_SWIG_WRAPPER).cpp: $(MY_SWIG_IF) jni/callbacks.i jni/my_typemaps.i
@@ -81 +67 @@
         @mkdir -p $(MY_PACKAGE_SRC)
         $(MY_SWIG) $(MY_SWIG_FLAG) -o $(MY_SWIG_WRAPPER).cpp -package $(MY_PACKAGE) \
-                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF) > $(MY_SWIG_WRAPPER)-tm.log
+                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF)
 
 $(MY_JNI_LIB): $(MY_SWIG_WRAPPER).cpp
@@ -88 +74 @@
                 $(MY_CFLAGS) $(MY_LDFLAGS)
 
-java: $(TEST_SRC)/hello.java
-        @mkdir -p $(MY_PACKAGE_BIN)
-        $(MY_JAVAC) -d $(MY_PACKAGE_BIN) $(MY_PACKAGE_SRC)/*.java
-        $(MY_JAVAC) -d $(MY_PACKAGE_BIN) -classpath "$(MY_PACKAGE_BIN)" $(TEST_SRC)/hello.java
-
-test: $(MY_PACKAGE_BIN)/hello.class
-        @# Need to specify classpath and library path, alternatively, they can be set via
-        @# CLASSPATH and java.library.path env settings
-        $(MY_JAVA) -cp $(MY_PACKAGE_BIN) -Djava.library.path="$(MY_PACKAGE_BIN)" hello
-
 $(LOCAL_PATH)/$(MY_SWIG_WRAPPER).cpp: $(MY_SWIG_WRAPPER).cpp
 

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello/MainActivity.java

@@ -12 +12 @@
                 setContentView(R.layout.activity_main);
                 
-                /* Call test app here
-                String [] args = {"sip:192.168.1.49"};
-                hello.main(args);
-                */
+                hello.init();
         }
 

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello/hello.java

@@ -11 +11 @@
 class app_config {
         public static int cur_call_id = -1;
+        public static int cur_acc_id = -1;
 }
 
@@ -83 +84 @@
                 return (app_config.cur_call_id > -1);
         }
-
-        public static void main(String[] args) {
+        
+        public static int init() {
                 int[] tp_id = new int[1];
                 int[] acc_id = new int[1];
-                int[] call_id = new int[1];
                 int status;
 
@@ -98 +98 @@
                         if (status != pjsua.PJ_SUCCESS) {
                                 System.out.println("Error creating pjsua: " + status);
-                                System.exit(status);
+                                return status;
                         }
                 }
@@ -115 +115 @@
                         status = pjsua.init(cfg, log_cfg, null);
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error inintializing pjsua", status);
+                                System.out.println("Error initializing pjsua: " + status);
+                                return status;
                         }
                 }
@@ -126 +127 @@
                         status = pjsua.transport_create(pjsip_transport_type_e.PJSIP_TRANSPORT_UDP, cfg, tp_id);
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error creating transport", status);
+                                System.out.println("Error creating transport: " + status);
+                                return status;
                         }
                 }
@@ -134 +136 @@
                         status = pjsua.acc_add_local(tp_id[0], true, acc_id);
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error creating local UDP account", status);
-                        }
+                                System.out.println("Error creating local UDP account: " + status);
+                                return status;
+                        }
+                        app_config.cur_acc_id = acc_id[0]; 
                 }
                 
@@ -142 +146 @@
                         status = pjsua.start();
                         if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error starting pjsua", status);
-                        }
-                }
-                
-                /* Make call to the URL. */
-                if (false) {
-                        status = pjsua.call_make_call(acc_id[0], "sip:localhost:6000", null, 0, null, call_id);
-                        if (status != pjsua.PJ_SUCCESS) {
-                                pj_error_exit("Error making call", status);
-                        }
-                        app_config.cur_call_id = call_id[0];
+                                System.out.println("Error starting pjsua: " + status);
+                                return status;
+                        }
                 }
                 
@@ -165 +161 @@
 
                         pjsua.schedule_timer(timer, tv);
+                }
+                
+                return pjsua.PJ_SUCCESS;
+        }
+
+
+        public static void destroy() {
+                pjsua.destroy();
+        }
+        
+
+        public static void main(String[] args)
+        {
+                /* Init pjsua */
+                int status = init();
+                if (status != pjsua.PJ_SUCCESS) {
+                        pj_error_exit("Failed initializing pjsua", status);
+                }
+                
+                /* Make call to the URL. */
+                if (args.length > 1) {
+                        int[] call_id = new int[1];
+                        status = pjsua.call_make_call(app_config.cur_acc_id, args[1], null, 0, null, call_id);
+                        if (status != pjsua.PJ_SUCCESS) {
+                                pj_error_exit("Error making call", status);
+                        }
+                        app_config.cur_call_id = call_id[0];
                 }
                 
@@ -221 +244 @@
                         }
                 }
-
+                
                 /* Finally, destroy pjsua */
-                {
-                        pjsua.destroy();
-                }
-                
-        }
-}
+                destroy();
+
+        }
+}