Changeset 4563

Timestamp:

Jul 15, 2013 5:34:14 AM (11 years ago)

Author:

bennylp

Message:

• Attempt to autodetect JDK dir. If JAVA_HOME env is set, then it will be used. Otherwise it will try to locate JDK dir by finding the location of "javac".
• Produce libpjsua.so on non-Windows (not sure if this works on Mac)
• Hardcoded path for Linux in swig_gen.py

Location:

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

Files:

• Makefile (modified) (2 diffs)
• swig_gen.py (modified) (1 diff)

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

@@ -5 +5 @@
 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           = /c/Program\ Files\ \(x86\)/Java/jdk1.7.0_21
-MY_JAVA          = $(MY_JDK)/bin/java.exe
-MY_JAVAC         = $(MY_JDK)/bin/javac.exe
-MY_JNI_CFLAGS    = -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 -I.
-MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
+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
@@ -25 +48 @@
 MY_PACKAGE_SRC   = $(MY_OUT_DIR)/src/$(subst .,/,$(MY_PACKAGE))
 MY_PACKAGE_BIN   = $(MY_OUT_DIR)/bin
-MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
 
 all: $(MY_JNI_LIB) java

pjproject/branches/projects/jni/pjsip-apps/src/jni/swig_gen.py

@@ -14 +14 @@
 #SOURCE_PATH  = PJ_ROOT_PATH + "pjlib/include/pj/types.h"
 
-# CPP (C preprocessor) settings, CPP is needed by pycparser.
-CPP_PATH         = 'C:/devs/bin/cpp.exe' if sys.platform == 'win32' else 'cpp'
+# CPP is needed by pycparser.
+if sys.platform == 'win32':
+        PYCPARSER_DIR="C:/devs/tools/pycparser"
+        CPP_PATH='C:/devs/bin/cpp.exe'
+else:
+        PYCPARSER_DIR="/home/bennylp/Desktop/opt/src/pycparser-master"
+        CPP_PATH='cpp'
+
+# CPP (C preprocessor) settings
 CPP_CFLAGS   = [
-        r'-DPJ_AUTOCONF',
-        r'-DCC_DUMMY',
-        r'-Djmp_buf=int',
-        r'-IC:/devs/tools/pycparser/utils/fake_libc_include',
+        '-DPJ_AUTOCONF',
+        '-DCC_DUMMY',
+        '-U__GNUC__',
+        '-Djmp_buf=int',
+        '-I' + PYCPARSER_DIR + '/utils/fake_libc_include',
         "-I" + PJ_ROOT_PATH + "pjlib/include",
         "-I" + PJ_ROOT_PATH + "pjlib-util/include",