sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- output messages while build process, remove verbose output from copy etc.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7408 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 14 years ago
parent b881cee6f7
commit ab9e2bb97b
2 changed files with 25 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 35
      engine/build.xml
  2. 5
      engine/src/bullet/native/build.xml

35
engine/build.xml
Unescape View File

@ -16,6 +16,7 @@
<!-- compiles the java classes of the native bullet version (works on all systems) --> <!-- compiles the java classes of the native bullet version (works on all systems) -->
<target name="-compile-bullet"> <target name="-compile-bullet">
<echo message="Compiling Bullet"/>
<mkdir dir="build/bullet"/> <mkdir dir="build/bullet"/>
<javac classpath="${javac.classpath}${path.separator}${build.classes.dir}" destdir="build/bullet" srcdir="src/bullet"/> <javac classpath="${javac.classpath}${path.separator}${build.classes.dir}" destdir="build/bullet" srcdir="src/bullet"/>
<jar jarfile="build/jME3-bullet.jar" basedir="build/bullet/" compress="true"/> <jar jarfile="build/jME3-bullet.jar" basedir="build/bullet/" compress="true"/>
@ -23,6 +24,7 @@
<!--this target creates the separate jar files for jme3 and modifies the classpath to include them--> <!--this target creates the separate jar files for jme3 and modifies the classpath to include them-->
<target name="-prepare-separate-jar-files"> <target name="-prepare-separate-jar-files">
<echo message="Preparing jME3 jar files"/>
<!--separate test classes--> <!--separate test classes-->
<mkdir dir="build/testclasses/"/> <mkdir dir="build/testclasses/"/>
<move file="build/classes/jme3test" todir="build/testclasses/" failonerror="false"/> <move file="build/classes/jme3test" todir="build/testclasses/" failonerror="false"/>
@ -57,6 +59,7 @@
<!-- compiles the android jar for jME3 --> <!-- compiles the android jar for jME3 -->
<target name="-compile-android" description="builds the jMonkeyEngine3 distribution for android"> <target name="-compile-android" description="builds the jMonkeyEngine3 distribution for android">
<echo message="Compiling Android jMonkeyEngin3.jar"/>
<path id="android-classpath"> <path id="android-classpath">
<pathelement path="lib/android/android.jar"/> <pathelement path="lib/android/android.jar"/>
<pathelement path="build/classes"/> <pathelement path="build/classes"/>
@ -74,6 +77,7 @@
<!--separates and packs the o ptional packages--> <!--separates and packs the o ptional packages-->
<target name="-create-optional-packages"> <target name="-create-optional-packages">
<echo message="Creating optional packages"/>
<!--native bullet--> <!--native bullet-->
<mkdir dir="dist/opt/native-bullet"/> <mkdir dir="dist/opt/native-bullet"/>
<mkdir dir="dist/opt/native-bullet/lib"/> <mkdir dir="dist/opt/native-bullet/lib"/>
@ -179,20 +183,21 @@
<delete dir="${jmp_dir}/jme3-project-testdata/release/libs/"/> <delete dir="${jmp_dir}/jme3-project-testdata/release/libs/"/>
<!--jMonkeyPlatform jME3 libs--> <!--jMonkeyPlatform jME3 libs-->
<copy file="${dist.jar}" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="true"/> <copy file="${dist.jar}" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
<copy file="dist/opt/native-bullet/lib/jME3-bullet.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/opt/native-bullet/lib/jME3-bullet.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
<copy file="dist/opt/native-bullet/lib/jME3-bullet-natives.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/opt/native-bullet/lib/jME3-bullet-natives.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
<copy file="dist/lib/jME3-jbullet.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
<!--natives need to be in jme3 package fro jme to work in jMP--> <!--natives need to be in jme3 package fro jme to work in jMP-->
<copy file="dist/lib/jME3-lwjgl-natives.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/lib/jME3-lwjgl-natives.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
<!--Project jME3 libs--> <!--Project jME3 libs-->
<copy file="${dist.jar}" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="${dist.jar}" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<copy file="dist/opt/native-bullet/lib/jME3-bullet.jar" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/opt/native-bullet/lib/jME3-bullet.jar" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<copy file="dist/opt/native-bullet/lib/jME3-bullet-natives.jar" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/opt/native-bullet/lib/jME3-bullet-natives.jar" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<copy file="dist/lib/jME3-jbullet.jar" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/lib/jME3-jbullet.jar" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<!--jMonkeyPlatform external libraries--> <!--jMonkeyPlatform external libraries-->
<copy todir="${jmp_dir}/jme3-core-libraries/release/modules/ext/" overwrite="true" failonerror="true" verbose="true"> <copy todir="${jmp_dir}/jme3-core-libraries/release/modules/ext/" overwrite="true" failonerror="true" verbose="false">
<!--exclude jme3 test data from core--> <!--exclude jme3 test data from core-->
<fileset dir="dist/lib/"> <fileset dir="dist/lib/">
<exclude name="jME3-testdata.jar"/> <exclude name="jME3-testdata.jar"/>
@ -203,7 +208,7 @@
</copy> </copy>
<!--Project external libraries--> <!--Project external libraries-->
<copy todir="${jmp_dir}/jme3-project-libraries/release/libs/" overwrite="true" failonerror="true" verbose="true"> <copy todir="${jmp_dir}/jme3-project-libraries/release/libs/" overwrite="true" failonerror="true" verbose="false">
<!--exclude jme3 test data from libs--> <!--exclude jme3 test data from libs-->
<fileset dir="dist/lib/"> <fileset dir="dist/lib/">
<exclude name="jME3-testdata.jar"/> <exclude name="jME3-testdata.jar"/>
@ -213,13 +218,13 @@
</copy> </copy>
<!--test data--> <!--test data-->
<copy file="dist/lib/jME3-testdata.jar" toDir="${jmp_dir}/jme3-project-testdata/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/lib/jME3-testdata.jar" toDir="${jmp_dir}/jme3-project-testdata/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<!--javadoc--> <!--javadoc-->
<zip destfile="dist/jMonkeyEngine3-javadoc.zip"> <zip destfile="dist/jMonkeyEngine3-javadoc.zip">
<zipfileset dir="dist/javadoc/"/> <zipfileset dir="dist/javadoc/"/>
</zip> </zip>
<copy file="dist/jMonkeyEngine3-javadoc.zip" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/jMonkeyEngine3-javadoc.zip" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<!--sources--> <!--sources-->
<zip destfile="dist/jMonkeyEngine3-sources.zip"> <zip destfile="dist/jMonkeyEngine3-sources.zip">
@ -243,10 +248,10 @@
<zipfileset dir="${src.terrain.dir}"/> <zipfileset dir="${src.terrain.dir}"/>
<zipfileset dir="${src.networking.dir}"/> <zipfileset dir="${src.networking.dir}"/>
</zip> </zip>
<copy file="dist/jMonkeyEngine3-sources.zip" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="true"/> <copy file="dist/jMonkeyEngine3-sources.zip" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
<!--examples--> <!--examples-->
<copy todir="${jmp_dir}/JME3TestsTemplate/src/" overwrite="true" failonerror="true" verbose="true"> <copy todir="${jmp_dir}/JME3TestsTemplate/src/" overwrite="true" failonerror="true" verbose="false">
<fileset dir="src/test/"> <fileset dir="src/test/">
<exclude name=".svn"/> <exclude name=".svn"/>
</fileset> </fileset>
@ -286,7 +291,7 @@
<target name="deploy-hudson" depends="dist"> <target name="deploy-hudson" depends="dist">
<copy <copy
file="${jme3zip}" file="${jme3zip}"
toDir="/var/www/com/nightly" overwrite="true" failonerror="true" verbose="true" toDir="/var/www/com/nightly" overwrite="true" failonerror="true" verbose="false"
/> />
<copydir <copydir
src="dist/javadoc/" dest="/var/www/org/javadoc/" forceoverwrite="true" src="dist/javadoc/" dest="/var/www/org/javadoc/" forceoverwrite="true"

5
engine/src/bullet/native/build.xml
Unescape View File

@ -42,6 +42,7 @@
</pathconvert> </pathconvert>
<target name="build-bullet-natives" description="builds the native bullet library for the platform being run on" depends="-create-folders, create-native-headers, -nativelib-osx, -nativelib-windows, -nativelib-linux"> <target name="build-bullet-natives" description="builds the native bullet library for the platform being run on" depends="-create-folders, create-native-headers, -nativelib-osx, -nativelib-windows, -nativelib-linux">
<echo message="Updating native jME3-bullet-natives.jar"/>
<zip basedir="${bullet.output.base}/jarcontent" file="${bullet.output.base}/jME3-bullet-natives.jar" compress="true"/> <zip basedir="${bullet.output.base}/jarcontent" file="${bullet.output.base}/jME3-bullet-natives.jar" compress="true"/>
<copy file="${bullet.output.base}/jME3-bullet-natives.jar" todir="dist/lib"/> <copy file="${bullet.output.base}/jME3-bullet-natives.jar" todir="dist/lib"/>
</target> </target>
@ -88,6 +89,7 @@
<!-- compares the API of native bullet and java version--> <!-- compares the API of native bullet and java version-->
<target name="bullet-api-diff"> <target name="bullet-api-diff">
<echo message="Comparing bullet and jbullet API"/>
<property name="dependencyfinder.home" value="lib/antlibs/depfinder"/> <property name="dependencyfinder.home" value="lib/antlibs/depfinder"/>
<path id="dependencyfinder"> <path id="dependencyfinder">
<pathelement location="${dependencyfinder.home}/classes"/> <pathelement location="${dependencyfinder.home}/classes"/>
@ -124,6 +126,7 @@
</target> </target>
<target name="-nativelib-osx" if="isMac"> <target name="-nativelib-osx" if="isMac">
<echo message="Building MacOSX version of native bullet"/>
<mkdir dir="${bullet.output.dir}/macosx"/> <mkdir dir="${bullet.output.dir}/macosx"/>
<cc name="${bullet.osx.compiler}" warnings="none" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/macosx/${bullet.library.name}" objdir="${bullet.build.dir}"> <cc name="${bullet.osx.compiler}" warnings="none" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/macosx/${bullet.library.name}" objdir="${bullet.build.dir}">
<fileset dir="${bullet.source.dir}"> <fileset dir="${bullet.source.dir}">
@ -158,6 +161,7 @@
</target> </target>
<target name="-nativelib-linux" if="isLinux"> <target name="-nativelib-linux" if="isLinux">
<echo message="Building Linux version of native bullet"/>
<mkdir dir="${bullet.output.dir}/linux"/> <mkdir dir="${bullet.output.dir}/linux"/>
<cc name="${bullet.linux.compiler}" warnings="severe" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/linux/${bullet.library.name}" objdir="${bullet.build.dir}"> <cc name="${bullet.linux.compiler}" warnings="severe" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/linux/${bullet.library.name}" objdir="${bullet.build.dir}">
<fileset dir="${bullet.source.dir}"> <fileset dir="${bullet.source.dir}">
@ -179,6 +183,7 @@
</target> </target>
<target name="-nativelib-windows" if="isWindows"> <target name="-nativelib-windows" if="isWindows">
<echo message="Building Windows version of native bullet"/>
<mkdir dir="${bullet.output.dir}/windows"/> <mkdir dir="${bullet.output.dir}/windows"/>
<cc multithreaded="" name="${bullet.windows.compiler}" warnings="none" debug="${bullet.compile.debug}" outtype="shared" outfile="${bullet.output.dir}/windows/${bullet.library.name}" objdir="${bullet.build.dir}"> <cc multithreaded="" name="${bullet.windows.compiler}" warnings="none" debug="${bullet.compile.debug}" outtype="shared" outfile="${bullet.output.dir}/windows/${bullet.library.name}" objdir="${bullet.build.dir}">
<fileset dir="${bullet.source.dir}"> <fileset dir="${bullet.source.dir}">

Write Preview
Loading…
Cancel
Save