Browse Source

- move android library to "Project Engine" plugin so updates in the core library are properly distributed

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8347 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
nor..67 14 years ago
parent
commit
c3b39f420a

+ 14 - 3
engine/build.xml

@@ -207,7 +207,7 @@
         <copy file="dist/lib/jME3-lwjgl-natives.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
 
         <!--jMonkeyPlatform Android libs-->
-        <copy file="dist/opt/android/jMonkeyEngine3.jar" toFile="${jmp_dir}/jme3-android/release/libs/jMonkeyEngine3-android.jar" overwrite="true" failonerror="true" verbose="false"/>
+        <copy file="dist/opt/android/jMonkeyEngine3.jar" toFile="${jmp_dir}/jme3-project-baselibs/release/libs/jMonkeyEngine3-android.jar" overwrite="true" failonerror="true" verbose="false"/>
         
         <!--Project jME3 libs-->
         <copy file="${dist.jar}" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
@@ -327,14 +327,25 @@
     </target>
 
     <!-- copy jme3 zip to jmonkeyengine.com/nightly -->
-    <target name="deploy-hudson" depends="dist, build-bullet-natives">
+    <target name="deploy-hudson-nightly" depends="dist, build-bullet-natives">
         <copy
             file="${jme3zip}"
-            toDir="/var/www/com/nightly" overwrite="true" failonerror="true" verbose="false"
+            toDir="/var/www/com/stable" overwrite="true" failonerror="true" verbose="false"
             />
         <copydir
             src="dist/javadoc/" dest="/var/www/org/javadoc/" forceoverwrite="true"
             />
     </target>
 
+    <!-- copy jme3 zip to jmonkeyengine.com/nightly -->
+    <target name="deploy-hudson-stable" depends="dist, build-bullet-natives">
+        <copy
+            file="${jme3zip}"
+            toDir="/var/www/com/stable" overwrite="true" failonerror="true" verbose="false"
+            />
+        <copydir
+            src="dist/javadoc/" dest="/var/www/org/javadoc/" forceoverwrite="true"
+            />
+    </target>
+    
 </project>

BIN
sdk/jme3-android/release/libs/jMonkeyEngine3-android.jar


+ 0 - 5
sdk/jme3-android/src/com/jme3/gde/android/layer.xml

@@ -29,9 +29,4 @@
             </file>
         </folder>
     </folder>
-    <folder name="org-netbeans-api-project-libraries">
-        <folder name="Libraries">
-            <file name="jme3-android.xml" url="jme3-android.xml"/>
-        </folder>
-    </folder>
 </filesystem>

+ 21 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version="1.0">
+    <name>jme3-android</name>
+    <type>j2se</type>
+    <localizing-bundle>com.jme3.gde.android.Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-android.jar!/</resource>
+    </volume>
+    <volume>
+        <type>src</type>
+    </volume>
+    <volume>
+        <type>javadoc</type>
+    </volume>
+</library>

+ 1 - 0
sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml

@@ -4,6 +4,7 @@
     <folder name="org-netbeans-api-project-libraries">
         <folder name="Libraries">
             <file name="jme3.xml" url="jme3.xml"/>
+            <file name="jme3-android.xml" url="jme3-android.xml"/>
         </folder>
     </folder>
 </filesystem>