Project

Profile

Help

Revision 6717e3bc

Added by O'Neil Delpratt almost 8 years ago

update to build files in 9.5

View differences:

latest9.5/build/build-constants.xml
33 33
    
34 34
    <import file="build-locations.xml"/> <!-- defines $repo-os and $repo-priv -->
35 35
    
36
    <property name="version" value="9.5.0.1"/>
37
    <property name="versionh" value="9-5-0-1"/>
36
    <property name="version" value="9.5.1.4"/>
37
    <property name="versionh" value="9-5-1-4"/>
38
    <property name="version.maven" value="9.5.1-4"/>
38 39
    <property name="major.version" value="9.5"/>
39 40
    <property name="major.versionh" value="9-5"/>
40
    <property name="release.date" value="2013-04-18"/>
41
    <property name="release.date" value="2014-01-22"/>
41 42
    
42 43
    <!-- REMEMBER ALSO TO SET THE VERSION IN Version.java -->
43 44
    
......
50 51
    <property name="repository" value=".."/>
51 52
    <property name="development-j.dir" value="${repository}/src"/>   
52 53
    <property name="development-data.dir" value="${development-j.dir}/he/data"/>        
53
<!--    <property name="source-hej.dir" value="${repo-os}/latest9.5/hej"/>
54
    <property name="source-eej.dir" value="${repo-priv}/latest9.5/eej"/> -->
55
    <property name="source-hej.dir" value="${repo-os}/he/java"/>
56
    <property name="source-eej.dir" value="${repo-priv}/ee/java"/>
54
    <property name="source-hej.dir" value="${repo-os}/latest9.5/hej"/>
55
    <property name="source-eej.dir" value="${repo-priv}/latest9.5/eej"/> 
56
    <!--<property name="source-hej.dir" value="${repo-os}/he/java"/>
57
    <property name="source-eej.dir" value="${repo-priv}/ee/java"/>-->
57 58
    	    
58 59
    <!-- directory holding XML user documentation -->
59
    <property name="userdoc.dir" value="${repository}/userdoc/saxon9"/>
60
  <property name="userdoc.dir" value="${repo-priv}/latest9.5/userdoc"/>
60 61
    
61 62
    
62 63
    <!-- directories holding use cases and sample applications -->
latest9.5/build/build-j.xml
18 18
    <property name="drivers-j.dir" value="../MyJava/testcode/test"/>		    
19 19
		    
20 20

  
21
    <taskdef resource="com/igormaznitsa/jcp/ant/tasks.properties" classpath="../lib/jcp-5.3.jar"/>
21
    <taskdef resource="com/igormaznitsa/jcp/ant/tasks.properties" classpath="../lib/jcp-5.3.2.jar"/>
22 22
    <!-- following locations are relative to the build file -->
23 23
        
24 24
    <property name="services.dir" value="services"/>
......
71 71
             just to use the first line: this works for JDK 1.6. But JDK 1.5 incorrectly
72 72
             expects a properties file, in the form of the subsequent line. The combination
73 73
             works with both Java releases -->
74
        <!-- See bug 1944. The next 9.5 maintenance release will use the JDK 1.6 format;
75
             the next full release will drop the XPath services data entirely -->
74 76
        <echo file="${services.dir}/saxon9he/META-INF/services/javax.xml.xpath.XPathFactory"
75 77
>net.sf.saxon.xpath.XPathFactoryImpl
76
http\://java.sun.com/jaxp/xpath/dom:    net.sf.saxon.xpath.XPathFactoryImpl
77
http\://saxon.sf.net/jaxp/xpath/om:     net.sf.saxon.xpath.XPathFactoryImpl
78
</echo>
78
        </echo>
79
        
80
        <!-- dropped from the above:
81
            http\://java.sun.com/jaxp/xpath/dom:    net.sf.saxon.xpath.XPathFactoryImpl
82
            http\://saxon.sf.net/jaxp/xpath/om:     net.sf.saxon.xpath.XPathFactoryImpl
83
        -->
79 84

  
80 85
        <mkdir dir="${services.dir}/saxon9pe/META-INF/services"/>
81 86
        <echo file="${services.dir}/saxon9pe/META-INF/services/javax.xml.transform.TransformerFactory"
82 87
              message="com.saxonica.config.ProfessionalTransformerFactory"/> 
83 88
        <echo file="${services.dir}/saxon9pe/META-INF/services/javax.xml.xpath.XPathFactory"
84 89
>com.saxonica.config.ProfessionalXPathFactory
85
http\://java.sun.com/jaxp/xpath/dom:    com.saxonica.config.ProfessionalXPathFactory
86
http\://saxon.sf.net/jaxp/xpath/om:     com.saxonica.config.ProfessionalXPathFactory
87
http\://www.xom.nu/jaxp/xpath/xom:      com.saxonica.config.ProfessionalXPathFactory
88
http\://jdom.org/jaxp/xpath/jdom:       com.saxonica.config.ProfessionalXPathFactory
89
http\://www.dom4j.org/jaxp/xpath/dom4j: com.saxonica.config.ProfessionalXPathFactory
90
</echo>
90
        </echo>
91
        
92
        <!-- dropped from the above:
93
            http\://java.sun.com/jaxp/xpath/dom:    com.saxonica.config.ProfessionalXPathFactory
94
            http\://saxon.sf.net/jaxp/xpath/om:     com.saxonica.config.ProfessionalXPathFactory
95
            http\://www.xom.nu/jaxp/xpath/xom:      com.saxonica.config.ProfessionalXPathFactory
96
            http\://jdom.org/jaxp/xpath/jdom:       com.saxonica.config.ProfessionalXPathFactory
97
            http\://www.dom4j.org/jaxp/xpath/dom4j: com.saxonica.config.ProfessionalXPathFactory
98
            -->
91 99

  
92 100
               
93 101
        <mkdir dir="${services.dir}/saxon9ee/META-INF/services"/>
......
95 103
              message="com.saxonica.config.EnterpriseTransformerFactory"/>
96 104
        <echo file="${services.dir}/saxon9ee/META-INF/services/javax.xml.xpath.XPathFactory"
97 105
>com.saxonica.config.EnterpriseXPathFactory
98
http\://java.sun.com/jaxp/xpath/dom:    com.saxonica.config.EnterpriseXPathFactory
99
http\://saxon.sf.net/jaxp/xpath/om:     com.saxonica.config.EnterpriseXPathFactory
100
http\://www.xom.nu/jaxp/xpath/xom:      com.saxonica.config.EnterpriseXPathFactory
101
http\://jdom.org/jaxp/xpath/jdom:       com.saxonica.config.EnterpriseXPathFactory
102
http\://www.dom4j.org/jaxp/xpath/dom4j: com.saxonica.config.EnterpriseXPathFactory
103
</echo>
106
        </echo>
107
        <!-- Dropped from the above:
108
            http\://java.sun.com/jaxp/xpath/dom:    com.saxonica.config.EnterpriseXPathFactory
109
            http\://saxon.sf.net/jaxp/xpath/om:     com.saxonica.config.EnterpriseXPathFactory
110
            http\://www.xom.nu/jaxp/xpath/xom:      com.saxonica.config.EnterpriseXPathFactory
111
            http\://jdom.org/jaxp/xpath/jdom:       com.saxonica.config.EnterpriseXPathFactory
112
            http\://www.dom4j.org/jaxp/xpath/dom4j: com.saxonica.config.EnterpriseXPathFactory
113
            -->
104 114
<echo file="${services.dir}/saxon9ee/META-INF/services/javax.xml.validation.SchemaFactory"
105 115
>com.saxonica.jaxp.SchemaFactoryImpl</echo>     
106 116
       <!--<echo file="${services.dir}/saxon9ee/META-INF/services/javax.xml.validation.SchemaFactory"
......
185 195
            <include name="net/sf/saxon/**/*.java"/>
186 196
            <include name="javax/xml/xquery/*.java"/>
187 197
            <exclude name="**/dotnet/**"/>
198
            <exclude name="net/sf/saxon/option/expath/zip/**"/>  
188 199
            <include name="net/sf/saxon/**/package.html"/>
200
	    <exclude name="net/sf/saxon/option/expath/zip/**" />		
189 201
          </fileset>
190 202
          <fileset dir="${source-eej.dir}">
191 203
            <include name="com/saxonica/**/*.java"/>
......
225 237
            <include name="net/sf/saxon/**/*.java"/>
226 238
            <include name="javax/xml/xquery/*.java"/>
227 239
            <exclude name="**/dotnet/**"/>
240
            <exclude name="net/sf/saxon/option/expath/zip/**"/>  
228 241
            <include name="net/sf/saxon/**/package.html"/>
242
	    <exclude name="net/sf/saxon/option/expath/zip/**" />		
229 243
          </fileset>
230 244
          <fileset dir="${source-eej.dir}">
231 245
            <include name="com/saxonica/**/*.java"/>
232 246
            <exclude name="com/saxonica/testdriver/**/*.java"/>
233 247
            <!--<exclude name="com/saxonica/jaxp/*.java"/>-->
234
            <exclude name="com/saxonica/config/pe/**" />
248
            <!--<exclude name="com/saxonica/config/pe/**" />-->
235 249
            <!--<exclude name="com/saxonica/config/DotNetVerifier.java"/>-->
236 250
            <exclude name="com/saxonica/config/DotNetExtensionFunctionFactory.java"/>
237 251
            <exclude name="com/saxonica/config/DotNetExtensionLibrary.java"/>
......
327 341
            destination="${temp-src-prep-eej.dir}"
328 342
            verbose="true">
329 343
        <global name="EE" value="true"/>
330
        <global name="PE" value="false"/>
344
        <global name="PE" value="true"/>
331 345
       <global name="STREAM" value="true"/>
332 346
       <global name="HOF" value="true"/>
333 347
       <global name="BYTECODE" value="true"/>
......
336 350
       </preprocess>
337 351
       <replaceregexp file="${temp-src-prep-eej.dir}/net/sf/saxon/Configuration.java" match="import net\.sf\.saxon\.dotnet\.DotNetPlatform(.*)" replace="" byline="yes" />
338 352
       <replaceregexp file="${temp-src-prep-eej.dir}/net/sf/saxon/Configuration.java" match="import com\.saxonica\.config\.DotNetPlatform(.*)" replace="" byline="yes" />
353
             <!--<replaceregexp match="import com\.saxonica\.bytecode(.*)" replace="" flags="g"  byline="true">
354
	     <fileset dir="${temp-src-prep-eej.dir}"  includes="**/*.java" />
355
       </replaceregexp>   -->
339 356
       <echo>Preprocessing eej complete!</echo>
340 357
    </target>
341 358
        
......
412 429
        </javac>
413 430
    </target>
414 431

  
432
<target name="unpack">
433
    <!-- saxon9-unpack.jar -->
434
    <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/hej/saxon9-unpack.jar" update="true">
435
        <include name="com/saxonica/ptree/PTreeReader.class"/>
436
        <include name="com/saxonica/ptree/PTreeReader$PTreeException.class"/>
437
        <include name="com/saxonica/ptree/TextMangler.class"/>
438
        <include name="com/saxonica/ptree/TextObfuscator.class"/>
439
        <include name="com/saxonica/ptree/PackageURIResolver.class"/>
440
    </jar>
441
</target>
415 442
          
416
    <target name="jar-hej" description="Create Saxon-HE jar files for Java" depends="compile-hej">
443
    <target name="jar-hej" description="Create Saxon-HE jar files for Java" depends="compile-hej, unpack">
417 444
        <mkdir dir="${product.dir}/hej"/>
418 445
        <mkdir dir="${classes-j.dir}/he"/>
419 446

  
......
460 487

  
461 488
    </target>
462 489
    
463
    <target name="jar-pej" description="Create Saxon-PE jar files for Java" depends="compile-pej">
490
    <target name="jar-pej" description="Create Saxon-PE jar files for Java" depends="compile-pej, unpack">
464 491
        <mkdir dir="${product.dir}/pej"/>
465 492
        <mkdir dir="${classes-j.dir}/pe"/>
466 493
        
......
519 546

  
520 547
    </target>
521 548
    
522
    <target name="jar-eej" description="Create Saxon-EE jar files for Java" depends="compile-eej">
549
    <target name="jar-eej" description="Create Saxon-EE jar files for Java" depends="compile-eej, unpack">
523 550
        <mkdir dir="${product.dir}/eej"/>
524 551
        <mkdir dir="${classes-j.dir}/ee"/>
525 552
        
......
734 761
    </target>           
735 762
    
736 763
                  
737
    <target name="product-javadoc" description="Generate Javadoc." depends="copysource-development-j">
764
    <target name="product-javadoc" description="Generate Javadoc." depends="copysource-development-j, preprocess-eej">
738 765
        <javadoc bottom="Copyright (c) 2004-2013 Saxonica Limited. All rights reserved."
739 766
            destdir="${javadoc.dir}" doctitle="Saxon9 Java API Documentation"
740 767
            noindex="false" notree="false" access="protected"
741 768
            maxmemory="512M" source="1.5">
742
            <packageset dir="${temp-src-j.dir}">
769
            <packageset dir="${temp-src-prep-eej.dir}">
743 770
                <include name="net/**"/>
744 771
                <include name="com/**"/>
745 772
                <include name="javax/xml/query/**"/>
......
783 810
    </target>
784 811

  
785 812

  
786
    <target name="signjars" depends="jar-hej, jar-pej, jar-eej, private-signjars" description="Sign all JAR files">
813
    <target name="signjars" depends="jar-hej, jar-pej, jar-eej, maven, private-signjars" description="Sign all JAR files">
787 814
        <!-- If the private-signjars task is not available, simply delete the dependency -->
788 815
    </target>
789 816
    
......
804 831
	  <zip zipfile="${issue.dir}/SaxonEE${versionh}J.zip">
805 832
        <fileset dir="${product.dir}/eej"/>
806 833
      </zip>                     
807
     </target>    
834
     </target>
835

  
836
    <target name="maven" description="Build files ready for maven" depends="compile-hej">
837
        <mkdir dir="product.dir/maven" />
838
       <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="../lib/jarjar-1.1.jar"/>
839
       <jar basedir="${temp-src-prep-hej.dir}" compress="true" jarfile="${product.dir}/maven/Saxon-HE-${version.maven}-sources.jar">
840
           <include name="net/**/*.java"/>
841
           <include name="net/**/package.html"/>
842
      </jar>
843

  
844
      <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/maven/Saxon-HE-${version.maven}.jar">
845
            <include name="net/**/*.class"/>
846
            <exclude name="net/sf/saxon/option/**/*.class"/>
847
            <!--<exclude name="**/javax/**/*.class"/>
848
            <exclude name="**/xpath/**/*.class"/>
849
            <exclude name="**/xqj/**/*.class"/>-->
850
            <include name="javax/xml/xquery/*.class"/>
851
            <include name="META-INF/**"/>
852
            <manifest>
853
                <attribute name="Project-Name" value="Saxon-HE"/>
854
                <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
855
            </manifest>
856
            <metainf dir="${services.dir}/saxon9he/META-INF"/>
857
            <!--<metainf dir="${services.dir}/saxon9-xpath/META-INF"/>-->
858
            <!--
859
            <service type="javax.xml.transform.TransformerFactory"
860
                provider="net.sf.saxon.TransformerFactoryImpl"/>
861
            -->
862
        </jar>
863

  
864
        <jar basedir="${development-data.dir}" compress="${build.compress}" jarfile="${product.dir}/maven/Saxon-HE-${version.maven}.jar" update="true">
865
            <include name="**"/>
866
        </jar>
867

  
868

  
869
        <jar basedir="${classes-j.dir}" compress="true" jarfile="${product.dir}/maven/Saxon-HE-${version.maven}-compressed.jar">
870
            <include name="net/**/*.class"/>
871
            <exclude name="net/sf/saxon/option/**/*.class"/>
872
            <!--<exclude name="**/javax/**/*.class"/>
873
            <exclude name="**/xpath/**/*.class"/>
874
            <exclude name="**/xqj/**/*.class"/>-->
875
            <include name="javax/xml/xquery/*.class"/>
876
            <include name="META-INF/**"/>
877
            <manifest>
878
                <attribute name="Project-Name" value="Saxon-HE"/>
879
                <attribute name="Main-Class" value="net.sf.saxon.Transform"/>
880
            </manifest>
881
            <metainf dir="${services.dir}/saxon9he/META-INF"/>
882
            <!--<metainf dir="${services.dir}/saxon9-xpath/META-INF"/>-->
883
            <!--
884
            <service type="javax.xml.transform.TransformerFactory"
885
                provider="net.sf.saxon.TransformerFactoryImpl"/>
886
            -->
887
        </jar>
888

  
889
                <!-- add data files -->
890
        <jar basedir="${development-data.dir}" compress="true" jarfile="${product.dir}/maven/Saxon-HE-${version.maven}-compressed.jar" update="true">
891
            <include name="**"/>
892
        </jar>
893
    </target>
808 894
       
809 895
    
810 896
</project>
latest9.5/build/build-n.xml
8 8
	<import file="build-constants.xml"/>      
9 9
		    
10 10
    <!-- directories holding C# source code -->
11
    <property name="vss-n.dir" value="${repo-os}/hen"/>
11
    <property name="vss-n.dir" value="${repo-os}/latest9.5/hen"/>
12 12

  
13 13
    <!-- directory holding C# source code as in Subversion -->
14 14
    <!--<property name="subversion-n.dir" value="${root}/saxon-svn2/latest9.0/bn/csource"/>-->	
......
28 28
<!--      <condition property="csharp.compiler" value="C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\csc.exe">
29 29
        <os family="windows"/>
30 30
      </condition>-->
31
    
32
  <condition property="csharp.compiler" value="C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe">
31
    <condition property="csharp.compiler" value="C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\csc.exe">
32
<!--  <condition property="csharp.compiler" value="C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe"> -->
33 33
    <os family="windows"/>
34 34
  </condition>
35 35
    <!-- following locations are for IKVMC code used to build the .NET product -->
......
83 83
    <property name="source-api-n.dir" value="${vss-n.dir}/csource/api"/>
84 84
    <property name="source-cmd-n.dir" value="${vss-n.dir}/csource/cmd"/>
85 85
    <property name="source-samples-n.dir" value="${vss-n.dir}/csource/samples"/>
86
    <taskdef resource="com/igormaznitsa/jcp/ant/tasks.properties" classpath="../lib/jcp-5.3.jar"/>
86
    <taskdef resource="com/igormaznitsa/jcp/ant/tasks.properties" classpath="../lib/jcp-5.3.2.jar"/>
87 87
           
88 88
    <path id="classpath-n">
89 89
        <fileset dir="${lib.dir}">
......
1185 1185
      </dependset>
1186 1186
    </target>               
1187 1187
                     
1188
    <!--<target name="product-dotnetdoc" description="Create .NET API documentation"
1189
        depends="copysource-development-n, csharp-hen, dotnetdoc-dependset" >-->
1190
  <target name="product-dotnetdoc" description="Create .NET API documentation" depends="csharp-een"
1191
    >
1188
    <target name="product-dotnetdoc" description="Create .NET API documentation"
1189
        depends="copysource-development-n, csharp-hen, dotnetdoc-dependset" >
1190

  
1192 1191
        <mkdir dir="${docout-n.dir}"/>
1193 1192
        
1194 1193
        <xslt  in="${doctools-n.dir}/parsecs.xsl"
......
1216 1215
	      <classpath refid="saxonee.class.path"/>
1217 1216
			<factory name="com.saxonica.config.EnterpriseTransformerFactory"/>
1218 1217
	    </xslt>
1219
	             	            
1218
	     <xslt in="${doctemp-n.dir}/merged.xml"
1219
			style="${doctools-n.dir}/convert-to-jel-package.xsl"
1220
			out="${docout-n.dir}/dotnetdoc-xml/packages/Saxon.Api.xml">
1221
	      <classpath refid="saxonee.class.path"/>
1222
			<factory name="com.saxonica.config.EnterpriseTransformerFactory"/>
1223
	    </xslt>
1220 1224
      
1221 1225
      <copy file="${doctools-n.dir}/stylesheet.css"
1222 1226
              tofile="${build-resources.dir}/doc/dotnetdoc/stylesheet.css"
......
1251 1255
    		description="Generate Saxon for the .NET platform"/>
1252 1256
    		<!--, samples-n --> 
1253 1257
    		
1254
    <target name="installer-hen" description="Create installer for Saxon-HE on .NET" depends="n">
1258
    <target name="installer-hen" description="Create installer for Saxon-HE on .NET" depends="n, release-userdoc-n">
1255 1259
       <mkdir dir="${temp.dir}/n/installer"/> 
1256 1260
       
1257 1261
      <echo file="${temp.dir}/n/installer/he.iss">
......
1282 1286
Source: "IKVM.OpenJDK.XML.API.dll"; DestDir: "{app}\bin"; Flags: gacinstall ; StrongAssemblyName: "IKVM.OpenJDK.XML.API.dll, ${ikvm.strongname}"
1283 1287
Source: "saxon9he.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon9he.dll, ${saxon.strongname}"
1284 1288
Source: "saxon9he-api.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon9he-api.dll, ${saxon.strongname}"
1289
Source: "..\notices\APACHE-RESOLVER.txt" ; DestDir: "{app}\notices"
1290
Source: "..\notices\APACHE-XERCES.txt" ; DestDir: "{app}\notices"
1291
Source: "..\notices\CERN.txt" ; DestDir: "{app}\notices"
1292
Source: "..\notices\FRIJTERS.txt" ; DestDir: "{app}\notices"
1293
Source: "..\notices\GPL+CLASSPATH.txt" ; DestDir: "{app}\notices"
1294
Source: "..\notices\JAMESCLARK.txt" ; DestDir: "{app}\notices"
1295
Source: "..\notices\LICENSE.txt" ; DestDir: "{app}\notices"
1296
Source: "..\notices\THAI.txt" ; DestDir: "{app}\notices"
1297
Source: "..\notices\UNICODE.txt" ; DestDir: "{app}\notices"
1285 1298

  
1286 1299
; Program Files
1287 1300
Source: "Query.exe"; DestDir: "{app}\bin"
......
1338 1351
Source: "IKVM.OpenJDK.XML.API.dll"; DestDir: "{app}\bin"; Flags: gacinstall ; StrongAssemblyName: "IKVM.OpenJDK.XML.API.dll, ${ikvm.strongname}"
1339 1352
Source: "saxon9pe.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon9pe.dll, ${saxon.strongname}"
1340 1353
Source: "saxon9pe-api.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon9pe-api.dll, ${saxon.strongname}"
1354
Source: "..\notices\APACHE-RESOLVER.txt" ; DestDir: "{app}\notices"
1355
Source: "..\notices\APACHE-XERCES.txt" ; DestDir: "{app}\notices"
1356
Source: "..\notices\CERN.txt" ; DestDir: "{app}\notices"
1357
Source: "..\notices\FRIJTERS.txt" ; DestDir: "{app}\notices"
1358
Source: "..\notices\GPL+CLASSPATH.txt" ; DestDir: "{app}\notices"
1359
Source: "..\notices\JAMESCLARK.txt" ; DestDir: "{app}\notices"
1360
Source: "..\notices\LICENSE.txt" ; DestDir: "{app}\notices"
1361
Source: "..\notices\THAI.txt" ; DestDir: "{app}\notices"
1362
Source: "..\notices\UNICODE.txt" ; DestDir: "{app}\notices"
1341 1363

  
1342 1364
; Program Files
1343 1365
Source: "Query.exe"; DestDir: "{app}\bin"
......
1394 1416
Source: "IKVM.OpenJDK.XML.API.dll"; DestDir: "{app}\bin"; Flags: gacinstall ; StrongAssemblyName: "IKVM.OpenJDK.XML.API.dll, ${ikvm.strongname}"
1395 1417
Source: "saxon9ee.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon9ee.dll, ${saxon.strongname}"
1396 1418
Source: "saxon9ee-api.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon9ee-api.dll, ${saxon.strongname}"
1419
Source: "..\notices\APACHE-RESOLVER.txt" ; DestDir: "{app}\notices"
1420
Source: "..\notices\APACHE-XERCES.txt" ; DestDir: "{app}\notices"
1421
Source: "..\notices\ASM.txt" ; DestDir: "{app}\notices"
1422
Source: "..\notices\CERN.txt" ; DestDir: "{app}\notices"
1423
Source: "..\notices\FRIJTERS.txt" ; DestDir: "{app}\notices"
1424
Source: "..\notices\GPL+CLASSPATH.txt" ; DestDir: "{app}\notices"
1425
Source: "..\notices\JAMESCLARK.txt" ; DestDir: "{app}\notices"
1426
Source: "..\notices\LICENSE.txt" ; DestDir: "{app}\notices"
1427
Source: "..\notices\THAI.txt" ; DestDir: "{app}\notices"
1428
Source: "..\notices\UNICODE.txt" ; DestDir: "{app}\notices"
1397 1429

  
1398 1430
; Program Files
1399 1431
Source: "Query.exe"; DestDir: "{app}\bin"
latest9.5/build/build.xml
52 52
    <import file="test-n.xml"/>   
53 53

  
54 54
    <path id="saxonee.class.path">
55
      <pathelement location="${lib.dir}/saxon9ee.jar"/>
55
      <pathelement location="${product.dir}/eej/saxon9ee.jar"/>
56 56
    </path>
57 57
    
58 58

  
......
109 109
         by platform in case a platform-specific build is needed -->
110 110
    
111 111
    
112
    <target name="samples" depends="samples-j, samples-n"/>
112
    <target name="samples" depends="samples-j"/> <!-- samples-n -->
113 113
    
114 114
 
115 115
  
......
298 298
      </xslt>-->
299 299
 
300 300
	  <zip zipfile="${build-resources.dir}/source-userdoc.zip">
301
		  <fileset dir="${userdoc.dir}">
302
		    <include name="**/*.xml"/>
303
		    <include name="**/*.xsl"/>
304
		    <include name="**/*.xsd"/>
305
		    <include name="**/*.css"/>
306
		    <include name="fixed/**"/>
307
		    <include name="welcome/**"/>
308
		  </fileset>
301
		  <fileset dir="${userdoc.dir}/viewer_app" />
309 302
	 </zip>  			     
310 303
    </target>
311 304
    
312 305
    <target name="release-source" description="Generate Zip file containing issued Source Code">
313 306
      <zip zipfile="${product.dir}/saxon${versionh}source.zip">
314
        <fileset dir="${source-hej.dir}">
307
        <fileset dir="${temp.dir}/preprocessed/hej/source">
315 308
           <include name="net/**/*.java"/>
316 309
           <include name="net/**/package.html"/>
317 310
        </fileset>
......
332 325
    
333 326
    <target name="resources" description="Generate contents of released resources file"
334 327
      	depends="release-userdoc, product-javadoc, product-dotnetdoc,
335
      	         samples, samples-j, testdrivers-j,  release-source">  <!-- samples-n, -->
328
      	         samples, samples-j, testdrivers-j,  release-source, release-userdoc-n">  <!-- samples-n, -->
336 329
      <mkdir dir="${product.dir}/resources/build"/>
337 330
      <copy todir="${product.dir}/resources/build">
338 331
        <fileset dir="${basedir}">
......
356 349
      	depends="j, n"/> 
357 350
      
358 351
    <target name="test" description="Run regression tests"
359
        depends="test-j, test-n"/>  	 
352
        depends="test-j, test-n"/>
353

  
354
    <target name="maintenance-release" description="Create .ZIP files for release"
355
        depends="build, release-j, release-n"
356
        >
357
        <!-- removed "resources" - not used in maintenance releases -->
358
        <!-- TODO add test -->
359

  
360
      <mkdir dir="${issue.dir}"/>
361
      <!-- <zip zipfile="${issue.dir}/saxonhe${versionh}j.zip">
362
        <fileset dir="${product.dir}/hej"/>
363
      </zip>
364
      <zip zipfile="${issue.dir}/saxonhe${versionh}n.zip">
365
        <fileset dir="${product.dir}/hen"/>
366
      </zip>
367
      <zip zipfile="${issue.dir}/saxonpe${versionh}j.zip">
368
        <fileset dir="${product.dir}/pej"/>
369
      </zip>
370
      <zip zipfile="${issue.dir}/saxonpe${versionh}n.zip">
371
        <fileset dir="${product.dir}/pen"/>
372
      </zip>
373
	  <zip zipfile="${issue.dir}/saxonee${versionh}j.zip">
374
        <fileset dir="${product.dir}/eej"/>
375
      </zip>
376
      <zip zipfile="${issue.dir}/saxonee${versionh}n.zip">
377
        <fileset dir="${product.dir}/een"/>
378
      </zip>-->
379

  
380
      <!-- <copy file="${product.dir}/saxon${versionh}source.zip" todir="${issue.dir}"/>-->
381
    </target>
360 382
      
361 383
    <target name="release" description="Create .ZIP files for release"
362 384
        depends="build, release-j, release-n, resources"
363
        >  
385
        >
386

  
364 387
        <!-- removed "resources" - not used in maintenance releases -->
365 388
        <!-- TODO add test -->
366 389
        

Also available in: Unified diff