You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2006/07/14 20:31:32 UTC
svn commit: r421979 - in /incubator/abdera/java/trunk: ./ BUILDING
build/build.xml security/README
Author: jmsnell
Date: Fri Jul 14 11:31:32 2006
New Revision: 421979
URL: http://svn.apache.org/viewvc?rev=421979&view=rev
Log:
Fixing up the build script so that the produced dist zips are correct
Better handling of the security conditional build
Three zips will be created, one for the jdk1.5, one for jdk1.4.2 and one for source
Updated some of the build documentation
Exclude the zips from the svn image
Modified:
incubator/abdera/java/trunk/ (props changed)
incubator/abdera/java/trunk/BUILDING
incubator/abdera/java/trunk/build/build.xml
incubator/abdera/java/trunk/security/README
Propchange: incubator/abdera/java/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 14 11:31:32 2006
@@ -1,3 +1,4 @@
.project
dist
+abdera.*.zip
Modified: incubator/abdera/java/trunk/BUILDING
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/BUILDING?rev=421979&r1=421978&r2=421979&view=diff
==============================================================================
--- incubator/abdera/java/trunk/BUILDING (original)
+++ incubator/abdera/java/trunk/BUILDING Fri Jul 14 11:31:32 2006
@@ -24,6 +24,8 @@
# delete downloaded dependencies
ant -f build/build.xml clean-downloads
+Note: To build with XML Security support, set the ABDERA_XMLSECURITY environment
+variable to "yes" prior to running the ant build
To build with Eclipse (http://www.eclipse.org).
Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=421979&r1=421978&r2=421979&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Fri Jul 14 11:31:32 2006
@@ -92,16 +92,22 @@
</and>
</not>
</condition>
- <condition property="do.download.security">
- <not>
- <and>
- <available file="${dependencies}/${xmlsecurity.jar}" />
- </and>
- </not>
- </condition>
<condition property="do.security">
<istrue value="${env.ABDERA_XMLSECURITY}"/>
</condition>
+ <condition property="do.download.security">
+ <and>
+ <istrue value="${do.security}" />
+ <not>
+ <and>
+ <available file="${dependencies}/${xmlsecurity.jar}" />
+ </and>
+ </not>
+ </and>
+ </condition>
+
+ <echo>Building Security? ${do.security}</echo>
+
<antcall target="download"/>
<antcall target="downloadsecurity" />
</target>
@@ -206,6 +212,9 @@
<delete dir="${work}" />
<delete dir="${test}" />
<delete dir="${dist}" />
+ <delete>
+ <fileset dir="${basedir}" includes="*.zip" />
+ </delete>
</target>
<target name="dist" depends="clean,build,test,docs">
@@ -227,16 +236,44 @@
<jar destfile="${security.jar}" basedir="${security.work}" />
</target>
- <target name="zip" depends="dist">
+ <target name="zip" depends="retro">
<zip destfile="${basedir}/${ant.project.name}.${version}.zip">
<fileset dir="${dist}">
<include name="**/*.jar" />
+ <include name="**/legal/*" />
+ <exclude name="**/*.retro.jar" />
+ <exclude name="**/retroweaver-rt-1.2.3.jar" />
</fileset>
<fileset dir="${docs}" includes="**/*" />
+ <fileset dir="${basedir}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README" />
+ </fileset>
+ </zip>
+ <zip destfile="${basedir}/${ant.project.name}.${version}.jdk142.zip">
+ <fileset dir="${dist}">
+ <include name="**/*.jar" />
+ <include name="**/legal/*" />
+ <exclude name="**/*.${version}.jar" />
+ </fileset>
+ <fileset dir="${docs}" includes="**/*" />
+ <fileset dir="${basedir}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README" />
+ </fileset>
+ </zip>
+ <zip destfile="${basedir}/${ant.project.name}.${version}.src.zip">
+ <fileset dir="${basedir}">
+ <exclude name="dist/**/*" />
+ <exclude name="**/*.zip" />
+ <exclude name="**/.project" />
+ </fileset>
</zip>
</target>
- <target name="downloadsecurity" if="do.download.security,do.security">
+ <target name="downloadsecurity" if="do.download.security">
<get src="${xmlsecurity.dir}/${xmlsecurity.jar}"
dest="${dependencies}/${xmlsecurity.jar}"
usetimestamp="true" />
Modified: incubator/abdera/java/trunk/security/README
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/README?rev=421979&r1=421978&r2=421979&view=diff
==============================================================================
--- incubator/abdera/java/trunk/security/README (original)
+++ incubator/abdera/java/trunk/security/README Fri Jul 14 11:31:32 2006
@@ -1,5 +1,3 @@
-Currently excluded from the build.
-
Requires the Apache XML Security version 1.3 to compile and the Bouncing Castle
Crypto implementation to run.