Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [4184] branches/cdom
|
From: <th...@us...> - 2007-09-29 18:46:25
|
Revision: 4184
http://pcgen.svn.sourceforge.net/pcgen/?rev=4184&view=rev
Author: thpr
Date: 2007-09-29 11:38:43 -0700 (Sat, 29 Sep 2007)
Log Message:
-----------
Bring CDOM up to 4173 *update complete*
Modified Paths:
--------------
branches/cdom/.classpath
branches/cdom/build.xml
branches/cdom/logging.properties
branches/cdom/maven.xml
branches/cdom/project.xml
branches/cdom/xdocs/changes.xml
Modified: branches/cdom/.classpath
===================================================================
--- branches/cdom/.classpath 2007-09-29 18:38:20 UTC (rev 4183)
+++ branches/cdom/.classpath 2007-09-29 18:38:43 UTC (rev 4184)
@@ -5,7 +5,11 @@
<classpathentry excluding="**/.svn/*" kind="src" path="code/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="code/src/test"/>
<classpathentry kind="src" path="code/src/utest"/>
- <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
+ <classpathentry kind="var" path="JRE_LIB" sourcepath="/JRE_SRC">
+ <attributes>
+ <attribute name="javadoc_location" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="lib" path="lib/fop/avalon-framework-cvs-20020806.jar"/>
<classpathentry kind="lib" path="lib/fop/batik.jar"/>
<classpathentry kind="lib" path="lib/fop/fop.jar"/>
@@ -28,7 +32,13 @@
<classpathentry kind="lib" path="lib/jep/RngPack-1.1a.jar"/>
<classpathentry kind="lib" path="lib/test/xmlunit1.0.jar"/>
<classpathentry kind="lib" path="lib/javacc.jar"/>
- <classpathentry kind="lib" path="lib/jep/jep-2.3.1.jar"/>
+ <classpathentry kind="lib" path="lib/jep/jep-2.3.1.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="http://www.singularsys.com/jep/doc/javadoc/"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="lib" path="lib/jep/djep-2.24.jar"/>
+ <classpathentry kind="lib" path="lib/cobra/cobra.jar"/>
+ <classpathentry kind="lib" path="lib/cobra/js.jar"/>
<classpathentry kind="output" path="code/build.eclipse"/>
</classpath>
Modified: branches/cdom/build.xml
===================================================================
--- branches/cdom/build.xml 2007-09-29 18:38:20 UTC (rev 4183)
+++ branches/cdom/build.xml 2007-09-29 18:38:43 UTC (rev 4184)
@@ -7,11 +7,7 @@
STANDARD TARGETS
================
-fetch-devel - update from CVS read-write
-fetch-anon - update from CVS read-only
-fetch-data - export data files from PCGen:DM CVS read-only
-fetch-docs - export doc files from PCGenDocs CVS read-only
-fetch-sheets - export outputsheets files from PCGenDocs CVS read-only
+svnupdate - update from SVN read-only
all - clean, [fetch-anon/devel], build, test, docs, deploy
main - the default build process (build)
clean - clean out the output directories
@@ -23,7 +19,7 @@
docs - do the API documenation (targets pcgen/doc/api)
deploy - ship the jars, wars, whatever to the execution system
-complete - runs clean fetch-data fetch-docs fetch-sheets fetch-devel all; for testing complete cycle
+complete - runs clean fetch-data fetch-docs fetch-sheets all; for testing complete cycle
BUILD
=====
@@ -46,7 +42,6 @@
<project name="pcgen" default="main" basedir=".">
<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" />
@@ -70,10 +65,6 @@
<property name="docs.overview" value="${src.java.dir}/pcgen/overview.html" />
<property name="src.xml.dir" value="${basedir}/xml" />
- <!-- For anonymous CVS -->
- <property name="fetch.passfile" value="anon-cvs.passfile" />
- <property name="fetch.cvsroot" value=":pserver:ano...@cv.../cvsroot" />
-
<!-- Choose compiler. Values are "classic", "modern", "jikes", "jvc"-->
<property name="build.compiler" value="modern" />
@@ -82,7 +73,7 @@
<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}/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.3.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" />
+ <property name="manifest.extra.jars" value="${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.3.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" />
<!-- Text files always shipped along -->
<property name="project.install.file" value="INSTALL" />
@@ -122,7 +113,6 @@
<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" />
@@ -318,11 +308,11 @@
all, main
-->
- <target name="rebuild" depends="clean, fetch-devel, build" description="Clean, refresh from CVS, and build the jar file." />
+ <target name="rebuild" depends="clean, svnupdate, build" description="Clean, update from SVN, and build the jar file." />
- <target name="all" depends="clean, build, test, emma.report, docs, deploy" description="Everything except refetch from CVS." />
+ <target name="all" depends="clean, build, test, emma.report, docs, deploy" description="Everything except update from SVN." />
- <target name="complete" depends="clean, fetch-devel, build, fetch-data, fetch-docs, fetch-sheets, test, emma.report, docs, deploy" description="Everything including developer refresh from CVS." />
+ <target name="complete" depends="clean, svnupdate, build, test, emma.report, docs, deploy" description="Everything including update from SVN." />
<target name="main" depends="build, test" description="[default] Do an (incremental) build." />
@@ -515,49 +505,24 @@
<target name="real-clean" depends="clean, clean-data, clean-docs, clean-sheets, clean-inifiles" description="Clean everything back to initial checkout" />
-
- <!-- CVS targets -->
-
- <target name="fetch-devel" description="Get the latest source from the CVS tree as a developer; this gives read-write access to the sources.">
- <cvs command="-qz3 update -PRd ." />
+ <!-- SVN targets -->
+
+ <target name="svnupdate">
+ <exec executable="svn">
+ <arg line="up" />
+ </exec>
</target>
- <target name="fetch-anon" description="Get the latest source anonymously from the CVS tree; this gives read-only access to the sources.">
- <echo file="${fetch.passfile}">/1 ${fetch.cvsroot}/pcgen A
-</echo>
- <cvs cvsRoot="${fetch.cvsroot}/pcgen" passfile="${fetch.passfile}" command="-qz3 update -PRd ." />
- <delete file="${fetch.passfile}" />
- </target>
+ <!-- Cleanup targets -->
- <target name="fetch-data" depends="clean-data" description="Get the latest data files anonymously from the PCGen:DM CVS tree; this gives read-only access to the data files.">
- <echo file="${fetch.passfile}">/1 ${fetch.cvsroot}/pcgendm A
-</echo>
- <cvs cvsRoot="${fetch.cvsroot}/pcgendm" passfile="${fetch.passfile}" command="export -d ${src.data.dir} -D now pcgendm/development/data" />
- <delete file="${fetch.passfile}" />
- </target>
-
<target name="clean-data" description="Remove data directory">
<delete dir="${src.data.dir}" />
</target>
- <target name="fetch-docs" depends="clean-docs" description="Get the latest doc files anonymously from the PCGenDocs CVS tree; this gives read-only access to the doc files.">
- <echo file="${fetch.passfile}">/1 ${fetch.cvsroot}/pcgendocs/pcgendocs A
-</echo>
- <cvs cvsRoot="${fetch.cvsroot}/pcgendocs" passfile="${fetch.passfile}" command="export -d ${src.docs.dir} -D now pcgendocs/docs" />
- <delete file="${fetch.passfile}" />
- </target>
-
<target name="clean-docs" description="Remove docs directory">
<delete dir="${src.docs.dir}" />
</target>
- <target name="fetch-sheets" depends="clean-sheets" description="Get the latest output sheet files anonymously from the PCGenDocs CVS tree; this gives read-only access to the sheet files.">
- <echo file="${fetch.passfile}">/1 ${fetch.cvsroot}/pcgendocs/pcgendocs A
-</echo>
- <cvs cvsRoot="${fetch.cvsroot}/pcgendocs" passfile="${fetch.passfile}" command="export -d ${src.outputsheets.dir} -D now pcgendocs/outputsheets" />
- <delete file="${fetch.passfile}" />
- </target>
-
<target name="clean-sheets" description="Remove outputsheets directory">
<delete dir="${src.outputsheets.dir}" />
</target>
Modified: branches/cdom/logging.properties
===================================================================
--- branches/cdom/logging.properties 2007-09-29 18:38:20 UTC (rev 4183)
+++ branches/cdom/logging.properties 2007-09-29 18:38:43 UTC (rev 4184)
@@ -14,15 +14,15 @@
# Note: If a level is enabled, all levels above it on this
# list will also be enabled.
# SEVERE (for all exceptions etc including NPEs)
-# LST_ERROR (LST error output)
-# LST_WARNING (LST warnings such as deprecated syntax use)
+# LSTERROR (LST error output)
# WARNING (for any code warnings)
+# LSTWARN (LST warnings such as deprecated syntax use)
# INFO (for any information messages such as memory on output sheet runs etc)
-# LST_INFO (LST information such as references to missing items in PRE or CHOOSE tags.)
+# LSTINFO (LST information such as references to missing items in PRE or CHOOSE tags.)
# FINER (aka DEBUG for all code tracing info)
# Set the default logging level for the all classes
-.level = WARNING
+.level = SEVERE
# Set the default logging level for new ConsoleHandler instances
# The highest level of the handler and the class is used, so best to
@@ -37,6 +37,6 @@
# Set the logging level for the PCGen loggers.
# Note: Add specific classes below using their fully qualified name
-pcgen.level = WARNING
-plugin.level = WARNING
+pcgen.level = LSTWARN
+plugin.level = LSTWARN
#pcgen.gui.tabs.ability.AbilityInfoPanel = FINER
\ No newline at end of file
Modified: branches/cdom/maven.xml
===================================================================
--- branches/cdom/maven.xml 2007-09-29 18:38:20 UTC (rev 4183)
+++ branches/cdom/maven.xml 2007-09-29 18:38:43 UTC (rev 4184)
@@ -78,6 +78,7 @@
<include name="outputsheets/**"/>
<include name="docs/**"/>
<include name="system/**"/>
+ <include name="preview/**"/>
</fileset>
</ant:zip>
Modified: branches/cdom/project.xml
===================================================================
--- branches/cdom/project.xml 2007-09-29 18:38:20 UTC (rev 4183)
+++ branches/cdom/project.xml 2007-09-29 18:38:43 UTC (rev 4184)
@@ -5,7 +5,7 @@
<id>pcgen</id>
<groupId>pcgen</groupId>
<name>PCGen</name>
- <currentVersion>5.13.1</currentVersion>
+ <currentVersion>5.13.2</currentVersion>
<organization>
<name>SourceForge</name>
<url>http://sourceforge.net/</url>
@@ -196,6 +196,16 @@
<dependencies>
<!-- Compiling -->
<dependency>
+ <groupId>cobra</groupId>
+ <artifactId>cobra</artifactId>
+ <version>0.97.2</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R5</version>
+ </dependency>
+ <dependency>
<groupId>mrj</groupId>
<artifactId>MRJ141Stubs</artifactId>
<version>0</version>
@@ -452,5 +462,10 @@
<name>5.13.1</name>
<tag>release-5.13.1</tag>
</version>
+ <version>
+ <id>5.13.2</id>
+ <name>5.13.2</name>
+ <tag>release-5.13.2</tag>
+ </version>
</versions>
</project>
Modified: branches/cdom/xdocs/changes.xml
===================================================================
--- branches/cdom/xdocs/changes.xml 2007-09-29 18:38:20 UTC (rev 4183)
+++ branches/cdom/xdocs/changes.xml 2007-09-29 18:38:43 UTC (rev 4184)
@@ -5,6 +5,16 @@
<title>PCGen Change Log</title>
</properties>
<body>
+ <release version="5.13.3" date="In SVN" description="Alpha release">
+ <action dev="thpr" type="add" issue="1800407">Deprecate Eqmod CHOOSE:EQBUILDER|1 tag</action>
+ <action dev="thpr" type="add" issue="1798233">Eliminate Cross-Level Interactions in SA tag</action>
+ <action dev="thpr" type="add" issue="1800290">SPELLLIST Token exception for DOMAINS</action>
+ <action dev="thpr" type="fix" issue="1790746">AUTO: must take multiple versions of each Subtoken</action>
+ <action dev="thpr" type="fix" issue="1800720">ADD:LANGUAGE|ALL broken</action>
+ <action dev="thpr" type="fix" issue="1802347">PRESA: Can't Count Properly</action>
+ <action dev="thpr" type="fix" issue="1802352">PRESA: ignores PRExxx tokens on SAs</action>
+ <action dev="thpr" type="add" issue="1784493">Attach REPEATLEVEL to level in Class LST</action>
+ </release>
<release version="5.13.1" date="2007-08-28" description="Alpha release">
<action dev="jdempsey" type="fix" issue="1782465">VFEAT tags ignored.</action>
<action dev="thpr" type="add" issue="1707366">Resolve MOVE related tag order of operations</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
