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

- commit changed build scripts and suite properties

Browse Source 
- rename icons

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8125 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-08-29 14:30:20 +00:00
parent fb0ef8d4e8
commit f03fe0b435
5 changed files with 125 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
build.xml
View File

@ -12,56 +12,39 @@
<target name="default" depends="zip"/> <target name="default" depends="zip"/>
<target name="build" description="Builds the complete SDK" depends="-check-platform, -update-sdk-platform-config"> <target name="build" description="Builds the complete GDE, copies over engine libraries." depends="-check-platform, -update-sdk-platform-config">
<ant dir="engine" target="update-sdk"/> <ant dir="engine" target="update-sdk"/>
<ant dir="sdk" target="zip-templates"/>
<ant dir="sdk" target="build"/> <ant dir="sdk" target="build"/>
</target> </target>
<target name="build-engine" description="Builds the engine only"> <target name="build-engine" description="Builds the engine libraries only">
<ant dir="engine" target="clean"/> <ant dir="engine" target="clean"/>
<ant dir="engine" target="jar"/> <ant dir="engine" target="dist"/>
</target> </target>
<target name="clean" description="Clean all build products"> <target name="clean" description="Clean all build products" depends="-check-platform, -update-sdk-platform-config">
<ant dir="engine" target="clean"/> <ant dir="engine" target="clean"/>
<ant dir="sdk" target="clean"/> <ant dir="sdk" target="clean"/>
</target> </target>
<target name="run" description="Runs the SDK" depends="build"> <target name="run" description="Runs the SDK" depends="-check-platform, -update-sdk-platform-config">
<ant dir="engine" target="update-sdk"/>
<ant dir="sdk" target="run"/> <ant dir="sdk" target="run"/>
</target> </target>
<target name="zip" description="Builds the complete SDK and packs it as a ZIP file" depends="build"> <target name="zip" description="Builds the complete SDK and packs it as a ZIP file" depends="build">
<ant dir="sdk" target="build-zip"/> <propertyfile file="sdk/nbproject/project.properties"/>
<move file="sdk/dist/jmonkeyplatform.zip" tofile="./jME3-SDK.zip"/> <move file="sdk/dist/${app.name}.zip" tofile="./jMonkeyEngine-GDE-${app.version}.zip"/>
</target> </target>
<target name="update-platform" description="Updates the base platform to the latest available build" depends="-remove-platform,-check-platform"/> <target name="update-platform" description="Updates the base platform to the latest available build" depends="-remove-platform,-check-platform"/>
<target name="hudson-nightly" depends="-update-platform-hudson">
<ant dir="engine" target="deploy-hudson"/>
<ant dir="engine" target="hudson-update-sdk"/>
<ant dir="sdk" target="hudson-nightly"/>
</target>
<target name="hudson-stable" depends="-update-platform-hudson">
<ant dir="engine" target="dist"/>
<ant dir="engine" target="hudson-update-sdk"/>
<ant dir="sdk" target="hudson-nightly"/>
</target>
<target name="-update-platform-hudson" description="Updates the base platform to the latest available build" depends="-remove-platform">
<copy file="/var/www/com/platform/base/alpha/platform-base.zip" todir="./"/>
<unzip src="platform-base.zip" dest="./"/>
<antcall target="-update-sdk-platform-config"/>
<delete file="platform-base.zip"/>
</target>
<target name="-check-platform" depends="-check-platform-present" unless="platform.present"> <target name="-check-platform" depends="-check-platform-present" unless="platform.present">
<property file="sdk/nbproject/project.properties"/>
<echo message="Downloading base platform, this only has to be done once."/> <echo message="Downloading base platform, this only has to be done once."/>
<!--get src="http://jmonkeyengine.googlecode.com/files/platform-base.zip" dest="./" skipexisting="true"/--> <!--get src="http://jmonkeyengine.googlecode.com/files/platform-base.zip" dest="./" skipexisting="true"/-->
<get src="http://jmonkeyengine.com/platform/base/alpha/platform-base.zip" dest="./" skipexisting="true"/> <get src="http://jmonkeyengine.com/platform/base/alpha/platform-base.zip" dest="./" skipexisting="false"/>
<!--get src="http://jmonkeyengine.com/updates/${app.version}/platform-base.zip" dest="./" skipexisting="false"/-->
<unzip src="platform-base.zip" dest="./"/> <unzip src="platform-base.zip" dest="./"/>
<antcall target="-update-sdk-platform-config"/> <antcall target="-update-sdk-platform-config"/>
<delete file="platform-base.zip"/> <delete file="platform-base.zip"/>
@ -85,6 +68,30 @@
<replace file="sdk/nbproject/private/platform-private.properties" token="\" value="\\"/> <replace file="sdk/nbproject/private/platform-private.properties" token="\" value="\\"/>
</target> </target>
<target name="update-sdk-platform-config" depends="-update-sdk-platform-config"/> <!--
****************************************************************
Only Relevant for building nightly on Hudson server from here on
****************************************************************
-->
<target name="hudson-nightly" depends="update-platform">
<exec executable="svn" dir="engine">
<arg value="update" />
</exec>
<ant dir="engine" target="dist"/>
<ant dir="engine" target="build-bullet-natives"/>
<ant dir="engine" target="update-sdk"/>
<ant dir="sdk" target="hudson-nightly"/>
</target>
<target name="hudson-stable" depends="update-platform">
<exec executable="svn" dir="engine">
<arg value="update" />
</exec>
<ant dir="engine" target="dist"/>
<ant dir="engine" target="build-bullet-natives"/>
<ant dir="engine" target="update-sdk"/>
<ant dir="sdk" target="hudson-stable"/>
</target>
</project> </project>

117
sdk/build.xml
View File

@ -13,8 +13,29 @@
<taskdef name="deb" classname="com.googlecode.ant_deb_task.Deb" classpathref="ant-import.classpath"/> <taskdef name="deb" classname="com.googlecode.ant_deb_task.Deb" classpathref="ant-import.classpath"/>
<taskdef name="desktopentry" classname="com.googlecode.ant_deb_task.DesktopEntry" classpathref="ant-import.classpath"/> <taskdef name="desktopentry" classname="com.googlecode.ant_deb_task.DesktopEntry" classpathref="ant-import.classpath"/>
<!--override branding target to include netbeans config file creation, using this target makes sure init was called-->
<target name="branding" depends="-create-netbeans-config, -set-base-version, -zip-templates, suite.branding">
</target>
<!--updates the help sets-->
<target name="update-help-sets" description="Loads the wiki pages from the web and converts them to JavaHelp html for manual.">
<ant antfile="build.xml" target="update-help-sets" inheritall="false" inheritrefs="false" dir="jme3-core/"/>
</target>
<target name="-create-netbeans-config">
<!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties-->
<mkdir dir="build/launcher/etc"/>
<copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf">
<filterchain>
<replacestring from="$${branding.token}" to="${branding.token}"/>
<replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/>
<replacestring from="-J-Xmx64m" to="${run.args.extra}"/>
</filterchain>
</copy>
</target>
<!--zips up the templates and adds them to the template project--> <!--zips up the templates and adds them to the template project-->
<target name="zip-templates" description="Updates the template zip files"> <target name="-zip-templates" description="Updates the template zip files">
<zip basedir="BasicGameTemplate/" destfile="jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip"> <zip basedir="BasicGameTemplate/" destfile="jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip">
<exclude name="**/build/"/> <exclude name="**/build/"/>
<exclude name="**/dist/"/> <exclude name="**/dist/"/>
@ -27,35 +48,60 @@
</zip> </zip>
</target> </target>
<!--override build to include netbeans config file creation--> <target name="-set-base-version" description ="sets/unsets base version to major version for all plugins, updates branding version">
<target name="build" depends="-create-netbeans-config, suite.build"> <!--sets/unsets base version to major version (e.g. 3.0.1) for all plugins-->
<foreach target="-do-base-version" list="${modules}" delimiter=":" param="module_dir" inheritall="true"/>
<!--sets version to application branding files-->
<replaceregexp file="${basedir}/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties"
match="currentVersion=(.*)"
replace="currentVersion=${app.title} ${app.version}"
byline="true"/>
<replaceregexp file="${basedir}/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties"
match="CTL_MainWindow_Title=(.*)"
replace="CTL_MainWindow_Title=${app.title} ${app.version}"
byline="true"/>
<replaceregexp file="${basedir}/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties"
match="CTL_MainWindow_Title_No_Project=(.*)"
replace="CTL_MainWindow_Title_No_Project=${app.title} ${app.version}"
byline="true"/>
<!--propertyfile
file="${basedir}/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties"
comment="Updated by build script">
<entry key="currentVersion" value="${app.title} ${app.version}" />
</propertyfile-->
<!--propertyfile
file="${basedir}/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties"
comment="Updated by build script">
<entry key="CTL_MainWindow_Title" value="${app.title} ${app.version}" />
<entry key="CTL_MainWindow_Title_No_Project" value="${app.title} ${app.version}" />
</propertyfile-->
</target> </target>
<!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties--> <target name="-do-base-version">
<target name="-create-netbeans-config"> <!--propertyfile
<property file="nbproject/project.properties"/> file="${module_dir}/nbproject/project.properties"
<mkdir dir="build/launcher/etc"/> comment="Updated by build script">
<copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf"> <entry key="spec.version.base" value="${plugins.version}" />
<filterchain> </propertyfile-->
<replacestring from="$${branding.token}" to="${branding.token}"/> <replaceregexp file="${module_dir}/nbproject/project.properties"
<replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/> match="spec.version.base=(.*)"
<replacestring from="-J-Xmx64m" to="${run.args.extra}"/> replace="spec.version.base=${plugins.version}"
</filterchain> byline="true"/>
</copy>
</target> </target>
<!--
****************************************************************
Only Relevant for building nightly on Hudson server from here on
****************************************************************
-->
<!--creates update center version via hudson build server--> <!--creates update center version via hudson build server-->
<target name="hudson-stable" depends="suite.clean, -revert-svn-changes, zip-templates, set-impl-version, suite.nbms, unset-impl-version"> <target name="hudson-nightly" depends="suite.clean, update-help-sets, -revert-svn-changes, set-impl-version, suite.nbms, unset-impl-version">
</target> </target>
<!--creates update center version via hudson build server--> <target name="hudson-stable" depends="suite.clean, -revert-svn-changes, set-impl-version, suite.nbms, unset-impl-version">
<target name="hudson-nightly" depends="suite.clean, -revert-svn-changes, zip-templates, set-impl-version, suite.nbms, unset-impl-version">
</target> </target>
<!--creates update center version via hudson build server-->
<target name="hudson-release" depends="suite.clean, -revert-svn-changes, zip-templates, set-impl-version, build, unset-impl-version">
</target>
<target name="set-impl-version"> <target name="set-impl-version">
<property file="nbproject/project.properties"/> <property file="nbproject/project.properties"/>
<antcall target="-create-jme3-svn-properties" inheritall="true"> <antcall target="-create-jme3-svn-properties" inheritall="true">
@ -163,11 +209,6 @@
</exec> </exec>
</target> </target>
<!--updates the help sets-->
<target name="-update-help-sets">
<ant antfile="build.xml" target="update-help-sets" inheritall="false" inheritrefs="false" dir="jme3-core/"/>
</target>
<!--creates properties files containing svn info for the jme3 folders--> <!--creates properties files containing svn info for the jme3 folders-->
<target name="-create-jme3-svn-properties"> <target name="-create-jme3-svn-properties">
<mkdir dir="build"/> <mkdir dir="build"/>
@ -200,30 +241,30 @@
</unzip> </unzip>
<desktopentry <desktopentry
toFile="build/jmonkeyplatform.desktop" toFile="build/jmonkeyplatform.desktop"
name="jMonkeyEngine3 SDK" name="jMonkeyEngine3 GDE"
comment="jMonkeyEngine3 Game SDK" comment="jMonkeyEngine3 Game Development Environment"
exec="/usr/local/jmonkeyplatform/bin/jmonkeyplatform" exec="/usr/local/${app.name}/bin/${app.name}"
icon="/usr/local/jmonkeyplatform/jmonkeyplatform.png" icon="/usr/local/${app.name}/jmonkeyengine.png"
categories="Development;Java" categories="Development;Java"
/> />
<deb toDir="dist" <deb toDir="dist"
package="jme3-sdk" package="jme3-sdk"
version="0.6.1" version="${app.version}"
section="devel" section="devel"
depends="sun-java6-jdk" depends="sun-java6-jdk"
maintainer="jMonkeyEngine" maintainer="jMonkeyEngine"
homepage="http://www.jmonkeyengine.com" homepage="http://www.jmonkeyengine.com"
postrm="debscripts/postrm" postrm="debscripts/postrm"
> >
<tarfileset dir="dist/jmonkeyplatform/" prefix="usr/local/jmonkeyplatform"> <tarfileset dir="dist/${app.name}/" prefix="usr/local/${app.name}">
<exclude name="bin/**"/> <exclude name="bin/**"/>
</tarfileset> </tarfileset>
<tarfileset dir="dist/jmonkeyplatform/bin" prefix="usr/local/jmonkeyplatform/bin" filemode="755"> <tarfileset dir="dist/${app.name}/bin" prefix="usr/local/${app.name}/bin" filemode="755">
<exclude name="*.exe"/> <exclude name="*.exe"/>
</tarfileset> </tarfileset>
<tarfileset file="build/jmonkeyplatform.desktop" prefix="usr/share/applications"/> <tarfileset file="build/jmonkeyengine.desktop" prefix="usr/share/applications"/>
<tarfileset file="jmonkeyplatform.png" prefix="usr/local/jmonkeyplatform"/> <tarfileset file="jmonkeyengine.png" prefix="usr/local/${app.name}"/>
<description synopsis="jMonkeyEngine3 SDK is a complete solution for Java OpenGL game development."> <description synopsis="jMonkeyEngine3 Game Development Environment is a complete solution for Java OpenGL game development.">
jMonkeyEngine 3 was rebuilt from the ground up to be a modern 3D game engine, jMonkeyEngine 3 was rebuilt from the ground up to be a modern 3D game engine,
compatible with OpenGL 2.0 and above. compatible with OpenGL 2.0 and above.
Its architecture is shader-based, making it fully capable of current and Its architecture is shader-based, making it fully capable of current and

0
sdk/jmonkeyplatform.icns → sdk/jmonkeyengine.icns
View File

0
sdk/jmonkeyplatform.png → sdk/jmonkeyengine.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

16
sdk/nbproject/project.properties
View File

@ -1,10 +1,13 @@
app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
app.name=jmonkeyplatform app.name=jmonkeyengine
app.title=jMonkeyPlatform app.title=jMonkeyEngine SDK
app.icon.icns=jmonkeyplatform.icns app.icon.icns=jmonkeyengine.icns
branding.token=${app.name} branding.token=${app.name}
#jme-specific, changes settings folder name: #version name used for application and settings folder, no spaces!
app.version=3.0-beta app.version=3.0beta
#version number used for plugins, only numbers (e.g. 3.1.3)
plugins.version=3.0.0
run.args.extra=-J-Xmx512m -J-XX:PermSize=256m
auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt
auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true
@ -41,7 +44,7 @@ modules=\
${project.com.jme3.gde.obfuscate}:\ ${project.com.jme3.gde.obfuscate}:\
${project.com.jme3.gde.blender}:\ ${project.com.jme3.gde.blender}:\
${project.com.jme3.gde.angelfont} ${project.com.jme3.gde.angelfont}
project.com.jme3.gde.android=jme3-android project.com.jme3.gde.android=Android Support
project.com.jme3.gde.angelfont=jme3-angelfont project.com.jme3.gde.angelfont=jme3-angelfont
project.com.jme3.gde.blender=jme3-blender project.com.jme3.gde.blender=jme3-blender
project.com.jme3.gde.codecheck=jme3-code-check project.com.jme3.gde.codecheck=jme3-code-check
@ -72,4 +75,3 @@ project.com.jme3.gde.textureeditor=jme3-texture-editor
project.com.jme3.gde.vehiclecreator=jme3-vehicle-creator project.com.jme3.gde.vehiclecreator=jme3-vehicle-creator
project.com.jme3.gde.wavefront=jme3-wavefront project.com.jme3.gde.wavefront=jme3-wavefront
project.com.jme3.gde.welcome=jme3-welcome-screen project.com.jme3.gde.welcome=jme3-welcome-screen
run.args.extra=-J-Xmx512m -J-XX:PermSize=256m