Merge pull request #77 from cchampet/dev_java_binding_available_to_other_java_binding

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 85f5c468c866 · 2014-09-03T22:39:19.000+02:00
Get java binding available to other java binding
diff --git a/src/AvTranscoder/avExport.i b/src/AvTranscoder/avExport.i
@@ -0,0 +1,26 @@
+// Need to modify the visibility of the constructor and getCPtr method
+// if you are invoking SWIG more than once and generating the wrapped classes
+// into different packages in each invocation.
+%typemap(javabody) SWIGTYPE %{
+  protected long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  public $javaclassname(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  public static long getCPtr($javaclassname obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+%}
+
+%typemap(javabody_derived) SWIGTYPE %{
+  public $javaclassname(long cPtr, boolean cMemoryOwn) {
+    super( cPtr, cMemoryOwn );
+  }
+
+  public static long getCPtr($javaclassname obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+%}
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -7,6 +7,7 @@
 
 
 %include "AvTranscoder/avException.i"
+%include "AvTranscoder/avExport.i"
 
 %{
 #include <AvTranscoder/common.hpp>
diff --git a/src/SConscript b/src/SConscript
@@ -28,7 +28,7 @@ staticAvTranscoder = env.StaticLibrary(
 sharedAvTranscoderName = 'AvTranscoder'
 # if windows plateform, add version to the name
 if os.name == "nt" and sys.platform.startswith("win"):
-    sharedAvTranscoderName += '.'+ avTranscoderVersion
+    sharedAvTranscoderName += '-'+ avTranscoderVersion
 sharedAvTranscoder = env.SharedLibrary(
     sharedAvTranscoderName,
     Glob( 'AvTranscoder/*.cpp' ) +
@@ -46,7 +46,7 @@ sharedAvTranscoder = env.SharedLibrary(
 javaAvTranscoderName = 'jAvTranscoder'
 # if windows plateform, add version to the name
 if os.name == "nt" and sys.platform.startswith("win"):
-    javaAvTranscoderName += '.'+ avTranscoderVersion
+    javaAvTranscoderName += '-'+ avTranscoderVersion
 javaAvTranscoder = envJava.SharedLibrary(
 	javaAvTranscoderName,
 	source=['AvTranscoder/avTranscoder.i'],
@@ -64,7 +64,7 @@ javaAvTranscoder = envJava.SharedLibrary(
 pythonAvTranscoderName = 'pyAvTranscoder'
 # if windows plateform, add version to the name
 if os.name == "nt" and sys.platform.startswith("win"):
-    pythonAvTranscoderName += '.'+ avTranscoderVersion
+    pythonAvTranscoderName += '-'+ avTranscoderVersion
 pythonAvTranscoder = envPy.SharedLibrary(
 	pythonAvTranscoderName,
 	source='AvTranscoder/avTranscoder.i',
