Author: aadamchik
Date: Thu Jun 22 06:25:39 2006
New Revision: 416366
URL: http://svn.apache.org/viewvc?rev=416366&view=rev
Log:
updating the ant script to handle new tutorial layout
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/tutorials.xml
incubator/cayenne/main/trunk/cayenne/cayenne-ant/default.properties
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/tutorials.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/tutorials.xml?rev=416366&r1=416365&r2=416366&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/tutorials.xml
(original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/tutorials.xml Thu Jun
22 06:25:39 2006
@@ -1,54 +1,16 @@
<?xml version="1.0"?>
-
<!-- =============================================== -->
-<!-- Tutorials buildfile. -->
-<!-- Tutorials normally do not follow the "standard" -->
-<!-- Cayenne subproject layout, therefore they have -->
-<!-- their own build.xml file called from here. -->
+<!-- Tutorial buildfile - just copy the sources. -->
<!-- =============================================== -->
<project>
- <property name="tutorials.src" value="${cayenne.java}/src/tutorials"/>
-
- <target name="compile">
- <ant antfile="${tutorials.src}/cayenne-cmd-app/build.xml"
target="compile"/>
- <ant antfile="${tutorials.src}/cayenne-web-app/build.xml"
target="compile"/>
- <ant antfile="${tutorials.src}/cayenne-tapestry-app/build.xml"
- target="compile"/>
- </target>
-
<target name="dist-src">
- <ant antfile="${tutorials.src}/cayenne-cmd-app/build.xml"
- target="dist-src" dir="${cayenne.java}"/>
- <ant antfile="${tutorials.src}/cayenne-web-app/build.xml"
- target="dist-src" dir="${cayenne.java}"/>
- <ant antfile="${tutorials.src}/cayenne-tapestry-app/build.xml"
- target="dist-src" dir="${cayenne.java}"/>
-
- <mkdir dir="${dist}/doc/tutorials"/>
+ <mkdir dir="${dist}/src/cayenne-tutorial"/>
- <copy todir="${dist}/doc/tutorials">
- <fileset dir="${dist}/src/tutorials"/>
+ <copy todir="${dist}/src/cayenne-tutorial">
+ <fileset dir="${cayenne.tutorial}" excludes="bin/**"/>
</copy>
- </target>
-
- <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"/>
-
- <!-- 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>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/default.properties
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/default.properties?rev=416366&r1=416365&r2=416366&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/default.properties
(original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/default.properties Thu Jun
22 06:25:39 2006
@@ -11,6 +11,7 @@
cayenne.java = ../cayenne-java
cayenne.java.1_5 = ../cayenne-java-1.5
cayenne.other = ../cayenne-other
+cayenne.tutorial = ../cayenne-tutorial
# Symbolic names for third-party libraries
ant.jar = ant-1.6.5.jar
