Scarab commit: svn commit: r10545 - trunk: . build

Author: ronvoe122
Date: 2008-04-25 13:55:53-0700
New Revision: 10545

Modified:
   trunk/build/build.xml
   trunk/maven.xml

Log:
Fixed the broken maven-build - the schema-generation failed, since the the ant-base-directory was changed in r10538.
Temporary commented out the calls of torque:doc and scarab:check-locales to make 'maven site' succeed.


Modified: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=diff&rev=10545&p1=trunk/build/build.xml&p2=trunk/build/build.xml&r1=10544&r2=10545
==============================================================================
--- trunk/build/build.xml	(original)
+++ trunk/build/build.xml	2008-04-25 13:55:53-0700
@@ -17,6 +17,9 @@
 <!-- ===================================================================== -->
 
 <project name="Scarab" default="deploy" basedir="..">
+     <!-- The basedir has to be the parent directory 
+          because the junit-tests require it.
+     -->
 
     <!-- Allow the user to have multiple configuration files and
          specify them using -Dconfiguration.file=filename 
@@ -277,7 +280,7 @@
     <target name="generate-om" depends="check-om-uptodate" 
             unless="om.uptodate">
 
-        <ant antfile="build/build-torque.xml" target="om" inheritAll="false">
+        <ant antfile="build-torque.xml" target="om" inheritAll="false" dir="build">
             <property name="lib.dir"                  value="../${repository.dir}"/>
             <property name="torque.schema.dir"        value="../${src.schema.dir}"/>
             <property name="torque.java.dir"          value="../${src.java.dir.scarab}"/>
@@ -295,7 +298,7 @@
     <target name="sql-specific-db" depends="check-sql-uptodate"
             unless="sql.uptodate">
         
-        <ant antfile="build/build-torque.xml" target="sql" inheritAll="false">
+        <ant antfile="build-torque.xml" target="sql" inheritAll="false" dir="build">
             <property name="lib.dir"                  value="../${repository.dir}"/>
             <property name="torque.schema.dir"        value="../${src.schema.dir}"/>
             <property name="torque.sql.dir"           value="../${build.project}/sql/all/${generatesql.database.type}"/>

Modified: trunk/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven.xml?view=diff&rev=10545&p1=trunk/maven.xml&p2=trunk/maven.xml&r1=10544&r2=10545
==============================================================================
--- trunk/maven.xml	(original)
+++ trunk/maven.xml	2008-04-25 13:55:53-0700
@@ -19,15 +19,15 @@
    <maven:property name="debian.tomcat.version" defaultValue="tomcat4" />
 
     <goal name="scarab:create-db">
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="create-db" 
         	 inheritAll="false"
-        	 dir="${root.dir}/build">
+        	 dir="${root.dir}">
         </ant:ant>
     </goal>
 
     <goal name="scarab:migrate-from-0.21">
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="migrate-from-0.21"
                  inheritAll="false"
                  dir="${root.dir}">
@@ -35,7 +35,7 @@
     </goal>
 
     <goal name="scarab:migrate-from-b20">
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="migrate-from-b20"
                  inheritAll="false"
                  dir="${root.dir}">
@@ -58,16 +58,16 @@
 
         <attainGoal name="war:webapp"/>
 
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="generate-all-sql" 
         	 inheritAll="false"
-        	 dir="${root.dir}/build">
+        	 dir="${root.dir}">
         </ant:ant>
 
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="create-db" 
         	 inheritAll="false"
-        	 dir="${root.dir}/build">
+        	 dir="${root.dir}">
         </ant:ant>
 
         <ant:mkdir dir="target/dist"/>
@@ -227,31 +227,27 @@
 
     
     <preGoal name="java:compile">
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="generate-om" 
         	 inheritAll="false"
-        	 dir="${root.dir}/build">
+        	 dir="${root.dir}">
         </ant:ant>
     </preGoal>
     
     <postGoal name="java:compile">
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="create-custom-property-file"
                  inheritAll="false"
-                 dir="${root.dir}/build"
+                 dir="${root.dir}"
         >
         </ant:ant>
     </postGoal>
     
-    <postGoal name="changes:report">
-      <ant:move file="target/changes-report.xml" todir="xdocs/"/>
-    </postGoal>
-    
     <preGoal name="site">
-        <attainGoal name="sdocbook"/>
-        <attainGoal name="torque:doc"/>
-        <attainGoal name="javadoc"/>
-        <attainGoal name="scarab:check-locales"/>
+       <attainGoal name="sdocbook"/>
+<!--        <attainGoal name="torque:doc"/> -->
+       <attainGoal name="javadoc"/>
+<!--        <attainGoal name="scarab:check-locales"/> -->
     </preGoal>    
    
     <!-- there are inconsistencies            -->
@@ -263,10 +259,10 @@
     </postGoal>
  
     <postGoal name="clean:clean">
-        <ant:ant antfile="build.xml"
+        <ant:ant antfile="build/build.xml"
              target="clean" 
           inheritAll="false"
-          dir="${root.dir}/build">
+          dir="${root.dir}">
         </ant:ant>
     </postGoal>