svn commit: r380259 - in /db/derby/code/trunk: BUILDING.txt build.xml java/build/org/apache/derbyBuild/build.xml java/tools/build.xml java/tools/org/apache/derby/iapi/tools/run.java tools/jar/tools.properties

[fu...@apache.org]

Author: fuzzylogic
Date: Thu Feb 23 14:49:20 2006
New Revision: 380259

URL: http://svn.apache.org/viewcvs?rev=380259&view=rev
Log:
Fix dyslexic repackaging of run.class. Also fix build instructions for Mac OS X.

Modified:
    db/derby/code/trunk/BUILDING.txt
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
    db/derby/code/trunk/java/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
    db/derby/code/trunk/tools/jar/tools.properties

Modified: db/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/BUILDING.txt?rev=380259&r1=380258&r2=380259&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.txt (original)
+++ db/derby/code/trunk/BUILDING.txt Thu Feb 23 14:49:20 2006
@@ -736,7 +736,7 @@
 ${j14lib}/jce.jar:
 ${j14lib}/charsets.jar
 
-compile.classpath=${java14compile.classpath}
+compile.classpath=${java13compile.classpath}
 
 
 

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=380259&r1=380258&r2=380259&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Feb 23 14:49:20 2006
@@ -952,7 +952,7 @@
     </copy>
 
     <manifest file="${derby.jar.dir}/lists/smftools.mf">
-      <attribute name="Main-Class" value="org.apache.derby.tools.iapi.run"/>
+      <attribute name="Main-Class" value="org.apache.derby.iapi.tools.run"/>
       <attribute name="Class-Path" value="derby.jar derbyclient.jar"/>
     </manifest> 
  	

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml?rev=380259&r1=380258&r2=380259&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml Thu Feb 23 14:49:20 2006
@@ -34,7 +34,7 @@
       srcdir="${derby.build.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath};${java.home}/../lib/tools.jar"/>
+        <pathelement path="${java14compile.classpath};${java.home}/../lib/tools.jar"/>
       </classpath>
       <include name="org/apache/derbyBuild/**"/>
     </javac>

Modified: db/derby/code/trunk/java/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/build.xml?rev=380259&r1=380258&r2=380259&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/build.xml Thu Feb 23 14:49:20 2006
@@ -41,9 +41,9 @@
 
   <target name="tools_base">
     <ant dir="${derby.tools.dir}/impl/tools"/>
+    <ant dir="${derby.tools.dir}/iapi/tools"/>
     <ant dir="${derby.tools.dir}/tools"/>
     <ant dir="${derby.tools.dir}/loc"/>
-    <ant dir="${derby.tools.dir}/iapi/tools"/>
   </target>
 
 

Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java?rev=380259&r1=380258&r2=380259&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java Thu Feb 23 14:49:20 2006
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.tools.iapi;
+package org.apache.derby.iapi.tools;
 
 import java.io.IOException;
 import org.apache.derby.tools.dblook;

Modified: db/derby/code/trunk/tools/jar/tools.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/jar/tools.properties?rev=380259&r1=380258&r2=380259&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/tools.properties (original)
+++ db/derby/code/trunk/tools/jar/tools.properties Thu Feb 23 14:49:20 2006
@@ -12,4 +12,4 @@
 derby.module.Attribute=org.apache.derby.iapi.reference.Attribute
 derby.module.cslook=org.apache.derby.tools.dblook
 derby.module.sysinfo=org.apache.derby.tools.sysinfo
-derby.module.run=org.apache.derby.tools.iapi.run
+derby.module.run=org.apache.derby.iapi.tools.run