update nojvm windows project to export same symbols that jvm project 16/10216/2
Antoine ELIAS [Tue, 15 Jan 2013 11:15:46 +0000 (12:15 +0100)]
Change-Id: Ibf1d419291e81dc3bf5c76beaa2a572db43a5ba3

scilab/modules/jvm/src/nojvm/nojvm.c
scilab/modules/jvm/src/nojvm/nojvm.vcxproj
scilab/modules/jvm/src/nojvm/nojvm.vcxproj.filters
scilab/modules/jvm/src/nojvm/nolibjvm_export.def [new file with mode: 0644]

index 4ba5723..547064e 100644 (file)
 #include "loadBackGroundClassPath.h"
 #include "loadOnUseClassPath.h"
 #include "localization.h"
+#include "getScilabJNIEnv.h"
+#include "getScilabJavaVM.h"
+#include "getScilabObject.h"
+#include "addToClasspath.h"
+#include "addToLibrarypath.h"
+#include "catchIfJavaException.h"
+
 /*--------------------------------------------------------------------------*/
 JVM_IMPEXP int gw_jvm(void)
 {
@@ -27,6 +34,36 @@ JVM_IMPEXP int gw_jvm(void)
     return 0;
 }
 
+JNIEnv *getScilabJNIEnv(void)
+{
+    return NULL;
+}
+
+JavaVM *getScilabJavaVM(void)
+{
+    return NULL;
+}
+
+jobject getScilabObject(void)
+{
+    return NULL;
+}
+
+BOOL addToClasspath(char *classpathstring, typeOfLoad load)
+{
+    return FALSE;
+}
+
+BOOL addToLibrarypath(char *librarypathstring)
+{
+    return FALSE;
+}
+
+BOOL catchIfJavaException(char *errorMsg)
+{
+    return FALSE;
+}
+
 /*--------------------------------------------------------------------------*/
 JVM_IMPEXP BOOL InitializeJVM(void)
 {
index abb0dd1..a1d0444 100644 (file)
@@ -91,6 +91,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <ModuleDefinitionFile>nolibjvm_export.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       <TargetMachine>MachineX64</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <ModuleDefinitionFile>nolibjvm_export.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       <TargetMachine>MachineX86</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <ModuleDefinitionFile>nolibjvm_export.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       <TargetMachine>MachineX64</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <ModuleDefinitionFile>nolibjvm_export.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="nolibjvm_export.def" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
index e598d7b..2b3698c 100644 (file)
@@ -16,6 +16,9 @@
     <Filter Include="Libraries Dependencies">
       <UniqueIdentifier>{9c8bab13-f3d2-452b-9c1c-1694fefd0ef9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Libraries Dependencies\Exports">
+      <UniqueIdentifier>{a507bbeb-a681-469c-b873-32951fed3162}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="nojvm.c">
@@ -27,4 +30,9 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="nolibjvm_export.def">
+      <Filter>Libraries Dependencies\Exports</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/scilab/modules/jvm/src/nojvm/nolibjvm_export.def b/scilab/modules/jvm/src/nojvm/nolibjvm_export.def
new file mode 100644 (file)
index 0000000..e76d553
--- /dev/null
@@ -0,0 +1,15 @@
+LIBRARY    nolibjvm.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; jvm module explicit export (SEP 35)
+; --------------------------------------- 
+getScilabJavaVM
+getScilabJNIEnv
+addToClasspath
+addToLibrarypath
+getScilabObject
+; --------------------------------------- 
+canCloseMainScilabObject
+forceCloseMainScilabObject
\ No newline at end of file