Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[15982] sandbox/uisync
|
From: <jde...@us...> - 2012-02-04 01:32:03
|
Revision: 15982
http://pcgen.svn.sourceforge.net/pcgen/?rev=15982&view=rev
Author: jdempsey
Date: 2012-02-04 01:31:53 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Replace old user interface with new user interface
* Step 4 - Bring uisync branch up to date with trunk
Issue#: CODE-1191
Modified Paths:
--------------
sandbox/uisync/build.xml
sandbox/uisync/docs/acknowledgments/outputsheets.html
sandbox/uisync/docs/acknowledgments/publishersandsources.html
sandbox/uisync/docs/faqpages/faqiwannahelp.html
sandbox/uisync/docs/faqpages/faqprintingissues.html
sandbox/uisync/docs/images/windows/load_sources.png
sandbox/uisync/docs/installationpages/upgradepcgen.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilesability.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilesclasses.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilesequipment.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilesinstall.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilespcc.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilesskills.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilesstartingkits.html
sandbox/uisync/docs/listfilepages/datafilestagpages/datafilestemplates.html
sandbox/uisync/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
sandbox/uisync/docs/listfilepages/globalfilestagpages/globalfileschoose.html
sandbox/uisync/docs/listfilepages/globalfilestagpages/globalfilesdefine.html
sandbox/uisync/docs/listfilepages/globalfilestagpages/globalfilesother.html
sandbox/uisync/docs/listfilepages/globalfilestagpages/globalfilesprexxx.html
sandbox/uisync/docs/listfilepages/listfileLSTwalkthrough.html
sandbox/uisync/docs/listfilepages/listfilesectionheading.html
sandbox/uisync/docs/listfilepages/listfiletagindex.html
sandbox/uisync/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html
sandbox/uisync/docs/listfilepages/lstfileclass/lfc_lesson17_converting_feats_to_abilities.html
sandbox/uisync/docs/listfilepages/lstfileclass/lfc_lesson18_HD_LEVEL_conversion.html
sandbox/uisync/docs/listfilepages/lstfileclass/lstfileclass_heading.html
sandbox/uisync/docs/listfilepages/systemfilestagpages/gamemodemiscinfolist.html
sandbox/uisync/docs/listfilepages/systemfilestagpages/systemfilessizeadjustment.html
sandbox/uisync/docs/menupages/tools/class/classeditorbasetab.html
sandbox/uisync/docs/menupages/tools/class/classeditorsectionheading.html
sandbox/uisync/docs/navlistindex.html
sandbox/uisync/docs/navtree.html
sandbox/uisync/docs/outputsheetpages/tokens/outputsheettokensspell.html
sandbox/uisync/docs/sourcehelp/pathfinder/pathfinder_header.html
sandbox/uisync/docs/walkthroughpages/walkthroughloadcampaignadvanced.html
sandbox/uisync/docs/walkthroughpages/walkthroughsectionheading.html
sandbox/uisync/installers/release-notes/README.md
sandbox/uisync/installers/win-installer/gendatalist.pl
sandbox/uisync/installers/win-installer/pcgen-nsis.jelly
sandbox/uisync/maven.xml
sandbox/uisync/outputsheets/base.xml
sandbox/uisync/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_4e_std_grey_light_new.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blackandwhite.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue_light.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_green_light.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey_light.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_red_light.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_full.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_light.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/fantasy_common.xsl
sandbox/uisync/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
sandbox/uisync/outputsheets/d20/fantasy/pdf/leadership.xsl
sandbox/uisync/pom.xml
sandbox/uisync/preview/d20/fantasy/Standard.htm
sandbox/uisync/preview/d20/fantasy/statblock5.htm
sandbox/uisync/preview/d20/fantasy/troubleshooting.htm
sandbox/uisync/preview/d20/gaslight/gaslight_statblock.htm
sandbox/uisync/preview/d20/gaslight/preview.html
sandbox/uisync/project.properties
sandbox/uisync/project.xml
sandbox/uisync/system/gameModes/35e/miscinfo.lst
sandbox/uisync/system/gameModes/3e/miscinfo.lst
sandbox/uisync/system/gameModes/Pathfinder_RPG/level.lst
sandbox/uisync/system/gameModes/Pathfinder_RPG/miscinfo.lst
sandbox/uisync/system/gameModes/Pathfinder_RPG/rules.lst
sandbox/uisync/system/gameModes/Pathfinder_RPG/statsandchecks.lst
sandbox/uisync/system/my_gamemode/statsandchecks.lst
sandbox/uisync/system/npcgen/classdata/classdata35.xml
Added Paths:
-----------
sandbox/uisync/.gitignore
sandbox/uisync/docs/images/menus/settings_loadsources.png
sandbox/uisync/docs/images/windows/createnewsourcecollection1.png
sandbox/uisync/docs/images/windows/createnewsourcecollection2.png
sandbox/uisync/docs/listfilepages/lstfileclass/lfc_lesson00_homebrew.html
sandbox/uisync/docs/walkthroughpages/walkthroughloadcampaign.html
sandbox/uisync/docs/walkthroughpages/walkthroughloadcampaignbasic.html
sandbox/uisync/installers/release-notes/pcgen-release-notes-51710.html
sandbox/uisync/installers/release-notes/pcgen-release-notes-5177.html
sandbox/uisync/installers/release-notes/pcgen-release-notes-5178.html
sandbox/uisync/installers/release-notes/pcgen-release-notes-5179.html
sandbox/uisync/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml
Removed Paths:
-------------
sandbox/uisync/docs/walkthroughpages/walkthroughloadcampaign.html
sandbox/uisync/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds.xml
Copied: sandbox/uisync/.gitignore (from rev 15960, Trunk/pcgen/.gitignore)
===================================================================
--- sandbox/uisync/.gitignore (rev 0)
+++ sandbox/uisync/.gitignore 2012-02-04 01:31:53 UTC (rev 15982)
@@ -0,0 +1,21 @@
+
+*.ini
+
+batch-convert.jar
+plugins/*.jar
+plugins/*plugins/
+
+code/bin/
+code/build/
+code/comp-manifest
+code/manifest
+
+hs_err_*.log
+
+outputsheets/d20/*/htmlxml/*.htm
+
+pcgen.exe
+pcgen.jar
+pcgen.sh
+pcgen_low_mem.bat
+
Modified: sandbox/uisync/build.xml
===================================================================
--- sandbox/uisync/build.xml 2012-02-03 16:44:21 UTC (rev 15981)
+++ sandbox/uisync/build.xml 2012-02-04 01:31:53 UTC (rev 15982)
@@ -14,7 +14,7 @@
real-clean - clean, clean-data, clean-docs, clean-sheets
build - do an [incremental] build (compile, jar, extras)
test - Run unit tests. Requires xxx?-optional.jar from Ant website,
- plus junit.jar to be in lib directory of ANT_HOME.
+ plus junit.jar to be in lib directory of ANT_HOME.
run - Run PCGen
docs - do the API documenation (targets pcgen/doc/api)
deploy - ship the jars, wars, whatever to the execution system
@@ -40,206 +40,229 @@
-->
<project name="pcgen" default="main" basedir=".">
- <import file="code/pluginbuild.xml" />
+ <import file="code/pluginbuild.xml" />
- <property name="bin.dir" value="${basedir}/code/bin" />
- <property name="build.dir" value="${basedir}/code/build" />
- <property name="build.classes.dir" value="${build.dir}/classes" />
- <property name="build.testclasses.dir" value="${build.dir}/testclasses" />
- <property name="build.src.dir" value="${build.dir}/src" />
- <property name="build.rpt.dir" value="${build.dir}/rpt" />
- <property name="coverage.dir" value="${build.dir}/coverage" />
- <property name="coverage.rpt.dir" value="${build.rpt.dir}/coverage" />
- <property name="dist.dir" value="${basedir}/code/dist" />
- <property name="doc.dir" value="${basedir}/doc/api" />
- <property name="etc.dir" value="${basedir}/code/etc" />
- <property name="src.java.dir" value="${basedir}/code/src/java" />
- <property name="src.test.java.dir" value="${basedir}/code/src/test" />
- <property name="src.utest.java.dir" value="${basedir}/code/src/utest" />
- <property name="src.itest.java.dir" value="${basedir}/code/src/itest" />
- <property name="src.testcommon.java.dir" value="${basedir}/code/src/testcommon" />
- <property name="lib.dir" value="lib" />
- <property name="src.data.dir" value="${basedir}/data" />
- <property name="src.docs.dir" value="${basedir}/docs" />
- <property name="src.outputsheets.dir" value="${basedir}/outputsheets" />
- <property name="docs.manual.dir" value="${basedir}/doc/" />
- <property name="docs.overview" value="${src.java.dir}/pcgen/overview.html" />
- <property name="src.xml.dir" value="${basedir}/xml" />
+ <property name="bin.dir" value="${basedir}/code/bin" />
+ <property name="build.dir" value="${basedir}/code/build" />
+ <property name="build.classes.dir" value="${build.dir}/classes" />
+ <property name="build.testclasses.dir" value="${build.dir}/testclasses" />
+ <property name="build.src.dir" value="${build.dir}/src" />
+ <property name="build.rpt.dir" value="${build.dir}/rpt" />
+ <property name="coverage.dir" value="${build.dir}/coverage" />
+ <property name="coverage.rpt.dir" value="${build.rpt.dir}/coverage" />
+ <property name="dist.dir" value="${basedir}/code/dist" />
+ <property name="doc.dir" value="${basedir}/doc/api" />
+ <property name="etc.dir" value="${basedir}/code/etc" />
+ <property name="src.java.dir" value="${basedir}/code/src/java" />
+ <property name="src.test.java.dir" value="${basedir}/code/src/test" />
+ <property name="src.utest.java.dir" value="${basedir}/code/src/utest" />
+ <property name="src.itest.java.dir" value="${basedir}/code/src/itest" />
+ <property name="src.testcommon.java.dir" value="${basedir}/code/src/testcommon" />
+ <property name="lib.dir" value="lib" />
+ <property name="src.data.dir" value="${basedir}/data" />
+ <property name="src.docs.dir" value="${basedir}/docs" />
+ <property name="src.outputsheets.dir" value="${basedir}/outputsheets" />
+ <property name="docs.manual.dir" value="${basedir}/doc/" />
+ <property name="docs.overview" value="${src.java.dir}/pcgen/overview.html" />
+ <property name="src.xml.dir" value="${basedir}/xml" />
- <!-- Choose compiler. Values are "classic", "modern", "jikes", "jvc"-->
- <property name="build.compiler" value="modern" />
+ <!-- Choose compiler. Values are "classic", "modern", "jikes", "jvc"-->
+ <property name="build.compiler" value="modern" />
- <!-- For writing the jar -->
- <property name="jar.bin.file" value="pcgen.jar" />
- <property name="manifest.file" value="code/manifest" />
- <property name="manifest.main.class" value="pcgen.core.Main" />
- <property name="default.main.class" value="pcgen.gui.pcGenGUI" />
- <property name="manifest.extra.jars" value="${lib.dir}/apache/commons-lang-2.4.jar ${lib.dir}/apache/commons-io-2.1.jar ${lib.dir}/fop/xercesImpl-2.5.0.jar ${lib.dir}/fop/avalon-framework-cvs-20020806.jar ${lib.dir}/fop/xml-apis.jar ${lib.dir}/fop/xalan-2.5.2.jar ${lib.dir}/fop/batik.jar ${lib.dir}/fop/fop.jar ${lib.dir}/lnf/kunststoff.jar ${lib.dir}/lnf/skinlf.jar ${lib.dir}/lnf/wraplf.jar ${lib.dir}/jep/jep-2.4.1.jar ${lib.dir}/jep/ext-1.1.1.jar ${lib.dir}/jdom.jar ${lib.dir}/MRJ141Stubs.jar ${lib.dir}/jep/djep-2.24.jar ${lib.dir}/jep/RngPack-1.1a.jar ${lib.dir}/tracerapi.jar ${lib.dir}/cobra/cobra.jar ${lib.dir}/cobra/js.jar ${lib.dir}/spring/commons-logging-1.1.1.jar ${lib.dir}/spring/spring-beans-2.5.6.SEC01.jar ${lib.dir}/spring/spring-core-2.5.6.SEC01.jar" />
+ <!-- For writing the jar -->
+ <property name="jar.bin.file" value="pcgen.jar" />
+ <property name="manifest.file" value="code/manifest" />
+ <property name="manifest.main.class" value="pcgen.core.Main" />
+ <property name="default.main.class" value="pcgen.gui.pcGenGUI" />
+ <property name="manifest.extra.jars" value="
+ ${lib.dir}/apache/commons-lang-2.4.jar
+ ${lib.dir}/fop/xercesImpl-2.5.0.jar
+ ${lib.dir}/fop/avalon-framework-cvs-20020806.jar
+ ${lib.dir}/fop/xml-apis.jar
+ ${lib.dir}/fop/xalan-2.5.2.jar
+ ${lib.dir}/fop/batik.jar
+ ${lib.dir}/fop/fop.jar
+ ${lib.dir}/lnf/kunststoff.jar
+ ${lib.dir}/lnf/skinlf.jar
+ ${lib.dir}/lnf/wraplf.jar
+ ${lib.dir}/jep/jep-2.4.1.jar
+ ${lib.dir}/jep/ext-1.1.1.jar
+ ${lib.dir}/jdom.jar
+ ${lib.dir}/MRJ141Stubs.jar
+ ${lib.dir}/jep/djep-2.24.jar
+ ${lib.dir}/jep/RngPack-1.1a.jar
+ ${lib.dir}/tracerapi.jar
+ ${lib.dir}/cobra/cobra.jar
+ ${lib.dir}/cobra/js.jar
+ ${lib.dir}/spring/commons-logging-1.1.1.jar
+ ${lib.dir}/spring/spring-beans-2.5.6.SEC01.jar
+ ${lib.dir}/spring/spring-core-2.5.6.SEC01.jar" />
- <!-- For writing the compatibility checker jar -->
- <property name="convert-jar.bin.file" value="batch-convert.jar" />
- <property name="convert-manifest.file" value="code/comp-manifest" />
- <property name="convert-manifest.main.class" value="pcgen.gui.converter.PCGenDataConvert" />
- <!-- Text files always shipped along -->
- <property name="project.license.file" value="LICENSE" />
+ <!-- For writing the compatibility checker jar -->
+ <property name="convert-jar.bin.file" value="batch-convert.jar" />
+ <property name="convert-manifest.file" value="code/comp-manifest" />
+ <property name="convert-manifest.main.class" value="pcgen.gui.converter.PCGenDataConvert" />
- <property name="project.dist.files" value="${project.license.file}" />
- <property name="batch.dist.files" value="${convert-jar.bin.file}" />
+ <!-- Text files always shipped along -->
+ <property name="project.license.file" value="LICENSE" />
- <!-- For installation -->
- <property name="bin.pcgen.exe" value="pcgen.exe" />
- <property name="bin.pcgenlowmem.bat" value="pcgen_low_mem.bat" />
- <property name="bin.pcgen.sh" value="pcgen.sh" />
- <property name="bin.filepaths.ini" value="filepaths.ini" />
+ <property name="project.dist.files" value="${project.license.file}" />
+ <property name="batch.dist.files" value="${convert-jar.bin.file}" />
- <!-- For packaging -->
- <property name="jar.src.file" value="src.jar" />
- <property name="zip.bins.file" value="pcgen.zip" />
- <property name="zip.resources.file" value="data.zip" />
- <property name="zip.jars.file" value="jars.zip" />
- <property name="zip.manual.file" value="manual.zip" />
- <property name="zip.autobuild.file" value="autobuild.zip" />
- <property name="zip.batch.file" value="batch-convert.zip" />
+ <!-- For installation -->
+ <property name="bin.pcgen.exe" value="pcgen.exe" />
+ <property name="bin.pcgenlowmem.bat" value="pcgen_low_mem.bat" />
+ <property name="bin.pcgen.sh" value="pcgen.sh" />
+ <property name="bin.filepaths.ini" value="filepaths.ini" />
- <!-- The jars required to run PCGen -->
- <path id="project.jars">
- <fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/test/**,javacc.jar,**/emma/**" />
- </path>
+ <!-- For packaging -->
+ <property name="jar.src.file" value="src.jar" />
+ <property name="zip.bins.file" value="pcgen.zip" />
+ <property name="zip.resources.file" value="data.zip" />
+ <property name="zip.jars.file" value="jars.zip" />
+ <property name="zip.manual.file" value="manual.zip" />
+ <property name="zip.autobuild.file" value="autobuild.zip" />
+ <property name="zip.batch.file" value="batch-convert.zip" />
- <!-- The Java CLASSPATH, used by the build process -->
- <path id="project.classpath">
- <pathelement path="${build.classes.dir}" />
- <pathelement location="${bin.dir}/${jar.bin.file}" />
- <path refid="project.jars" />
- </path>
+ <!-- The jars required to run PCGen -->
+ <path id="project.jars">
+ <fileset dir="${lib.dir}" includes="**/*.jar" excludes="**/test/**,javacc.jar,**/emma/**" />
+ </path>
- <!-- The Javadoc CLASSPATH, used by the javadoc process -->
- <path id="javadoc.classpath">
- <pathelement path="${build.classes.dir} ${lib.dir}/lib/junit-4.1.jar" />
- <pathelement location="${bin.dir}/${jar.bin.file}" />
- <path refid="project.jars" />
- </path>
+ <!-- The Java CLASSPATH, used by the build process -->
+ <path id="project.classpath">
+ <pathelement path="${build.classes.dir}" />
+ <pathelement location="${bin.dir}/${jar.bin.file}" />
+ <path refid="project.jars" />
+ </path>
- <!-- For testing -->
- <property name="test.jar.file" value="pcgen-tests.jar" />
- <property name="test.manifest.file" value="code/manifest-tests" />
- <property name="test.framework.class" value="AllJUnitTests" />
- <property name="test.manifest.extra.jars" value="${manifest.extra.jars} ${s}/test/junit-4.1.jar ${lib.dir}/test/xmlunit1.0.jar" />
- <property name="test.all-output.file" value="TEST-test.AllJUnitTests.txt" />
- <property name="test.bin.pcgen.bat" value="pcgen-tests.bat" />
- <property name="test.bin.pcgen.sh" value="pcgen-tests.sh" />
+ <!-- The Javadoc CLASSPATH, used by the javadoc process -->
+ <path id="javadoc.classpath">
+ <pathelement path="${build.classes.dir} ${lib.dir}/lib/junit-4.1.jar" />
+ <pathelement location="${bin.dir}/${jar.bin.file}" />
+ <path refid="project.jars" />
+ </path>
- <!-- The jars required to test PCGen -->
- <path id="project.test.jars">
- <path refid="project.jars" />
- <fileset dir="${lib.dir}" includes="**/test/*.jar" />
- </path>
+ <!-- For testing -->
+ <property name="test.jar.file" value="pcgen-tests.jar" />
+ <property name="test.manifest.file" value="code/manifest-tests" />
+ <property name="test.framework.class" value="AllJUnitTests" />
+ <property name="test.manifest.extra.jars" value="${manifest.extra.jars} ${lib.dir}/test/junit-4.1.jar ${lib.dir}/test/xmlunit1.0.jar" />
+ <property name="test.all-output.file" value="TEST-test.AllJUnitTests.txt" />
+ <property name="test.bin.pcgen.bat" value="pcgen-tests.bat" />
+ <property name="test.bin.pcgen.sh" value="pcgen-tests.sh" />
- <!-- The Java CLASSPATH, used by the test process -->
- <path id="test.project.classpath">
- <pathelement path="${build.classes.dir}" />
- <pathelement path="${build.testclasses.dir}" />
- <pathelement location="${bin.dir}/${jar.bin.file}" />
- <pathelement location="${bin.dir}/${test.jar.file}" />
- <path refid="project.test.jars" />
- </path>
+ <!-- The jars required to test PCGen -->
+ <path id="project.test.jars">
+ <path refid="project.jars" />
+ <fileset dir="${lib.dir}" includes="**/test/*.jar" />
+ </path>
- <!--
- Internal targets:
- init, init-release, compile, jar (link), staging
+ <!-- The Java CLASSPATH, used by the test process -->
+ <path id="test.project.classpath">
+ <pathelement path="${build.classes.dir}" />
+ <pathelement path="${build.testclasses.dir}" />
+ <pathelement location="${bin.dir}/${jar.bin.file}" />
+ <pathelement location="${bin.dir}/${test.jar.file}" />
+ <path refid="project.test.jars" />
+ </path>
+
+ <!--
+ Internal targets:
+ init, init-release, compile, jar (link), staging
-->
- <!-- Initialise the build, e.g. Create the build directory structure -->
- <target name="init">
- <tstamp />
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.classes.dir}" />
- <mkdir dir="${build.testclasses.dir}" />
- <mkdir dir="${build.dir}/test-results/xml" />
- <mkdir dir="${build.rpt.dir}" />
- <mkdir dir="${bin.dir}" />
- </target>
+ <!-- Initialise the build, e.g. Create the build directory structure -->
+ <target name="init">
+ <tstamp />
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.classes.dir}" />
+ <mkdir dir="${build.testclasses.dir}" />
+ <mkdir dir="${build.dir}/test-results/xml" />
+ <mkdir dir="${build.rpt.dir}" />
+ <mkdir dir="${bin.dir}" />
+ </target>
- <!-- Compile the JavaCC sources -->
- <target name="compile-compile" depends="init, properties" description="Compile JavaCC sources">
- </target>
+ <!-- Compile the JavaCC sources -->
+ <target name="compile-compile" depends="init, properties" description="Compile JavaCC sources">
+ </target>
- <!-- Compile the java code -->
- <target name="compile" depends="compile-compile" description="Compile Java sources">
- <javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" deprecation="true" includes="**/*.java" debug="Yes" source="1.6" target="1.6" memoryInitialSize="128m" memoryMaximumSize="512m" fork="true" encoding="ISO-8859-1">
- <classpath refid="project.classpath" />
- </javac>
- </target>
+ <!-- Compile the java code -->
+ <target name="compile" depends="compile-compile" description="Compile Java sources">
+ <javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" deprecation="true" includes="**/*.java" debug="Yes" source="1.6" target="1.6" memoryInitialSize="128m" memoryMaximumSize="512m" fork="true" encoding="ISO-8859-1" includeantruntime="false">
+ <classpath refid="project.classpath" />
+ </javac>
+ </target>
- <!-- Alternative compile target - compile the java code with optimzation on and debug off -->
- <target name="compile-optimize" depends="compile-compile" description="Compile Java sources with optimisation on">
- <javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" deprecation="true" includes="**/*.java" debug="No" optimize="Yes" source="1.6" target="1.6" memoryInitialSize="128m" memoryMaximumSize="512m" fork="true" encoding="ISO-8859-1">
- <classpath refid="project.classpath" />
- </javac>
- </target>
+ <!-- Alternative compile target - compile the java code with optimzation on and debug off -->
+ <target name="compile-optimize" depends="compile-compile" description="Compile Java sources with optimisation on">
+ <javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" deprecation="true" includes="**/*.java" debug="No" optimize="Yes" source="1.6" target="1.6" memoryInitialSize="128m" memoryMaximumSize="512m" fork="true" encoding="ISO-8859-1">
+ <classpath refid="project.classpath" />
+ </javac>
+ </target>
- <!-- Copy 'master' outputsheets into various gamemodes -->
- <target name="copyoutputsheets" depends="init" description="Copy output sheets">
- <copy todir="${src.outputsheets.dir}/d20/historical/htmlxml">
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
- </copy>
- <copy todir="${src.outputsheets.dir}/d20/horror/htmlxml">
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
- </copy>
- <copy todir="${src.outputsheets.dir}/d20/sciencefiction/htmlxml">
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
- </copy>
- <copy todir="${src.outputsheets.dir}/d20/western/htmlxml">
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
- <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
- </copy>
- </target>
+ <!-- Copy 'master' outputsheets into various gamemodes -->
+ <target name="copyoutputsheets" depends="init" description="Copy output sheets">
+ <copy todir="${src.outputsheets.dir}/d20/historical/htmlxml">
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
+ </copy>
+ <copy todir="${src.outputsheets.dir}/d20/horror/htmlxml">
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
+ </copy>
+ <copy todir="${src.outputsheets.dir}/d20/sciencefiction/htmlxml">
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
+ </copy>
+ <copy todir="${src.outputsheets.dir}/d20/western/htmlxml">
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="eqsheet_fantasy_std.htm" />
+ <fileset dir="${src.outputsheets.dir}/d20/fantasy/htmlxml" includes="psheet_fantasy_std.htm" />
+ </copy>
+ </target>
- <!-- Copy property and image files into the build structure -->
- <target name="properties" depends="copyoutputsheets" description="Copy property files">
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.java.dir}" includes="**/*.properties" />
- <fileset dir="${src.java.dir}" includes="**/*.xml" />
- <fileset dir="${src.java.dir}" includes="**/*.gif" />
- <fileset dir="${src.java.dir}" includes="**/*.png" />
- <fileset dir="${src.java.dir}" includes="**/*.jpg" />
- </copy>
- </target>
+ <!-- Copy property and image files into the build structure -->
+ <target name="properties" depends="copyoutputsheets" description="Copy property files">
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${src.java.dir}" includes="**/*.properties" />
+ <fileset dir="${src.java.dir}" includes="**/*.xml" />
+ <fileset dir="${src.java.dir}" includes="**/*.gif" />
+ <fileset dir="${src.java.dir}" includes="**/*.png" />
+ <fileset dir="${src.java.dir}" includes="**/*.jpg" />
+ </copy>
+ </target>
- <!-- Jar up PCGen -->
- <target name="jar" depends="compile, manifest,convert-jar" description="Build (Link) program jar files">
- <mkdir dir="${bin.dir}" />
- <jar jarfile="${bin.dir}/${jar.bin.file}" manifest="${manifest.file}">
- <fileset dir="${src.java.dir}" includes="images/" />
- <fileset dir="${build.classes.dir}" excludes="test/**,src/**,plugin/**" />
- <fileset dir="." includes="${project.license.file}" />
- </jar>
- </target>
- <target name="convert-jar" depends="compile, manifest" description="Build (Link) converter jar files">
- <jar jarfile="${bin.dir}/${convert-jar.bin.file}" manifest="${convert-manifest.file}">
- </jar>
- </target>
+ <!-- Jar up PCGen -->
+ <target name="jar" depends="compile, manifest,convert-jar" description="Build (Link) program jar files">
+ <mkdir dir="${bin.dir}" />
+ <jar jarfile="${bin.dir}/${jar.bin.file}" manifest="${manifest.file}">
+ <fileset dir="${src.java.dir}" includes="images/" />
+ <fileset dir="${build.classes.dir}" excludes="test/**,src/**,plugin/**" />
+ <fileset dir="." includes="${project.license.file}" />
+ </jar>
+ </target>
+ <target name="convert-jar" depends="compile, manifest" description="Build (Link) converter jar files">
+ <jar jarfile="${bin.dir}/${convert-jar.bin.file}" manifest="${convert-manifest.file}">
+ </jar>
+ </target>
- <!-- Create the MANIFEST.MF file that's included inside the Pcgen.jar file -->
- <target name="manifest" description="Write the Java manifest">
- <echo file="${manifest.file}">Manifest-Version: 1.2
+ <!-- Create the MANIFEST.MF file that's included inside the Pcgen.jar file -->
+ <target name="manifest" description="Write the Java manifest">
+ <echo file="${manifest.file}">Manifest-Version: 1.2
Main-Class: ${manifest.main.class}
Class-Path: ${manifest.extra.jars}
</echo>
- <echo file="${convert-manifest.file}">Manifest-Version: 1.2
+ <echo file="${convert-manifest.file}">Manifest-Version: 1.2
Main-Class: ${convert-manifest.main.class}
Class-Path: pcgen.jar ${manifest.extra.jars}
</echo>
- </target>
+ </target>
- <!-- Create the Windows and POSIX scripts that can be used to start PCGen -->
- <target name="scripts" depends="init" description="Write program scripts">
- <copy file="${basedir}/code/${bin.pcgen.exe}" todir="${bin.dir}"/>
- <echo file="${bin.dir}/${bin.pcgenlowmem.bat}">@ECHO OFF
+ <!-- Create the Windows and POSIX scripts that can be used to start PCGen -->
+ <target name="scripts" depends="init" description="Write program scripts">
+ <copy file="${basedir}/code/${bin.pcgen.exe}" todir="${bin.dir}"/>
+ <echo file="${bin.dir}/${bin.pcgenlowmem.bat}">@ECHO OFF
ECHO PCGEN_LOW_MEM.BAT
ECHO ==================
ECHO Uncomment the following line and comment out the last line
@@ -251,23 +274,23 @@
ECHO To load all sources takes more than the default 64MB.
java -Dswing.aatext=true -Xmx96m -jar ${jar.bin.file}
</echo>
- <echo file="${bin.dir}/${bin.pcgen.sh}">#!/bin/sh
+ <echo file="${bin.dir}/${bin.pcgen.sh}">#!/bin/sh
cd `dirname $$0`
pcgendir="$$HOME/.pcgen"
if [ ! -d "$$pcgendir" ]
then
- mkdir "$$pcgendir" || exit 2
+ mkdir "$$pcgendir" || exit 2
fi
if [ "x$$BROWSER" = x ]
then
- case "$$WINDOWMANAGER" in
- *kde ) BROWSER=kde-open ;;
- *gdm ) BROWSER=gnome-open ;;
- * ) BROWSER=netscape ;;
- esac
+ case "$$WINDOWMANAGER" in
+ *kde ) BROWSER=kde-open ;;
+ *gdm ) BROWSER=gnome-open ;;
+ * ) BROWSER=netscape ;;
+ esac
fi
# To load all sources takes more than the default 64MB.
@@ -277,29 +300,29 @@
while [ "x$$1" != x ]
do
- case "$$1" in
- -h ) cat <<EOM
+ case "$$1" in
+ -h ) cat <<EOM
usage: $$0 [java-options] [-- pcgen-options]
- For java options, try 'java -h' and 'java -X -h'.
- Useful java property defines:
- -DBROWSER=/path/to/browser
- -Dpcgen.filter=/path/to/filter.ini
- -Dpcgen.options=/path/to/options.ini
- This script recognizes the BROWSER environment variable.
+ For java options, try 'java -h' and 'java -X -h'.
+ Useful java property defines:
+ -DBROWSER=/path/to/browser
+ -Dpcgen.filter=/path/to/filter.ini
+ -Dpcgen.options=/path/to/options.ini
+ This script recognizes the BROWSER environment variable.
EOM
- exit 0
- ;;
- -- ) whosearg=pcgen
- ;;
- * ) if [ "$$whosearg" = java ]
- then
- javaargs="$$javaargs $$1"
- else
- pcgenargs="$$pcgenargs $$1"
- fi
- ;;
- esac
- shift
+ exit 0
+ ;;
+ -- ) whosearg=pcgen
+ ;;
+ * ) if [ "$$whosearg" = java ]
+ then
+ javaargs="$$javaargs $$1"
+ else
+ pcgenargs="$$pcgenargs $$1"
+ fi
+ ;;
+ esac
+ shift
done
# PCGen related properties:
@@ -317,470 +340,468 @@
exec java -DBROWSER="$$BROWSER" $$javaargs -jar ./${jar.bin.file} $$pcgenargs
</echo>
- <echo file="${bin.dir}/${bin.filepaths.ini}">## Emacs, this is -*- java-properties-generic -*- mode.
+ <echo file="${bin.dir}/${bin.filepaths.ini}">## Emacs, this is -*- java-properties-generic -*- mode.
#
# filepaths.ini -- location of other .ini files set in pcgen
# Do not edit this file manually.
pcgen.filepaths=user
</echo>
- <chmod file="${bin.dir}/${bin.pcgen.sh}" perm="+x" />
+ <chmod file="${bin.dir}/${bin.pcgen.sh}" perm="+x" />
- <!-- Correct the EOL for the scripts -->
- <fixcrlf srcdir="${bin.dir}" eol="crlf" includes="*.bat" />
- <fixcrlf srcdir="${bin.dir}" eol="lf" eof="remove" includes="*.sh" />
- </target>
+ <!-- Correct the EOL for the scripts -->
+ <fixcrlf srcdir="${bin.dir}" eol="crlf" includes="*.bat" />
+ <fixcrlf srcdir="${bin.dir}" eol="lf" eof="remove" includes="*.sh" />
+ </target>
- <target name="build-extra" depends="scripts" description="Extra build steps" />
+ <target name="build-extra" depends="scripts" description="Extra build steps" />
- <!--
- Top level targets:
- build, test, clean, deploy, run
- publish, fetch, docs/javadocs,
- all, main
+ <!--
+ Top level targets:
+ build, test, clean, deploy, run
+ publish, fetch, docs/javadocs,
+ all, main
-->
- <!-- Clean, update from SVN, and build the jar file -->
- <target name="rebuild" depends="clean, svnupdate, build" description="Clean, update from SVN, and build the jar file." />
+ <!-- Clean, update from SVN, and build the jar file -->
+ <target name="rebuild" depends="clean, svnupdate, build" description="Clean, update from SVN, and build the jar file." />
- <!-- Perform the full build and package excluding the svnupdate -->
- <target name="all" depends="clean, build, test, emma.report, docs, deploy" description="Everything except update from SVN." />
+ <!-- Perform the full build and package excluding the svnupdate -->
+ <target name="all" depends="clean, build, test, emma.report, docs, deploy" description="Everything except update from SVN." />
- <!-- Perform the full build and package including the svnupdate -->
- <target name="complete" depends="clean, svnupdate, build, test, emma.report, docs, deploy" description="Everything including update from SVN." />
+ <!-- Perform the full build and package including the svnupdate -->
+ <target name="complete" depends="clean, svnupdate, build, test, emma.report, docs, deploy" description="Everything including update from SVN." />
- <!-- The default target, do a clean build and basic test -->
- <target name="main" depends="clean, build, quicktest" description="[default] Do a clean build and quick test." />
+ <!-- The default target, do a clean build and basic test -->
+ <target name="main" depends="clean, build, quicktest" description="[default] Do a clean build and quick test." />
- <!-- Do an incremental build and basic test -->
- <target name="inc" depends="build, quicktest" description="Do an incremental build (e.g Don't clean first) and quick test." />
+ <!-- Do an incremental build and basic test -->
+ <target name="inc" depends="build, quicktest" description="Do an incremental build (e.g Don't clean first) and quick test." />
- <!-- Compile the Javadocs -->
- <target name="docs" depends="compile-compile" description="Build Java API documentation">
- <mkdir dir="${doc.dir}" />
- <javadoc sourcepath="${src.java.dir}:${build.src.dir}" destdir="${doc.dir}" packagenames="pcgen.*,gmgen.*,plugin.*" classpathref="javadoc.classpath" author="true" version="true" use="true" package="true" splitindex="true" windowtitle="PCGen Packages" doctitle="<h1>PCGen Packages</h1>" overview="${docs.overview}" maxmemory="256m">
- <group title="PCGen Base Packages" packages="pcgen" />
- <group title="PCGen Core Packages" packages="pcgen.core" />
- <group title="PCGen GUI Packages" packages="pcgen.gui" />
- <group title="PCGen Utility Packages" packages="pcgen.util" />
- <group title="PCGen XML Packages" packages="pcgen.xml" />
- <group title="GMGen Packages" packages="gmgen.*" />
- <group title="Network Plugin" packages="plugin.network,plugin.network.*" />
- <group title="Character Sheet Plugin" packages="plugin.charactersheet,plugin.charactersheet.*" />
- <group title="Dicebag Plugin" packages="plugin.dicebag,plugin.dicebag.*" />
- <group title="Random Name Generator Plugin" packages="plugin.doomsdaybook,plugin.doomsdaybook.*" />
- <group title="Encounter Plugin" packages="plugin.encounter,plugin.encounter.*" />
- <group title="Experience Plugin" packages="plugin.experience,plugin.experience.*" />
- <group title="Initiative Plugin" packages="plugin.initiative,plugin.initiative.*" />
- <group title="Notes Plugin" packages="plugin.notes,plugin.notes.*" />
- <group title="Overland Travel Plugin" packages="plugin.overland,plugin.overland.*" />
- <group title="Character Tracker Plugin" packages="plugin.pcgtracker,plugin.pcgtracker.*" />
- <group title="Lst Tokens" packages="plugin.lsttokens,plugin.lsttokens.*" />
- <group title="Output Tokens" packages="plugin.exporttokens,plugin.exporttokens.*" />
- </javadoc>
- </target>
+ <!-- Compile the Javadocs -->
+ <target name="docs" depends="compile-compile" description="Build Java API documentation">
+ <mkdir dir="${doc.dir}" />
+ <javadoc sourcepath="${src.java.dir}:${build.src.dir}" destdir="${doc.dir}" packagenames="pcgen.*,gmgen.*,plugin.*" classpathref="javadoc.classpath" author="true" version="true" use="true" package="true" splitindex="true" windowtitle="PCGen Packages" doctitle="<h1>PCGen Packages</h1>" overview="${docs.overview}" maxmemory="256m">
+ <group title="PCGen Base Packages" packages="pcgen" />
+ <group title="PCGen Core Packages" packages="pcgen.core" />
+ <group title="PCGen GUI Packages" packages="pcgen.gui" />
+ <group title="PCGen Utility Packages" packages="pcgen.util" />
+ <group title="PCGen XML Packages" packages="pcgen.xml" />
+ <group title="GMGen Packages" packages="gmgen.*" />
+ <group title="Network Plugin" packages="plugin.network,plugin.network.*" />
+ <group title="Character Sheet Plugin" packages="plugin.charactersheet,plugin.charactersheet.*" />
+ <group title="Dicebag Plugin" packages="plugin.dicebag,plugin.dicebag.*" />
+ <group title="Random Name Generator Plugin" packages="plugin.doomsdaybook,plugin.doomsdaybook.*" />
+ <group title="Encounter Plugin" packages="plugin.encounter,plugin.encounter.*" />
+ <group title="Experience Plugin" packages="plugin.experience,plugin.experience.*" />
+ <group title="Initiative Plugin" packages="plugin.initiative,plugin.initiative.*" />
+ <group title="Notes Plugin" packages="plugin.notes,plugin.notes.*" />
+ <group title="Overland Travel Plugin" packages="plugin.overland,plugin.overland.*" />
+ <group title="Character Tracker Plugin" packages="plugin.pcgtracker,plugin.pcgtracker.*" />
+ <group title="Lst Tokens" packages="plugin.lsttokens,plugin.lsttokens.*" />
+ <group title="Output Tokens" packages="plugin.exporttokens,plugin.exporttokens.*" />
+ </javadoc>
+ </target>
- <!-- Perform the build, e.g. compile and package -->
- <target name="build" depends="emma, compile, instrument, jar, jar-all-plugins, build-extra" description="Do an [incremental] build (compile, jar).">
- <copy todir="${basedir}">
- <fileset dir="${bin.dir}" includes="**/*.jar" />
- <fileset dir="${bin.dir}" includes="**/*.bat" />
- <fileset dir="${bin.dir}" includes="**/*.exe" />
- <fileset dir="${bin.dir}" includes="**/*.sh" />
- </copy>
- <!-- fix for UNIXen; harmless on Windows -->
- <chmod file="pcgen.sh" perm="a+rx" />
- <chmod file="pcgendev.sh" perm="a+rx" />
- </target>
+ <!-- Perform the build, e.g. compile and package -->
+ <target name="build" depends="emma, compile, instrument, jar, jar-all-plugins, build-extra" description="Do an [incremental] build (compile, jar).">
+ <copy todir="${basedir}">
+ <fileset dir="${bin.dir}" includes="**/*.jar" />
+ <fileset dir="${bin.dir}" includes="**/*.bat" />
+ <fileset dir="${bin.dir}" includes="**/*.exe" />
+ <fileset dir="${bin.dir}" includes="**/*.sh" />
+ </copy>
+ <!-- fix for UNIXen; harmless on Windows -->
+ <chmod file="pcgen.sh" perm="a+rx" />
+ <chmod file="pcgendev.sh" perm="a+rx" />
+ </target>
- <!-- MAVEN hook for building plugins, to be called by MAVEN build only -->
- <target name="build-plugins" depends="clean-plugins" description="Maven hook for building plugins.">
- <mkdir dir="${basedir}/target/classes" />
- <antcall target="jar-all-plugins">
- <!-- param name="build.classes.dir" value="${basedir}/target/classes"/ -->
- </antcall>
- </target>
+ <!-- MAVEN hook for building plugins, to be called by MAVEN build only -->
+ <target name="build-plugins" depends="clean-plugins" description="Maven hook for building plugins.">
+ <mkdir dir="${basedir}/target/classes" />
+ <antcall target="jar-all-plugins">
+ <!-- param name="build.classes.dir" value="${basedir}/target/classes"/ -->
+ </antcall>
+ </target>
- <target name="build-optimize" depends="compile-optimize, jar, jar-all-plugins, build-extra" description="Do an [incremental] build (compile, jar) with optimization on.">
- <!-- fix for UNIXen; harmless on Windows -->
- <copy todir="${basedir}">
- <fileset dir="${bin.dir}" includes="**/*.jar" />
- <fileset dir="${bin.dir}" includes="**/*.bat" />
- <fileset dir="${bin.dir}" includes="**/*.exe" />
- <fileset dir="${bin.dir}" includes="**/*.sh" />
- </copy>
- <chmod file="pcgen.sh" perm="a+rx" />
- <chmod file="pcgendev.sh" perm="a+rx" />
- <echo>Run pcgendev.bat (or pcgendev.sh) to run build.</echo>
- </target>
+ <target name="build-optimize" depends="compile-optimize, jar, jar-all-plugins, build-extra" description="Do an [incremental] build (compile, jar) with optimization on.">
+ <!-- fix for UNIXen; harmless on Windows -->
+ <copy todir="${basedir}">
+ <fileset dir="${bin.dir}" includes="**/*.jar" />
+ <fileset dir="${bin.dir}" includes="**/*.bat" />
+ <fileset dir="${bin.dir}" includes="**/*.exe" />
+ <fileset dir="${bin.dir}" includes="**/*.sh" />
+ </copy>
+ <chmod file="pcgen.sh" perm="a+rx" />
+ <chmod file="pcgendev.sh" perm="a+rx" />
+ <echo>Run pcgendev.bat (or pcgendev.sh) to run build.</echo>
+ </target>
- <!-- Deploy PCGen as various archives -->
- <target name="deploy" depends="jar.src, zip.bins, zip.resources, zip.jars, zip.manual" description="Ship the jars, wars, whatever to the execution system.">
- </target>
+ <!-- Deploy PCGen as various archives -->
+ <target name="deploy" depends="jar.src, zip.bins, zip.resources, zip.jars, zip.manual" description="Ship the jars, wars, whatever to the execution system.">
+ </target>
- <!-- Jar up the PCGen source code -->
- <target name="jar.src">
- <mkdir dir="${dist.dir}" />
- <jar jarfile="${dist.dir}/${jar.src.file}" basedir="${src.java.dir}" excludes="**/CVS/*, **/.svn/*, test, **/test/*" />
- </target>
+ <!-- Jar up the PCGen source code -->
+ <target name="jar.src">
+ <mkdir dir="${dist.dir}" />
+ <jar jarfile="${dist.dir}/${jar.src.file}" basedir="${src.java.dir}" excludes="**/CVS/*, **/.svn/*, test, **/test/*" />
+ </target>
- <!-- Zip up the binaries and executables, e.g. The PCGen jar file, the shell scripts etc -->
- <target name="zip.bins">
- <mkdir dir="${dist.dir}" />
- <zip zipfile="${dist.dir}/${zip.bins.file}">
- <fileset dir="." includes="${project.dist.files}" />
- <fileset dir="${bin.dir}">
- <include name="pcgen.jar" />
- <include name="pcgen.sh" />
- <include name="pcgen.exe" />
- <include name="filepaths.ini" />
- </fileset>
- <fileset dir=".">
- <include name="templates/**" />
- <exclude name="**/CVS/*, **/.svn/*" />
- </fileset>
- </zip>
- </target>
+ <!-- Zip up the binaries and executables, e.g. The PCGen jar file, the shell scripts etc -->
+ <target name="zip.bins">
+ <mkdir dir="${dist.dir}" />
+ <zip zipfile="${dist.dir}/${zip.bins.file}">
+ <fileset dir="." includes="${project.dist.files}" />
+ <fileset dir="${bin.dir}">
+ <include name="pcgen.jar" />
+ <include name="pcgen.sh" />
+ <include name="pcgen.exe" />
+ <include name="filepaths.ini" />
+ </fileset>
+ <fileset dir=".">
+ <include name="templates/**" />
+ <exclude name="**/CVS/*, **/.svn/*" />
+ </fileset>
+ </zip>
+ </target>
- <target name="zip.batch">
- <delete file="${zip.batch.file}" />
- <zip zipfile="${zip.batch.file}">
- <fileset dir="." includes="${batch.dist.files}" />
- <fileset dir=".">
- <include name="plugins/**" />
- <include name="system/**" />
- <exclude name="**/CVS/*, **/.svn/*" />
- </fileset>
- <fileset dir=".">
- <include name="${lib.dir}/jdom.*"/>
- <include name="${lib.dir}/djep*"/>
- <include name="${lib.dir}/mrj*"/>
- <include name="${lib.dir}/MRJ*"/>
- <include name="${lib.dir}/jep/*.jar"/>
- <include name="${lib.dir}/jep/*.txt"/>
- <exclude name="**/test/**,javacc.jar,**/emma/**" />
- </fileset>
+ <target name="zip.batch">
+ <delete file="${zip.batch.file}" />
+ <zip zipfile="${zip.batch.file}">
+ <fileset dir="." includes="${batch.dist.files}" />
+ <fileset dir=".">
+ <include name="plugins/**" />
+ <include name="system/**" />
+ <exclude name="**/CVS/*, **/.svn/*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="${lib.dir}/jdom.*"/>
+ <include name="${lib.dir}/djep*"/>
+ <include name="${lib.dir}/mrj*"/>
+ <include name="${lib.dir}/MRJ*"/>
+ <include name="${lib.dir}/jep/*.jar"/>
+ <include name="${lib.dir}/jep/*.txt"/>
+ <exclude name="**/test/**,javacc.jar,**/emma/**" />
+ </fileset>
+ </zip>
+ </target>
- </zip>
- </target>
+ <!-- Zip up the resources, e.g. The data files -->
+ <target name="zip.resources">
+ <mkdir dir="${dist.dir}" />
+ <zip zipfile="${dist.dir}/${zip.resources.file}">
+ <fileset dir="${src.data.dir}" />
+ </zip>
+ </target>
- <!-- Zip up the resources, e.g. The data files -->
- <target name="zip.resources">
- <mkdir dir="${dist.dir}" />
- <zip zipfile="${dist.dir}/${zip.resources.file}">
- <fileset dir="${src.data.dir}" />
- </zip>
- </target>
+ <!-- Zip up the external libraries that PCGen uses e.g. JEP, FOP etc -->
+ <!-- Karianna: Added apache and cobra subdirs as of 19/03/2008 -->
+ <target name="zip.jars">
+ <mkdir dir="${dist.dir}" />
+ <zip zipfile="${dist.dir}/${zip.jars.file}">
+ <fileset dir=".">
+ <include name="lib/**" />
+ <include name="lib/apache/**" />
+ <include name="lib/cobra/**" />
+ <include name="lib/emma/**" />
+ <include name="lib/fop/**" />
+ <include name="lib/jep/**" />
+ <include name="lib/lnf/**" />
+ <include name="lib/spring/**" />
+ <include name="lib/test/**" />
+ <exclude name="**/CVS/*, **/.svn/*" />
+ </fileset>
+ </zip>
+ </target>
- <!-- Zip up the external libraries that PCGen uses e.g. JEP, FOP etc -->
- <!-- Karianna: Added apache and cobra subdirs as of 19/03/2008 -->
- <target name="zip.jars">
- <mkdir dir="${dist.dir}" />
- <zip zipfile="${dist.dir}/${zip.jars.file}">
- <fileset dir=".">
- <include name="lib/**" />
- <include name="lib/apache/**" />
- <include name="lib/cobra/**" />
- <include name="lib/emma/**" />
- <include name="lib/fop/**" />
- <include name="lib/jep/**" />
- <include name="lib/lnf/**" />
- <include name="lib/spring/**" />
- <include name="lib/test/**" />
- <exclude name="**/CVS/*, **/.svn/*" />
- </fileset>
- </zip>
- </target>
+ <!-- Zip up the manual, e.g. The PCGen documentation -->
+ <target name="zip.manual">
+ <mkdir dir="${dist.dir}" />
+ <zip zipfile="${dist.dir}/${zip.manual.file}">
+ <fileset dir="${docs.manual.dir}" />
+ </zip>
+ </target>
- <!-- Zip up the manual, e.g. The PCGen documentation -->
- <target name="zip.manual">
- <mkdir dir="${dist.dir}" />
- <zip zipfile="${dist.dir}/${zip.manual.file}">
- <fileset dir="${docs.manual.dir}" />
- </zip>
- </target>
+ <!-- Target for Zipping up a complete 'autobuild' -->
+ <target name="zip.autobuild">
+ <mkdir dir="${dist.dir}" />
+ <zip zipfile="${dist.dir}/${zip.autobuild.file}">
+ <fileset dir="." includes="${project.dist.files}" />
+ <fileset dir="${bin.dir}">
+ <include name="pcgen.jar" />
+ <include name="pcgen.sh" />
+ <include name="pcgen.exe" />
+ <include name="filepaths.ini" />
+ </fileset>
+ <fileset dir=".">
+ <include name="outputsheets/**" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="lib/**" />
+ <include name="lib/emma/**" />
+ <include name="lib/fop/**" />
+ <include name="lib/jep/**" />
+ <include name="lib/lnf/**" />
+ <include name="lib/test/**" />
+ <include name="lib/spring/**" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="data/**" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="${docs.manual.dir}" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="plugins/**" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="system/**" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </fileset>
+ <fileset dir=".">
+ <include name="characters/CodeMonkey.pcg" />
+ </fileset>
+ </zip>
+ </target>
- <!-- Target for Zipping up a complete 'autobuild' -->
- <target name="zip.autobuild">
- <mkdir dir="${dist.dir}" />
- <zip zipfile="${dist.dir}/${zip.autobuild.file}">
- <fileset dir="." includes="${project.dist.files}" />
- <fileset dir="${bin.dir}">
- <include name="pcgen.jar" />
- <include name="pcgen.sh" />
- <include name="pcgen.exe" />
- <include name="filepaths.ini" />
- </fileset>
- <fileset dir=".">
- <include name="outputsheets/**" />
- <exclude name="**/CVS/*, **/.svn*" />
- </fileset>
- <fileset dir=".">
- <include name="lib/**" />
- <include name="lib/emma/**" />
- <include name="lib/fop/**" />
- <include name="lib/jep/**" />
- <include name="lib/lnf/**" />
- <include name="lib/test/**" />
- <include name="lib/spring/**" />
- <exclude name="**/CVS/*, **/.svn*" />
- </fileset>
- <fileset dir=".">
- <include name="data/**" />
- <exclude name="**/CVS/*, **/.svn*" />
- </fileset>
- <fileset dir=".">
- <include name="${docs.manual.dir}" />
- <exclude name="**/CVS/*, **/.svn*" />
- </fileset>
- <fileset dir=".">
- <include name="plugins/**" />
- <exclude name="**/CVS/*, **/.svn*" />
- </fileset>
- <fileset dir=".">
- <include name="system/**" />
- <exclude name="**/CVS/*, **/.svn*" />
- </fileset>
- <fileset dir=".">
- <include name="characters/CodeMonkey.pcg" />
- </fileset>
- </zip>
- </target>
+ <!-- Gzip PCGen for distribution to POSIX systems -->
+ <target name="gzip" depends="gzip.bins, gzip.resources" description="Ship the jars, wars, whatever to the execution system.">
+ </target>
- <!-- Gzip PCGen for distribution to POSIX systems -->
- <target name="gzip" depends="gzip.bins, gzip.resources" description="Ship the jars, wars, whatever to the execution system.">
- </target>
+ <!-- Gzip up the binaries and executables, e.g. The PCGen jar file, the shell scripts etc -->
+ <target name="gzip.bins">
+ <mkdir dir="${dist.dir}" />
+ <tar tarfile="${dist.dir}/pcgen.tar">
+ <tarfileset dir="." includes="${project.dist.files}" />
+ <tarfileset dir="${bin.dir}">
+ <include name="pcgen.jar" />
+ <include name="pcgen.sh" />
+ <include name="pcgen.exe" />
+ <include name="filepaths.ini" />
+ </tarfileset>
+ <tarfileset dir=".">
+ <include name="templates/**" />
+ <exclude name="**/CVS/*, **/.svn*" />
+ </tarfileset>
+ </tar>
+ <gzip zipfile="${dist.dir}/pcgen.tar.gz" src="${dist.dir}/pcgen.tar" />
+ </target>
- <!-- Gzip up the binaries and executables, e.g. The PCGen jar file, the shell scripts etc -->
- <target name="gzip.bins">
- <mkdir dir="${dist.dir}" />
- <tar tarfile="${dist.dir}/pcgen.tar">
- <tarfileset dir="." includes="${project.dist.files}" />
- <tarfileset dir="${bin.dir}">
- <include name="pcgen.jar" />
- <include name="pcgen.sh" />
- <include name="pcgen.exe" />
- <include name="filepaths.ini" />
- </tarfileset>
- <tarfileset dir=".">
- <include name="templates/**" />
- <exclude name="**/CVS/*, **/.svn*" />
- </tarfileset>
- </tar>
- <gzip zipfile="${dist.dir}/pcgen.tar.gz" src="${dist.dir}/pcgen.tar" />
- </target>
+ <!-- Gzip up the resources, e.g. The data files -->
+ <target name="gzip.resources">
+ <mkdir dir="${dist.dir}" />
+ <tar tarfile="${dist.dir}/data.tar">
+ <tarfileset dir="${src.data.dir}" />
+ </tar>
+ <gzip zipfile="${dist.dir}/data.tar.gz" src="${dist.dir}/data.tar" />
+ </target>
- <!-- Gzip up the resources, e.g. The data files -->
- <target name="gzip.resources">
- <mkdir dir="${dist.dir}" />
- <tar tarfile="${dist.dir}/data.tar">
- <tarfileset dir="${src.data.dir}" />
- </tar>
- <gzip zipfile="${dist.dir}/data.tar.gz" src="${dist.dir}/data.tar" />
- </target>
+ <!--
+ Maintenance targets:
+ clean, makedirs, real-clean etc
+ -->
- <!--
- Maintenance targets:
- clean, makedirs, real-clean etc
- -->
+ <!-- Clean the project, e.g. wipe the build, bin, javadocs and dist directories -->
+ <target name="clean" depends="makedirs, clean-plugins" description="Clean all working files">
+ <delete dir="${build.dir}" />
+ <delete dir="${bin.dir}" />
+ <delete dir="${doc.dir}" />
+ <delete dir="${dist.dir}" />
+ <delete file="${manifest.file}" />
+ <delete file="${test.manifest.file}" />
+ <delete file="${test.all-output.file}" />
+ </target>
- <!-- Clean the project, e.g. wipe the build, bin, javadocs and dist directories -->
- <target name="clean" depends="makedirs, clean-plugins" description="Clean all working files">
- <delete dir="${build.dir}" />
- <delete dir="${bin.dir}" />
- <delete dir="${doc.dir}" />
- <delete dir="${dist.dir}" />
- <delete file="${manifest.file}" />
- <delete file="${test.manifest.file}" />
- <delete file="${test.all-output.file}" />
- </target>
+ <!-- Make the needed directories -->
+ <target name="makedirs" depends="makeplugindirs" description="Creates any needed directories">
+ </target>
- <!-- Make the needed directories -->
- <target name="makedirs" depends="makeplugindirs" description="Creates any needed directories">
- </target>
+ <!-- Extreme clean, cleans out outputsheets, data, docs and more -->
+ <target name="real-clean" depends="clean, clean-data, clean-docs, clean-sheets, clean-inifiles" description="Clean everything back to initial checkout" />
- <!-- Extreme clean, cleans out outputsheets, data, docs and more -->
- <target name="real-clean" depends="clean, clean-data, clean-docs, clean-sheets, clean-inifiles" description="Clean everything back to initial checkout" />
+ <!--
+ SVN targets:
+ svnupdate
+ -->
- <!--
- SVN targets:
- svnupdate
- -->
+ <!-- Perform an svn update -->
+ <target name="svnupdate">
+ <exec executable="svn">
+ <arg line="up" />
+ </exec>
+ </target>
- <!-- Perform an svn update -->
- <target name="svnupdate">
- <exec executable="svn">
- <arg line="up" />
- </exec>
- </target>
+ <!--
+ Cleanup targets:
+ clean-data, clean-docs etc
+ -->
- <!--
- Cleanup targets:
- clean-data, clean-docs etc
- -->
+ <!-- Remove the data dir -->
+ <target name="clean-data" description="Remove data directory">
+ <delete dir="${src.data.dir}" />
+ </target>
- <!-- Remove the data dir -->
- <target name="clean-data" description="Remove data directory">
- <delete dir="${src.data.dir}" />
- </target>
+ <!-- Remove the docs dir -->
+ <target name="clean-docs" description="Remove docs directory">
+ <delete dir="${src.docs.dir}" />
+ </target>
- <!-- Remove the docs dir -->
- <target name="clean-docs" description="Remove docs directory">
- <delete dir="${src.docs.dir}" />
- </target>
+ <!-- Remove the outputsheets dir -->
+ <target name="clean-sheets" description="Remove outputsheets directory">
+ <delete dir="${src.outputsheets.dir}" />
+ </target>
- <!-- Remove the outputsheets dir -->
- <target name="clean-sheets" description="Remove outputsheets directory">
- <delete dir="${src.outputsheets.dir}" />
- </target>
+ <!-- Remove the ini files dir -->
+ <target name="clean-inifiles" description="Remove runtime .ini files">
+ <delete file="filepaths.ini" />
+ <delete file="filter.ini" />
+ <delete file="options.ini" />
+ </target>
- <!-- Remove the ini files dir -->
- <target name="clean-inifiles" description="Remove runtime .ini files">
- <delete file="filepaths.ini" />
- <delete file="filter.ini" />
- <delete file="options.ini" />
- </target>
-
-
- <!--
- EMMA Targets:
+ <!--
+ EMMA Targets:
emma.lib, emma etc
- EMMA is a code coverage system that intruments the class files
- rather than the source files.
- -->
- <path id="emma.lib">
- <pathelement location="${lib.dir}/emma/emma.jar" />
- <pathelement location="${lib.dir}/emma/emma_ant.jar" />
- </path>
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+ EMMA is a code coverage system that intruments the class files
+ rather than the source files.
+ -->
+ <path id="emma.lib">
+ <pathelement location="${lib.dir}/emma/emma.jar" />
+ <pathelement location="${lib.dir}/emma/emma_ant.jar" />
+ </path>
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
- <!--
- Turn on EMMA code coverage for the project.
- At the moment the code coverage will only be turned on
- when ant is run with -Demma.enabled=true
+ <!--
+ Turn on EMMA code coverage for the project.
+ At the moment the code coverage will only be turned on
+ when ant is run with -Demma.enabled=true
- To always use code coverage uncomment property line below.
- -->
- <target name="emma" description="turns on EMMA instrumentation/reporting">
- <!--property name="emma.enabled" value="true" /-->
- </target>
+ To always use code coverage uncomment property line below.
+ -->
+ <target name="emma" description="turns on EMMA instrumentation/reporting">
+ <!--property name="emma.enabled" value="true" /-->
+ </target>
- <!--
- The target for the instrumented files is the same as the
- original location, this is so that the rest of the build
- script works transparently and does not need to know if
- code coverage has been turned on or not.
+ <!--
+ The target for the instrumented files is the same as the
+ original location, this is so that the rest of the build
+ script works transparently and does not need to know if
+ code coverage has been turned on or not.
- If Instrumenting is working properly you should see output like this:
- [emma.instr] processing instrumentation path ...
- [emma.instr] instrumentation path processed in 33828 ms
- [emma.instr] [2010 class(es) instrumented, 0 resource(s) copied]
- [emma.instr] metadata merged into [C:\Documents and Settings\wardc\My Documents\src\pcgen-5.7.1\build\coverage\metadata.emma] {in 2656 ms}
- -->
- <path id="instrument.path">
- <p...
[truncated message content] |