You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/03/31 23:42:25 UTC
svn commit: r760670 - in /incubator/pivot/trunk: BUILD build.xml
Author: tvolkert
Date: Tue Mar 31 21:42:24 2009
New Revision: 760670
URL: http://svn.apache.org/viewvc?rev=760670&view=rev
Log:
Updated build file so that the "package" target puts all JAR files in one common ${folder.lib} folder
Modified:
incubator/pivot/trunk/BUILD
incubator/pivot/trunk/build.xml
Modified: incubator/pivot/trunk/BUILD
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/BUILD?rev=760670&r1=760669&r2=760670&view=diff
==============================================================================
--- incubator/pivot/trunk/BUILD (original)
+++ incubator/pivot/trunk/BUILD Tue Mar 31 21:42:24 2009
@@ -4,23 +4,22 @@
* JDK 1.5 or greater
-* CLASSPATH must contain the following entries:
- * junit.jar (version 4), available from http://www.junit.org
+Building Pivot (using Ant: http://ant.apache.org/)
+==================================================
- * jcommon-1.0.12.jar and jfreechart-1.0.9.jar, available from
- http://www.jfree.org
+* To compile all Pivot source files into binary class files:
- * plugin.jar, availble from the installed JDK
+ $ cd src
+ $ ant
- * servlet-api.jar (version 2.4), availble from http://java.sun.com/javaee
+* To regenerate the JAR files in the lib folder:
- * stax-1.2.0.jar, available from http://stax.codehaus.org
- (this is only needed if compiling with a JDK 1.5 compiler)
+ $ rm -rf lib
+ $ cd src
+ $ ant -Dfolder.lib=../lib package
+* To generate Javadoc
-Building Pivot
-==============
-
-Execute Ant (http://ant.apache.org/) from the current directory. This will
-create a "bin" directory containing the Pivot binaries.
+ $ cd src
+ $ ant -Dfolder.doc=<path> doc
Modified: incubator/pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.xml?rev=760670&r1=760669&r2=760670&view=diff
==============================================================================
--- incubator/pivot/trunk/build.xml (original)
+++ incubator/pivot/trunk/build.xml Tue Mar 31 21:42:24 2009
@@ -1,37 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="pivot" default="build">
- <property name="src" value="src"/>
- <property name="bin" value="ant-bin"/>
- <property name="lib" value="lib"/>
- <property name="dist" value="dist"/>
- <property name="deploy" value="deploy"/>
-
- <property name="doc" value="doc"/>
- <property name="charts" value="charts"/>
- <property name="chartstest" value="charts-test"/>
- <property name="core" value="core"/>
- <property name="coretest" value="core-test"/>
- <property name="web" value="web"/>
- <property name="webtest" value="web-test"/>
- <property name="wtk" value="wtk"/>
- <property name="wtktest" value="wtk-test"/>
-
- <property name="demos" value="demos"/>
- <property name="tutorials" value="tutorials"/>
- <property name="tools" value="tools"/>
-
- <property name="keystore" value="etc/pivot.keystore"/>
- <property name="alias" value="pivot"/>
- <property name="storepass" value="apache"/>
-
- <tstamp/>
- <property file="build.properties"/>
+ <!-- Properties that affect the directories that are created as part of the build -->
+ <property name="folder.src" value="src"/>
+ <property name="folder.bin" value="ant-bin"/>
+ <property name="folder.lib" value="lib"/>
+ <property name="folder.dist" value="dist"/>
+ <property name="folder.deploy" value="deploy"/>
+ <property name="folder.doc" value="doc"/>
+
+ <!-- Keystore properties -->
+ <property name="keystore.location" value="etc/pivot.keystore"/>
+ <property name="keystore.alias" value="pivot"/>
+ <property name="keystore.passwd" value="apache"/>
<!-- Compiler properties -->
<property name="compiler.optimize" value="true"/>
<property name="compiler.deprecation" value="true"/>
<property name="compiler.debug" value="false"/>
+ <!-- Dynamic properties -->
+ <tstamp/>
+ <property file="build.properties"/>
+
<target name="build" description="Compiles all packages"
depends="charts, charts-test, core, core-test, web, web-test, wtk, wtk-test, demos, tutorials, tools"/>
@@ -40,23 +30,24 @@
<target name="clean" description="Removes all build artifacts"
depends="charts-clean, charts-test-clean, core-clean, core-test-clean, web-clean, web-test-clean, wtk-clean, wtk-test-clean, demos-clean, tutorials-clean, tools-clean">
- <delete dir="${dist}"/>
- <delete dir="${deploy}"/>
- <delete dir="${doc}"/>
+ <delete dir="${folder.dist}"/>
+ <delete dir="${folder.deploy}"/>
+ <delete dir="${folder.doc}"/>
+ <delete dir="${folder.lib}"/>
</target>
<!-- Javadoc -->
<target name="doc" description="Generates API documentation for all packages">
- <javadoc packagenames="pivot.*" destdir="${doc}" author="true" version="true" use="true">
+ <javadoc packagenames="pivot.*" destdir="${folder.doc}" author="true" version="true" use="true">
<classpath>
- <fileset dir="${charts}/${lib}" includes="**/*.jar"/>
- <fileset dir="${wtk}/${lib}" includes="**/*.jar"/>
- <fileset dir="${web}/${lib}" includes="**/*.jar"/>
- </classpath>
- <packageset dir="${charts}/${src}" includes="**/*"/>
- <packageset dir="${core}/${src}" includes="**/*"/>
- <packageset dir="${web}/${src}" includes="**/*"/>
- <packageset dir="${wtk}/${src}" includes="**/*"/>
+ <fileset dir="charts/lib" includes="**/*.jar"/>
+ <fileset dir="wtk/lib" includes="**/*.jar"/>
+ <fileset dir="web/lib" includes="**/*.jar"/>
+ </classpath>
+ <packageset dir="charts/src" includes="**/*"/>
+ <packageset dir="core/src" includes="**/*"/>
+ <packageset dir="web/src" includes="**/*"/>
+ <packageset dir="wtk/src" includes="**/*"/>
<header>
<![CDATA[
<script type="text/javascript">
@@ -76,9 +67,9 @@
<!-- Charts -->
<target name="charts" depends="core, wtk">
- <mkdir dir="${charts}/${bin}"/>
- <javac srcdir="${charts}/${src}"
- destDir="${charts}/${bin}"
+ <mkdir dir="charts/${folder.bin}"/>
+ <javac srcdir="charts/src"
+ destDir="charts/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -86,22 +77,23 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="${core}/${bin}"/>
- <pathelement location="${wtk}/${bin}"/>
- <fileset dir="${charts}/${lib}" includes="**.*.jar"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
+ <fileset dir="charts/lib" includes="**.*.jar"/>
</classpath>
</javac>
</target>
<target name="charts-package" depends="charts">
- <jar jarfile="${charts}/${ant.project.name}-charts.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-charts.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${charts}/${bin}"/>
- <fileset dir="${charts}/${src}">
+ <fileset dir="charts/${folder.bin}"/>
+ <fileset dir="charts/src">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -109,15 +101,15 @@
</target>
<target name="charts-clean">
- <delete dir="${charts}/${bin}"/>
- <delete file="${charts}/${ant.project.name}-charts.jar"/>
+ <delete dir="charts/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-charts.jar"/>
</target>
<!-- Charts Test -->
<target name="charts-test" depends="charts, core, wtk">
- <mkdir dir="${chartstest}/${bin}"/>
- <javac srcdir="${chartstest}/${src}"
- destDir="${chartstest}/${bin}"
+ <mkdir dir="charts-test/${folder.bin}"/>
+ <javac srcdir="charts-test/src"
+ destDir="charts-test/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -125,17 +117,18 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="charts/${bin}"/>
- <pathelement location="core/${bin}"/>
- <pathelement location="wtk/${bin}"/>
+ <pathelement location="charts/${folder.bin}"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
</classpath>
</javac>
</target>
<target name="charts-test-package" depends="charts-test">
- <jar jarfile="${chartstest}/${ant.project.name}-charts.test.jar">
- <fileset dir="${chartstest}/${bin}"/>
- <fileset dir="${chartstest}/${src}">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-charts.test.jar">
+ <fileset dir="charts-test/${folder.bin}"/>
+ <fileset dir="charts-test/src">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -143,15 +136,15 @@
</target>
<target name="charts-test-clean">
- <delete dir="${chartstest}/${bin}"/>
- <delete file="${chartstest}/${ant.project.name}-charts.test.jar"/>
+ <delete dir="charts-test/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-charts.test.jar"/>
</target>
<!-- Core -->
<target name="core">
- <mkdir dir="${core}/${bin}"/>
- <javac srcdir="${core}/${src}"
- destDir="${core}/${bin}"
+ <mkdir dir="core/${folder.bin}"/>
+ <javac srcdir="core/src"
+ destDir="core/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -162,14 +155,15 @@
</target>
<target name="core-package" depends="core">
- <jar jarfile="${core}/${ant.project.name}-core.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-core.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${core}/${bin}"/>
- <fileset dir="${core}/${src}">
+ <fileset dir="core/${folder.bin}"/>
+ <fileset dir="core/src">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -177,15 +171,15 @@
</target>
<target name="core-clean">
- <delete dir="${core}/${bin}"/>
- <delete file="${core}/${ant.project.name}-core.jar"/>
+ <delete dir="core/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-core.jar"/>
</target>
<!-- Core Test -->
<target name="core-test" depends="core">
- <mkdir dir="${coretest}/${bin}"/>
- <javac srcdir="${coretest}/${src}"
- destDir="${coretest}/${bin}"
+ <mkdir dir="core-test/${folder.bin}"/>
+ <javac srcdir="core-test/src"
+ destDir="core-test/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -193,16 +187,17 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="${core}/${bin}"/>
+ <pathelement location="core/${folder.bin}"/>
<pathelement location="junit.jar"/>
</classpath>
</javac>
</target>
<target name="core-test-package" depends="core-test">
- <jar jarfile="${coretest}/${ant.project.name}-core.test.jar">
- <fileset dir="${coretest}/${bin}"/>
- <fileset dir="${coretest}/${src}">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-core.test.jar">
+ <fileset dir="core-test/${folder.bin}"/>
+ <fileset dir="core-test/src">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -210,15 +205,15 @@
</target>
<target name="core-test-clean">
- <delete dir="${coretest}/${bin}"/>
- <delete file="${coretest}/${ant.project.name}-core.test.jar"/>
+ <delete dir="core-test/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-core.test.jar"/>
</target>
<!-- Web -->
<target name="web" depends="core">
- <mkdir dir="${web}/${bin}"/>
- <javac srcdir="${web}/${src}"
- destDir="${web}/${bin}"
+ <mkdir dir="web/${folder.bin}"/>
+ <javac srcdir="web/src"
+ destDir="web/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -226,35 +221,36 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="${core}/${bin}"/>
- <fileset dir="${web}/${lib}" includes="**/*.jar"/>
+ <pathelement location="core/${folder.bin}"/>
+ <fileset dir="web/lib" includes="**/*.jar"/>
</classpath>
</javac>
</target>
<target name="web-package" depends="web">
- <jar jarfile="${web}/${ant.project.name}-web.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-web.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${web}/${bin}" excludes="pivot/web/server/**"/>
- <fileset dir="${web}/${src}">
+ <fileset dir="web/${folder.bin}" excludes="pivot/web/server/**"/>
+ <fileset dir="web/src">
<exclude name="pivot/web/server/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
</jar>
- <jar jarfile="${web}/${ant.project.name}-web.server.jar">
+ <jar jarfile="${folder.lib}/${ant.project.name}-web.server.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${web}/${bin}" includes="pivot/web/server/*"/>
- <fileset dir="${web}/${src}">
+ <fileset dir="web/${folder.bin}" includes="pivot/web/server/*"/>
+ <fileset dir="web/src">
<include name="pivot/web/server/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
@@ -263,16 +259,16 @@
</target>
<target name="web-clean">
- <delete dir="${web}/${bin}"/>
- <delete file="${web}/${ant.project.name}-web.jar"/>
- <delete file="${web}/${ant.project.name}-web.server.jar"/>
+ <delete dir="web/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-web.jar"/>
+ <delete file="${folder.lib}/${ant.project.name}-web.server.jar"/>
</target>
<!-- Web Test -->
<target name="web-test" depends="core, web, wtk">
- <mkdir dir="${webtest}/${bin}"/>
- <javac srcdir="${webtest}/${src}"
- destDir="${webtest}/${bin}"
+ <mkdir dir="web-test/${folder.bin}"/>
+ <javac srcdir="web-test/src"
+ destDir="web-test/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -280,18 +276,19 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="${core}/${bin}"/>
- <pathelement location="${web}/${bin}"/>
- <pathelement location="${wtk}/${bin}"/>
- <fileset dir="${web}/${lib}" includes="**/*.jar"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
+ <fileset dir="web/lib" includes="**/*.jar"/>
</classpath>
</javac>
</target>
<target name="web-test-package" depends="web-test">
- <jar jarfile="${webtest}/${ant.project.name}-web.test.jar">
- <fileset dir="${webtest}/${bin}" excludes="pivot/web/test/server/**"/>
- <fileset dir="${webtest}/${src}">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-web.test.jar">
+ <fileset dir="web-test/${folder.bin}" excludes="pivot/web/test/server/**"/>
+ <fileset dir="web-test/src">
<exclude name="pivot/web/test/server/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
@@ -300,48 +297,52 @@
</target>
<target name="web-test-war" depends="core-package, web-package, wtk-package, web-test-package">
- <copy todir="${webtest}/www/${lib}">
- <fileset dir="${core}" includes="${ant.project.name}-core.jar"/>
- <fileset dir="${web}" includes="${ant.project.name}-web.jar"/>
- <fileset dir="${wtk}" includes="${ant.project.name}-wtk.jar"/>
- <fileset dir="${wtk}" includes="${ant.project.name}-wtk.terra.jar"/>
- <fileset dir="${webtest}" includes="${ant.project.name}-web.test.jar"/>
- <fileset dir="${wtk}/${lib}" includes="*.jar"/>
+ <copy todir="web-test/www/lib">
+ <fileset dir="${folder.lib}">
+ <include name="${ant.project.name}-core.jar"/>
+ <include name="${ant.project.name}-web.jar"/>
+ <include name="${ant.project.name}-wtk.jar"/>
+ <include name="${ant.project.name}-wtk.terra.jar"/>
+ <include name="${ant.project.name}-web.test.jar"/>
+ </fileset>
+ <fileset dir="wtk/lib" includes="*.jar"/>
</copy>
- <mkdir dir="${webtest}/${lib}"/>
- <copy todir="${webtest}/${lib}">
- <fileset dir="${core}" includes="${ant.project.name}-core.jar"/>
- <fileset dir="${web}" includes="${ant.project.name}-web.server.jar"/>
+ <mkdir dir="web-test/lib"/>
+ <copy todir="web-test/lib">
+ <fileset dir="${folder.lib}">
+ <include name="${ant.project.name}-core.jar"/>
+ <include name="${ant.project.name}-web.server.jar"/>
+ </fileset>
</copy>
- <war destfile="${webtest}/${ant.project.name}_web_test.war" webxml="${webtest}/web.xml">
- <fileset dir="${webtest}/www"/>
- <classes dir="${webtest}/${bin}">
+ <war destfile="${folder.lib}/${ant.project.name}_web_test.war" webxml="web-test/web.xml">
+ <fileset dir="web-test/www"/>
+ <classes dir="web-test/${folder.bin}">
<include name="pivot/web/test/server/**"/>
</classes>
- <classes dir="${webtest}/${src}">
+ <classes dir="web-test/src">
<include name="pivot/web/test/server/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</classes>
- <lib dir="${webtest}/${lib}"/>
+ <lib dir="web-test/lib"/>
</war>
</target>
<target name="web-test-clean">
- <delete dir="${webtest}/www/${lib}" includes="*.jar"/>
- <delete dir="${webtest}/${bin}"/>
- <delete dir="${webtest}/${lib}"/>
- <delete file="${webtest}/${ant.project.name}-web.test.jar"/>
- <delete file="${webtest}/${ant.project.name}_web_test.war"/>
+ <delete dir="web-test/www/lib" includes="*.jar"/>
+ <delete dir="web-test/${folder.bin}"/>
+ <delete dir="web-test/lib"/>
+ <delete file="${folder.lib}/${ant.project.name}-web.test.jar"/>
+ <delete file="${folder.lib}/${ant.project.name}_web_test.war"/>
</target>
<!-- WTK -->
<target name="wtk" depends="core">
- <mkdir dir="${wtk}/${bin}"/>
- <javac srcdir="${wtk}/${src}"
- destDir="${wtk}/${bin}"
+ <mkdir dir="wtk/${folder.bin}"/>
+ <javac srcdir="wtk/src"
+ destDir="wtk/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -349,24 +350,25 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="${core}/${bin}"/>
- <fileset dir="${wtk}/${lib}" includes="*.jar"/>
+ <pathelement location="core/${folder.bin}"/>
+ <fileset dir="wtk/lib" includes="**/*.jar"/>
</classpath>
</javac>
</target>
<target name="wtk-package" depends="wtk">
- <jar jarfile="${wtk}/${ant.project.name}-wtk.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-wtk.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${wtk}/${bin}">
+ <fileset dir="wtk/${folder.bin}">
<exclude name="pivot/wtk/skin/terra/**"/>
<exclude name="pivot/wtk/skin/obsidian/**"/>
</fileset>
- <fileset dir="${wtk}/${src}">
+ <fileset dir="wtk/src">
<exclude name="pivot/wtk/skin/terra/**"/>
<exclude name="pivot/wtk/skin/obsidian/**"/>
<exclude name="**/*.java"/>
@@ -374,28 +376,28 @@
</fileset>
</jar>
- <jar jarfile="${wtk}/${ant.project.name}-wtk.terra.jar">
+ <jar jarfile="${folder.lib}/${ant.project.name}-wtk.terra.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${wtk}/${bin}" includes="pivot/wtk/skin/terra/**"/>
- <fileset dir="${wtk}/${src}">
+ <fileset dir="wtk/${folder.bin}" includes="pivot/wtk/skin/terra/**"/>
+ <fileset dir="wtk/src">
<include name="pivot/wtk/skin/terra/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
</jar>
- <jar jarfile="${wtk}/${ant.project.name}-wtk.obsidian.jar">
+ <jar jarfile="${folder.lib}/${ant.project.name}-wtk.obsidian.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${wtk}/${bin}" includes="pivot/wtk/skin/obsidian/**"/>
- <fileset dir="${wtk}/${src}">
+ <fileset dir="wtk/${folder.bin}" includes="pivot/wtk/skin/obsidian/**"/>
+ <fileset dir="wtk/src">
<include name="pivot/wtk/skin/obsidian/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
@@ -404,17 +406,17 @@
</target>
<target name="wtk-clean">
- <delete dir="${wtk}/${bin}"/>
- <delete file="${wtk}/${ant.project.name}-wtk.jar"/>
- <delete file="${wtk}/${ant.project.name}-wtk.terra.jar"/>
- <delete file="${wtk}/${ant.project.name}-wtk.obsidian.jar"/>
+ <delete dir="wtk/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-wtk.jar"/>
+ <delete file="${folder.lib}/${ant.project.name}-wtk.terra.jar"/>
+ <delete file="${folder.lib}/${ant.project.name}-wtk.obsidian.jar"/>
</target>
<!-- WTK Test -->
<target name="wtk-test" depends="core, wtk">
- <mkdir dir="${wtktest}/${bin}"/>
- <javac srcdir="${wtktest}/${src}"
- destDir="${wtktest}/${bin}"
+ <mkdir dir="wtk-test/${folder.bin}"/>
+ <javac srcdir="wtk-test/src"
+ destDir="wtk-test/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -422,16 +424,17 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="${core}/${bin}"/>
- <pathelement location="${wtk}/${bin}"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
</classpath>
</javac>
</target>
<target name="wtk-test-package" depends="wtk-test">
- <jar jarfile="${wtktest}/${ant.project.name}-wtk.test.jar">
- <fileset dir="${wtktest}/${bin}"/>
- <fileset dir="${wtktest}/${src}">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-wtk.test.jar">
+ <fileset dir="wtk-test/${folder.bin}"/>
+ <fileset dir="wtk-test/src">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -439,15 +442,15 @@
</target>
<target name="wtk-test-clean">
- <delete dir="${wtktest}/${bin}"/>
- <delete file="${wtktest}/${ant.project.name}-wtk.test.jar"/>
+ <delete dir="wtk-test/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-wtk.test.jar"/>
</target>
<!-- Demos -->
<target name="demos" depends="core, web, wtk">
- <mkdir dir="${demos}/${bin}"/>
- <javac srcdir="${demos}/${src}"
- destDir="${demos}/${bin}"
+ <mkdir dir="demos/${folder.bin}"/>
+ <javac srcdir="demos/src"
+ destDir="demos/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -455,23 +458,24 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="core/${bin}"/>
- <pathelement location="web/${bin}"/>
- <pathelement location="wtk/${bin}"/>
- <fileset dir="${demos}/${lib}" includes="*.jar"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
+ <fileset dir="demos/lib" includes="**/*.jar"/>
</classpath>
</javac>
</target>
<target name="demos-package" depends="demos">
- <jar jarfile="${demos}/${ant.project.name}-demos.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-demos.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${demos}/${bin}"/>
- <fileset dir="${demos}/${src}">
+ <fileset dir="demos/${folder.bin}"/>
+ <fileset dir="demos/src">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -479,15 +483,15 @@
</target>
<target name="demos-clean">
- <delete dir="${demos}/${bin}"/>
- <delete file="${demos}/${ant.project.name}-demos.jar"/>
+ <delete dir="demos/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-demos.jar"/>
</target>
<!-- Tutorials -->
<target name="tutorials" depends="core, wtk, web, charts">
- <mkdir dir="${tutorials}/${bin}"/>
- <javac srcdir="${tutorials}/${src}"
- destDir="${tutorials}/${bin}"
+ <mkdir dir="tutorials/${folder.bin}"/>
+ <javac srcdir="tutorials/src"
+ destDir="tutorials/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -495,51 +499,52 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="core/${bin}"/>
- <pathelement location="web/${bin}"/>
- <pathelement location="wtk/${bin}"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
</classpath>
</javac>
</target>
<target name="tutorials-package" depends="tutorials">
- <jar jarfile="${tutorials}/${ant.project.name}-tutorials.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-tutorials.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${tutorials}/${bin}" excludes="pivot/tutorials/stocktracker/**"/>
- <fileset dir="${tutorials}/${src}">
+ <fileset dir="tutorials/${folder.bin}" excludes="pivot/tutorials/stocktracker/**"/>
+ <fileset dir="tutorials/src">
<exclude name="**/*.java"/>
<exclude name="pivot/tutorials/stocktracker/**"/>
</fileset>
</jar>
- <jar jarfile="${tutorials}/${ant.project.name}-stocktracker.jar">
+ <jar jarfile="${folder.lib}/${ant.project.name}-stocktracker.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${tutorials}/${bin}" includes="pivot/tutorials/stocktracker/*"/>
- <fileset dir="${tutorials}/${src}">
+ <fileset dir="tutorials/${folder.bin}" includes="pivot/tutorials/stocktracker/*"/>
+ <fileset dir="tutorials/src">
<exclude name="**/*.java"/>
</fileset>
</jar>
</target>
<target name="tutorials-clean">
- <delete dir="${tutorials}/${bin}"/>
- <delete file="${tutorials}/${ant.project.name}-tutorials.jar"/>
- <delete file="${tutorials}/${ant.project.name}-stocktracker.jar"/>
+ <delete dir="tutorials/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-tutorials.jar"/>
+ <delete file="${folder.lib}/${ant.project.name}-stocktracker.jar"/>
</target>
<!-- Tools -->
<target name="tools" depends="core, wtk, web">
- <mkdir dir="${tools}/${bin}"/>
- <javac srcdir="${tools}/${src}"
- destDir="${tools}/${bin}"
+ <mkdir dir="tools/${folder.bin}"/>
+ <javac srcdir="tools/src"
+ destDir="tools/${folder.bin}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
debug="${compiler.debug}"
@@ -547,43 +552,44 @@
failonerror="true">
<compilerarg value="-Xlint"/>
<classpath>
- <pathelement location="core/${bin}"/>
- <pathelement location="web/${bin}"/>
- <pathelement location="wtk/${bin}"/>
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
</classpath>
</javac>
</target>
<target name="tools-package" depends="tools">
- <jar jarfile="${tools}/${ant.project.name}-tools.jar">
+ <mkdir dir="${folder.lib}"/>
+ <jar jarfile="${folder.lib}/${ant.project.name}-tools.jar">
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="${tools}/${bin}"/>
- <fileset dir="${tools}/${src}">
+ <fileset dir="tools/${folder.bin}"/>
+ <fileset dir="tools/src">
<exclude name="**/*.java"/>
</fileset>
</jar>
</target>
<target name="tools-clean">
- <delete dir="${tools}/${bin}"/>
- <delete file="${tools}/${ant.project.name}-tools.jar"/>
+ <delete dir="tools/${folder.bin}"/>
+ <delete file="${folder.lib}/${ant.project.name}-tools.jar"/>
</target>
<!-- Package all binaries and source -->
<target name="dist" description="Generates release artifacts"
depends="trim-whitespace, clean, package, doc">
- <property name="release" value="apache-${ant.project.name}-${version}-incubating"/>
+ <property name="folder.release" value="apache-${ant.project.name}-${version}-incubating"/>
- <mkdir dir="${dist}/${release}/${doc}"/>
- <mkdir dir="${dist}/${release}/${lib}"/>
- <mkdir dir="${dist}/${release}/${src}"/>
+ <mkdir dir="${folder.dist}/${folder.release}/${folder.doc}"/>
+ <mkdir dir="${folder.dist}/${folder.release}/${folder.lib}"/>
+ <mkdir dir="${folder.dist}/${folder.release}/${folder.src}"/>
<!-- Construct the release hierarchy -->
- <copy todir="${dist}/${release}">
+ <copy todir="${folder.dist}/${folder.release}">
<fileset dir=".">
<include name="BUILD"/>
<include name="DISCLAIMER"/>
@@ -595,28 +601,28 @@
</copy>
<!-- Copy lib -->
- <copy file="${charts}/${ant.project.name}-charts.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-charts-incubating.jar"/>
- <copy file="${core}/${ant.project.name}-core.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-core-incubating.jar"/>
- <copy file="${web}/${ant.project.name}-web.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-web-incubating.jar"/>
- <copy file="${web}/${ant.project.name}-web.server.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-web-incubating.server.jar"/>
- <copy file="${wtk}/${ant.project.name}-wtk.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-wtk-incubating.jar"/>
- <copy file="${wtk}/${ant.project.name}-wtk.terra.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-wtk-incubating.terra.jar"/>
- <copy file="${tools}/${ant.project.name}-tools.jar"
- tofile="${dist}/${release}/${lib}/${ant.project.name}-tools-incubating.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-charts.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-charts-incubating.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-core.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-core-incubating.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-web.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-web-incubating.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-web.server.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-web-incubating.server.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-wtk.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-wtk-incubating.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-wtk.terra.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-wtk-incubating.terra.jar"/>
+ <copy file="${folder.lib}/${ant.project.name}-tools.jar"
+ tofile="${folder.dist}/${folder.release}/${folder.lib}/${ant.project.name}-tools-incubating.jar"/>
<!-- Copy doc -->
- <copy todir="${dist}/${release}/${doc}">
- <fileset dir="${doc}"/>
+ <copy todir="${folder.dist}/${folder.release}/${folder.doc}">
+ <fileset dir="${folder.doc}"/>
</copy>
<!-- Copr src -->
- <copy todir="${dist}/${release}/${src}">
+ <copy todir="${folder.dist}/${folder.release}/${folder.src}">
<fileset dir=".">
<include name="build.*"/>
<include name="*.jar"/>
@@ -633,102 +639,102 @@
</copy>
<!-- Create the .zip archive -->
- <zip destfile="${dist}/${release}.zip" level="9">
- <fileset dir="${dist}" includes="${release}/**"/>
+ <zip destfile="${folder.dist}/${folder.release}.zip" level="9">
+ <fileset dir="${folder.dist}" includes="${folder.release}/**"/>
</zip>
- <checksum file="${dist}/${release}.zip" algorithm="md5"/>
- <checksum file="${dist}/${release}.zip" algorithm="sha"/>
+ <checksum file="${folder.dist}/${folder.release}.zip" algorithm="md5"/>
+ <checksum file="${folder.dist}/${folder.release}.zip" algorithm="sha"/>
<!-- Create the .tar.gz archive -->
- <tar destfile="${dist}/${release}.tar" longfile="gnu">
- <fileset dir="${dist}" includes="${release}/**"/>
+ <tar destfile="${folder.dist}/${folder.release}.tar" longfile="gnu">
+ <fileset dir="${folder.dist}" includes="${folder.release}/**"/>
</tar>
- <gzip src="${dist}/${release}.tar" destfile="${dist}/${release}.tar.gz"/>
- <delete file="${dist}/${release}.tar"/>
- <checksum file="${dist}/${release}.tar.gz" algorithm="md5"/>
- <checksum file="${dist}/${release}.tar.gz" algorithm="sha"/>
+ <gzip src="${folder.dist}/${folder.release}.tar" destfile="${folder.dist}/${folder.release}.tar.gz"/>
+ <delete file="${folder.dist}/${folder.release}.tar"/>
+ <checksum file="${folder.dist}/${folder.release}.tar.gz" algorithm="md5"/>
+ <checksum file="${folder.dist}/${folder.release}.tar.gz" algorithm="sha"/>
</target>
<!-- Generate deployment files for online demos and tutorials -->
<target name="deploy" description="Generates deployment files for online demos and tutorials"
depends="package">
- <delete dir="${deploy}"/>
- <mkdir dir="${deploy}"/>
+ <delete dir="${folder.deploy}"/>
+ <mkdir dir="${folder.deploy}"/>
<!-- Platform -->
- <copy file="${charts}/${ant.project.name}-charts.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-charts.jar" signedjar="${deploy}/${ant.project.name}-charts.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
-
- <copy file="${core}/${ant.project.name}-core.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-core.jar" signedjar="${deploy}/${ant.project.name}-core.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
-
- <copy file="${web}/${ant.project.name}-web.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-web.jar" signedjar="${deploy}/${ant.project.name}-web.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
-
- <copy file="${wtk}/${ant.project.name}-wtk.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-wtk.jar" signedjar="${deploy}/${ant.project.name}-wtk.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
-
- <copy file="${wtk}/${ant.project.name}-wtk.terra.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-wtk.terra.jar" signedjar="${deploy}/${ant.project.name}-wtk.terra.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <copy file="${folder.lib}/${ant.project.name}-charts.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-charts.jar" signedjar="${folder.deploy}/${ant.project.name}-charts.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+
+ <copy file="${folder.lib}/${ant.project.name}-core.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-core.jar" signedjar="${folder.deploy}/${ant.project.name}-core.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+
+ <copy file="${folder.lib}/${ant.project.name}-web.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-web.jar" signedjar="${folder.deploy}/${ant.project.name}-web.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+
+ <copy file="${folder.lib}/${ant.project.name}-wtk.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-wtk.jar" signedjar="${folder.deploy}/${ant.project.name}-wtk.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+
+ <copy file="${folder.lib}/${ant.project.name}-wtk.terra.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-wtk.terra.jar" signedjar="${folder.deploy}/${ant.project.name}-wtk.terra.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
<!-- StAX -->
- <copy file="${wtk}/lib/stax-api-1.0.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/stax-api-1.0.jar" signedjar="${deploy}/stax-api-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
-
- <copy file="${wtk}/lib/stax-1.2.0.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/stax-1.2.0.jar" signedjar="${deploy}/stax-1.2.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <copy file="wtk/lib/stax-api-1.0.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/stax-api-1.0.jar" signedjar="${folder.deploy}/stax-api-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+
+ <copy file="wtk/lib/stax-1.2.0.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/stax-1.2.0.jar" signedjar="${folder.deploy}/stax-1.2.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
<!-- JFree -->
- <copy file="${charts}/lib/jcommon-1.0.12.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/jcommon-1.0.12.jar" signedjar="${deploy}/jcommon-1.0.12.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
-
- <copy file="${charts}/lib/jfreechart-1.0.9.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/jfreechart-1.0.9.jar" signedjar="${deploy}/jfreechart-1.0.9.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <copy file="charts/lib/jcommon-1.0.12.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/jcommon-1.0.12.jar" signedjar="${folder.deploy}/jcommon-1.0.12.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+
+ <copy file="charts/lib/jfreechart-1.0.9.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/jfreechart-1.0.9.jar" signedjar="${folder.deploy}/jfreechart-1.0.9.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
<!-- Google Data -->
- <signjar jar="${demos}/${lib}/gdata-base-1.0.jar" signedjar="${deploy}/gdata-base-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/gdata-client-1.0.jar" signedjar="${deploy}/gdata-client-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/gdata-client-meta-1.0.jar" signedjar="${deploy}/gdata-client-meta-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/gdata-contacts-1.0.jar" signedjar="${deploy}/gdata-contacts-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/gdata-contacts-meta-1.0.jar" signedjar="${deploy}/gdata-contacts-meta-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/gdata-core-1.0.jar" signedjar="${deploy}/gdata-core-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/gdata-media-1.0.jar" signedjar="${deploy}/gdata-media-1.0.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <signjar jar="demos/lib/gdata-base-1.0.jar" signedjar="${folder.deploy}/gdata-base-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/gdata-client-1.0.jar" signedjar="${folder.deploy}/gdata-client-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/gdata-client-meta-1.0.jar" signedjar="${folder.deploy}/gdata-client-meta-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/gdata-contacts-1.0.jar" signedjar="${folder.deploy}/gdata-contacts-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/gdata-contacts-meta-1.0.jar" signedjar="${folder.deploy}/gdata-contacts-meta-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/gdata-core-1.0.jar" signedjar="${folder.deploy}/gdata-core-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/gdata-media-1.0.jar" signedjar="${folder.deploy}/gdata-media-1.0.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
<!-- Smack -->
- <signjar jar="${demos}/${lib}/smack.jar" signedjar="${deploy}/smack.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <signjar jar="${demos}/${lib}/smackx.jar" signedjar="${deploy}/smackx.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <signjar jar="demos/lib/smack.jar" signedjar="${folder.deploy}/smack.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <signjar jar="demos/lib/smackx.jar" signedjar="${folder.deploy}/smackx.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
<!-- Demos -->
- <copy file="${chartstest}/${ant.project.name}-charts.test.jar" todir="${deploy}"/>
- <copy file="${demos}/${ant.project.name}-demos.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-demos.jar" signedjar="${deploy}/${ant.project.name}-demos.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <copy file="${folder.lib}/${ant.project.name}-charts.test.jar" todir="${folder.deploy}"/>
+ <copy file="${folder.lib}/${ant.project.name}-demos.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-demos.jar" signedjar="${folder.deploy}/${ant.project.name}-demos.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
<!-- Tutorials -->
- <copy file="${tutorials}/${ant.project.name}-tutorials.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-tutorials.jar" signedjar="${deploy}/${ant.project.name}-tutorials.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
- <copy file="${tutorials}/${ant.project.name}-stocktracker.jar" todir="${deploy}"/>
- <signjar jar="${deploy}/${ant.project.name}-stocktracker.jar" signedjar="${deploy}/${ant.project.name}-stocktracker.signed.jar"
- keystore="${keystore}" storepass="${storepass}" alias="${alias}"/>
+ <copy file="${folder.lib}/${ant.project.name}-tutorials.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-tutorials.jar" signedjar="${folder.deploy}/${ant.project.name}-tutorials.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
+ <copy file="${folder.lib}/${ant.project.name}-stocktracker.jar" todir="${folder.deploy}"/>
+ <signjar jar="${folder.deploy}/${ant.project.name}-stocktracker.jar" signedjar="${folder.deploy}/${ant.project.name}-stocktracker.signed.jar"
+ keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"/>
</target>
<!-- Remove trailing white space in all source files -->