Move native libraries to directory libs/native and add native library for arm-Linux.

SVN: 31691

base/build.gradle

@@ -10,7 +10,7 @@ dependencies {
 } 
 
 tasks.withType(Test) {
-    systemProperty "java.library.path", "../libraries/unix/native/unix/amd64-Linux:../libraries/nativedata/native/nativedata/amd64-Linux:../libraries/unix/native/unix/x86_64-Mac OS X:../libraries/nativedata/native/nativedata/x86_64-Mac OS X"
+    systemProperty "java.library.path", "libs/native/unix/amd64-Linux:libs/native/nativedata/amd64-Linux:libs/native/unix/x86_64-Mac OS X:libs/native/nativedata/x86_64-Mac OS X"
 }
 
 new ByteArrayOutputStream().withStream { os ->
@@ -36,16 +36,14 @@ new ByteArrayOutputStream().withStream { os ->
 sourceSets {
   test {
     resources {
-      srcDir "../libraries"
-      include "nativedata/**"
-      include "unix/**"
+      srcDir "libs"
+      include "**"
     }
   }
 }
 
 jar {
-    from fileTree("../libraries/nativedata/")
-    from fileTree("../libraries/unix/")	
+    from fileTree("libs/")
 }
 
 task standaloneTestJar(type: Jar, dependsOn: [classes, testClasses]) {
@@ -53,8 +51,7 @@ task standaloneTestJar(type: Jar, dependsOn: [classes, testClasses]) {
     from files(sourceSets.main.output.classesDir)
     from files(sourceSets.main.output.resourcesDir)
     from files(sourceSets.test.output.classesDir)
-    from files("../libraries/nativedata")
-    from files("../libraries/unix")
+    from files("libs")
  
     from {configurations.testRuntime.collect {zipTree(it)}}
  

base/build/build.xml

@@ -14,8 +14,7 @@
 	<property name="src.zip.file" value="${dist}/cisd-base-src.zip" />
 	<property name="javadoc.zip.file" value="${dist}/cisd-base-javadoc.zip" />
 	<property name="original.dist" value="../${ant.project.name}/dist" />
-	<property name="nativesrc1" value="${lib}/unix/native" />
-	<property name="nativesrc2" value="${lib}/nativedata/native" />
+	<property name="nativesrc" value="libs/native" />
 	<property name="nativeroot" value="${targets}/ant" />
 	<property name="native" value="${nativeroot}/native" />
 
@@ -30,13 +29,13 @@
 		<build-info revision="revision.number" version="version.number" clean="clean.flag" />
 		<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
 		<copy todir="${native}">
-			<fileset dir="${nativesrc1}">
+			<fileset dir="${nativesrc}">
 				<include name="**/libunix.so" />
 				<include name="**/libunix.jnilib" />
 			</fileset>
 		</copy>
 		<copy todir="${native}">
-			<fileset dir="${nativesrc2}">
+			<fileset dir="${nativesrc}">
 				<include name="**/libnativedata.so" />
 				<include name="**/libnativedata.jnilib" />
 				<include name="**/nativedata.dll" />
@@ -67,13 +66,13 @@
 		<build-info revision="revision.number" version="version.number" clean="clean.flag" />
 		<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
 		<copy todir="${native}">
-			<fileset dir="${nativesrc1}">
+			<fileset dir="${nativesrc}">
 				<include name="**/libunix.so" />
 				<include name="**/libunix.jnilib" />
 			</fileset>
 		</copy>
 		<copy todir="${native}">
-			<fileset dir="${nativesrc2}">
+			<fileset dir="${nativesrc}">
 				<include name="**/libnativedata.so" />
 				<include name="**/libnativedata.jnilib" />
 				<include name="**/nativedata.dll" />
@@ -161,4 +160,4 @@
 		</antcall>
 	</target>
 
-</project>
\ No newline at end of file
+</project>