Menu
▾
▴
[Cayenne-cvs] cayenne build-doc.xml,1.7,1.8 build-tutorials.xml,1.1,1.2 build.xml,1.40,1.41
|
From: <me...@us...> - 2002-10-02 03:50:04
|
Update of /cvsroot/cayenne/cayenne
In directory usw-pr-cvs1:/tmp/cvs-serv13010
Modified Files:
build-doc.xml build-tutorials.xml build.xml
Log Message:
fixed build scripts to use new tutorial source folders
Index: build-doc.xml
===================================================================
RCS file: /cvsroot/cayenne/cayenne/build-doc.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- build-doc.xml 9 Sep 2002 01:17:37 -0000 1.7
+++ build-doc.xml 2 Oct 2002 03:50:00 -0000 1.8
@@ -18,16 +18,7 @@
<!-- ============================================= -->
<target name="release-site" depends="nositedir,prepare,doc,api">
<delete dir="${site.dir}/cayenne"/>
- <mkdir dir="${site.dir}/cayenne"/>
-
- <!-- copy tutorial distros -->
- <antcall target="tutorial-dist">
- <param name="tutorial.name" value="cayenne-cmd-app"/>
- </antcall>
- <antcall target="tutorial-dist">
- <param name="tutorial.name" value="cayenne-web-app"/>
- </antcall>
-
+ <mkdir dir="${site.dir}/cayenne"/>
<!-- copy all but HTML -->
<copy todir="${site.dir}/cayenne">
@@ -57,7 +48,6 @@
<mkdir dir="${dist}/doc"/>
<mkdir dir="${dist}/doc/api"/>
<mkdir dir="${dist}/doc/dtd"/>
- <mkdir dir="${dist}/doc/tutorial"/>
</target>
@@ -71,7 +61,7 @@
<!-- ========================================== -->
<!-- Creates a fulldocumentation build. -->
<!-- ========================================== -->
- <target name="dist-src" depends="doc,api,tutorials"/>
+ <target name="dist-src" depends="doc,api"/>
<!-- ========================================== -->
@@ -109,51 +99,7 @@
<include name="**/*.dtd"/>
</fileset>
</copy>
- </target>
-
-
- <!-- ========================================== -->
- <!-- Distributes Cayenne tutorials. -->
- <!-- ========================================== -->
- <target name="tutorials" depends="prepare">
- <antcall target="tutorial-src">
- <param name="tutorial.name" value="cayenne-cmd-app"/>
- </antcall>
- <antcall target="tutorial-src">
- <param name="tutorial.name" value="cayenne-web-app"/>
- </antcall>
- </target>
-
-
- <!-- ========================================== -->
- <!-- Distributes a single Cayenne tutorial. -->
- <!-- ========================================== -->
- <target name="tutorial-src" if="tutorial.name">
- <!-- copy unpacked tutorial files -->
- <copy todir="${dist}/doc/tutorial" filtering="no">
- <fileset dir="doc/tutorial">
- <include name="${tutorial.name}/**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="tutorial-dist" if="tutorial.name">
- <!-- package tutorial files for single click download -->
- <tar tarfile="${dist}/doc/tutorial/${tutorial.name}.tar">
- <tarfileset dir="${dist}/doc/tutorial">
- <include name="${tutorial.name}/**"/>
-
- <!-- exclude files that should be autogenerated by Cayenne -->
- <exclude name="**/*Artist.java"/>
- <exclude name="**/*Painting.java"/>
- <exclude name="**/*Gallery.java"/>
- </tarfileset>
- </tar>
- <gzip src="${dist}/doc/tutorial/${tutorial.name}.tar"
- zipfile="${dist}/doc/tutorial/${tutorial.name}.tar.gz"/>
- <delete file="${dist}/doc/tutorial/${tutorial.name}.tar"/>
- </target>
-
+ </target>
<!-- ========================================== -->
<!-- Copies documentation images in the target -->
Index: build-tutorials.xml
===================================================================
RCS file: /cvsroot/cayenne/cayenne/build-tutorials.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- build-tutorials.xml 1 Oct 2002 05:12:26 -0000 1.1
+++ build-tutorials.xml 2 Oct 2002 03:50:00 -0000 1.2
@@ -17,10 +17,30 @@
<ant antfile="src/tutorials/cayenne-cmd-app/build.xml" target="dist-src"/>
<ant antfile="src/tutorials/cayenne-web-app/build.xml" target="dist-src"/>
</target>
-
- <target name="dist-bin">
- <ant antfile="src/tutorials/cayenne-cmd-app/build.xml" target="dist-bin"/>
- <ant antfile="src/tutorials/cayenne-web-app/build.xml" target="dist-bin"/>
+
+ <target name="release-site" depends="nositedir,dist-src">
+ <mkdir dir="${site.dir}/cayenne/tutorials"/>
+
+ <copy todir="${site.dir}/cayenne/tutorials">
+ <fileset dir="${dist}/src/tutorials"/>
+ </copy>
+ </target>
+
+ <target name="doc" depends="dist-src">
+ <mkdir dir="${dist}/doc/tutorials"/>
+
+ <copy todir="${dist}/doc/tutorials">
+ <fileset dir="${dist}/src/tutorials"/>
+ </copy>
</target>
+
+
+ <!-- Simply calls compile task. Exists in the project -->
+ <!-- for consistency with other subproject buildfiles. -->
+ <target name="dist-bin" depends="compile"/>
+
+ <target name="nositedir" unless="site.dir">
+ <fail>"site.dir" must be defined.</fail>
+ </target>
</project>
Index: build.xml
===================================================================
RCS file: /cvsroot/cayenne/cayenne/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- build.xml 1 Oct 2002 05:12:26 -0000 1.40
+++ build.xml 2 Oct 2002 03:50:00 -0000 1.41
@@ -57,9 +57,10 @@
<!-- Creates a full release of Cayenne. -->
<!-- ============================================= -->
<target name="release">
- <ant antfile="build-doc.xml" target="dist-src"/>
<ant antfile="build-cayenne.xml" target="dist-src"/>
<ant antfile="build-tests.xml" target="dist-src"/>
+ <ant antfile="build-tutorials.xml" target="dist-src"/>
+ <ant antfile="build-doc.xml" target="dist-src"/>
<copy todir="${dist}" file="doc/release-notes/RELEASE-NOTES-${project.version}.txt"/>
@@ -68,6 +69,7 @@
<include name="${project.name}-${project.version}/**"/>
</tarfileset>
</tar>
+
<gzip src="${dist.base}/${project.name}-src-${project.version}.tar"
zipfile="${dist.base}/${project.name}-src-${project.version}.tar.gz"/>
<delete file="${dist.base}/${project.name}-src-${project.version}.tar"/>
@@ -81,12 +83,13 @@
<target name="release-site">
<ant antfile="build-cayenne.xml" target="dist-src"/>
<ant antfile="build-tests.xml" target="dist-src"/>
+ <ant antfile="build-tutorials.xml" target="release-site"/>
<ant antfile="build-doc.xml" target="release-site"/>
</target>
<!-- ========================================== -->
- <!-- Builds all Cayenne Java subprojects. -->
+ <!-- Builds all Cayenne Java subproject JARS. -->
<!-- ========================================== -->
<target name="build">
<ant antfile="build-cayenne.xml" target="dist-bin"/>
@@ -129,6 +132,7 @@
<!-- ========================================== -->
<target name="doc">
<ant antfile="build-doc.xml" target="doc"/>
+ <ant antfile="build-tutorials.xml" target="doc"/>
</target>
|
