Scarab commit: svn commit: r10594 - trunk: build src/conf/conf

Author: ronvoe122
Date: 2008-06-29 09:23:34-0700
New Revision: 10594

Modified:
   trunk/build/build.xml
   trunk/src/conf/conf/build.xml

Log:
Fixed copying and execution of db-specific migration scripts, added target for migration from 0.21 to main build.xml.

Modified: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=diff&rev=10594&p1=trunk/build/build.xml&p2=trunk/build/build.xml&r1=10593&r2=10594
==============================================================================
--- trunk/build/build.xml	(original)
+++ trunk/build/build.xml	2008-06-29 09:23:34-0700
@@ -357,7 +357,15 @@
     
     </target>
 
-    <target name="migrate-from-b20" description="migrate from b20 to b21">        
+    <target name="migrate-from-0.21" description="migrate from 0.21 to 0.22">        
+        <ant antfile="build.xml"
+             target="migrate-from-0.21" 
+             inheritAll="false"
+             dir="${runtime.config.dir}">
+        </ant>
+    </target>
+
+	<target name="migrate-from-b20" description="migrate from b20 to b21">        
         <ant antfile="build.xml"
              target="migrate-from-b20" 
              inheritAll="false"

Modified: trunk/src/conf/conf/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/build.xml?view=diff&rev=10594&p1=trunk/src/conf/conf/build.xml&p2=trunk/src/conf/conf/build.xml&r1=10593&r2=10594
==============================================================================
--- trunk/src/conf/conf/build.xml	(original)
+++ trunk/src/conf/conf/build.xml	2008-06-29 09:23:34-0700
@@ -59,6 +59,7 @@
             <filterset refid="copy-filter"/>
             <fileset dir="${sql.all.dir}/${scarab.database.type}">
                 <include name="*.sql"/>
+                <include name="upgrade/*.sql"/>
             </fileset>
             <fileset dir="${sql.all.dir}">
                 <include name="*.sql"/>
@@ -188,7 +189,7 @@
             password="${scarab.database.admin.password}"
 	        onerror="continue">
             <classpath refid="classpath"/>
-	        <transaction src="${sql.current.upgrade.dir}/${scarab.database.type}upgrade-0.22-resize_id_prefix.sql"/>
+            <transaction src="${sql.current.upgrade.dir}/upgrade-0.22-resize_id_prefix.sql"/>
         </sql>
     </target>