stefano 2003/03/15 15:27:39
Modified: . build.properties build.xml
Log:
now the scratchpad samples work
Revision Changes Path
1.6 +1 -1 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 13 Mar 2003 21:29:01 -0000 1.5
+++ build.properties 15 Mar 2003 23:27:39 -0000 1.6
@@ -107,7 +107,7 @@
scratchpad=${src}/scratchpad
scratchpad.src=${scratchpad}/src
scratchpad.lib=${scratchpad}/lib
-scratchpad.webapp=${scratchpad}/webapp
+scratchpad.samples=${scratchpad}/webapp/samples
# Deprecated Stuff
deprecated=${src}/deprecated
1.11 +26 -9 cocoon-2.1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 15 Mar 2003 20:23:07 -0000 1.10
+++ build.xml 15 Mar 2003 23:27:39 -0000 1.11
@@ -593,7 +593,30 @@
<!-- patch the welcome page to tell we have samples to show -->
<xpatch directory="${webapp.samples}" extension="xwelcome"
configuration="${build.webapp}/welcome.xml"/>
</target>
-
+
+ <target name="scratchpad-samples" depends="prepare, init-xpatch"
unless="unless.exclude.scratchpad">
+
+ <!-- copy sample files -->
+ <copy todir="${build.webapp.samples}" filtering="on">
+ <fileset dir="${scratchpad.samples}">
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.webapp.samples}" filtering="off">
+ <fileset dir="${scratchpad.samples}">
+ <include name="**/*.jpg"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <!-- patch the samples page to tell we have scratchpad samples to show -->
+ <xpatch directory="${scratchpad.samples}" extension="xsamples"
configuration="${build.webapp.samples}/samples.xml"/>
+ </target>
+
<target name="block-samples" depends="prepare"
unless="unless.exclude.webapp.samples">
<ant antfile="${build.temp}/blocks-build.xml"
inheritAll="true"
@@ -613,12 +636,6 @@
<copy file="${resources.styles}/cocoon.css"
tofile="${build.webapp}/resources/styles/cocoon.css"/>
<copy file="${webapp}/sitemap.xmap" tofile="${build.webapp}/sitemap.xmap"/>
-
- <copy todir="${build.webapp}/stylesheets" filtering="on">
- <fileset dir="${webapp.samples}/stylesheets">
- <include name="*.xsl*"/>
- </fileset>
- </copy>
<copy todir="${build.webapp}/WEB-INF" filtering="on">
<fileset dir="${webapp}/WEB-INF">
@@ -670,7 +687,7 @@
target="patch"/>
</target>
- <target name="prepare-webapp-samples" depends="prepare-webapp, samples,
block-samples" unless="unless.exclude.webapp.samples"/>
+ <target name="prepare-webapp-samples" depends="prepare-webapp, samples,
block-samples, scratchpad-samples" unless="unless.exclude.webapp.samples"/>
<target name="prepare-webapp-deprecated" depends="prepare-webapp,init-xpatch"
unless="unless.exclude.deprecated">
<copy file="${build}/${name}-deprecated.jar"
tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
