Move JNA library to the com.microsoft.tfs.jni module

JetBrains · Nov 17, 2019 · 0f82448 · 0f82448
1 parent aa64176
commit 0f82448
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 7 deletions.
diff --git a/build/modules/clc/build.xml b/build/modules/clc/build.xml
@@ -127,6 +127,7 @@
 			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.core/libs" includes="**/*.jar" />
 			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.core.httpclient/libs" includes="**/*.jar" />
 			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.logging/lib" includes="**/*.jar" />
+			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.jni/libs" includes="**/*.jar" />
 		</copy>
 
 		<!-- copy plugin jars -->

diff --git a/build/modules/sdk/build.xml b/build/modules/sdk/build.xml
@@ -20,6 +20,7 @@
         <!-- copy core dependency jars -->
         <copy todir="${dir.binaries}/${name.dist-directory.sdk}/redist/lib" flatten="true">
             <fileset dir="${dir.global.build.output.plugins}/com.microsoft.tfs.core/libs" includes="**/*.jar" />
+            <fileset dir="${dir.global.build.output.plugins}/com.microsoft.tfs.jni/libs" includes="**/*.jar" />
         </copy>
 
         <!-- copy dependent plugin jars -->

diff --git a/source/com.microsoft.tfs.core/.classpath b/source/com.microsoft.tfs.core/.classpath
@@ -40,8 +40,6 @@
 			<attribute name="javadoc_location" value="jar:platform:/resource/com.microsoft.tfs.core/libs_src/jackson-core-2.4.1/jackson-databind-2.4.1-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="libs/jna/jna-4.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/jna/jna-platform-4.2.1.jar"/>
 	<classpathentry kind="lib" path="libs/jsr305-1.3.9/jsr305-1.3.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/oauth2-useragent/oauth2-useragent-0.11.2.jar" sourcepath="libs/oauth2-useragent/oauth2-useragent-0.11.2-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
@@ -25,8 +25,6 @@ Bundle-ClassPath: com.microsoft.tfs.core.jar,
  libs/jackson-core-2.4.1/jackson-core-2.4.1.jar,
  libs/jackson-core-2.4.1/jackson-databind-2.4.1.jar,
  libs/annotation-detector-3.0.4/annotation-detector-3.0.4.jar,
- libs/jna/jna-4.2.1.jar,
- libs/jna/jna-platform-4.2.1.jar,
  libs/slf4j/slf4j-api-1.7.19.jar,
  libs/slf4j/slf4j-log4j12-1.7.19.jar,
  libs/oauth2-useragent/oauth2-useragent-0.11.2.jar,

diff --git a/source/com.microsoft.tfs.core/build.properties b/source/com.microsoft.tfs.core/build.properties
@@ -17,8 +17,6 @@ bin.includes = META-INF/,\
                libs/jackson-core-2.4.1/jackson-core-2.4.1.jar,\
                libs/jackson-core-2.4.1/jackson-databind-2.4.1.jar,\
                libs/annotation-detector-3.0.4/annotation-detector-3.0.4.jar,\
-               libs/jna/jna-4.2.1.jar,\
-               libs/jna/jna-platform-4.2.1.jar,\
                libs/slf4j/slf4j-api-1.7.19.jar,\
                libs/slf4j/slf4j-log4j12-1.7.19.jar,\
                libs/oauth2-useragent/oauth2-useragent-0.11.2.jar,\

diff --git a/source/com.microsoft.tfs.jni/.classpath b/source/com.microsoft.tfs.jni/.classpath
@@ -6,5 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+    <classpathentry exported="true" kind="lib" path="libs/jna/jna-4.2.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/jna/jna-platform-4.2.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
@@ -29,4 +29,6 @@ Export-Package: com.microsoft.tfs.jni,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.microsoft.tfs.logging,
  com.microsoft.tfs.util
-Bundle-ClassPath: com.microsoft.tfs.jni.jar
+Bundle-ClassPath: com.microsoft.tfs.jni.jar,
+ libs/jna/jna-4.2.1.jar,
+ libs/jna/jna-platform-4.2.1.jar
diff --git a/source/com.microsoft.tfs.jni/build.properties b/source/com.microsoft.tfs.jni/build.properties
@@ -1,5 +1,7 @@
 bin.includes = META-INF/,\
                os/,\
                com.microsoft.tfs.jni.jar,\
+               libs/jna/jna-4.2.1.jar,\
+               libs/jna/jna-platform-4.2.1.jar,\
                plugin.properties
 source.com.microsoft.tfs.jni.jar = src/
diff --git a/...microsoft.tfs.core/libs/jna/jna-4.2.1.jar → ....microsoft.tfs.jni/libs/jna/jna-4.2.1.jar b/...microsoft.tfs.core/libs/jna/jna-4.2.1.jar → ....microsoft.tfs.jni/libs/jna/jna-4.2.1.jar
diff --git a/....tfs.core/libs/jna/jna-platform-4.2.1.jar → ...t.tfs.jni/libs/jna/jna-platform-4.2.1.jar b/....tfs.core/libs/jna/jna-platform-4.2.1.jar → ...t.tfs.jni/libs/jna/jna-platform-4.2.1.jar