[patch] Diff file called by the ebuild (attachment 198387) to prep the upstream build.xml

gentoo-build.xml.diff (text/plain), 16.26 KB, created by Michael Jinks on 2009-07-18 08:32:59 UTC

--- files/build-9.1.0.7.xml	2009-07-17 21:08:18.000000000 -0500
+++ /home/mjinks/src/saxon/gentoo-build-9.1.0.7.xml	2009-07-18 03:11:21.000000000 -0500
@@ -2,7 +2,20 @@
 
 <project basedir="." default="all" name="Saxon-B The XSLT and XQuery Processor"
          xmlns:dn="antlib:org.apache.ant.dotnet">
-    
+
+    <!-- hacked on by [e-mail] according to instructions
+	found at:
+	http://www.nabble.com/Compiling-saxon9.jar-for-OpenOffice.org-3-tt18334779.html#a18334779
+
+	- remove -bn, -san, and -saj tasks
+	
+	the same instructions also say you "might" want to remove:
+	-jdom, -xom, -dom4j, -xqj, -sql
+	...but previous ebuilds appear to have used them, so we'll try
+	to do the same.
+	
+	-->
+
     <!--TODO: 1: ensure saxon9api.netmodule is included in the build
            2: remove the archive target before shipping this file-->
     
@@ -49,19 +62,20 @@
     <!-- following locations are specific to the machine -->
 
 		    <!-- root drive -->
-		    <property name="root" value="c:/"/>
+		    <property name="root" value="."/>
 		    
 		    <!-- root drive for built files -->
-		    <property name="oroot" value="e:/"/>
+		    <property name="oroot" value="."/>
 		    
 		    <!-- directory holding Java source code -->
-		    <property name="development-j.dir" value="${root}/MyJava/saxon8.x"/>
+		    <!-- <property name="development-j.dir" value="${root}/MyJava/saxon8.x"/> -->
+		    <property name="development-j.dir" value="${root}/src"/>
 		    
 		    <!-- directory holding Java source code as in Subversion -->
-		    <property name="subversion-j.dir" value="${root}/saxon-svn2/latest9.0/bj"/>		
+		    <!-- <property name="subversion-j.dir" value="${root}/saxon-svn2/latest9.0/bj"/>-->
 		    
 		    <!-- directory holding latest patch state of Saxon-SA Java code -->
-		    <property name="saj-patch.dir" value="${root}/saxon-90-patch"/>				        
+		    <!-- <property name="saj-patch.dir" value="${root}/saxon-90-patch"/>-->
 		    
 		    <!-- directory holding Java test drivers -->
 		    <property name="drivers-j.dir" value="${root}/MyJava/testcode/test"/>		    
@@ -83,7 +97,8 @@
 		    <property name="samples.dir" value="${root}/MyJava/samples"/>
 		    
 		    <!-- directory in which to build the product for release -->
-		    <property name="product.dir" value="${oroot}/saxon-build/${version}"/>
+		    <!--<property name="product.dir" value="${oroot}/saxon-build/${version}"/>-->
+		    <property name="product.dir" value="${oroot}/dist"/>
 		    
 		    <!-- directory in which to build the issued .ZIP files -->
 		    <property name="issue.dir" value="${oroot}/saxon-issues/saxon-issue-${release.date}"/>
@@ -97,11 +112,12 @@
     
     <!-- following locations are for IKVMC code used to build the .NET product -->
     
+    <!--
     <property name="development-ikvm.dir" value="${root}/MyDotNet"/>
     <property name="ikvm.dir" value="${development-ikvm.dir}/ikvm-0.36.0.11"/>
     <property name="generated.stubs.dir" value="${development-ikvm.dir}/stubs"/>
     <property name="saxondotnet.snk" value="${development-ikvm.dir}/make/saxondotnet.snk"/>
-    <property name="dot.net.debug" value="live"/> <!-- set to 'debug' for testing, 'live' for final build -->
+    <property name="dot.net.debug" value="live"/>--> <!-- set to 'debug' for testing, 'live' for final build -->
     
     <!-- The other important thing to enable debugging is that the .pdb file is available in the same directory
          as the .dll. At present debugging Saxon-SA code is proving problematic: saxon9sa.dll is dynamically
@@ -120,7 +136,7 @@
     
     <!-- following locations are relative to the build file -->
         
-    <property name="lib.dir" value="libs"/>
+    <property name="lib.dir" value="lib"/>
     <property name="temp.dir" value="temp"/>
     <property name="services.dir" value="services"/>
     <property name="temp-src-j.dir" value="${temp.dir}/j/source"/>
@@ -134,9 +150,11 @@
 		<!-- following locations are relative to the destination directory -->
 		
     <property name="build-bj.dir" value="${product.dir}/bj"/>  
+    <!-- 
     <property name="build-saj.dir" value="${product.dir}/saj"/> 
     <property name="build-bn.dir" value="${product.dir}/bn"/>  
     <property name="build-san.dir" value="${product.dir}/san"/>
+    -->
     <property name="build-resources.dir" value="${product.dir}/resources"/> 
     <property name="javadoc.dir" value="${build-resources.dir}/doc/javadoc"/>   
     
@@ -166,10 +184,12 @@
     <!-- development source -->
         
     <property name="source-bj.dir" value="${development-j.dir}"/>
+    <!--
     <property name="source-saj.dir" value="${development-j.dir}"/>
     <property name="source-api-n.dir" value="${vss-n.dir}"/>
     <property name="source-cmd-n.dir" value="${vss-n.dir}"/>
     <property name="source-samples-n.dir" value="${vss-n.dir}"/>        
+    -->
     
 
     <path id="classpath-j">
@@ -316,12 +336,13 @@
             <!--<exclude name="**/s9api/**"/>		 s9api needs Java 5 -->
             <include name="net/sf/saxon/**/package.html"/>
           </fileset>
-          <fileset dir="${source-saj.dir}">
+	  <!-- <fileset dir="${source-saj.dir}">
             <include name="com/saxonica/**/*.java"/>
             <exclude name="com/saxonica/validate/DotNetVerifier.java"/>
             <include name="com/saxonica/**/package.html"/>
-          </fileset>          
+          </fileset>          -->
         </copy>
+	<!--
         <replace file="${temp-src-j.dir}/com/saxonica/validate/SchemaAwareConfiguration.java"
                  token="/*DOTNETONLY*/"
                  value="//"
@@ -329,7 +350,7 @@
         <replace file="${temp-src-j.dir}/net/sf/saxon/Configuration.java"
                  token="/*DOTNETONLY*/"
                  value="//"
-                 summary="yes"/>                
+                 summary="yes"/>-->
         <copy todir="${temp-src-nj.dir}">
           <fileset dir="${source-bj.dir}">
             <include name="net/sf/saxon/**/*.java"/>
@@ -348,7 +369,7 @@
             <exclude name="**/xpath/**"/>
             <exclude name="**/xqj/**"/>
           </fileset>
-		  <fileset dir="${source-saj.dir}">
+          <!--<fileset dir="${source-saj.dir}">
             <include name="com/saxonica/extra/*.java"/>
             <include name="com/saxonica/fsa/*.java"/>
             <include name="com/saxonica/ptree/*.java"/>
@@ -357,17 +378,18 @@
             <include name="com/saxonica/update/*.java"/>
             <include name="com/saxonica/validate/*.java"/>
             <include name="com/saxonica/Validate.java"/>
-          </fileset>          
+          </fileset>-->
         </copy>
+	<!--
         <replace file="${temp-src-nj.dir}/com/saxonica/validate/SchemaAwareConfiguration.java"
                  token="/*JAVAONLY*/"
                  value="//"
-                 summary="yes"/>  
+                 summary="yes"/>  -->
         <replace file="${temp-src-nj.dir}/net/sf/saxon/Configuration.java"
                  token="/*JAVAONLY*/"
                  value="//"
                  summary="yes"/>
-        <copy todir="${temp-src-nc.dir}/api">
+        <!-- <copy todir="${temp-src-nc.dir}/api">
           <fileset dir="${vss-n.dir}">
             <include name="Saxon.Api/*.cs"/>
           </fileset>
@@ -393,7 +415,7 @@
           <fileset dir="${source-samples-n.dir}/TestRunner">
             <include name="*.cs"/>
           </fileset>
-        </copy>
+        </copy> -->
 
         
     </target>    
@@ -444,6 +466,7 @@
         </javac>
     </target>
     
+    <!--
     <target name="compile-saj" description="Compile Saxon-SA classes for Java." depends="copysource-development">
         <mkdir dir="${classes-j.dir}"/>
         <javac debug="${build.debug}"  debuglevel="${build.debuglevel}" 
@@ -459,9 +482,10 @@
             </classpath>
         </javac>
     </target>
+    -->
     
     <target name="compile-s9api" description="Compile s9api classes for Java." 
-                                 depends="compile-bj, compile-saj, copysource-development">
+                                 depends="compile-bj, copysource-development">
         <!-- Compiling the s9api package requires JDK 1.5 -->
         <!-- The bj and saj source must be compiled first to ensure that it is done using 1.4, otherwise
              it will be compiled in 1.5 mode because the classes are referenced from the s9api package -->
@@ -477,6 +501,7 @@
         </javac>
     </target>    
     
+    <!-- 
     <target name="compile-bn" description="Compile Saxon-B classes for .NET" depends="copysource-development">
         <mkdir dir="${classes-n.dir}"/>
         <javac debug="${build.debug}" debuglevel="${build.debuglevel}" 
@@ -506,8 +531,9 @@
             </classpath>
         </javac>
     </target>        
+    -->
 
-    <target name="jar-bj" description="Create Saxon-B jar files for Java" depends="compile-bj, compile-s9api">
+    <target name="jar-bj" description="Create Saxon-B jar files for Java" depends="compile-bj, compile-s9api, create-meta-inf">
         <mkdir dir="${product.dir}/bj"/>
         <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9.jar">
             <include name="net/**/*.class"/>
@@ -562,14 +588,15 @@
                 <provider classname="http\://jdom.org/jaxp/xpath/jdom:       net.sf.saxon.xpath.XPathFactoryImpl"/>
                 <provider classname="http\://www.dom4j.org/jaxp/xpath/dom4j: net.sf.saxon.xpath.XPathFactoryImpl"/>
             </service>-->
-        </jar>  
+        </jar>
         <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-xqj.jar">
             <include name="net/sf/saxon/xqj/*.class"/>
             <include name="javax/xml/namespace/*.class"/>
             <include name="javax/xml/xquery/*.class"/>
-        </jar>                 
+        </jar>
     </target>
     
+    <!--
     <target name="jar-saj" description="Create Saxon-SA jar files for Java" depends="compile-saj, jar-bj">
         <mkdir dir="${product.dir}/saj"/>
         <copy todir="${product.dir}/saj">
@@ -595,33 +622,41 @@
                 <attribute name="Project-Name" value="Saxon-SA"/>
             </manifest>
             <metainf dir="${services.dir}/saxon9sa/META-INF"/>
+	    -->
             <!--
             <service type="javax.xml.transform.TransformerFactory"
                 provider="com.saxonica.SchemaAwareTransformerFactory"/>
             -->    
+	    <!--
         </jar>
         <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa-jaxp.jar">
             <include name="com/saxonica/jaxp/*.class"/>
             <include name="net/sf/saxon/dom/TypeInfoImpl.class"/>
             <metainf dir="${services.dir}/saxon9sa-jaxp/META-INF"/>
+	    -->
             <!--
             <service type="javax.xml.validation.SchemaFactory">
                 <provider classname="com.saxonica.jaxp.SchemaFactoryImpl"/>
                 <provider classname="http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl"/>
             </service>
             -->
+	    <!--
         </jar>
         <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa-qc.jar">
             <include name="com/saxonica/codegen/*.class"/>
             <include name="com.saxonica.CompileQuery.class"/>
         </jar>
+	-->
         <!-- The Saxon-Ant task is delivered with Saxon-B but it won't compile without Saxon-SA present,
              unless modified 
         <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-ant.jar">
             <include name="net/sf/saxon/ant/*.class"/>
         </jar>-->
+	<!--
     </target>
+    -->
     
+    <!-- 
     <target name="jar-bn" description="Create Saxon-B jar files for .NET" depends="compile-bn">
         <mkdir dir="${jar-n.dir}"/>
         <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9.jar">
@@ -645,11 +680,14 @@
           </fileset>
         </copy>
         <copy file="${saxondotnet.snk}" todir="${basedir}"/> 
+    -->
         <!--
             Invoke IKVMC to cross-compile the JAR files into DLLs
         -->           
+    <!-- 
         <exec dir="." executable="ikvmc.cmd" >
-          <arg line="${dot.net.debug}"/>  <!-- set to 'debug' for testing, 'live' for final build -->
+          <arg line="${dot.net.debug}"/> -->  <!-- set to 'debug' for testing, 'live' for final build -->
+    <!-- 
           <arg line="${basedir}/${jar-n.dir}"/>
           <arg line="${basedir}/${dll-n.dir}"/>
           <arg line="${version}"/>
@@ -729,6 +767,7 @@
         </fileset>
       </copy>
     </target>            
+    -->
     
     <target name="samples" description="Assemble Cross-Platform Samples and Use-Cases">
     	<mkdir dir="${build-resources.dir}/samples"/>
@@ -750,8 +789,7 @@
       </copy>
     </target>
     
-    <target name="samples-j" description="Copy and Compile Java Samples"
-    				depends="jar-saj">
+    <target name="samples-j" description="Copy and Compile Java Samples">
       <mkdir dir="${product.dir}/resources/samples/java"/>
       <mkdir dir="${product.dir}/resources/samples/java/classes"/>
       <copy todir="${product.dir}/resources/samples/java">
@@ -802,6 +840,7 @@
       </copy>
     </target>           
     
+    <!--
     <target name="samples-n" description="Assemble release samples for .NET"
                   depends="csharp-n">
       <mkdir dir="${build-resources.dir}/samples/cs"/>
@@ -826,6 +865,7 @@
         </fileset>
       </copy>      
     </target>               
+    -->
                   
     <target name="product-javadoc" description="Generate Javadoc.">
         <javadoc bottom="Copyright (c) Saxonica Limited. All rights reserved."
@@ -851,6 +891,7 @@
               overwrite="true"/>
     </target>
     
+    <!--
     <target name="product-dotnetdoc" description="Copy .NET API documentation"
         depends="copysource-development">
       <taskdef name="saxon-xslt" 
@@ -880,6 +921,7 @@
               tofile="${build-resources.dir}/doc/dotnetdoc/stylesheet.css"
               overwrite="true"/>
     </target>  
+    -->
     
     
     <target name="release-userdoc" description="Generate User Documentation">
@@ -897,6 +939,7 @@
           <include name="notices/**"/>
         </fileset>
       </copy>
+      <!--
       <copy todir="${product.dir}/saj">
         <fileset dir="${userdoc.dir}/welcome">
           <include name="doc/**"/>
@@ -915,6 +958,7 @@
           <include name="notices/**"/>
         </fileset>
       </copy>       
+	-->
 			<saxon-xslt in="${userdoc.dir}/catalog.xml" 
 			            style="${userdoc.dir}/render-page2.xsl"
 			            schemaAware="true"
@@ -956,8 +1000,8 @@
     </target>
     
     <target name="resources" description="Generate contents of released resources file"
-      	depends="release-userdoc, product-javadoc, product-dotnetdoc,
-      	         samples, samples-j, testdrivers-j, samples-n, release-source">
+      	depends="release-userdoc, product-javadoc,
+      	         samples, samples-j, testdrivers-j, release-source">
       <mkdir dir="${product.dir}/resources/build"/>
       <copy todir="${product.dir}/resources/build">
         <fileset dir="${basedir}">
@@ -976,14 +1020,19 @@
     <target name="bj" depends="compile-bj, jar-bj"
         description="Generate Saxon-B for the Java platform"/>
 
+    <!-- 
     <target name="saj" depends="bj, jar-saj"
         description="Generate Saxon-SA for the Java platform"/>
                
     <target name="n" depends="product-bn, product-san"
     		description="Generate Saxon for the .NET platform"/>    
+    -->
 
     <target name="build" description="Complete Saxon product build"
-      	depends="bj, saj, n"/> <!-- add resources -->
+      	depends="bj"/> <!-- add resources -->
+      
+    <target name="jar" description="Probably a mistake but jar is the only target the gentoo build wants to call"
+      	depends="build"/>
       
     <target name="release" description="Create .ZIP files for release" 
         >  <!--depends="build, resources"-->