[Beepcore-java-commits] CVS: beepcore-java build.properties.sample,NONE,1.1 build.xml,1.23,1.24
Status: Beta
Brought to you by:
huston
Menu
▾
▴
[Beepcore-java-commits] CVS: beepcore-java build.properties.sample,NONE,1.1 build.xml,1.23,1.24
|
From: Huston F. <hu...@us...> - 2002-10-15 05:01:02
|
Update of /cvsroot/beepcore-java/beepcore-java
In directory usw-pr-cvs1:/tmp/cvs-serv32329
Modified Files:
build.xml
Added Files:
build.properties.sample
Log Message:
build file cleanup for commons-logging and added build.properties file
--- NEW FILE: build.properties.sample ---
debug="on"
optimize="on"
deprecation="off"
concurrent.jar=${basedir}/lib/concurrent.jar
commons-logging.jar=${basedir}/lib/commons-logging.jar
xml-parser.jar=${basedir}/lib/xerces.jar
cryptix.jar=${basedir}/lib/cryptix32.jar
cryptix-asn1.jar=${basedir}/lib/cryptix-asn1.jar
puretls.jar=${basedir}/lib/puretls.jar
Index: build.xml
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** build.xml 18 Sep 2002 14:31:09 -0000 1.23
--- build.xml 15 Oct 2002 05:00:53 -0000 1.24
***************
*** 1,3 ****
--- 1,7 ----
<project name="beepcore" default="core-jar" basedir=".">
+
+ <!-- The build.properties file defines the parth to local jar files -->
+ <property file="build.properties"/>
+
<property name="name" value="beepcore" />
<property name="Name" value="BEEP Core" />
***************
*** 7,11 ****
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
! <property name="deprecation" value="on"/>
<property name="beepcore.home" value="."/>
--- 11,22 ----
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
! <property name="deprecation" value="off"/>
!
! <!-- Construct classpath for building core -->
! <path id="core.compile.classpath">
! <pathelement location="${concurrent.jar}"/>
! <pathelement location="${commons-logging.jar}"/>
! <pathelement location="${xml-parser.jar}"/>
! </path>
<property name="beepcore.home" value="."/>
***************
*** 13,16 ****
--- 24,28 ----
<property name="release.dir" value="${build.dir}/${release.name}" />
+ <!-- Core properties -->
<property name="core.build.dir" value="${build.dir}/core" />
<property name="core.doc.dir" value="${release.dir}/doc/core" />
***************
*** 19,22 ****
--- 31,43 ----
<property name="core.packages" value="org.beepcore.beep.core,org.beepcore.beep.util,org.beepcore.beep.transport.tcp,org.beepcore.beep.lib,org.beepcore.beep.profile,org.beepcore.beep.profile.echo,org.beepcore.beep.profile.tls"/>
+ <property name="source.jar.name" value="beepsource.jar"/>
+
+ <!-- Construct classpath for building sub-projects -->
+ <path id="compile.classpath">
+ <path refid="core.compile.classpath"/>
+ <pathelement location="${release.dir}/lib/${core.jar.name}"/>
+ </path>
+
+ <!-- Examples properties -->
<property name="example.build.dir" value="${build.dir}/example" />
<property name="example.jar.name" value="example.jar" />
***************
*** 25,32 ****
<property name="jdk.doc.dir" value="doc/jdk" />
! <property name="jsse.doc.dir" value="doc/jsse" />
!
! <property name="puretls.doc.dir" value="doc/puretls" />
!
<property name="sasl.build.dir" value="${build.dir}/sasl"/>
<property name="sasl.doc.dir" value="${release.dir}/doc/sasl"/>
--- 46,50 ----
<property name="jdk.doc.dir" value="doc/jdk" />
! <!-- SASL properties -->
<property name="sasl.build.dir" value="${build.dir}/sasl"/>
<property name="sasl.doc.dir" value="${release.dir}/doc/sasl"/>
***************
*** 34,55 ****
<property name="sasl.src.dir" value="src"/>
! <property name="source.jar.name" value="beepsource.jar"/>
!
! <property name="test.build.dir" value="${build.dir}/test" />
! <property name="test.src.dir" value="test" />
!
<property name="tls-jsse.build.dir" value="${build.dir}/tls-jsse" />
<property name="tls-jsse.doc.dir" value="${release.dir}/doc/tls-jsse" />
<property name="tls-jsse.jar.name" value="beeptls-jsse.jar" />
<property name="tls-ptls.build.dir" value="${build.dir}/tls-ptls" />
<property name="tls-ptls.doc.dir" value="${release.dir}/doc/tls-ptls" />
<property name="tls-ptls.jar.name" value="beeptls-ptls.jar" />
<property name="tls.src.dir" value="tls" />
<property name="doc-ref-offline" value="false" />
! <target name="init">
<mkdir dir="${core.build.dir}" />
<condition property="javadoc.param" value="-breakiterator">
--- 52,81 ----
<property name="sasl.src.dir" value="src"/>
! <!-- JSSE TLS properties -->
<property name="tls-jsse.build.dir" value="${build.dir}/tls-jsse" />
<property name="tls-jsse.doc.dir" value="${release.dir}/doc/tls-jsse" />
<property name="tls-jsse.jar.name" value="beeptls-jsse.jar" />
+ <property name="jsse.doc.dir" value="doc/jsse" />
+
+ <!-- PTLS TLS properties -->
<property name="tls-ptls.build.dir" value="${build.dir}/tls-ptls" />
<property name="tls-ptls.doc.dir" value="${release.dir}/doc/tls-ptls" />
<property name="tls-ptls.jar.name" value="beeptls-ptls.jar" />
+ <property name="puretls.doc.dir" value="doc/puretls" />
+
+ <!-- TLS properties -->
<property name="tls.src.dir" value="tls" />
<property name="doc-ref-offline" value="false" />
! <!-- Test properties -->
! <property name="test.build.dir" value="${build.dir}/test" />
! <property name="test.src.dir" value="test" />
!
!
!
! <target name="-init">
<mkdir dir="${core.build.dir}" />
<condition property="javadoc.param" value="-breakiterator">
***************
*** 62,72 ****
</target>
! <target name="core" depends="init">
<mkdir dir="${core.build.dir}"/>
<javac srcdir="${core.src.dir}/"
destdir="${core.build.dir}"
! debug="${debug}"
! optimize="${optimize}"
! deprecation="${deprecation}">
<include name="**/core/*.java"/>
<include name="**/lib/*.java"/>
--- 88,100 ----
</target>
! <!-- Core targets -->
! <target name="core" depends="-init">
<mkdir dir="${core.build.dir}"/>
<javac srcdir="${core.src.dir}/"
destdir="${core.build.dir}"
! classpathref="core.compile.classpath"
! debug="${debug}"
! optimize="${optimize}"
! deprecation="${deprecation}">
<include name="**/core/*.java"/>
<include name="**/lib/*.java"/>
***************
*** 76,84 ****
<include name="**/transport/**/*.java"/>
<include name="**/util/*.java"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${beepcore.home}/lib/concurrent.jar"/>
- <pathelement location="${release.dir}/lib/${core.jar.name}"/>
- </classpath>
</javac>
</target>
--- 104,107 ----
***************
*** 102,110 ****
additionalparam="${javadoc.param}"
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
! <classpath>
! <pathelement path="${java.class.path}"/>
! <pathelement location="${beepcore.home}/lib/concurrent.jar"/>
! <pathelement location="${release.dir}/lib/${core.jar.name}"/>
! </classpath>
</javadoc>
</target>
--- 125,129 ----
additionalparam="${javadoc.param}"
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
! <classpath refid="compile.classpath"/>
</javadoc>
</target>
***************
*** 128,132 ****
basedir="${build.dir}/src"/>
! <copy file="lib/concurrent.jar"
tofile="${release.dir}/lib/concurrent.jar"/>
<copy file="lib/xerces.jar"
--- 147,151 ----
basedir="${build.dir}/src"/>
! <copy file="${concurrent.jar}"
tofile="${release.dir}/lib/concurrent.jar"/>
<copy file="lib/xerces.jar"
***************
*** 150,153 ****
--- 169,173 ----
</target>
+ <!-- Example targets -->
<target name="example-compile" depends="core-jar,sasl">
<mkdir dir="${example.build.dir}"/>
***************
*** 159,164 ****
<exclude name="**/util/Log4JLog.java"/>
<classpath>
! <pathelement path="${java.class.path}"/>
! <pathelement location="${release.dir}/lib/${core.jar.name}"/>
<pathelement location="${release.dir}/lib/${sasl.jar.name}"/>
</classpath>
--- 179,183 ----
<exclude name="**/util/Log4JLog.java"/>
<classpath>
! <path refid="compile.classpath"/>
<pathelement location="${release.dir}/lib/${sasl.jar.name}"/>
</classpath>
***************
*** 166,170 ****
</target>
! <target name="example" depends="example-compile,log4jlog,14log">
<mkdir dir="${release.dir}/lib"/>
<jar jarfile="${release.dir}/lib/${example.jar.name}"
--- 185,189 ----
</target>
! <target name="example" depends="example-compile">
<mkdir dir="${release.dir}/lib"/>
<jar jarfile="${release.dir}/lib/${example.jar.name}"
***************
*** 184,200 ****
</target>
! <target name="ptls-dist" depends="tls-ptls">
! <copy file="lib/cryptix32.jar"
! tofile="${release.dir}/lib/cryptix32.jar"/>
! <copy file="lib/cryptix-asn1.jar"
! tofile="${release.dir}/lib/cryptix-asn1.jar"/>
! <copy file="lib/puretls.jar"
! tofile="${release.dir}/lib/puretls.jar"/>
! <copy file="lib/LICENSE.cryptix"
! tofile="${release.dir}/LICENSE.cryptix"/>
! <copy file="lib/LICENSE.puretls"
! tofile="${release.dir}/LICENSE.puretls"/>
! </target>
!
<target name="test" depends="example">
<mkdir dir="${test.build.dir}"/>
--- 203,207 ----
</target>
! <!-- Test targets -->
<target name="test" depends="example">
<mkdir dir="${test.build.dir}"/>
***************
*** 206,211 ****
<include name="**/*.java"/>
<classpath>
! <pathelement path="${java.class.path}"/>
! <pathelement location="${release.dir}/lib/${core.jar.name}"/>
<pathelement location="${release.dir}/lib/${sasl.jar.name}"/>
<pathelement location="${example.build.dir}"/>
--- 213,217 ----
<include name="**/*.java"/>
<classpath>
! <path refid="compile.classpath"/>
<pathelement location="${release.dir}/lib/${sasl.jar.name}"/>
<pathelement location="${example.build.dir}"/>
***************
*** 214,229 ****
</target>
<target name="sasl-compile" depends="core-jar">
<mkdir dir="${sasl.build.dir}"/>
<javac srcdir="${sasl.src.dir}/"
destdir="${sasl.build.dir}"
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}">
<include name="**/sasl/**/*.java"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${release.dir}/lib/${core.jar.name}"/>
- </classpath>
</javac>
</target>
--- 220,233 ----
</target>
+ <!-- SASL targets -->
<target name="sasl-compile" depends="core-jar">
<mkdir dir="${sasl.build.dir}"/>
<javac srcdir="${sasl.src.dir}/"
destdir="${sasl.build.dir}"
+ classpathref="compile.classpath"
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}">
<include name="**/sasl/**/*.java"/>
</javac>
</target>
***************
*** 247,252 ****
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
<classpath>
! <pathelement path="${java.class.path}"/>
! <pathelement location="${release.dir}/lib/${core.jar.name}"/>
<pathelement location="${release.dir}/lib/${sasl.jar.name}"/>
</classpath>
--- 251,255 ----
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
<classpath>
! <path refid="compile.classpath"/>
<pathelement location="${release.dir}/lib/${sasl.jar.name}"/>
</classpath>
***************
*** 254,269 ****
</target>
<target name="tls-jsse-compile" depends="core-jar">
<mkdir dir="${tls-jsse.build.dir}"/>
<javac srcdir="${tls.src.dir}/"
destdir="${tls-jsse.build.dir}"
debug="${debug}"
optimize="${optimize}"
! deprecation="off">
<include name="**/jsse/*.java"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${release.dir}/lib/${core.jar.name}"/>
- </classpath>
</javac>
</target>
--- 257,270 ----
</target>
+ <!-- JSSE targets -->
<target name="tls-jsse-compile" depends="core-jar">
<mkdir dir="${tls-jsse.build.dir}"/>
<javac srcdir="${tls.src.dir}/"
destdir="${tls-jsse.build.dir}"
+ classpathref="compile.classpath"
debug="${debug}"
optimize="${optimize}"
! deprecation="${deprecation}">
<include name="**/jsse/*.java"/>
</javac>
</target>
***************
*** 298,302 ****
packagelistLoc="${core.doc.dir}" />
<classpath>
! <pathelement path="${java.class.path}"/>
<pathelement location="${release.dir}/lib/${core.jar.name}"/>
<pathelement location="${release.dir}/lib/${tls-jsse.jar.name}"/>
--- 299,303 ----
packagelistLoc="${core.doc.dir}" />
<classpath>
! <path refid="core.compile.classpath"/>
<pathelement location="${release.dir}/lib/${core.jar.name}"/>
<pathelement location="${release.dir}/lib/${tls-jsse.jar.name}"/>
***************
*** 305,308 ****
--- 306,310 ----
</target>
+ <!-- PTLS targets -->
<target name="tls-ptls-compile" depends="core-jar">
<mkdir dir="${tls-ptls.build.dir}"/>
***************
*** 314,319 ****
<include name="**/ptls/*.java"/>
<classpath>
! <pathelement path="${java.class.path}"/>
! <pathelement location="${release.dir}/lib/${core.jar.name}"/>
</classpath>
</javac>
--- 316,323 ----
<include name="**/ptls/*.java"/>
<classpath>
! <path refid="compile.classpath"/>
! <pathelement location="${cryptix.jar}"/>
! <pathelement location="${cryptix-asn1.jar}"/>
! <pathelement location="${puretls.jar}"/>
</classpath>
</javac>
***************
*** 344,349 ****
packagelistLoc="${core.doc.dir}" />
<classpath>
! <pathelement path="${java.class.path}"/>
! <pathelement location="${release.dir}/lib/${core.jar.name}"/>
<pathelement location="${release.dir}/lib/${tls-ptls.jar.name}"/>
</classpath>
--- 348,355 ----
packagelistLoc="${core.doc.dir}" />
<classpath>
! <path refid="compile.classpath"/>
! <pathelement location="${cryptix.jar}"/>
! <pathelement location="${cryptix-asn1.jar}"/>
! <pathelement location="${puretls.jar}"/>
<pathelement location="${release.dir}/lib/${tls-ptls.jar.name}"/>
</classpath>
***************
*** 351,355 ****
</target>
! <target name="doc" depends="core-doc,sasl-doc,tls-jsse-doc,tls-ptls-doc"/>
<!-- Packages the distribution with ZIP -->
--- 357,372 ----
</target>
! <target name="ptls-dist" depends="tls-ptls">
! <copy file="lib/cryptix32.jar"
! tofile="${release.dir}/lib/cryptix32.jar"/>
! <copy file="lib/cryptix-asn1.jar"
! tofile="${release.dir}/lib/cryptix-asn1.jar"/>
! <copy file="lib/puretls.jar"
! tofile="${release.dir}/lib/puretls.jar"/>
! <copy file="lib/LICENSE.cryptix"
! tofile="${release.dir}/LICENSE.cryptix"/>
! <copy file="lib/LICENSE.puretls"
! tofile="${release.dir}/LICENSE.puretls"/>
! </target>
<!-- Packages the distribution with ZIP -->
***************
*** 370,418 ****
<target name="dist" depends="dist-zip,dist-tgz"/>
<target name="clean">
<delete dir="${build.dir}" />
<delete dir="${doc.dir}" />
- </target>
-
- <target name="log4jCheck">
- <available classname="org.apache.log4j.Category"
- property="log4j-present"
- classpath="${java.class.path}"/>
- </target>
-
- <target name="log4jlog" depends="init,core-jar,log4jCheck" if="log4j-present">
- <mkdir dir="${example.build.dir}"/>
- <javac srcdir="${example.src.dir}/"
- destdir="${example.build.dir}"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="${deprecation}">
- <include name="**/util/Log4JLog.java"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${release.dir}/lib/${core.jar.name}"/>
- </classpath>
- </javac>
- </target>
-
- <target name="14LoggingCheck">
- <available classname="java.util.loggin.Logger"
- property="14logging-present"
- classpath="${java.class.path}"/>
- </target>
-
- <target name="14log" depends="init,core-jar,14LoggingCheck" if="14logging-present">
- <mkdir dir="${example.build.dir}"/>
- <javac srcdir="${example.src.dir}/"
- destdir="${example.build.dir}"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="${deprecation}">
- <include name="**/util/BeepLogger.java"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${release.dir}/lib/${core.jar.name}"/>
- </classpath>
- </javac>
</target>
</project>
--- 387,395 ----
<target name="dist" depends="dist-zip,dist-tgz"/>
+ <target name="doc" depends="core-doc,sasl-doc,tls-jsse-doc,tls-ptls-doc"/>
+
<target name="clean">
<delete dir="${build.dir}" />
<delete dir="${doc.dir}" />
</target>
</project>
|
