[IOT-2405] Enable building generic java in Windows
authorGeorge Nash <george.nash@intel.com>
Tue, 13 Jun 2017 21:49:56 +0000 (14:49 -0700)
committerRick Bell <richard.s.bell@intel.com>
Wed, 5 Jul 2017 20:34:20 +0000 (20:34 +0000)
commitf0cb3733ba7b1d7e1ed690f94be7cf84670007d5
treef3f7eac8bf0f221d92b99686f10e8e33e36d2061
parentd4353319adbaa5f93c558b4ac3f68a01b3e21bc0
[IOT-2405] Enable building generic java in Windows

Changed the name of the iotivity-linux folder to
iotivity-java. Update the build scripts to account
for the name change of the folder. The name of the
output jar file is no longer iotivity-linux.jar it
is now iotivity.jar.

The JNI code links against the static librarys not
the shared librarys for oc, oc_logger, octbstack,
and connectivity_abstraction. Not all libraries are
have a dll built for windows, they must be statically
linked. This insures the Java code is identical for
all platforms. This also greatly reduces the number
of dependencies for the java code on native libraries.
The code now only needs to import ocstack-jni for the
IoTivity stack and ca-interface for security.

Other small updates to address compiler warnings.

Bug: https://jira.iotivity.org/browse/IOT-2405
Change-Id: I98392a6d0c2a5299746fa7dd6540724b0f5a4bc8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21061
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
30 files changed:
build_common/external_libs.scons
build_common/windows/SConscript
extlibs/android/gradle/SConscript
java/SConscript
java/common/src/main/java/org/iotivity/base/OcRepresentation.java
java/common/src/main/java/org/iotivity/base/OcResourceResponse.java
java/examples-java/build.gradle
java/iotivity-android/src/main/java/org/iotivity/base/OcPlatform.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
java/iotivity-java/build.gradle [moved from java/iotivity-linux/build.gradle with 100% similarity]
java/iotivity-java/settings.gradle [new file with mode: 0644]
java/iotivity-java/src/main/java/org/iotivity/base/OcPlatform.java [moved from java/iotivity-linux/src/main/java/org/iotivity/base/OcPlatform.java with 99% similarity]
java/iotivity-java/src/main/java/org/iotivity/base/PlatformConfig.java [moved from java/iotivity-linux/src/main/java/org/iotivity/base/PlatformConfig.java with 100% similarity]
java/iotivity-java/src/main/java/org/iotivity/ca/CaInterface.java [moved from java/iotivity-linux/src/main/java/org/iotivity/ca/CaInterface.java with 100% similarity]
java/iotivity-java/src/main/java/org/iotivity/ca/CaIpInterface.java [moved from java/iotivity-linux/src/main/java/org/iotivity/ca/CaIpInterface.java with 100% similarity]
java/jni/JniCaInterface.c
java/jni/JniOcPlatform.cpp
java/jni/JniOcProvisioning.cpp
java/jni/JniOcRDClient.cpp
java/jni/JniOcRepresentation.cpp
java/jni/JniOcRepresentation.h
java/jni/JniOcResource.cpp
java/jni/JniOcSecureResource.cpp
java/jni/JniOcStack.cpp
java/jni/JniSecureUtils.cpp
java/jni/JniUtils.cpp
java/jni/SConscript
resource/csdk/connectivity/src/adapter_util/caadapterutils.c
resource/src/SConscript
run.bat