db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r999928 - in /db/derby/code/trunk: ./ java/demo/ java/demo/toursdb/ java/engine/org/apache/derby/impl/sql/ java/engine/org/apache/derby/impl/sql/compile/ java/engine/org/apache/derby/loc/ java/shared/ java/shared/org/apache/derby/shared/com...
Date Wed, 22 Sep 2010 13:11:52 GMT
Author: rhillegas
Date: Wed Sep 22 13:11:52 2010
New Revision: 999928

URL: http://svn.apache.org/viewvc?rev=999928&view=rev
Log:
DERBY-3986: Stop dropping build artifacts into subversion-controlled space.

Modified:
    db/derby/code/trunk/   (props changed)
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/demo/build.xml
    db/derby/code/trunk/java/demo/toursdb/   (props changed)
    db/derby/code/trunk/java/demo/toursdb/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/   (props changed)
    db/derby/code/trunk/java/engine/org/apache/derby/loc/   (props changed)
    db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml
    db/derby/code/trunk/java/shared/build.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/sanity/   (props changed)
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/   (props changed)
    db/derby/code/trunk/tools/ant/properties/dirs.properties
    db/derby/code/trunk/tools/release/build.xml

Propchange: db/derby/code/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 22 13:11:52 2010
@@ -1,7 +1,8 @@
-classes
-classes.pptesting
-classes.storeless
-changenumber.properties
-jars
-javadoc
-junit_*
+classes
+classes.pptesting
+classes.storeless
+changenumber.properties
+jars
+javadoc
+junit_*
+generated

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Sep 22 13:11:52 2010
@@ -19,8 +19,12 @@
 <project default="buildsource" basedir=".">
 
 <!-- Set Properties -->
+
+
   <!-- User settings -->
+  <property environment="env"/>
   <property file="local.properties"/>
+
   <property file="${user.home}/ant.properties"/>
   <!-- Set property lib dir -->
   <property name="properties.dir" value="tools/ant/properties"/>
@@ -43,6 +47,7 @@
 
     <tstamp/>
     <mkdir dir="${out.dir}"/>
+    <antcall target="make-generated-dirs"/>
 
     <!-- Create the emtpy dir that we put in the boot classpath to
          prevent the default Java runtime libraries from being loaded.
@@ -58,6 +63,20 @@
     <property name="init.done" value="true"/>
   </target>
 
+   <target name="make-generated-dirs">
+
+    <mkdir dir="${generated.dir}"/>
+    <mkdir dir="${generated.bin.dir}"/>
+    <mkdir dir="${generated.src.dir}"/>
+    <mkdir dir="${generated.sanity.dir}"/>
+    <mkdir dir="${generated.ij.dir}"/>
+    <mkdir dir="${generated.sql.dir}"/>
+    <mkdir dir="${generated.engine.locale.dir}"/>
+    <mkdir dir="${generated.cache.dir}"/>
+    <mkdir dir="${generated.toursdb.dir}"/>
+
+   </target>
+
   <target name="setissane">
     <condition property="is.sane">
       <equals arg1="${sanity}" arg2="true"/>
@@ -525,13 +544,13 @@
           <equals arg1="${sane}" arg2="${sanity}"/>
         </not>
         <not>
-          <available file="${sanity.dir}/SanityState.java"/>
+          <available file="${generated.sanity.dir}/SanityState.java"/>
         </not>
       </or>
     </condition>
   </target>
 
-  <property name="state.file" value="${derby.engine.src.dir}/state.properties"/>
+  <property name="state.file" value="${generated.sanity.dir}/state.properties"/>
   <property file="${state.file}"/>
   <target name="state" if="needstate"
           depends="showenv,getstate"
@@ -540,7 +559,7 @@
     <property name="sane" value="true"/>
     <filter token="SANE" value="${sane}"/>
     <copy file="${sanity.dir}/SanityState.tmpl"
-          tofile="${sanity.dir}/SanityState.java"
+          tofile="${generated.sanity.dir}/SanityState.java"
           overwrite="yes" filtering="on"/>
     <property name="header" value="Generated file - do not modify!"/>
     <propertyfile file="${state.file}" comment="${header}">
@@ -553,21 +572,28 @@
 <!--                     Remove SanityState.java file                    -->
 <!-- =================================================================== -->
   <target name="cleanstate">
-    <delete file="${derby.engine.src.dir}/state.properties"/>
-    <delete file="${sanity.dir}/SanityState.java"/>
+    <delete dir="${generated.sanity.dir}"/>
     <delete dir="${sanity.out.dir}"/>
   </target>
 
 <!-- =================================================================== -->
 <!--                 Remove all built objects (except jars)              -->
 <!-- =================================================================== -->
-  <target name="clobber" depends="clean,cleanstate,cleanparsers,cleanmessages,cleancatalog,cleantoursdb"/>
+  <target name="clobber" depends="clean,cleangenerated,cleanstate,cleanparsers,cleancatalog,cleantoursdb"/>
+
+<!-- =================================================================== -->
+<!--                       Remove the tree of generated intermediate sources         
                  -->
+<!-- =================================================================== -->
+  <target name="cleangenerated">
+    <delete dir="${generated.dir}"/>
+  </target>
 
 <!-- =================================================================== -->
 <!--                       Remove output tree                            -->
 <!-- =================================================================== -->
   <target name="clean">
     <delete dir="${out.dir}"/>
+    <delete dir="${generated.dir}"/>
   	<delete dir="${out.storeless.dir}"/>
   	<delete dir="${out.pptesting.dir}"/>
   </target>
@@ -584,25 +610,26 @@
   <target name="genParser" depends="chkparser" unless="parser.done">
     <echo level="info" message="  ${msg}"/>
     <delete>
-      <fileset dir="${directory}" includes="${rmfiles}"/>
+      <fileset dir="${generated.src.dir}/${directory}" includes="${rmfiles}"/>
     </delete>
     <java classname="javacc"
           classpath="${javacc}"
-                dir="${directory}"
+                dir="${derbysrc.dir}/${srcroot}/${directory}"
                fork="yes"
         failonerror="true">
+      <arg value="-OUTPUT_DIRECTORY=${generated.src.dir}/${directory}"/>
       <arg value="${jjfile}"/>
     </java>
     <!-- Qualify reference to tokenImage to fix issue with inheritence -->
     <!-- IBM JDK 1.3.1. See DERBY-1078                                 -->
-    <replaceregexp file="${directory}/${chkfile}" match="tokenImage" 
+    <replaceregexp file="${generated.src.dir}/${directory}/${chkfile}" match="tokenImage"

                    replace="${constantsfile}.tokenImage"/>
   </target>
 
   <target name="chkparser">
     <uptodate property="parser.done"
-              targetfile="${directory}/${chkfile}" >
-      <srcfiles dir="${directory}" includes="${jjfile}" />
+              targetfile="${generated.src.dir}/${directory}/${chkfile}" >
+      <srcfiles dir="${derbysrc.dir}/${srcroot}/${directory}" includes="${jjfile}" />
     </uptodate>
   </target>
 
@@ -610,13 +637,8 @@
 <!--                     Remove parser-generated files                   -->
 <!-- =================================================================== -->
   <target name="cleanparsers">
-    <delete>
-      <fileset dir="${derby.engine.dir}/impl/sql/compile" includes="SQLParser.java,SQLParserTokenManager.java,SQLParserConstants.java,TokenMgrError.java"/>
-    </delete>
-    <delete>
-      <fileset dir="${derby.tools.dir}/impl/tools/ij"
-            includes="ij.java,ijTokenManager.java,ijConstants.java,Token.java,mtGrammar.java,mtGrammarConstants.java,mtGrammarTokenManager.java,CharStream.java,SimpleCharStream.java,TokenMgrError.java"/>
-    </delete>
+    <delete dir="${generated.sql.dir}"/>
+    <delete dir="${generated.ij.dir}"/>
   </target>
 
 <!-- =================================================================== -->
@@ -625,7 +647,6 @@
   <target name="jsr169stubs">
     <mkdir dir="${out.stubs.dir}"/>
     <mkdir dir="${out.jsr169.dir}"/>
-
     <javac
       source="1.4"
       target="1.4"
@@ -758,7 +779,7 @@
 </target>
 
 <target name="makebinscript">
-  <concat destfile="bin/${script}">
+  <concat destfile="${generated.bin.dir}/${script}">
     <fileset file="bin/templates/derby_common.sh"/>
     <fileset file="bin/templates/${script}"/>
   </concat>
@@ -770,7 +791,7 @@
 <!-- =================================================================== -->
   <target name="cleanmessages">
     <delete>
-      <fileset dir="${derby.locales.dir}" includes="messages_en.properties"/>
+      <fileset dir="${generated.engine.locale.dir}" includes="messages_en.properties"/>
     </delete>
   </target>
 
@@ -797,7 +818,7 @@
       </classpath>
       <jvmarg value="-DWS=${workspace}"/>
       <jvmarg value="-DclassDir=${out.dir}"/>
-      <jvmarg value="-Dout=${derby.engine.src.dir}/${derby.dir}/iapi/services/cache/ClassSizeCatalog.java"/>
+      <jvmarg value="-Dout=${generated.cache.dir}/ClassSizeCatalog.java"/>
       <jvmarg value="-Dprefix.1=org.apache.derby.iapi.types"/>            
       <jvmarg value="-Dprefix.2=org.apache.derby.impl"/>
       <arg value="org.apache.derby.iapi.types.DataValueDescriptor"/>
@@ -823,7 +844,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
+      srcdir="${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>
@@ -853,7 +874,7 @@
 
   <target name="cleancatalog"
           description="Remove the generated catalog java file.">
-    <delete file="${derby.engine.dir}/iapi/services/cache/ClassSizeCatalog.java"/>
+    <delete dir="${generated.cache.dir}"/>
   </target>
 
 <!-- =================================================================== -->
@@ -862,10 +883,7 @@
 
   <target name="cleantoursdb"
           description="Remove the generated sample database.">
-    <delete file="${derby.demo.src.dir}/toursdb/toursdb.jar"/>
-    <delete file="${derby.demo.src.dir}/toursdb/toursdb.out"/>
-    <delete file="${derby.demo.src.dir}/toursdb/derby.log"/>
-    <delete dir="${derby.demo.src.dir}/toursdb/toursdb"/>
+    <delete dir="${generated.toursdb.dir}"/>
   </target>
 
 <!-- =================================================================== -->
@@ -876,14 +894,12 @@
     <propertyfile file="${state.file}" comment="${header}">
       <entry key="sanity" value="true" type="string"/>
     </propertyfile>
-    <delete file="${sanity.dir}/SanityState.java"/> 
     <delete dir="${sanity.out.dir}"/>
   </target>
   <target name="insane">
     <propertyfile file="${state.file}" comment="${header}">
       <entry key="sanity" value="false" type="string"/>
     </propertyfile>
-    <delete file="${sanity.dir}/SanityState.java"/>
     <delete dir="${sanity.out.dir}"/>
   </target>
 
@@ -1238,11 +1254,11 @@
   <target name="buildjars" depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar"/>
 
   <target name="initjars" depends="setsanityname,getsvnversion,setCompilerProperties">
-    <property name="derby.jar.dir" value="${basedir}/jars/${sanity.name}"/>
-    <property name="derby.jar.topdir" value="${basedir}/jars"/>
+    <property name="derby.jar.dir" value="${out.base}/jars/${sanity.name}"/>
+    <property name="derby.jar.topdir" value="${out.base}/jars"/>
     <mkdir dir="${derby.jar.dir}"/>
     <mkdir dir="${derby.jar.dir}/lists"/>
-    <loadfile srcFile="${basedir}/changenumber.properties"
+    <loadfile srcFile="${out.base}/changenumber.properties"
                failonerror="false"
                property="changenumber">
       <filterchain>
@@ -1784,7 +1800,7 @@
    <target name="getsvnversion">
      <exec executable="svnversion"
            failifexecutionfails="no"
-           output="${basedir}/changenumber.properties">
+           output="${out.base}/changenumber.properties">
        <arg value="${basedir}"/>
        <arg value="-n"/>
      </exec>

Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Wed Sep 22 13:11:52 2010
@@ -117,8 +117,8 @@
   <target name="checktoursdb">
     <condition property="toursdb.available">
       <and>
-        <available file="${derby.demo.src.dir}/toursdb/toursdb.jar"/>
-        <available file="${derby.demo.src.dir}/toursdb/toursdb"/>
+        <available file="${generated.toursdb.dir}/toursdb.jar"/>
+        <available file="${generated.toursdb.dir}/toursdb"/>
       </and>
     </condition>
   </target>

Propchange: db/derby/code/trunk/java/demo/toursdb/
            ('svn:ignore' removed)

Modified: db/derby/code/trunk/java/demo/toursdb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Wed Sep 22 13:11:52 2010
@@ -59,56 +59,56 @@
   <target name="buildschema">
     <echo level="info" message="Begin building toursdb"/>
     <java classname="org.apache.derby.tools.ij"
-          output="toursdb.out"
+          output="${generated.toursdb.dir}/toursdb.out"
           failonerror="true"
-          dir="${derby.demo.src.dir}/toursdb" fork="true">
+          dir="${generated.toursdb.dir}" fork="true">
       <classpath>
         <pathelement path="${out.dir}"/>
         <pathelement path="${compile.classpath}"/>
       </classpath>
       <sysproperty key="ij.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
       <sysproperty key="ij.database" value="jdbc:derby:toursdb;create=true"/>
-      <arg value="ToursDB_schema.sql"/>
+      <arg value="${derby.demo.src.dir}/toursdb/ToursDB_schema.sql"/>
     </java>
   </target>
 
   <target name="loadtables">
     <java classname="org.apache.derby.tools.ij"
-          output="toursdb.out" append="true"
+          output="${generated.toursdb.dir}/toursdb.out" append="true"
           failonerror="true"
-          dir="${derby.demo.src.dir}/toursdb" fork="true">
+          dir="${generated.toursdb.dir}" fork="true">
       <classpath>
         <pathelement path="${out.dir}"/>
         <pathelement path="${compile.classpath}"/>
       </classpath>
       <sysproperty key="ij.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
       <sysproperty key="ij.database" value="jdbc:derby:toursdb;create=true"/>
-      <arg value="loadTables.sql"/>
+      <arg value="${derby.demo.src.dir}/toursdb/loadTables.sql"/>
     </java>
     <java classname="toursdb.insertMaps"
-          output="toursdb.out" append="true"
+          output="${generated.toursdb.dir}/toursdb.out" append="true"
           failonerror="true"
-          dir="${derby.demo.src.dir}/toursdb" fork="true">
+          dir="${generated.toursdb.dir}" fork="true">
       <classpath>
         <pathelement path="${out.dir}"/>
         <pathelement path="${compile.classpath}"/>
       </classpath>
     </java>
     <java classname="org.apache.derby.tools.ij"
-          output="toursdb.out" append="true"
+          output="${generated.toursdb.dir}/toursdb.out" append="true"
           failonerror="true"
-          dir="${derby.demo.src.dir}/toursdb" fork="true">
+          dir="${generated.toursdb.dir}" fork="true">
       <classpath>
         <pathelement path="${out.dir}"/>
         <pathelement path="${compile.classpath}"/>
       </classpath>
-      <arg value="disconnect.sql"/>
+      <arg value="${derby.demo.src.dir}/toursdb/disconnect.sql"/>
     </java>
   </target>
 
   <target name="jarup"> 
-    <zip destfile="${derby.demo.src.dir}/toursdb/toursdb.jar"
-         basedir="${derby.demo.src.dir}/toursdb"
+    <zip destfile="${generated.toursdb.dir}/toursdb.jar"
+         basedir="${generated.toursdb.dir}"
          includes="toursdb/**"/>
     <echo level="info" message="Finished building toursdb"/>
   </target>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml Wed Sep 22 13:11:52
2010
@@ -38,12 +38,42 @@
   <target name="parser">
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating SQL parser..."/>
-      <property name="directory" value="${derby.engine.dir}/impl/sql/compile"/>
+      <property name="srcroot" value="engine"/>
+      <property name="directory" value="${derby.dir}/impl/sql/compile"/>
       <property name="rmfiles" value="implparser_rm.files"/>
       <property name="jjfile" value="sqlgrammar.jj"/>
       <property name="chkfile" value="SQLParser.java"/>
       <property name="constantsfile" value="SQLParserConstants"/>
     </ant>
+
+    <!--
+      The following files were generated:
+
+      CharStream.java
+      ParseException.java
+      SQLParser.java
+      SQLParserConstants.java
+      SQLParserTokenManager.java
+      Token.java
+      TokenMgrError.java
+
+      3 of those files are checked into the codeline:
+
+      CharStream.java
+      ParseException.java
+      Token.java
+
+      We don't want generated code to clash with the checked-in versions. So
+      we delete the conflicting classes here.
+    -->
+    <delete>
+      <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile">
+        <include name="CharStream.java"/>
+        <include name="ParseException.java"/>
+        <include name="Token.java"/>
+      </fileset>
+    </delete>
+
   </target>
 
   <target name="compile" depends="parser">
@@ -58,7 +88,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
+      srcdir="${derby.engine.src.dir}:${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
            ('svn:ignore' removed)

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/loc/
            ('svn:ignore' removed)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml Wed Sep 22 13:11:52 2010
@@ -35,7 +35,7 @@
     classpath="${out.dir}"
   />
   <property name="messageDescriptors" value="${derby.locales.dir}/messages.xml"/>
-  <property name="englishMessages" value="${derby.locales.dir}/messages_en.properties"/>
+  <property name="englishMessages" value="${generated.engine.locale.dir}/messages_en.properties"/>
   <property name="docDirectory" value="${out.dir}/doc"/>
   <property name="sqlstateTables" value="${docDirectory}/rrefexcept71493.dita"/>
 
@@ -70,7 +70,7 @@
   <target name="split" depends="verifysplit">
 
     <antcall target="doSplit">
-      <param name="msgdir" value="${derby.locales.dir}"/>
+      <param name="msgdir" value="${generated.engine.locale.dir}"/>
       <param name="msgfile" value="messages_en"/>
     </antcall>
     <antcall target="doSplit">

Modified: db/derby/code/trunk/java/shared/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/build.xml (original)
+++ db/derby/code/trunk/java/shared/build.xml Wed Sep 22 13:11:52 2010
@@ -50,6 +50,7 @@
 <!-- Targets -->
 
 <!-- compile classes  -->
+  <echo message="building generated sanity info"/>
   <target name="compile">
   	<javac
       source="1.4"
@@ -62,6 +63,24 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
+      srcdir="${generated.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+          <pathelement path="${java14compile.classpath}"/>
+      </classpath>
+    </javac>
+
+  	<javac
+      source="1.4"
+      target="1.4"
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}"
       srcdir="${derby.shared.src.dir}"
       includes="org/apache/derby/shared/**"
       destdir="${out.dir}">

Propchange: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/sanity/
            ('svn:ignore' removed)

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml Wed Sep 22 13:11:52
2010
@@ -38,7 +38,8 @@
   <target name="parser">
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating ij parser..."/>
-      <property name="directory" value="${derby.tools.dir}/impl/tools/ij"/>
+      <property name="srcroot" value="tools"/>
+      <property name="directory" value="${derby.dir}/impl/tools/ij"/>
       <property name="rmfiles" value="ijimplparser_rm.files"/>
       <property name="jjfile" value="ij.jj"/>
       <property name="chkfile" value="ij.java"/>
@@ -46,12 +47,42 @@
     </ant>
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating mtGrammar parser..."/>
-      <property name="directory" value="${derby.tools.dir}/impl/tools/ij"/>
+      <property name="srcroot" value="tools"/>
+      <property name="directory" value="${derby.dir}/impl/tools/ij"/>
       <property name="rmfiles" value="mtparser_rm.files"/>
       <property name="jjfile" value="mtGrammar.jj"/>
       <property name="chkfile" value="mtGrammar.java"/>
       <property name="constantsfile" value="mtGrammarConstants"/>
     </ant>
+
+    <!--
+      The following files were just generated:
+
+      CharStream.java
+      ij.java
+      ijConstants.java
+      ijTokenManager.java
+      mtGrammar.java
+      mtGrammarConstants.java
+      mtGrammarTokenManager.java
+      ParseException.java
+      SimpleCharStream.java
+      Token.java
+      TokenMgrError.java
+
+      1 of those files is checked into the codeline:
+
+      ParseException.java
+
+      We don't want generated code to clash with the checked-in versions. So
+      we delete the conflicting class here.
+    -->
+    <delete>
+      <fileset dir="${generated.src.dir}/${derby.dir}/impl/tools/ij">
+        <include name="ParseException.java"/>
+      </fileset>
+    </delete>
+
   </target>
 
   <target name="compile_tools_impl">
@@ -67,7 +98,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="${derby.tools.src.dir}"
+      srcdir="${derby.tools.src.dir}:${generated.src.dir}"
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${java14compile.classpath}"/>

Propchange: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/
            ('svn:ignore' removed)

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Wed Sep 22 13:11:52 2010
@@ -31,15 +31,20 @@ locales.dir=${javacom.dir}/locales
 # Output dirs
 #
 class.dir=classes
-out.dir=${basedir}/${class.dir}
-out.storeless.dir=${basedir}/${class.dir}.storeless
-out.pptesting.dir=${basedir}/${class.dir}.pptesting
+out.base=${basedir}
+generated.dir=${out.base}/generated
+generated.src.dir=${generated.dir}/java
+generated.bin.dir=${generated.dir}/bin
+generated.toursdb.dir=${generated.dir}/toursdb
+out.dir=${out.base}/${class.dir}
+out.storeless.dir=${out.base}/classes.storeless
+out.pptesting.dir=${out.base}/classes.pptesting
 outcom.dir=${out.dir}/${com.dir}
-out.javadoc.dir=${basedir}/javadoc
-out.testdir=${basedir}/testout_${jdk}
+out.javadoc.dir=${out.base}/javadoc
+out.testdir=${out.base}/testout_${jdk}
 loc.dir=${out.dir}/org/apache/derby/loc
 drdaloc.dir=${out.dir}/org/apache/derby/loc/drda
-jarsdist.dir=${basedir}/jars
+jarsdist.dir=${out.base}/jars
 metadata.out.dir=${out.dir}/org/apache/derby/impl/jdbc
 
 out.stubs.dir=${out.dir}/stubs
@@ -91,6 +96,13 @@ derby.client.locales.dir=${derby.client.
 sanity.dir=${derby.shared.dir}/shared/common/sanity
 sanity.out.dir=${out.dir}/${derby.dir}/shared/common/sanity
 
+generated.sanity.dir=${generated.src.dir}/${derby.dir}/shared/common/sanity
+generated.ij.dir=${generated.src.dir}/${derby.dir}/impl/tools/ij
+generated.sql.dir=${generated.src.dir}/${derby.dir}/impl/sql/compile
+generated.engine.locale.dir=${generated.src.dir}/${derby.dir}/loc
+generated.cache.dir=${generated.src.dir}/${derby.dir}/iapi/services/cache
+
+
 derby.testing.dir=org/apache/derbyTesting
 derby.testing.out.dir=${out.dir}/${derby.testing.dir}
 derby.testing.functest.dir=${derby.testing.dir}/functionTests

Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?rev=999928&r1=999927&r2=999928&view=diff
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Wed Sep 22 13:11:52 2010
@@ -153,6 +153,8 @@
       <!-- bin -->
       <zipfileset dir="${basedir}/bin" prefix="${derby.bin}/bin" 
                   filemode="755" includes="*" excludes="templates"/>
+      <zipfileset dir="${generated.bin.dir}" prefix="${derby.bin}/bin" 
+                  filemode="755" includes="*"/>
       <!-- demo -->
       <zipfileset file="${derby.demo.src.dir}/README.txt"
                   fullpath="${derby.bin}/demo/README.txt"/>
@@ -176,7 +178,7 @@
                   prefix="${derby.bin}/demo/programs/nserverdemo"/>
       <zipfileset dir="${basedir}/classes/nserverdemo" includes="*.class"
                   prefix="${derby.bin}/demo/programs/nserverdemo"/>
-      <zipfileset dir="${basedir}/java/demo/toursdb" includes="toursdb/**,toursdb.jar"
+      <zipfileset dir="${generated.toursdb.dir}" includes="toursdb/**,toursdb.jar"
                   prefix="${derby.bin}/demo/databases"/>
       <zipfileset dir="${basedir}/classes" includes="Wwd*.class"
                   prefix="${derby.bin}/demo/programs/workingwithderby"/>
@@ -210,6 +212,8 @@
       <!-- bin -->
       <tarfileset dir="${basedir}/bin" prefix="${derby.bin}/bin" 
                   mode="755" includes="*" excludes="templates"/>
+      <tarfileset dir="${generated.bin.dir}" prefix="${derby.bin}/bin" 
+                  filemode="755" includes="*"/>
       <!-- demo -->
       <tarfileset file="${derby.demo.src.dir}/README.txt"
                   fullpath="${derby.bin}/demo/README.txt"/>
@@ -233,7 +237,7 @@
                   prefix="${derby.bin}/demo/programs/nserverdemo"/>
       <tarfileset dir="${basedir}/classes/nserverdemo" includes="*.class"
                   prefix="${derby.bin}/demo/programs/nserverdemo"/>
-      <tarfileset dir="${basedir}/java/demo/toursdb" includes="toursdb/**,toursdb.jar"
+      <tarfileset dir="${generated.toursdb.dir}" includes="toursdb/**,toursdb.jar"
                   prefix="${derby.bin}/demo/databases"/>
       <tarfileset dir="${basedir}/classes" includes="Wwd*.class"
                   prefix="${derby.bin}/demo/programs/workingwithderby"/>



Mime
View raw message