update build

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@194 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade 2008-12-26 12:45:43 +00:00
parent 3b6546b438
commit 124806b327
57 changed files with 91 additions and 265 deletions

163
build.xml
View File

@ -57,7 +57,9 @@
<!-- set os specific properties -->
<property name="os.windows" value="windows"/>
<property name="ext.windows" value="bat"/>
<property name="os.linux" value="linux"/>
<property name="ext.linux" value="sh"/>
<condition property="os" value="${os.windows}" else="${os.linux}">
<os family="windows"/>
@ -108,69 +110,16 @@
<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask"
classpath="${launch4j.dir}/launch4j.jar:${launch4j.dir}/lib/xstream.jar"/>
<!-- jar file dependencies that have versions specified in their names -->
<property name="jar.jcommon" value="jcommon-1.0.12.jar"/>
<property name="jar.jfreechart" value="jfreechart-1.0.9.jar"/>
<property name="jar.jama" value="jama-1.0.2.jar"/>
<property name="jar.log4j" value="log4j-1.2.14.jar"/>
<property name="jar.swing-layout" value="swing-layout-1.0.jar"/>
<property name="jar.jinvoke" value="jinvoke-3.0.3.jar"/>
<!-- common classpath for building, javadoc -->
<path id="classpath">
<pathelement location="lib/Graph3d/windows/lib/j3dcore.jar"/>
<pathelement location="lib/Graph3d/windows/lib/j3dutils.jar"/>
<pathelement location="lib/Graph3d/windows/lib/vecmath.jar"/>
<pathelement location="lib/Graph3d/windows/Graph3d.jar"/>
<pathelement location="lib/Graph3d/${jar.jama}"/>
<pathelement location="lib/BareBonesBrowserLaunch.jar"/>
<pathelement location="lib/jep.jar"/>
<pathelement location="lib/Jama.jar"/>
<pathelement location="lib/jamlab.jar"/>
<pathelement location="lib/JFontChooser.jar"/>
<pathelement location="lib/${jar.log4j}"/>
<pathelement location="lib/${jar.swing-layout}"/>
<pathelement location="lib/tts/cmu_time_awb.jar"/>
<pathelement location="lib/tts/cmu_us_kal.jar"/>
<pathelement location="lib/tts/cmudict04.jar"/>
<pathelement location="lib/tts/cmulex.jar"/>
<pathelement location="lib/tts/cmutimelex.jar"/>
<pathelement location="lib/tts/en_us.jar"/>
<pathelement location="lib/tts/freetts.jar"/>
<pathelement location="lib/logger/rxtx/RXTXcomm.jar"/>
<pathelement location="lib/jdic/windows/jdic_stub.jar"/>
<pathelement location="lib/jdic/jdic.jar"/>
<pathelement location="lib/logger/${jar.jcommon}"/>
<pathelement location="lib/logger/${jar.jfreechart}"/>
<pathelement location="lib/logger/${jar.jinvoke}"/>
<!-- windows classpath -->
<path id="windows.classpath">
<fileset dir="lib/common" includes="*.jar"/>
<fileset dir="lib/windows" includes="*.jar"/>
</path>
<!-- classpath for execution -->
<path id="classpath.installed">
<pathelement location="lib/j3dcore.jar"/>
<pathelement location="lib/j3dutils.jar"/>
<pathelement location="lib/vecmath.jar"/>
<pathelement location="lib/Graph3d.jar"/>
<pathelement location="lib/${jar.jama}"/>
<pathelement location="lib/BareBonesBrowserLaunch.jar"/>
<pathelement location="lib/jep.jar"/>
<pathelement location="lib/Jama.jar"/>
<pathelement location="lib/jamlab.jar"/>
<pathelement location="lib/JFontChooser.jar"/>
<pathelement location="lib/${jar.log4j}"/>
<pathelement location="lib/${jar.swing-layout}"/>
<pathelement location="lib/cmu_time_awb.jar"/>
<pathelement location="lib/cmu_us_kal.jar"/>
<pathelement location="lib/cmudict04.jar"/>
<pathelement location="lib/cmulex.jar"/>
<pathelement location="lib/cmutimelex.jar"/>
<pathelement location="lib/en_us.jar"/>
<pathelement location="lib/freetts.jar"/>
<pathelement location="lib/RXTXcomm.jar"/>
<pathelement location="lib/jdic_stub.jar"/>
<pathelement location="lib/jdic.jar"/>
<pathelement location="lib/${jar.jcommon}"/>
<pathelement location="lib/${jar.jfreechart}"/>
<pathelement location="lib/${jar.jinvoke}"/>
<!-- linux classpath -->
<path id="linux.classpath">
<fileset dir="lib/common" includes="*.jar"/>
<fileset dir="lib/linux" includes="*.jar"/>
</path>
<!-- this set of filters should contain all the substitutions needed -->
@ -192,12 +141,6 @@
<filter token="version.buildnumber" value="${version.buildnumber}"/>
<filter token="version.extra" value="${version.extra}"/>
<filter token="version.extra1" value="${version.extra1}"/>
<filter token="jar.jcommon" value="${jar.jcommon}"/>
<filter token="jar.jfreechart" value="${jar.jfreechart}"/>
<filter token="jar.jinvoke" value="${jar.jinvoke}"/>
<filter token="jar.jama" value="${jar.jama}"/>
<filter token="jar.log4j" value="${jar.log4j}"/>
<filter token="jar.swing-layout" value="${jar.swing-layout}"/>
<filter token="jvm.args" value="${jvm.args}"/>
</filterset>
</target>
@ -213,39 +156,24 @@
<!-- pre-build preparation -->
<!-- =================================================================== -->
<target name="prepare" depends="-init">
<mkdir dir="${build.dir}/classes"/>
<mkdir dir="${build.dir}/lib"/>
<!-- generate the Version class -->
<copy overwrite="true" tofile="${src.dir}/com/romraider/Version.java" file="src/com/romraider/Version.java.template">
<filterset refid="version.filterset"/>
</copy>
</target>
<!-- =================================================================== -->
<!-- complete rebuild -->
<!-- =================================================================== -->
<target name="rebuild" depends="clean, build">
</target>
<target name="rebuild" depends="clean, build"/>
<!-- =================================================================== -->
<!-- Compiles the source directory -->
<!-- =================================================================== -->
<target name="build" depends="prepare">
<javac failonerror="true" srcdir="${src.dir}" destdir="${classes.dir}" target="1.5">
<classpath refid="classpath"/>
</javac>
<!-- don't use the build path for jar file - we need the paths to
point to the relative location after installation -->
<manifestclasspath property="jar.classpath" jarfile="${jar.package}">
<classpath refid="classpath.installed"/>
</manifestclasspath>
<manifest file="${build.dir}/MANIFEST.MF">
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="${class.start}"/>
<attribute name="Class-Path" value="${jar.classpath}"/>
</manifest>
<jar basedir="${classes.dir}" destfile="${build.dir}/lib/${jar.package}" manifest="${build.dir}/MANIFEST.MF"/>
<macro_compile os="${os.windows}"/>
<macro_jar os="${os.windows}"/>
<macro_jar os="${os.linux}"/>
</target>
<!-- ================================================================== -->
@ -260,7 +188,7 @@
<include name="**"/>
</packageset>
<bottom>${javadoc.footer}</bottom>
<classpath refid="classpath"/>
<classpath refid="${os.windows}.classpath"/>
</javadoc>
</target>
@ -293,13 +221,15 @@
</copy>
<macro_generate_executables/>
<macro_standalone os="${os.windows}"/>
<macro_standalone os="${os.linux}"/>
</target>
<!-- =================================================================== -->
<!-- all -->
<!-- =================================================================== -->
<target name="all" depends="rebuild, dist">
</target>
<target name="all" depends="rebuild, dist"/>
<!-- =================================================================== -->
<!-- Macros -->
@ -359,4 +289,57 @@
</sequential>
</macrodef>
<macrodef name="macro_jar">
<attribute name="os"/>
<sequential>
<mkdir dir="${build.dir}/@{os}/lib"/>
<manifestclasspath property="@{os}.jar.classpath" jarfile="${jar.package}">
<classpath>
<fileset dir="lib/common" includes="*.jar"/>
<fileset dir="lib/@{os}" includes="*.jar"/>
</classpath>
</manifestclasspath>
<manifest file="${build.dir}/@{os}/MANIFEST.MF">
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="${class.start}"/>
<attribute name="Class-Path" value="${@{os}.jar.classpath}"/>
</manifest>
<jar basedir="${classes.dir}" destfile="${build.dir}/@{os}/lib/${jar.package}" manifest="${build.dir}/@{os}/MANIFEST.MF"/>
</sequential>
</macrodef>
<macrodef name="macro_compile">
<attribute name="os"/>
<sequential>
<mkdir dir="${classes.dir}"/>
<javac failonerror="true" srcdir="${src.dir}" destdir="${classes.dir}" target="1.5">
<classpath refid="@{os}.classpath"/>
</javac>
</sequential>
</macrodef>
<macrodef name="macro_standalone">
<attribute name="os"/>
<sequential>
<copy file="run.script" tofile="${dist.dir}/run.${ext.@{os}}">
<filterset>
<filter token="os" value="@{os}"/>
</filterset>
</copy>
<zip destfile="${dist.dir}/@{os}/${name.package}${version.major}.${version.minor}.${version.patch}${version.extra}${version.extra1}-@{os}.zip">
<zipfileset file="build/@{os}/lib/${jar.package}" prefix="${name.package}"/>
<zipfileset file="${dist.dir}/run.${ext.@{os}}" prefix="${name.package}" filemode="755"/>
<zipfileset file="license.txt" prefix="${name.package}"/>
<zipfileset file="release_notes.txt" prefix="${name.package}"/>
<zipfileset file="log4j.properties" prefix="${name.package}"/>
<zipfileset file="logger.dtd" prefix="${name.package}"/>
<zipfileset file="profile.dtd" prefix="${name.package}"/>
<zipfileset dir="graphics" prefix="${name.package}/graphics" excludes="*.bmp"/>
<zipfileset dir="plugins" prefix="${name.package}/plugins"/>
<zipfileset dir="lib/common" prefix="${name.package}/lib/common"/>
<zipfileset dir="lib/@{os}" prefix="${name.package}/lib/@{os}"/>
<zipfileset dir="src" prefix="${name.package}/src" excludes="**/*.template"/>
</zip>
</sequential>
</macrodef>
</project>

1
run.script Normal file
View File

@ -0,0 +1 @@
java -Djava.library.path=.;lib/@os@ -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms32M -Xmx384M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar 1>>romraider_sout.log 2>&1

View File

@ -24,8 +24,6 @@
</resources>
<panels>
<!-- <panel classname="HelloPanel"/>
-->
<panel classname="InfoPanel"/>
<panel classname="LicencePanel"/>
<panel classname="TargetPanel"/>
@ -38,104 +36,24 @@
<packs>
<pack name="Base" required="yes">
<description>RomRaider binary files</description>
<file src="build/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
<file src="build/linux/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
<file src="license.txt" targetdir="$INSTALL_PATH"/>
<file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
<file src="log4j.properties" targetdir="$INSTALL_PATH"/>
<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics"
excludes="*.bmp"/>
<!-- Logger files -->
<!--<file src="logger.xml" targetdir="$INSTALL_PATH"/>-->
<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics" excludes="*.bmp"/>
<file src="log4j.properties" targetdir="$INSTALL_PATH"/>
<file src="logger.dtd" targetdir="$INSTALL_PATH"/>
<file src="profile.dtd" targetdir="$INSTALL_PATH"/>
<file src="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/lc1.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/lm1.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="lib/BareBonesBrowserLaunch.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/jep.jar" targetdir="$INSTALL_PATH/lib"/>
<file src="lib/JFontChooser.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/@jar.swing-layout@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/@jar.log4j@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/Jama.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/jamlab.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/Graph3d/@jar.jama@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/Graph3d/linux/Graph3d.jar"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/j3dcore.jar"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/j3dutils.jar"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/libj3dcore-ogl.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/libj3dcore-ogl-cg.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/librxtxParallel.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/librxtxSerial.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/Graph3d/linux/lib/vecmath.jar"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib"/>
<file src="lib/jdic/linux/jdic_stub.jar"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/linux/x86/libjdic.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/linux/x86/libmozembed-linux-gtk1.2.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/linux/x86/libmozembed-linux-gtk2.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/linux/x86/libtray.so"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/linux/x86/mozembed-linux-gtk1.2"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/jdic/linux/x86/mozembed-linux-gtk2"
targetdir="$INSTALL_PATH/lib" os="unix"/>
<file src="lib/logger/@jar.jcommon@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/@jar.jfreechart@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/@jar.jinvoke@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/rxtx/RXTXcomm.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/rxtx/linux/i686/librxtxSerial.so"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmu_time_awb.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmu_us_kal.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmutimelex.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/en_us.jar" targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/freetts.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmulex.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmudict04.jar"
targetdir="$INSTALL_PATH/lib"/>
<fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common"/>
<fileset dir="lib/linux" targetdir="$INSTALL_PATH/lib/linux"/>
</pack>
<!-- END Base Pack -->
<!--<pack name="ECU Definitions" required="no">-->
<!--<description>-->
<!--The latest official ECU definitions-->
<!--</description>-->
<!--<file src="ecu_defs/ecu_defs.xml" targetdir="$INSTALL_PATH"/>-->
<!--</pack>-->
<pack name="Source Files" required="no">
<description>@name.package@ Source Files</description>

View File

@ -24,8 +24,6 @@
</resources>
<panels>
<!-- <panel classname="HelloPanel"/>
-->
<panel classname="InfoPanel"/>
<panel classname="LicencePanel"/>
<panel classname="TargetPanel"/>
@ -38,99 +36,25 @@
<packs>
<pack name="Base" required="yes">
<description>RomRaider binary files</description>
<file src="build/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
<file src="build/windows/lib/@name.package@.jar" targetdir="$INSTALL_PATH"/>
<file src="build/dist/@name.package@.exe" targetdir="$INSTALL_PATH"/>
<!--
<file src="@name.package@.bat" targetdir="$INSTALL_PATH" />
-->
<file src="license.txt" targetdir="$INSTALL_PATH"/>
<file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
<file src="log4j.properties" targetdir="$INSTALL_PATH"/>
<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics"
excludes="*.bmp"/>
<!-- Logger files -->
<!--<file src="logger.xml" targetdir="$INSTALL_PATH"/>-->
<fileset dir="graphics" targetdir="$INSTALL_PATH/graphics" excludes="*.bmp"/>
<file src="log4j.properties" targetdir="$INSTALL_PATH"/>
<file src="logger.dtd" targetdir="$INSTALL_PATH"/>
<file src="profile.dtd" targetdir="$INSTALL_PATH"/>
<file src="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/lc1.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/lm1.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="lib/BareBonesBrowserLaunch.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/jep.jar" targetdir="$INSTALL_PATH/lib"/>
<file src="lib/JFontChooser.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/@jar.swing-layout@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/@jar.log4j@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/Jama.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/jamlab.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/Graph3d/@jar.jama@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/Graph3d/windows/Graph3d.jar"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/Graph3d/windows/lib/j3dcore.jar"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/Graph3d/windows/lib/j3dcore-ogl.dll"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/Graph3d/windows/lib/j3dcore-ogl-cg.dll"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/Graph3d/windows/lib/j3dutils.jar"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/Graph3d/windows/lib/vecmath.jar"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/jdic/jdic.jar" targetdir="$INSTALL_PATH/lib"/>
<file src="lib/jdic/windows/jdic_stub.jar"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/jdic/windows/x86/IeEmbed.exe"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/jdic/windows/x86/jdic.dll"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/jdic/windows/x86/MozEmbed.exe"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/jdic/windows/x86/tray.dll"
targetdir="$INSTALL_PATH/lib" os="windows"/>
<file src="lib/logger/@jar.jcommon@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/@jar.jfreechart@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/@jar.jinvoke@"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/rxtx/RXTXcomm.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/logger/rxtx/win32/rxtxSerial.dll"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmu_time_awb.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmu_us_kal.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmutimelex.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/en_us.jar" targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/freetts.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmulex.jar"
targetdir="$INSTALL_PATH/lib"/>
<file src="lib/tts/cmudict04.jar"
targetdir="$INSTALL_PATH/lib"/>
<fileset dir="lib/common" targetdir="$INSTALL_PATH/lib/common"/>
<fileset dir="lib/windows" targetdir="$INSTALL_PATH/lib/windows"/>
</pack>
<!-- END Base Pack -->
<!--<pack name="ECU Definitions" required="no">-->
<!--<description>-->
<!--The latest official ECU definitions-->
<!--</description>-->
<!--<file src="ecu_defs/ecu_defs.xml" targetdir="$INSTALL_PATH"/>-->
<!--</pack>-->
<pack name="Source Files" required="no">
<description>@name.package@ Source Files</description>

View File

@ -28,7 +28,7 @@ version.extra1=
class.start=com.romraider.ECUExec
# JVM args
jvm.args=-Djava.library.path=lib -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms32M -Xmx384M -XX:-UseParallelGC -XX:CompileThreshold=10000
jvm.args=-Djava.library.path=lib/${os} -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms32M -Xmx384M -XX:-UseParallelGC -XX:CompileThreshold=10000
# copyright stuff
copyright=Copyright(c) 2006-${time.year} ${name.organization}. Released under GPL 2.0.