Project

Profile

Help

Revision 76f5c46e

Added by Norman Tovey-Walsh 6 months ago

Build saxon10 artifacts not saxon9 ones

View differences:

build-n.gradle
377 377
  dependsOn: ["henCompile"],
378 378
  description: "Build the HE jar file for Saxon .NET"
379 379
) {
380
  archiveBaseName = "saxon9he"
380
  archiveBaseName = "saxon10he"
381 381
  destinationDirectory = file("${buildDir}/n/jar")
382 382
  from ("build/classes/hen") {
383 383
    include "net/**/*.class"
......
396 396
  dependsOn: ["penCompile"],
397 397
  description: "Build the PE jar file for Saxon .NET"
398 398
) {
399
  archiveBaseName = "saxon9pe"
399
  archiveBaseName = "saxon10pe"
400 400
  destinationDirectory = file("${buildDir}/n/jar")
401 401
  from ("build/classes/pen") {
402 402
    include "net/**/*.class"
......
440 440
  dependsOn: ["eenCompile"],
441 441
  description: "Build the EE jar file for Saxon .NET"
442 442
) {
443
  archiveBaseName = "saxon9ee"
443
  archiveBaseName = "saxon10ee"
444 444
  destinationDirectory = file("${buildDir}/n/jar")
445 445
  from ("build/classes/een") {
446 446
    include "net/**/*.class"
......
548 548
  inputs.files("${buildDir}/n/bin/he")
549 549
  inputs.file("${buildDir}/xerces/xerces.jar")
550 550
  inputs.file("${ikvmDir}/saxondotnet.snk")
551
  outputs.file("build/n/bin/he/saxon9he.dll")
551
  outputs.file("build/n/bin/he/saxon10he.dll")
552 552

  
553 553
  def ikvmCommand = [ "${ikvmDir}/ikvm-${ikvmVersion}/bin/ikvmc.exe" ] \
554 554
  + additionalIkvmOptions \
555
  + ["-out:${buildDir}/n/bin/he/saxon9he.dll",
556
     "-assembly:saxon9he",
555
  + ["-out:${buildDir}/n/bin/he/saxon10he.dll",
556
     "-assembly:saxon10he",
557 557
     "-target:library",
558 558
     "-keyfile:${ikvmDir}/saxondotnet.snk",
559 559
     "-version:${saxonVersion}",
......
562 562
     "-reference:System.Xml.dll",
563 563
     "-reference:System.dll",
564 564
     "-reference:${buildDir}/n/bin/he/IKVM.OpenJDK.Core.dll",
565
     "${buildDir}/n/jar/saxon9he.jar",
565
     "${buildDir}/n/jar/saxon10he.jar",
566 566
     "${buildDir}/n/jar/xerces.jar"]
567 567

  
568 568
  commandLine ikvmCommand
......
579 579
  inputs.files("${buildDir}/n/bin/pe")
580 580
  inputs.file("${buildDir}/xerces/xerces.jar")
581 581
  inputs.file("${ikvmDir}/saxondotnet.snk")
582
  outputs.file("build/n/bin/pe/saxon9pe.dll")
582
  outputs.file("build/n/bin/pe/saxon10pe.dll")
583 583

  
584 584
  def ikvmCommand = [ "${ikvmDir}/ikvm-${ikvmVersion}/bin/ikvmc.exe" ] \
585 585
  + additionalIkvmOptions \
586
  + ["-out:${buildDir}/n/bin/pe/saxon9pe.dll",
587
     "-assembly:saxon9pe",
586
  + ["-out:${buildDir}/n/bin/pe/saxon10pe.dll",
587
     "-assembly:saxon10pe",
588 588
     "-target:library",
589 589
     "-keyfile:${ikvmDir}/saxondotnet.snk",
590 590
     "-version:${saxonVersion}",
......
594 594
     "-reference:System.dll",
595 595
     "-reference:${buildDir}/n/bin/pe/IKVM.OpenJDK.Core.dll",
596 596
     "-reference:System.Security.dll",
597
     "${buildDir}/n/jar/saxon9pe.jar",
597
     "${buildDir}/n/jar/saxon10pe.jar",
598 598
     "${buildDir}/n/jar/xerces.jar",
599 599
     "${buildDir}/n/jar/tagsoup-${tagsoupVersion}.jar",
600 600
     "${buildDir}/n/jar/javax.mail-${mailVersion}.jar",
......
614 614
  inputs.files("${buildDir}/n/bin/ee")
615 615
  inputs.file("${buildDir}/xerces/xerces.jar")
616 616
  inputs.file("${ikvmDir}/saxondotnet.snk")
617
  outputs.file("build/n/bin/ee/saxon9ee.dll")
617
  outputs.file("build/n/bin/ee/saxon10ee.dll")
618 618

  
619 619
  def ikvmCommand = [ "${ikvmDir}/ikvm-${ikvmVersion}/bin/ikvmc.exe" ] \
620 620
  + additionalIkvmOptions \
621
  + ["-out:${buildDir}/n/bin/ee/saxon9ee.dll",
622
     "-assembly:saxon9ee",
621
  + ["-out:${buildDir}/n/bin/ee/saxon10ee.dll",
622
     "-assembly:saxon10ee",
623 623
     "-target:library",
624 624
     "-keyfile:${ikvmDir}/saxondotnet.snk",
625 625
     "-version:${saxonVersion}",
......
629 629
     "-reference:System.dll",
630 630
     "-reference:${buildDir}/n/bin/ee/IKVM.OpenJDK.Core.dll",
631 631
     "-reference:System.Security.dll",
632
     "${buildDir}/n/jar/saxon9ee.jar",
632
     "${buildDir}/n/jar/saxon10ee.jar",
633 633
     "${buildDir}/n/jar/xerces.jar",
634 634
     "${buildDir}/n/jar/asm-${asmVersion}/asm-${asmVersion}.jar",
635 635
     "${buildDir}/n/jar/asm-${asmVersion}/asm-analysis-${asmVersion}.jar",
......
753 753
  ) {
754 754
    inputs.files("${buildDir}/n/build/dll/he")
755 755
    inputs.files("${buildDir}/n/csharp/api")
756
    outputs.file("${buildDir}/n/bin/he/saxon9he-api.dll")
756
    outputs.file("${buildDir}/n/bin/he/saxon10he-api.dll")
757 757

  
758 758
    doLast {
759 759
      def args = [csharpCompiler,
760
                  "-out:${buildDir}/n/bin/he/saxon9he-api.dll",
761
                  "-target:library", "-doc:${buildDir}/n/saxon9he-api.xml",
760
                  "-out:${buildDir}/n/bin/he/saxon10he-api.dll",
761
                  "-target:library", "-doc:${buildDir}/n/saxon10he-api.xml",
762 762
                  "-keyfile:${ikvmDir}/saxondotnet.snk"]
763 763
      fileTree(dir: "${buildDir}/n/bin/he",
764 764
               include: "*.dll").each { dll ->
......
835 835
  ) {
836 836
    inputs.files("${buildDir}/n/build/dll/pe")
837 837
    inputs.files("${buildDir}/n/csharp/api")
838
    outputs.file("${buildDir}/n/bin/pe/saxon9pe-api.dll")
838
    outputs.file("${buildDir}/n/bin/pe/saxon10pe-api.dll")
839 839

  
840 840
    doLast {
841 841
      def args = [csharpCompiler,
842
                  "-out:${buildDir}/n/bin/pe/saxon9pe-api.dll",
843
                  "-target:library", "-doc:${buildDir}/n/saxon9pe-api.xml",
842
                  "-out:${buildDir}/n/bin/pe/saxon10pe-api.dll",
843
                  "-target:library", "-doc:${buildDir}/n/saxon10pe-api.xml",
844 844
                  "-keyfile:${ikvmDir}/saxondotnet.snk"]
845 845
      fileTree(dir: "${buildDir}/n/bin/pe",
846 846
               include: "*.dll").each { dll ->
......
917 917
  ) {
918 918
    inputs.files("${buildDir}/n/build/dll/ee")
919 919
    inputs.files("${buildDir}/n/csharp/api")
920
    outputs.file("${buildDir}/n/bin/ee/saxon9ee-api.dll")
920
    outputs.file("${buildDir}/n/bin/ee/saxon10ee-api.dll")
921 921

  
922 922
    doLast {
923 923
      def args = [csharpCompiler,
924
                  "-out:${buildDir}/n/bin/ee/saxon9ee-api.dll",
925
                  "-target:library", "-doc:${buildDir}/n/saxon9ee-api.xml",
924
                  "-out:${buildDir}/n/bin/ee/saxon10ee-api.dll",
925
                  "-target:library", "-doc:${buildDir}/n/saxon10ee-api.xml",
926 926
                  "-keyfile:${ikvmDir}/saxondotnet.snk"]
927 927
      fileTree(dir: "${buildDir}/n/bin/ee",
928 928
               include: "*.dll").each { dll ->
......
1026 1026
  dependsOn: ["hen_csharpApi", "hen_csharpTransform", "hen_csharpQuery"],
1027 1027
  description: "Build Saxon HE for .NET"
1028 1028
) {
1029
  from "${buildDir}/n/saxon9he-api.xml"
1029
  from "${buildDir}/n/saxon10he-api.xml"
1030 1030
  into "${buildDir}/n/bin/he"
1031 1031
}
1032 1032

  
......
1035 1035
  dependsOn: ["pen_csharpApi", "pen_csharpTransform", "pen_csharpQuery"],
1036 1036
  description: "Build Saxon PE for .NET"
1037 1037
) {
1038
  from "${buildDir}/n/saxon9pe-api.xml"
1038
  from "${buildDir}/n/saxon10pe-api.xml"
1039 1039
  into "${buildDir}/n/bin/pe"
1040 1040
}
1041 1041

  
......
1044 1044
  dependsOn: ["een_csharpApi", "een_csharpTransform", "een_csharpQuery", "een_csharpValidate"],
1045 1045
  description: "Build Saxon EE for .NET"
1046 1046
) {
1047
  from "${buildDir}/n/saxon9ee-api.xml"
1047
  from "${buildDir}/n/saxon10ee-api.xml"
1048 1048
  into "${buildDir}/n/bin/ee"
1049 1049
}
1050 1050

  

Also available in: Unified diff