db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb build.xml build.properties
Date Tue, 04 May 2004 14:16:27 GMT
arminw      2004/05/04 07:16:27

  Modified:    .        build.xml build.properties
  Log:
  update build files, tools package has moved
  
  Revision  Changes    Path
  1.123     +45 -11    db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- build.xml	24 Apr 2004 12:02:40 -0000	1.122
  +++ build.xml	4 May 2004 14:16:26 -0000	1.123
  @@ -40,6 +40,7 @@
       <path id="compilation-classpath">
           <pathelement path="${build.dest}"/>
           <pathelement path="${build.desttest}"/>
  +        <pathelement path="${build.desttools}"/>
           <fileset dir="${lib}">
               <include name="**/*.jar"/>
               <include name="**/*.zip"/>
  @@ -148,6 +149,7 @@
           <mkdir dir="${build.dir}"/>
           <mkdir dir="${build.dest}"/>
           <mkdir dir="${build.desttest}"/>
  +        <mkdir dir="${build.desttools}"/>
   		<mkdir dir="${build.destjca}"/>
           <mkdir dir="${dist}"/>
           <copy todir="${build.src}">
  @@ -156,6 +158,9 @@
           <copy todir="${build.srctest}">
               <fileset dir="${src.test}"/>
           </copy>
  +        <copy todir="${build.srctools}">
  +            <fileset dir="${src.tools}"/>
  +        </copy>
   		<copy todir="${build.srcjca}">
   			<fileset dir="${src.jca}"/>
   		</copy>
  @@ -182,6 +187,14 @@
               <arg value="${JDK}"/>
               <arg value="${JDBC}"/>
           </java>
  +        <java fork="no"
  +              classname="org.hsqldb.util.CodeSwitcher"
  +              failonerror="true"
  +              classpathref="compilation-classpath">
  +            <arg value="${build.srctools}" />
  +            <arg value="${JDK}"/>
  +            <arg value="${JDBC}"/>
  +        </java>
           <replace dir="${build.src}" token="$$VERSION$$" value="${version}"/>
           <replace dir="${build.src}" token="$$VERSION$$" value="${version}"/>
           <replace dir="${build.src}" token="$$MAJOR$$" value="${major}"/>
  @@ -238,6 +251,10 @@
                  debug="on" deprecation="${deprecation}">
               <classpath refid="compilation-classpath" />
           </javac>
  +        <javac srcdir="${build.srctools}" destdir="${build.desttools}" excludes="${excludes}"
  +               debug="on" deprecation="${deprecation}">
  +            <classpath refid="compilation-classpath" />
  +        </javac>
       </target>
   
       <!-- include OJB JDORI implementation -->
  @@ -272,6 +289,10 @@
                  debug="off" deprecation="off" optimize="on">
               <classpath refid="compilation-classpath"/>
           </javac>
  +        <javac srcdir="${build.srctools}" destdir="${build.desttools}" excludes="${excludes}"
  +               debug="off" deprecation="off" optimize="on">
  +            <classpath refid="compilation-classpath"/>
  +        </javac>
   		<javac srcdir="${build.srcjca}" destdir="${build.destjca}" excludes="${excludes}"
   			   debug="on" deprecation="${deprecation}">
   			<classpath refid="compilation-classpath" />
  @@ -413,9 +434,6 @@
   			manifest="${build.dest}/MANIFEST.MF"
   			includes="LICENSE,NOTICE,README,javax/**,org/**"
   			excludes="org/apache/ojb/tutorial5/**,org/apache/ojb/tools/**"/>
  -		<jar jarfile="${dist}/${archive}-tools.jar" basedir="${build.dest}"
  -			manifest="${build.dest}/MANIFEST.MF"
  -			includes="LICENSE,NOTICE,README,org/apache/ojb/tools/**"/>
   		<jar jarfile="${dist}/${archive}-tutorial.jar" basedir="${build.dest}"
   			manifest="${build.dest}/MANIFEST.MF"
   			includes="LICENSE,NOTICE,README,org/apache/ojb/tutorial5/**"/>
  @@ -425,8 +443,9 @@
   		<jar jarfile="${dist}/${archive}-src.jar" basedir="${build.src}"
   			manifest="${build.dest}/MANIFEST.MF"
   			includes="LICENSE,NOTICE,README,org/**"/>
  -
  -
  +        <jar jarfile="${dist}/${archive}-tools.jar" basedir="${build.desttools}"
  +			manifest="${build.dest}/MANIFEST.MF"
  +			includes="LICENSE,NOTICE,README,org/apache/ojb/tools/**"/>
   	</target>
       <!-- ================================================================== -->
       <!-- Build sample war-file for deployment in tomcat                     -->
  @@ -567,15 +586,14 @@
           <copy todir="${build.dir}/ojb-blank/lib">
               <fileset dir="${lib}">
                 <include name="*.jar"/>
  -              <exclude name="ant.jar"/>
  +              <exclude name="ant-*.jar"/>
                 <exclude name="antlr.debug.jar"/>
                 <exclude name="antlr_compiletime.jar"/>
                 <exclude name="junit.jar"/>
  -              <exclude name="optional.jar"/>
                 <exclude name="xalan.jar"/>
                 <exclude name="ejb.jar"/>
                 <exclude name="servlet.jar"/>
  -              <exclude name="jakarta-regexp-1.2.jar"/>
  +              <exclude name="jakarta-regexp-*.jar"/>
                 <exclude name="torque-*.jar"/>
                 <exclude name="velocity-*.jar"/>
               </fileset>
  @@ -593,7 +611,12 @@
               description="Builds the complete documentation.">
       </target>
   
  -    <target name="forrest" depends="">
  +
  +    <!-- ================================================================== -->
  +    <!-- Forrest documentation/website generation                           -->
  +    <!-- ================================================================== -->
  +    <!-- builds the OJB documentation file, target directory is Forrest default dir
([forrest]/build/site) -->
  +    <target name="forrest" depends="" description="build OJB docs" >
           <property name="src.static.files" value="${src.test}/org/apache/ojb"/>
           <property name="temp.forrest.dir" value="forrest/src/documentation/content"/>
           <!--
  @@ -617,6 +640,16 @@
           </delete>
       </target>
   
  +    <!-- builds the whole OJB website, target directory is Forrest default dir ([forrest]/build/site)
-->
  +    <target name="forrest-web" depends="api" description="build OJB website" >
  +        <property name="temp.forrest.dir" value="forrest/src/documentation/content"/>
  +        <copy todir="${temp.forrest.dir}/api">
  +            <fileset dir="${build.dir}/doc/api"/>
  +        </copy>
  +        <antcall target="forrest"/>
  +        <delete dir="${temp.forrest.dir}/api"/>
  +    </target>
  +
       <!-- ================================================================== -->
       <!-- Build the html-documentation                                       -->
       <!-- ================================================================== -->
  @@ -629,7 +662,7 @@
       <!-- ================================================================== -->
       <target name="javadoc" depends="prepare" description="Builds the full JavaDocs.">
           <mkdir dir="${build.dir}/doc/javadoc"/>
  -        <javadoc sourcepath="${build.src}:${build.srctest}"
  +        <javadoc sourcepath="${build.src}:${build.srctest}:${build.srctools}"
                    destdir="${build.dir}/doc/javadoc"
                    doctitle="${icon}${br}${name} ${version} JavaDoc "
                    windowtitle="${name} ${version} JavaDoc"
  @@ -892,6 +925,7 @@
       <target name="junit" depends="main, junit-no-compile"
       	description="Performs all JUnit regression tests."/>
   
  +    <!-- property 'test.package' has to be set at command line -->
       <target name="run-test" depends="prepare-repository, copy-testdb">
           <junit printsummary="yes" showoutput="true" fork="yes" dir="${build.test}/ojb">
           	<jvmarg value="-DOJB.bootLogLevel=INFO" />
  
  
  
  1.53      +4 -1      db-ojb/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.properties,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- build.properties	5 Apr 2004 17:11:48 -0000	1.52
  +++ build.properties	4 May 2004 14:16:26 -0000	1.53
  @@ -79,6 +79,7 @@
   src.dir=src
   src.java=${src.dir}/java
   src.test=${src.dir}/test
  +src.tools=${src.dir}/tools
   src.jca=${src.dir}/jca
   ojb=${source}/ojb
   etc=${source}/etc
  @@ -92,9 +93,11 @@
   build.dir = ${basedir}/target
   build.src = ${build.dir}/src
   build.srctest = ${build.dir}/srctest
  +build.srctools = ${build.dir}/srctools
   build.srcjca = ${build.dir}/srcjca
   build.dest = ${build.dir}/classes
   build.desttest = ${build.dir}/classestest
  +build.desttools = ${build.dir}/classestools
   build.destjca = ${build.dir}/classesjca
   build.test = ${build.dir}/test
   junit.dir = ${build.dir}/test/ojb
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message