cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stephan 2003/03/03 06:03:34 Modified:tools/src blocks-build.xsl Log: Minimal correction, masking build property. Revision ChangesPath 1.26 +2 -2 xml-cocoon2/tools/src/blocks-build.xsl Index: blocks-build.xsl === RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- blocks-build.xsl 3 Mar 2003 11:41:47 - 1.25 +++ blocks-build.xsl 3 Mar 2003 14:03:34 - 1.26 @@ -245,8 +245,8 @@ - - + +
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stefano 2003/03/03 03:41:47 Modified:tools/src blocks-build.xsl Log: fixing build xsl accordingly to the new gump-friendly block names Revision ChangesPath 1.25 +5 -5 xml-cocoon2/tools/src/blocks-build.xsl Index: blocks-build.xsl === RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- blocks-build.xsl 27 Feb 2003 17:13:12 - 1.24 +++ blocks-build.xsl 3 Mar 2003 11:41:47 - 1.25 @@ -37,26 +37,26 @@ -init,-compile +init,-compile -init,-patch +init,-patch -init,-samples +init,-samples -init,-lib +init,-lib - +
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stefano 2003/02/27 09:13:13 Modified:tools/src blocks-build.xsl Log: no need to create the 'build/block/src' folder since we aren't copying the files anymore Revision ChangesPath 1.24 +0 -1 xml-cocoon2/tools/src/blocks-build.xsl Index: blocks-build.xsl === RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- blocks-build.xsl 26 Feb 2003 10:47:40 - 1.23 +++ blocks-build.xsl 27 Feb 2003 17:13:12 - 1.24 @@ -121,7 +121,6 @@ -
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stefano 2003/02/24 10:38:04 Modified:tools/src blocks-build.xsl Log: added default target so that ant 1.5.1 doesn't complain Revision ChangesPath 1.22 +1 -1 xml-cocoon2/tools/src/blocks-build.xsl Index: blocks-build.xsl === RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- blocks-build.xsl 22 Feb 2003 16:00:15 - 1.21 +++ blocks-build.xsl 24 Feb 2003 18:38:04 - 1.22 @@ -4,7 +4,7 @@ - + Autogenerated Ant build file that builds blocks.
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stefano 2003/02/22 08:00:15
Modified:tools/src blocks-build.xsl
Log:
now blocks add stuff from their /WEB-INF directory into the webapp folder.
fixed also the run of the xconf tool.
Revision ChangesPath
1.21 +19 -4 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- blocks-build.xsl 21 Feb 2003 13:27:03 - 1.20
+++ blocks-build.xsl 22 Feb 2003 16:00:15 - 1.21
@@ -87,6 +87,7 @@
,-patch
+
@@ -110,7 +111,13 @@
${blocks}//lib/
+
+
+ ${blocks}//WEB-INF/
+
+
+
@@ -203,17 +210,25 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stefano 2003/02/21 05:27:04 Modified:tools/src blocks-build.xsl Log: fix a typo that didn't make the block compile mocks. This should fix the full build on JDK 1.4, there is still some work to do for 1.3 but I'm workign on it Revision ChangesPath 1.20 +4 -4 xml-cocoon2/tools/src/blocks-build.xsl Index: blocks-build.xsl === RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- blocks-build.xsl 20 Feb 2003 20:04:58 - 1.19 +++ blocks-build.xsl 21 Feb 2003 13:27:03 - 1.20 @@ -66,10 +66,10 @@ - + - + @@ -95,7 +95,7 @@ - + @@ -132,7 +132,7 @@ - +
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
stefano 2003/02/20 12:04:58
Modified:tools/src blocks-build.xsl
Log:
the new build system
Revision ChangesPath
1.19 +158 -266 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blocks-build.xsl 31 Jan 2003 18:08:48 - 1.18
+++ blocks-build.xsl 20 Feb 2003 20:04:58 - 1.19
@@ -1,335 +1,227 @@
http://www.w3.org/1999/XSL/Transform";>
+
-
- Autogenerated Ant build file that creates the build
dependencies.
-
+
+ Autogenerated Ant build file that builds blocks.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- cocoon-core
- ,
-
-
-
-
-
-
-
-
-
-
+
+init,-compile
-
-
-
-
+
+init,-patch
-
-
+
+init,-samples
-
-
- ${line.separator} /* Start JDBC3 specific
code
-
-
+
+init,-lib
-
-
-
-
-
-
-
+
-
-
-
-
-
-${blocks.dir}/${currentblock.name}
-
-
-${build.war}/samples/${currentblock.name}
-
-
- ${currentblock.dir}/samples
-
-
-
-
-
-
-
- ${lib.dir}
-
-
-
-
- ${build.dir}
+
-
- *.jar
-
-
-
-
-
-${blocks.dir}/${currentblock.name}
-
-
-
-${currentblock.dir}/mocks
-
-
-
-${build.blocks.root}/${currentblock.name}/mocks
-
-
-
-${build.currentblock.mocks.dir}
-
-
-
-${currentblock.mocks.dir}
-${build.currentblock.mocks.dir}
-${debug}
-${optimize}
-${deprecation}
-${target.vm}
-${nowarn}
-true
-
-
-
-
-
-
-
-
-
-
-${blocks.dir}/${currentblock.name}
-
+
+
+,-compile
+
-
-${currentblock.dir}/java
-
+
+
-
-${currentblock.dir}/conf
-
+
+
-
-${currentblock.dir}/samples
-
+
+
+
+
+
+
+
-
-${build.blocks.root}/${currentblock.name}
-
+
+
-
-${build.currentblock.dir}/src
-
+
+
+,-patch
+
-
-${build.currentblock.dir}/dest
-
+
+
+
+
+,-samples
+
-
-${build.currentblock.src}
-
+
+
-
-${build.currentblock.dest}
-
+
+
+
+
+
+,-lib
+
+
+
+ ${blocks}//lib/
+
+
+
-
-${currentblock.dir}/mocks
-
-
-
-${build.blocks.root}/${currentblock.name}/mocks
-
-
-
-${build.currentblock.mocks.dir}
-
-
-
-
-
-
-
- ${lib.dir}
+
+
+
-
+
+
+
+
-
- ${build.dir}
-
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
nicolaken2003/01/14 01:26:49 Modified:tools/src blocks-build.xsl Log: Lowering memory need during the build again Revision ChangesPath 1.17 +1 -1 xml-cocoon2/tools/src/blocks-build.xsl Index: blocks-build.xsl === RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- blocks-build.xsl 10 Jan 2003 11:01:29 - 1.16 +++ blocks-build.xsl 14 Jan 2003 09:26:49 - 1.17 @@ -12,7 +12,7 @@ - + -- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
nicolaken2003/01/10 03:01:29
Modified:tools/src blocks-build.xsl
Log:
Set fork=true to the javac task for the blocks.
This lowers the memory need for the build.
Before the memory used to build each block was not released by Ant, and kept
building up till the build failed.
Now after each block build, memory is released.
Revision ChangesPath
1.16 +4 -2 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blocks-build.xsl 2 Jan 2003 10:50:08 - 1.15
+++ blocks-build.xsl 10 Jan 2003 11:01:29 - 1.16
@@ -115,7 +115,8 @@
${deprecation}
${target.vm}
${nowarn}
-
+true
+
@@ -275,7 +276,8 @@
${deprecation}
${target.vm}
${nowarn}
-
+true
+
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
nicolaken2002/12/18 16:22:29
Modified:tools/src blocks-build.xsl
Log:
Fix the build so now it uses samples and mock objects again.
Revision ChangesPath
1.14 +2 -2 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blocks-build.xsl 18 Dec 2002 20:05:48 - 1.13
+++ blocks-build.xsl 19 Dec 2002 00:22:29 - 1.14
@@ -301,12 +301,12 @@
-
+
${blocks.dir}//samples/sitemap.xmap
-
+
${blocks.dir}//mocks/
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
nicolaken2002/12/18 12:05:48
Modified:tools/src blocks-build.xsl
Log:
Fix a build system bug that was preventing blocks without samples
or mocks to be build is a block that had them was built before.
This is because Ant has immutable properties.
Thanks again to Heinrichs-Wolpert for pointing it out.
Revision ChangesPath
1.13 +16 -14xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- blocks-build.xsl 3 Dec 2002 16:54:00 - 1.12
+++ blocks-build.xsl 18 Dec 2002 20:05:48 - 1.13
@@ -50,7 +50,16 @@
-
+
+
+
+
+
+
+
+
+
+
${blocks.dir}/${currentblock.name}
@@ -63,7 +72,7 @@
-
+
${lib.dir}
@@ -111,8 +120,7 @@
-
-
+
${blocks.dir}/${currentblock.name}
@@ -283,13 +291,7 @@
-
-
-
-
-
-
-
+
@@ -299,12 +301,12 @@
-
+
${blocks.dir}//samples/sitemap.xmap
-
+
${blocks.dir}//mocks/
@@ -316,7 +318,7 @@
-
+
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
nicolaken2002/12/03 08:54:00
Modified:tools/src blocks-build.xsl
Log:
Updated block build system to compile and use mock objects in
the "mocks" subdir of the blocks if present.
Revision ChangesPath
1.12 +79 -2 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blocks-build.xsl 29 Oct 2002 15:52:56 - 1.11
+++ blocks-build.xsl 3 Dec 2002 16:54:00 - 1.12
@@ -62,8 +62,8 @@
-
-
+
+
${lib.dir}
@@ -79,6 +79,40 @@
+
+
+${blocks.dir}/${currentblock.name}
+
+
+
+${currentblock.dir}/mocks
+
+
+
+${build.blocks.root}/${currentblock.name}/mocks
+
+
+
+${build.currentblock.mocks.dir}
+
+
+
+${currentblock.mocks.dir}
+${build.currentblock.mocks.dir}
+${debug}
+${optimize}
+${deprecation}
+${target.vm}
+${nowarn}
+
+
+
+
+
+
+
+
+
${blocks.dir}/${currentblock.name}
@@ -116,6 +150,44 @@
${build.currentblock.dest}
+
+
+
+${currentblock.dir}/mocks
+
+
+
+${build.blocks.root}/${currentblock.name}/mocks
+
+
+
+${build.currentblock.mocks.dir}
+
+
+
+
+
+
+
+ ${lib.dir}
+
+
+
+
+
+ ${build.dir}
+
+
+ *.jar
+
+
+
+
+ ${build.currentblock.mocks.dir}
+
+
+
+
${build.currentblock.src}
@@ -231,6 +303,11 @@
${blocks.dir}//samples/sitemap.xmap
+
+
+ ${blocks.dir}//mocks/
+
+
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: xml-cocoon2/tools/src blocks-build.xsl
Torsten Curdt wrote: > > On Wednesday 30 October 2002 08:11, Carsten Ziegeler wrote: > > [EMAIL PROTECTED] wrote: > > > + > > > + > > > > > > > > > > Doesn't it work if I set include to false? Or why did you add > > the comment? > > excactly - see from the ant manuall: > > A target also has the ability to perform its execution if (or unless) a > property has been set > > > > > In the first example, if the module-A-present property is set (to > any value), > the target will be run. Yes, I know - so we have a bug which should be fixed. Carsten - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: cvs commit: xml-cocoon2/tools/src blocks-build.xsl
On Wednesday 30 October 2002 08:11, Carsten Ziegeler wrote: > [EMAIL PROTECTED] wrote: > > + > > + > > > > > > Doesn't it work if I set include to false? Or why did you add > the comment? excactly - see from the ant manuall: A target also has the ability to perform its execution if (or unless) a property has been set In the first example, if the module-A-present property is set (to any value), the target will be run. -- Torsten - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: cvs commit: xml-cocoon2/tools/src blocks-build.xsl
[EMAIL PROTECTED] wrote: > + > + > > Doesn't it work if I set include to false? Or why did you add the comment? Carsten - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
tcurdt 2002/10/29 07:52:56
Modified:.module.xml properties.xml
tools/src blocks-build.xsl
Log:
added the precept block, marked it unstable and not active in normal build
Revision ChangesPath
1.14 +18 -0 xml-cocoon2/module.xml
Index: module.xml
===
RCS file: /home/cvs/xml-cocoon2/module.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- module.xml28 Oct 2002 07:49:20 - 1.13
+++ module.xml29 Oct 2002 15:52:56 - 1.14
@@ -288,4 +288,22 @@
+
+
+org.apache.cocoon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1.10 +3 -1 xml-cocoon2/properties.xml
Index: properties.xml
===
RCS file: /home/cvs/xml-cocoon2/properties.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- properties.xml23 Oct 2002 16:56:21 - 1.9
+++ properties.xml29 Oct 2002 15:52:56 - 1.10
@@ -99,7 +99,8 @@
-
+
+
@@ -112,6 +113,7 @@
+
1.11 +8 -0 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blocks-build.xsl 21 Oct 2002 16:44:41 - 1.10
+++ blocks-build.xsl 29 Oct 2002 15:52:56 - 1.11
@@ -230,6 +230,14 @@
${blocks.dir}//samples/sitemap.xmap
+
+
+
+
+
+
+
+
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
haul2002/10/21 09:44:41
Modified:tools/src blocks-build.xsl
Log:
Forgot to copy .xsl files into .jar
Revision ChangesPath
1.10 +12 -3 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- blocks-build.xsl 18 Oct 2002 14:10:09 - 1.9
+++ blocks-build.xsl 21 Oct 2002 16:44:41 - 1.10
@@ -122,9 +122,18 @@
${currentblock.java.dir}
-
-
-
+
+
+
+
+
+
+
+${build.currentblock.dest}
+
+
+ ${currentblock.java.dir}
+
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
haul2002/10/18 07:10:09
Modified:tools/src blocks-build.xsl
Log:
Revision ChangesPath
1.9 +32 -4 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- blocks-build.xsl 4 Oct 2002 12:18:50 - 1.8
+++ blocks-build.xsl 18 Oct 2002 14:10:09 - 1.9
@@ -23,7 +23,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
${blocks.dir}/${currentblock.name}
@@ -37,7 +63,7 @@
-
+
${lib.dir}
@@ -95,8 +121,10 @@
${currentblock.java.dir}
-
+
+
+
@@ -112,7 +140,7 @@
-
+
${build.currentblock.dest}
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
cziegeler2002/10/04 05:18:50
Modified:tools/src blocks-build.xsl
Log:
Using java compiler options from main tree for blocks as well
Revision ChangesPath
1.8 +8 -2 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- blocks-build.xsl 2 Oct 2002 08:10:33 - 1.7
+++ blocks-build.xsl 4 Oct 2002 12:18:50 - 1.8
@@ -144,12 +144,18 @@
${build.dest}/org/apache/cocoon/cocoon.roles
-
+
+ Compiling block with Java
${ant.java.version}, debug ${debug}, optimize ${optimize}, deprecation
${deprecation}...
+
${build.currentblock.src}
-
${build.currentblock.dest}
+${debug}
+${optimize}
+${deprecation}
+${target.vm}
+${nowarn}
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
cziegeler2002/09/27 05:56:29
Modified:tools/src blocks-build.xsl
Log:
Fixing copying of samples
Revision ChangesPath
1.6 +15 -12xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blocks-build.xsl 27 Sep 2002 12:28:28 - 1.5
+++ blocks-build.xsl 27 Sep 2002 12:56:28 - 1.6
@@ -23,7 +23,21 @@
-
+
+
+
+${blocks.dir}/${currentblock.name}
+
+
+${build.war}/samples/${currentblock.samplename}
+
+
+ ${currentblock.dir}/samples
+
+
+
+
+
${lib.dir}
@@ -152,17 +166,6 @@
-
-
-${build.war}/samples/${currentblock.samplename}
-
-
- ${currentblock.dir}
-
- samples/**
-
-
-
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-cocoon2/tools/src blocks-build.xsl
cziegeler2002/09/27 05:28:28
Modified:tools/src blocks-build.xsl
Log:
First fix
Revision ChangesPath
1.5 +1 -1 xml-cocoon2/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blocks-build.xsl 27 Sep 2002 12:11:17 - 1.4
+++ blocks-build.xsl 27 Sep 2002 12:28:28 - 1.5
@@ -157,7 +157,7 @@
${build.war}/samples/${currentblock.samplename}
- ${build.currentblock.dir}
+ ${currentblock.dir}
samples/**
--
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
