User: rinkrank
Date: 02/02/24 17:07:08
Modified: . build.xml build.sh build.bat
Log:
-Using xjavadoc.jar instead of classes
-Removed version number form jar name
Revision Changes Path
1.7 +12 -5 xdocletgui/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdocletgui/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- build.xml 17 Feb 2002 19:44:17 -0000 1.6
+++ build.xml 25 Feb 2002 01:07:08 -0000 1.7
@@ -15,10 +15,10 @@
<property name="src.dir" value="${basedir}/src"/>
<property name="etc.dir" value="${basedir}/etc"/>
<property name="log4j.dir" value="${etc.dir}/log4j"/>
- <property name="log4j.file" value="configLog4j.properties"/>
+ <property name="log4j.file" value="log4j.properties"/>
<property name="java.src.dir" value="${src.dir}/java"/>
<property name="build.dir" value="${basedir}/build"/>
- <property name="jar.file"
value="${build.dir}/${name.version}.jar"/>
+ <property name="jar.file" value="${build.dir}/${name}.jar"/>
<property name="build.java.src.dir" value="${build.dir}/src"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.docs.dir" value="${build.dir}/docs"/>
@@ -39,6 +39,12 @@
<!-- =================================================================== -->
<target name="init">
<tstamp/>
+ <condition property="log4j.properties.file"
value="file:/${log4j.dir}/${log4j.file}">
+ <os family="windows" />
+ </condition>
+ <condition property="log4j.properties.file"
value="file://${log4j.dir}/${log4j.file}">
+ <os family="unix" />
+ </condition>
</target>
<!-- =================================================================== -->
@@ -50,6 +56,7 @@
</fileset>
<pathelement location="${build.classes.dir}"/>
<pathelement location="../xjavadoc/build/classes"/>
+
</path>
<!-- =================================================================== -->
@@ -170,7 +177,7 @@
<target name="junit-swing" depends="compile" description="Runs the JUnit Swing
UI">
<java classname="junit.swingui.TestRunner" fork="yes">
<classpath refid="classpath"/>
- <jvmarg value="-Dlog4j.configuration=file://${log4j.dir}/${log4j.file}"/>
+ <jvmarg value="-Dlog4j.configuration=${log4j.properties.file}"/>
</java>
</target>
@@ -180,7 +187,7 @@
<target name="junit" depends="compile" description="Runs All JUnit tests">
<mkdir dir="${build.reports.xml.dir}"/>
<junit fork="yes">
- <jvmarg value="-Dlog4j.configuration=file://${log4j.dir}/${log4j.file}"/>
+ <jvmarg value="-Dlog4j.configuration=${log4j.properties.file}"/>
<classpath refid="classpath"/>
@@ -246,7 +253,7 @@
fork="yes"
doclet="xdocletgui.swing.Main"
>
- <jvmarg value="-Dlog4j.configuration=file://${log4j.dir}/${log4j.file}"/>
+ <jvmarg value="-Dlog4j.configuration=${log4j.properties.file}"/>
<fileset dir="../xdoclet/core/samples/src/java">
<include name="**/*.java"/>
</fileset>
1.2 +1 -1 xdocletgui/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/xdoclet/xdocletgui/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- build.sh 27 Jan 2002 17:45:31 -0000 1.1
+++ build.sh 25 Feb 2002 01:07:08 -0000 1.2
@@ -22,7 +22,7 @@
:./lib/servlet.jar\
:./lib/xalan_1_2_2_D9.jar\
:./lib/xdoclet.jar\
-:../xjavadoc/build/classes\
+:../xjavadoc/xjavadoc.jar\
:$JAVA_HOME/lib/tools.jar
$JAVA_HOME/bin/java -classpath $CP org.apache.tools.ant.Main $*
1.3 +1 -1 xdocletgui/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/xdoclet/xdocletgui/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- build.bat 7 Feb 2002 21:50:22 -0000 1.2
+++ build.bat 25 Feb 2002 01:07:08 -0000 1.3
@@ -8,7 +8,7 @@
set CP=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
for %%i in (lib\*.jar) do call appendcp.bat %%i
-call appendcp ..\xjavadoc\build\classes
+call appendcp ..\xjavadoc\xjavadoc.jar
:: ----- Execute The Requested Build -------------------------------------------
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
