User: vharcq
Date: 02/04/28 01:50:05
Modified: modules/script Tag: MODULE_REFACTORING_BRANCH
build-common.xml build.xml
Log:
Remove dist/ we have only one build/ per module and build all there
Copy the modules jar to a modules/ subdir of the output dir of xdoclet-all-modules
Revision Changes Path
No revision
No revision
1.1.2.2 +4 -6 xdoclet/modules/script/Attic/build-common.xml
Index: build-common.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/script/Attic/build-common.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- build-common.xml 28 Apr 2002 08:33:34 -0000 1.1.2.1
+++ build-common.xml 28 Apr 2002 08:50:05 -0000 1.1.2.2
@@ -10,8 +10,7 @@
<property name="output.java.src.dir" value="${output.dir}/src"/>
<property name="output.classes.dir" value="${output.dir}/classes"/>
<property name="output.meta.dir"
value="${output.classes.dir}/META-INF"/>
-
- <property name="dist.dir" value="dist"/>
+ <property name="output.lib.dir" value="${output.dir}/lib"/>
<property name="docs.dir" value="docs"/>
@@ -27,7 +26,7 @@
<include name="xdoclet.jar" />
</fileset>
<fileset dir="${root.dir}/modules">
- <include name="*/dist/lib/*.jar" />
+ <include name="*/build/output/lib/*.jar" />
</fileset>
</path>
@@ -48,7 +47,7 @@
<target name="prepare" depends="init-base">
<mkdir dir="${output.classes.dir}"/>
<mkdir dir="${output.meta.dir}"/>
- <mkdir dir="${dist.dir}/lib"/>
+ <mkdir dir="${output.lib.dir}"/>
</target>
<!-- =================================================================== -->
@@ -139,7 +138,7 @@
<fileset dir="${config.dir}" />
</copy>
-->
- <jar jarfile="${dist.dir}/lib/${jar.prefix}${module-name}.jar">
+ <jar jarfile="${output.lib.dir}/${jar.prefix}${module-name}.jar">
<fileset dir="${output.classes.dir}"
includes="**/*.class"/>
<fileset dir="${output.meta.dir}"
@@ -163,7 +162,6 @@
<target name="clean" depends="init-base">
<delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
</target>
1.1.2.2 +8 -3 xdoclet/modules/script/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/script/Attic/build.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- build.xml 28 Apr 2002 08:33:34 -0000 1.1.2.1
+++ build.xml 28 Apr 2002 08:50:05 -0000 1.1.2.2
@@ -145,6 +145,12 @@
</jar>
</target>
+ <target name="clean">
+
+ <delete dir="${output.dir}"/>
+
+ </target>
+
<!-- =================================================================== -->
<!-- Create all modules distribution -->
<!-- =================================================================== -->
@@ -155,9 +161,8 @@
<mkdir dir="${output.lib.dir}/modules"/>
<copy todir="${output.lib.dir}/modules">
- <fileset dir=".">
- <include name="*/dist/lib/*.jar" />
- </fileset>
+ <fileset dir="ejb/build/output/lib/" includes="*.jar"/>
+ <fileset dir="bea/build/output/lib/" includes="*.jar"/>
</copy>
</target>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
