[Japi-cvs] SF.net SVN: japi: [353] libs
Status: Beta
Brought to you by:
christianhujer
Menu
▾
▴
[Japi-cvs] SF.net SVN: japi: [353] libs
|
From: <chr...@us...> - 2007-05-19 14:07:27
|
Revision: 353
http://svn.sourceforge.net/japi/?rev=353&view=rev
Author: christianhujer
Date: 2007-05-19 07:07:25 -0700 (Sat, 19 May 2007)
Log Message:
-----------
Some more unification of build.xml.
Modified Paths:
--------------
common/trunk/commonBuild.xml
libs/argparser/trunk/build.xml
libs/lang/trunk/build.xml
libs/logging/trunk/build.xml
libs/registry/trunk/build.xml
libs/taglets/trunk/build.xml
libs/util/trunk/build.xml
libs/xml/trunk/build.xml
Modified: common/trunk/commonBuild.xml
===================================================================
--- common/trunk/commonBuild.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ common/trunk/commonBuild.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -5,6 +5,17 @@
~
~ @author <a href="mailto:ch...@ri...">Christian Hujer</a>
-->
+<taskdef name="pack200" classpath="common/lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
+
+<target
+ name = "clean"
+ description = "Cleans Sandbox"
+>
+ <delete dir="classes" />
+ <delete dir="dist" />
+ <delete dir="docs" />
+</target>
+
<target name="compile" description="Compiles this module.">
<property name="javaversion" value="1.5" />
<mkdir dir="classes/production/${module.shortname}" />
@@ -30,7 +41,11 @@
</copy>
</target>
-<target name="dist" description="Creates distribution archives.">
+<target
+ name = "dist"
+ description = "Creates and packs distribution archives."
+ depends = "clean, compile"
+>
<delete dir="dist" />
<mkdir dir="dist" />
<property name="distName" value="dist/${module.name}-${module.version}" />
@@ -60,9 +75,9 @@
<zipfileset dir="classes/production/${module.shortname}" />
<manifest>
<attribute name="Implementation-Title" value="${module.name}" />
- <attribute name="Implementation-Vendor" value="The JAPI Developers" />
+ <attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
<attribute name="Implementation-Version" value="${module.version}" />
- <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi" />
+ <attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
</manifest>
</jar>
<tar tarfile="${distName}.doc.tar">
@@ -82,12 +97,12 @@
</jar>
</parallel>
<parallel>
- <gzip src="${distName.src.tar" destfile="${distName.src.tar.gz}" />
- <bzip2 src="${distName.src.tar" destfile="${distName.src.tar.bz2}" />
- <gzip src="${distName.doc.tar" destfile="${distName.doc.tar.gz}" />
- <bzip2 src="${distName.doc.tar" destfile="${distName.doc.tar.bz2}" />
+ <gzip src="${distName}.src.tar" destfile="${distName}.src.tar.gz" />
+ <bzip2 src="${distName}.src.tar" destfile="${distName}.src.tar.bz2" />
+ <gzip src="${distName}.doc.tar" destfile="${distName}.doc.tar.gz" />
+ <bzip2 src="${distName}.doc.tar" destfile="${distName}.doc.tar.bz2" />
<pack200
- src="${distName.jar}"
+ src="${distName}.jar"
destfile="${distName}.pack.gz"
gzipoutput="true"
stripdebug="true"
@@ -116,7 +131,7 @@
splitindex = "yes"
windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
- header = "JAPI Library ${module.title} ${module.version}<br />API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
bottom = "<div style="text-align:center;">© 2005-2007 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
serialwarn = "yes"
@@ -127,6 +142,9 @@
linksource = "yes"
link = "${user.javadoc.link}"
>
+ <!--
+ overview = "src/overview.html"
+ -->
<classpath>
<fileset dir="lib" includes="annotations.jar" />
</classpath>
Modified: libs/argparser/trunk/build.xml
===================================================================
--- libs/argparser/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/argparser/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -32,6 +32,7 @@
description = "Cleans Sandbox"
>
<delete dir="classes" />
+ <delete dir="dist" />
<delete dir="docs" />
</target>
@@ -56,7 +57,7 @@
<copy
todir="classes/production/${module.shortname}"
>
- <fileset dir="src" includes="**/*.properties" />
+ <fileset dir="src" includes="**/*.properties" excludes="test/**/*.properties" />
<fileset dir="src" includes="META-INF/services/**" />
</copy>
</target>
@@ -156,7 +157,7 @@
doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
- bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ bottom = "<div style=" text-align:center;">© 2005-2007 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
serialwarn = "yes"
charset = "utf-8"
docencoding = "utf-8"
Modified: libs/lang/trunk/build.xml
===================================================================
--- libs/lang/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/lang/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -32,6 +32,7 @@
description = "Cleans Sandbox"
>
<delete dir="classes" />
+ <delete dir="dist" />
<delete dir="docs" />
</target>
@@ -56,7 +57,7 @@
<copy
todir="classes/production/${module.shortname}"
>
- <fileset dir="src" includes="**/*.properties" />
+ <fileset dir="src" includes="**/*.properties" excludes="test/**/*.properties" />
<fileset dir="src" includes="META-INF/services/**" />
</copy>
</target>
@@ -91,7 +92,7 @@
</zipfileset>
</jar>
<jar destfile="${distName}.jar">
- <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipfileset dir="classes/production/${module.shortname}" />
<manifest>
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -156,7 +157,7 @@
doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
- bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ bottom = "<div style=" text-align:center;">© 2005-2007 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
serialwarn = "yes"
charset = "utf-8"
docencoding = "utf-8"
Modified: libs/logging/trunk/build.xml
===================================================================
--- libs/logging/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/logging/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -56,7 +56,7 @@
<copy
todir="classes/production/${module.shortname}"
>
- <fileset dir="src" includes="**/*.properties" />
+ <fileset dir="src" includes="**/*.properties" excludes="test/**/*.properties" />
<fileset dir="src" includes="META-INF/services/**" />
</copy>
</target>
@@ -91,7 +91,7 @@
</zipfileset>
</jar>
<jar destfile="${distName}.jar">
- <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipfileset dir="classes/production/${module.shortname}" />
<manifest>
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: libs/registry/trunk/build.xml
===================================================================
--- libs/registry/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/registry/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ JAPI libs-registry is a library for parsing command line arguments.
+ ~ JAPI libs-registry is a library for handling multiple interface implementations.
~ Copyright (C) 2007 Christian Hujer.
~
~ This library is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@
<copy
todir="classes/production/${module.shortname}"
>
- <fileset dir="src" includes="**/*.properties" />
+ <fileset dir="src" includes="**/*.properties" excludes="test/**/*.properties" />
<fileset dir="src" includes="META-INF/services/**" />
</copy>
</target>
@@ -91,7 +91,7 @@
</zipfileset>
</jar>
<jar destfile="${distName}.jar">
- <zipfileset dir="classes" excludes="production/**,test/**"/>
+ <zipfileset dir="classes/production/${module.shortname}" />
<manifest>
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
Modified: libs/taglets/trunk/build.xml
===================================================================
--- libs/taglets/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/taglets/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -22,6 +22,7 @@
<property name="module.version" value="0.1" />
<property name="module.name" value="japi-lib-taglets" />
+ <property name="module.shortname" value="taglets" />
<taskdef name="pack200" classpath="lib/Pack200Task.jar" classname="com.sun.tools.apache.ant.pack200.Pack200Task" />
@@ -38,11 +39,11 @@
name = "compile"
description = "Compiles production classes"
>
- <mkdir dir="classes/production/taglets" />
- <mkdir dir="classes/test/taglets" />
+ <mkdir dir="classes/production/${module.shortname}" />
+ <mkdir dir="classes/test/${module.shortname}" />
<javac
srcdir="src"
- destdir="classes/production"
+ destdir="classes/production/${module.shortname}"
encoding="utf-8"
source="1.5"
target="1.5"
@@ -52,6 +53,12 @@
</classpath>
<exclude name="test/**/*.java" />
</javac>
+ <copy
+ todir="classes/production/${module.shortname}"
+ >
+ <fileset dir="src" includes="**/*.properties" excludes="test/**/*.properties" />
+ <fileset dir="src" includes="META-INF/services/**" />
+ </copy>
</target>
<target
@@ -84,9 +91,9 @@
</zipfileset>
</jar>
<jar destfile="${distName}.jar">
- <zipfileset dir="classes/production" />
+ <zipfileset dir="classes/production/${module.shortname}" />
<manifest>
- <attribute name="Implementation-Title" value="JAPI" />
+ <attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
<attribute name="Implementation-Version" value="${module.version}" />
<attribute name="Implementation-URL" value="http://sourceforge.net/projects/japi/" />
@@ -145,11 +152,11 @@
locale = "en_US"
use = "yes"
splitindex = "yes"
- windowtitle = "JAPI Library Taglets ${module.version} API documentation"
- doctitle = "JAPI<br />Yet another Java API<br />Library Taglets ${module.version} API documentation"
- header = "JAPI Library Taglets ${module.version}<br />API Documentation"
- footer = "JAPI<br />Yet another Java API<br />Library Taglets ${module.version} API documentation"
- bottom = "<div style=" text-align:center;">© 2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ windowtitle = "JAPI Library ${module.title} ${module.version} API documentation"
+ doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
+ footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
+ bottom = "<div style=" text-align:center;">© 2005-2007 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
serialwarn = "yes"
charset = "utf-8"
docencoding = "utf-8"
@@ -188,4 +195,5 @@
<!--tag enabled="true" name="xxx" description="XXX:" /-->
</javadoc>
</target>
+
</project>
Modified: libs/util/trunk/build.xml
===================================================================
--- libs/util/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/util/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -32,6 +32,7 @@
description = "Cleans Sandbox"
>
<delete dir="classes" />
+ <delete dir="dist" />
<delete dir="docs" />
</target>
@@ -91,7 +92,7 @@
</zipfileset>
</jar>
<jar destfile="${distName}.jar">
- <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipfileset dir="classes/production/${module.shortname}" />
<manifest>
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
@@ -156,7 +157,7 @@
doctitle = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
header = "JAPI Library ${module.title} ${module.version}<br />API Documentation"
footer = "JAPI<br />Yet another Java API<br />Library ${module.title} ${module.version} API documentation"
- bottom = "<div style=" text-align:center;">© 2005-2006 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
+ bottom = "<div style=" text-align:center;">© 2005-2007 Christian Hujer. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>"
serialwarn = "yes"
charset = "utf-8"
docencoding = "utf-8"
Modified: libs/xml/trunk/build.xml
===================================================================
--- libs/xml/trunk/build.xml 2007-05-19 12:41:30 UTC (rev 352)
+++ libs/xml/trunk/build.xml 2007-05-19 14:07:25 UTC (rev 353)
@@ -91,7 +91,7 @@
</zipfileset>
</jar>
<jar destfile="${distName}.jar">
- <zipfileset dir="classes/production/${module.shortname}"/>
+ <zipfileset dir="classes/production/${module.shortname}" />
<manifest>
<attribute name="Implementation-Title" value="${module.name}" />
<attribute name="Implementation-Vendor" value="Christian Hujer + the JAPI Developers" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
