From: <jde...@us...> - 2006-06-22 12:58:22
|
Revision: 1108 Author: jdempsey Date: 2006-06-22 05:58:14 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/pcgen/?rev=1108&view=rev Log Message: ----------- Build a valid pcgen.jar file with maven. Only produce 2 zips, libs and everything else. List all developers for site report purposes. Modified Paths: -------------- Branches/5.10.x/pcgen/maven.xml Branches/5.10.x/pcgen/project.properties Branches/5.10.x/pcgen/project.xml Modified: Branches/5.10.x/pcgen/maven.xml =================================================================== --- Branches/5.10.x/pcgen/maven.xml 2006-06-22 12:38:08 UTC (rev 1107) +++ Branches/5.10.x/pcgen/maven.xml 2006-06-22 12:58:14 UTC (rev 1108) @@ -1,9 +1,15 @@ <project xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> <goal name="generate-jars"> + <ant:ant dir="${basedir}" antfile="build.xml" target="scripts"> + <property name="build.classes.dir" value="${maven.build.dest}"/> + </ant:ant> <ant:ant dir="${basedir}" antfile="build.xml" target="build-plugins"> <property name="build.classes.dir" value="${maven.build.dest}"/> </ant:ant> + <ant:ant dir="${basedir}" antfile="build.xml" target="manifest"> + <property name="build.classes.dir" value="${maven.build.dest}"/> + </ant:ant> </goal> <preGoal name="java:compile"> <attainGoal name="javacc:javacc-generate"/> @@ -29,16 +35,40 @@ </goal> <goal name="pcgen:package" prereqs="pcgen:package-clean"> + <j:new className="java.util.Date" var="timestamp" /> + <j:new className="java.text.SimpleDateFormat" var="format"> + <j:arg type="java.lang.String" value="yyyyMMdd.HHmm" /> + </j:new> + <j:invokeStatic className="java.util.TimeZone" method="getTimeZone" var="timezone"> + <j:arg type="java.lang.String" value="UTC" /> + </j:invokeStatic> + <j:invoke on="${format}" var="formattedDate" method="setTimeZone"> + <j:arg type="java.util.TimeZone" value="${timezone}" /> + </j:invoke> + <j:invoke on="${format}" var="formattedDate" method="format"> + <j:arg type="java.util.Date" value="${timestamp}" /> + </j:invoke> + <ant:mkdir dir="${basedir}/target/distributions" /> - <ant:zip basedir="${basedir}" destfile="target/distributions/pcgen-5.10.x-all.zip" - includes="pcgen.jar, pcgen.bat, pcgen.sh, pcgen_low_mem.bat, plugins/**, data/**, outputsheets/**, docs/**, system/**, lib/**" - excludes="lib/emma/**, lib/test/**" /> - <ant:zip basedir="${basedir}" destfile="target/distributions/pcgen-5.10.x-code.zip" - includes="pcgen.jar, pcgen.bat, pcgen.sh, pcgen_low_mem.bat, plugins/**" /> - <ant:zip basedir="${basedir}" destfile="target/distributions/pcgen-5.10.x-content.zip" - includes="data/**, outputsheets/**, docs/**, system/**" /> - <ant:zip basedir="${basedir}" destfile="target/distributions/pcgen-5.10.x-libraries.zip" + <ant:zip destfile="target/distributions/pcgen-5.10.x-all-no-libs-${formattedDate}.zip"> + <fileset dir="${basedir}/target"> + <include name="pcgen.jar"/> + </fileset> + <fileset dir="${basedir}/code/bin"> + <include name="pcgen.sh"/> + <include name="pcgen.bat"/> + <include name="pcgen_low_mem.bat"/> + </fileset> + <fileset dir="${basedir}" > + <include name="plugins/**"/> + <include name="data/**"/> + <include name="outputsheets/**"/> + <include name="docs/**"/> + <include name="system/**"/> + </fileset> + </ant:zip> + <ant:zip basedir="${basedir}" destfile="target/distributions/pcgen-5.10.x-libraries-${formattedDate}.zip" includes="lib/**" excludes="lib/emma/**, lib/test/**"/> </goal> Modified: Branches/5.10.x/pcgen/project.properties =================================================================== --- Branches/5.10.x/pcgen/project.properties 2006-06-22 12:38:08 UTC (rev 1107) +++ Branches/5.10.x/pcgen/project.properties 2006-06-22 12:58:14 UTC (rev 1108) @@ -18,8 +18,8 @@ # The properties for the java:compile goal ########################################## maven.compile.deprectation = true -maven.compile.source = 1.5 -maven.compile.target = 1.5 +maven.compile.source = 1.4 +maven.compile.target = 1.4 ################################## # The properties for the docs goal @@ -34,9 +34,10 @@ ################################# # The properties for the jar goal ################################# -maven.jar.index = true -maven.jar.manifest.extensions.add = true -maven.jar.override = true +maven.jar.excludes=**/package.html,plugin/** +maven.jar.mainclass=pcgen.core.Main +maven.jar.manifest=code/manifest +maven.final.name=pcgen #################################### # The properties for the javacc goal @@ -56,7 +57,7 @@ maven.javadoc.maxmemory = 192m maven.javadoc.overview = ${basedir}/code/src/java/pcgen/overview.html maven.javadoc.private = true -maven.javadoc.source = 1.5 +maven.javadoc.source = 1.4 maven.javadoc.use = true maven.javadoc.version = true maven.javadoc.additionalparam = -linksource @@ -74,7 +75,7 @@ ################################## maven.junit.fork=on maven.junit.jvmargs=-Xmx192m -maven.test.source = 1.5 +maven.test.source = 1.4 ##################################### # The properties for the license goal Modified: Branches/5.10.x/pcgen/project.xml =================================================================== --- Branches/5.10.x/pcgen/project.xml 2006-06-22 12:38:08 UTC (rev 1107) +++ Branches/5.10.x/pcgen/project.xml 2006-06-22 12:58:14 UTC (rev 1108) @@ -14,7 +14,7 @@ <logo>http://pcgen.sourceforge.net/banners/PCGen_FullBanner_486x60.png</logo> <description>PCGen RPG character generator.</description> - <shortDescription>PCGen PRG character generator.</shortDescription> + <shortDescription>PCGen RPG character generator.</shortDescription> <repository> <connection>scm:svn:https://svn.sourceforge.net/svnroot/pcgen/Branches/5.10.x/pcgen</connection> @@ -87,6 +87,34 @@ <url>http://perrenland.org</url> <timezone>+10</timezone> </developer> + <developer> + <name>Aaron Divinsky</name> + <id>boomer70</id> + </developer> + <developer> + <name>Frank Kliewe</name> + <id>frank_kliewe</id> + </developer> + <developer> + <name>Eddy Anthony</name> + <id>eddyanthony</id> + </developer> + <developer> + <name>Paul W. King</name> + <id>kingpaul</id> + </developer> + <developer> + <name>Brian</name> + <id>telechus</id> + </developer> + <developer> + <name>Andrew Wilson</name> + <id>nuance</id> + </developer> + <developer> + <name>Tir Gwaith</name> + <id>tir-gwaith</id> + </developer> </developers> <dependencies> @@ -231,6 +259,13 @@ <include>**/*.properties</include> </includes> </resource> + <resource> + <!-- The resources are in the same place as the sources. --> + <directory>code/src/java</directory> + <includes> + <include>pcgen/gui/resource/*</include> + </includes> + </resource> </resources> </build> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |