コミット: 2218a3420635f38ad49f50f61aa99251813f6563 - MikuMikuStudio (git)

Main repository of MikuMikuStudio

コミットメタ情報

• リビジョン: 2218a3420635f38ad49f50f61aa99251813f6563 (tree)
• 日時: 2013-07-07 23:55:11
• 作者: kobayasi <kobayasi@pscn...>
• コミッター: kobayasi

ログメッセージ

Change build script

Remove jbullet.
Add native physics.
Add mmd library.

変更サマリ

• modified: engine/build.xml
• modified: engine/lib/nblibraries.properties
• modified: engine/nbproject/build-impl.xml
• modified: engine/nbproject/genfiles.properties
• modified: engine/nbproject/project.properties
• modified: engine/nbproject/project.xml

差分

--- a/engine/build.xml
+++ b/engine/build.xml
@@ -49,10 +49,10 @@
         <move file="build/classes/jme3game" todir="build/testclasses/" failonerror="false"/>
         <jar jarfile="build/jME3-test.jar" basedir="build/testclasses/" compress="true"/>
 
-        <!--separate jbullet physics classes-->
+<!--        separate jbullet physics classes
         <mkdir dir="build/jbullet/com/jme3/"/>
         <move file="build/classes/com/jme3/bullet" todir="build/jbullet/com/jme3/" failonerror="false"/>
-        <jar jarfile="build/jME3-jbullet.jar" basedir="build/jbullet/" compress="true"/>
+        <jar jarfile="build/jME3-jbullet.jar" basedir="build/jbullet/" compress="true"/>-->
 
         <!--separate assets-->
         <jar jarfile="build/jME3-testdata.jar" basedir="src/test-data" compress="true"/>
@@ -69,7 +69,7 @@
             <map from="${testdata.dir.resolved}" to="${testdata.jar.resolved}"/>
             
             <!--add both bullet jar files to dist classpath, will both be in manifest-->
-            <path path="build/jME3-jbullet.jar"/>
+<!--            <path path="build/jME3-jbullet.jar"/>-->
             <path path="build/jME3-bullet.jar"/>
             <path path="build/jME3-test.jar"/>
         </pathconvert>
@@ -123,7 +123,16 @@
             <fileset dir="${src.desktop-fx.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
+<!--            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>-->
+            <fileset dir="src/bullet/com" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="src/bullet/projectkyoto" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.mmd.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${src.niftygui.dir}" excludes="${excludes}" includes="${includes}">
@@ -152,7 +161,10 @@
             <fileset dir="${src.desktop-fx.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
+<!--            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>-->
+            <fileset dir="${src.mmd.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
             <fileset dir="${src.niftygui.dir}" excludes="${excludes}" includes="${includes}">
@@ -185,15 +197,15 @@
 
     <target name="-do-update-sdk">
         <fileset id="jme3-jars" dir="dist/">
-            <include name="**/jME3-jbullet.jar"/>
+<!--            <include name="**/jME3-jbullet.jar"/>-->
             <include name="**/jME3-bullet.jar"/>
             <include name="**/jME3-bullet-natives.jar"/>
         </fileset>
-        <fileset id="mmd-jars" dir="lib/">
+<!--        <fileset id="mmd-jars" dir="lib/">
             <include name="MMDLoaderJME3-lib.jar"/>
             <include name="MMDLoaderJME3-source.jar"/>
             <include name="MMDLoaderJME3-javadoc.jar"/>
-        </fileset>
+        </fileset>-->
 
         <!--clear old files-->
         <delete dir="${jmp_dir}/JME3TestsTemplate/src/"/>
@@ -263,7 +275,8 @@
             <zipfileset dir="${src.desktop.dir}"/>
             <zipfileset dir="${src.desktop-fx.dir}"/>
             <zipfileset dir="${src.games.dir}"/>
-            <zipfileset dir="${src.jbullet.dir}"/>
+<!--            <zipfileset dir="${src.jbullet.dir}"/>-->
+            <zipfileset dir="${src.mmd.dir}"/>
             <zipfileset dir="${src.niftygui.dir}"/>
             <zipfileset dir="${src.jogg.dir}"/>
             <zipfileset dir="${src.lwjgl-oal.dir}"/>
@@ -318,7 +331,8 @@
             <zipfileset dir="${src.desktop.dir}" prefix="source"/>
             <zipfileset dir="${src.desktop-fx.dir}" prefix="source"/>
             <zipfileset dir="${src.games.dir}" prefix="source"/>
-            <zipfileset dir="${src.jbullet.dir}" prefix="source"/>
+<!--            <zipfileset dir="${src.jbullet.dir}" prefix="source"/>-->
+            <zipfileset dir="${src.mmd.dir}" prefix="source"/>
             <zipfileset dir="${src.niftygui.dir}" prefix="source"/>
             <zipfileset dir="${src.jogg.dir}" prefix="source"/>
             <zipfileset dir="${src.lwjgl-oal.dir}" prefix="source"/>

--- a/engine/lib/nblibraries.properties
+++ b/engine/lib/nblibraries.properties
@@ -1,7 +1,8 @@
 libs.android.classpath=\
     ${base}/android/android.jar
 libs.bullet.classpath=\
-    ${base}/bullet/jME3-bullet-natives.jar
+    ${base}/bullet/jME3-bullet-natives.jar:\
+    ${base}/bullet/jME3-bullet.jar
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.jbullet.classpath=\
@@ -57,3 +58,5 @@ libs.swing-layout.src=\
 libs.noise.classpath=\
     ${base}/noise/noise-0.0.1-SNAPSHOT.jar
 
+libs.vecmath.classpath=\
+    ${base}/jbullet/vecmath.jar

--- a/engine/nbproject/build-impl.xml
+++ b/engine/nbproject/build-impl.xml
@@ -166,6 +166,7 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.mmd.dir}"/>
                 <available file="${src.core-effects.dir}"/>
                 <available file="${src.core.dir}"/>
                 <available file="${src.core-data.dir}"/>
@@ -175,7 +176,6 @@ is divided into following sections:
                 <available file="${src.desktop.dir}"/>
                 <available file="${src.desktop-fx.dir}"/>
                 <available file="${src.games.dir}"/>
-                <available file="${src.jbullet.dir}"/>
                 <available file="${src.niftygui.dir}"/>
                 <available file="${src.jogg.dir}"/>
                 <available file="${src.lwjgl-oal.dir}"/>
@@ -251,6 +251,7 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.mmd.dir">Must set src.mmd.dir</fail>
         <fail unless="src.core-effects.dir">Must set src.core-effects.dir</fail>
         <fail unless="src.core.dir">Must set src.core.dir</fail>
         <fail unless="src.core-data.dir">Must set src.core-data.dir</fail>
@@ -260,7 +261,6 @@ is divided into following sections:
         <fail unless="src.desktop.dir">Must set src.desktop.dir</fail>
         <fail unless="src.desktop-fx.dir">Must set src.desktop-fx.dir</fail>
         <fail unless="src.games.dir">Must set src.games.dir</fail>
-        <fail unless="src.jbullet.dir">Must set src.jbullet.dir</fail>
         <fail unless="src.niftygui.dir">Must set src.niftygui.dir</fail>
         <fail unless="src.jogg.dir">Must set src.jogg.dir</fail>
         <fail unless="src.lwjgl-oal.dir">Must set src.lwjgl-oal.dir</fail>
@@ -293,7 +293,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.jbullet.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}" name="srcdir"/>
+            <attribute default="${src.mmd.dir}:${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -333,7 +333,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.jbullet.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}" name="srcdir"/>
+            <attribute default="${src.mmd.dir}:${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -365,7 +365,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.jbullet.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}" name="srcdir"/>
+            <attribute default="${src.mmd.dir}:${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -663,11 +663,12 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.jbullet.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.mmd.dir}:${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.mmd.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.core-effects.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.core.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.core-data.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -677,7 +678,6 @@ is divided into following sections:
             <fileset dir="${src.desktop.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.desktop-fx.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.games.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.jbullet.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.niftygui.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.jogg.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.lwjgl-oal.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -709,7 +709,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.jbullet.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.mmd.dir}:${src.core-effects.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-plugins.dir}:${src.terrain.dir}:${src.networking.dir}:${src.desktop.dir}:${src.desktop-fx.dir}:${src.games.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.lwjgl-oal.dir}:${src.lwjgl-ogl.dir}:${src.ogre.dir}:${src.blender.dir}:${src.pack.dir}:${src.jheora.dir}:${src.test.dir}:${src.tools.dir}:${src.xml.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -929,6 +929,9 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.mmd.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.core-effects.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -956,9 +959,6 @@ is divided into following sections:
             <fileset dir="${src.games.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.jbullet.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${src.niftygui.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -998,6 +998,9 @@ is divided into following sections:
             </fileset>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.mmd.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.core-effects.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
@@ -1025,9 +1028,6 @@ is divided into following sections:
             <fileset dir="${src.games.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
             <fileset dir="${src.niftygui.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>

--- a/engine/nbproject/genfiles.properties
+++ b/engine/nbproject/genfiles.properties
@@ -3,8 +3,8 @@ build.xml.script.CRC32=34d4c2f2
 build.xml.stylesheet.CRC32=958a1d3e
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=36a145c8
-nbproject/build-impl.xml.script.CRC32=7dd2f2a4
+nbproject/build-impl.xml.data.CRC32=07233107
+nbproject/build-impl.xml.script.CRC32=6f457b0f
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
 nbproject/profiler-build-impl.xml.data.CRC32=aff514c1
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed

--- a/engine/nbproject/project.properties
+++ b/engine/nbproject/project.properties
@@ -5,6 +5,10 @@ ant.customtasks.libs=JWSAntTasks
 application.homepage=http://www.jmonkeyengine.com/
 application.title=jMonkeyEngine 3.0
 application.vendor=jMonkeyEngine
+assets.compress=false
+assets.excludes=
+assets.folder.name=
+assets.jar.name=
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -34,7 +38,7 @@ jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
     ${libs.jogg.classpath}:\
-    ${libs.jbullet.classpath}:\
+    ${libs.vecmath.classpath}:\
     ${libs.bullet.classpath}:\
     ${libs.lwjgl.classpath}:\
     ${libs.jheora.classpath}:\
@@ -99,11 +103,11 @@ src.core.dir=src/core
 src.desktop-fx.dir=src/desktop-fx
 src.desktop.dir=src/desktop
 src.games.dir=src/games
-src.jbullet.dir=src/jbullet
 src.jheora.dir=src/jheora
 src.jogg.dir=src/jogg
 src.lwjgl-oal.dir=src/lwjgl-oal
 src.lwjgl-ogl.dir=src/lwjgl-ogl
+src.mmd.dir=src/mmd
 src.networking.dir=src\\networking
 src.niftygui.dir=src/niftygui
 src.ogre.dir=src/ogre

--- a/engine/nbproject/project.xml
+++ b/engine/nbproject/project.xml
@@ -11,6 +11,7 @@
             <name>jMonkeyEngine3</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
+                <root id="src.mmd.dir" name="MikuMikuDance"/>
                 <root id="src.core-effects.dir" name="Core-Effects"/>
                 <root id="src.core.dir" name="Core"/>
                 <root id="src.core-data.dir" name="Core-Data"/>
@@ -20,7 +21,6 @@
                 <root id="src.desktop.dir" name="Desktop"/>
                 <root id="src.desktop-fx.dir" name="Desktop-FX"/>
                 <root id="src.games.dir" name="Games"/>
-                <root id="src.jbullet.dir" name="JBullet"/>
                 <root id="src.niftygui.dir" name="NiftyGUI"/>
                 <root id="src.jogg.dir" name="JOGG"/>
                 <root id="src.lwjgl-oal.dir" name="LWJGL-OAL"/>