Project

Profile

Help

Maintenance. Planio will be undergoing a scheduled maintenance this weekend. Between Saturday, July 24 at 9:00 UTC and Sunday, July 25, 22:00 UTC your account might observe occasional downtimes which may last up to several minutes in some cases.

Revision 05591ffc

Added by O'Neil Delpratt 6 months ago

Further fixup to the .NET dll names

View differences:

build-n.gradle
296 296
        writer.writeLine("          [assembly: AssemblyConfiguration(\"\")]")
297 297
        writer.writeLine("          [assembly: AssemblyCompany(\"Saxonica\")]")
298 298
        writer.writeLine("          [assembly: AssemblyProduct(\"Saxon.Api\")]")
299
        writer.writeLine("          [assembly: AssemblyCopyright(\"Copyright © Saxonica 2019\")]")
299
        writer.writeLine("          [assembly: AssemblyCopyright(\"Copyright © Saxonica 2020\")]")
300 300
        writer.writeLine("          [assembly: AssemblyTrademark(\"\")]")
301 301
        writer.writeLine("          [assembly: AssemblyCulture(\"\")]")
302 302
        writer.writeLine("          [assembly: ComVisible(false)]")
......
549 549
  inputs.files("${buildDir}/n/bin/he")
550 550
  inputs.file("${buildDir}/xerces/xerces.jar")
551 551
  inputs.file("${ikvmDir}/saxondotnet.snk")
552
  outputs.file("build/n/bin/he/saxon10he.dll")
552
  outputs.file("build/n/bin/he/saxon-he-${saxonMajorVersion}.${saxonMinorVersion}.dll")
553 553

  
554 554
  def ikvmCommand = [ "${ikvmDir}/ikvm-${ikvmVersion}/bin/ikvmc.exe" ] \
555 555
  + additionalIkvmOptions \
556
  + ["-out:${buildDir}/n/bin/he/saxon10he.dll",
557
     "-assembly:saxon10he",
556
  + ["-out:${buildDir}/n/bin/he/saxon-he-${saxonMajorVersion}.${saxonMinorVersion}.dll",
557
     "-assembly:saxon-he-${saxonMajorVersion}.${saxonMinorVersion}",
558 558
     "-target:library",
559 559
     "-keyfile:${ikvmDir}/saxondotnet.snk",
560 560
     "-version:${saxonVersion}",
......
580 580
  inputs.files("${buildDir}/n/bin/pe")
581 581
  inputs.file("${buildDir}/xerces/xerces.jar")
582 582
  inputs.file("${ikvmDir}/saxondotnet.snk")
583
  outputs.file("build/n/bin/pe/saxon10pe.dll")
583
  outputs.file("build/n/bin/pe/saxon-pe-${saxonMajorVersion}.${saxonMinorVersion}.dll")
584 584

  
585 585
  def ikvmCommand = [ "${ikvmDir}/ikvm-${ikvmVersion}/bin/ikvmc.exe" ] \
586 586
  + additionalIkvmOptions \
587
  + ["-out:${buildDir}/n/bin/pe/saxon10pe.dll",
588
     "-assembly:saxon10pe",
587
  + ["-out:${buildDir}/n/bin/pe/saxon-pe-${saxonMajorVersion}.${saxonMinorVersion}.dll",
588
     "-assembly:saxon-pe-${saxonMajorVersion}.${saxonMinorVersion}",
589 589
     "-target:library",
590 590
     "-keyfile:${ikvmDir}/saxondotnet.snk",
591 591
     "-version:${saxonVersion}",
......
615 615
  inputs.files("${buildDir}/n/bin/ee")
616 616
  inputs.file("${buildDir}/xerces/xerces.jar")
617 617
  inputs.file("${ikvmDir}/saxondotnet.snk")
618
  outputs.file("build/n/bin/ee/saxon10ee.dll")
618
  outputs.file("build/n/bin/ee/saxon-ee-${saxonMajorVersion}.${saxonMinorVersion}.dll")
619 619

  
620 620
  def ikvmCommand = [ "${ikvmDir}/ikvm-${ikvmVersion}/bin/ikvmc.exe" ] \
621 621
  + additionalIkvmOptions \
622
  + ["-out:${buildDir}/n/bin/ee/saxon10ee.dll",
623
     "-assembly:saxon10ee",
622
  + ["-out:${buildDir}/n/bin/ee/saxon-ee-${saxonMajorVersion}.${saxonMinorVersion}.dll",
623
     "-assembly:saxon-ee-${saxonMajorVersion}.${saxonMinorVersion}",
624 624
     "-target:library",
625 625
     "-keyfile:${ikvmDir}/saxondotnet.snk",
626 626
     "-version:${saxonVersion}",
......
706 706
        writer.writeLine("          using System.Runtime.InteropServices;")
707 707
        writer.writeLine("          [assembly: AssemblyCompany(\"Saxonica\")]")
708 708
        writer.writeLine("          [assembly: AssemblyProduct(\"Saxon.HE\")]")
709
        writer.writeLine("          [assembly: AssemblyCopyright(\"Copyright © Saxonica 2019\")]")
709
        writer.writeLine("          [assembly: AssemblyCopyright(\"Copyright © Saxonica 2020\")]")
710 710
        writer.writeLine("          [assembly: AssemblyVersion(\"${saxonVersion}\")]")
711 711
        writer.writeLine("          [assembly: AssemblyFileVersion(\"${saxonVersion}\")]")
712 712
      }
......
754 754
  ) {
755 755
    inputs.files("${buildDir}/n/build/dll/he")
756 756
    inputs.files("${buildDir}/n/csharp/api")
757
    outputs.file("${buildDir}/n/bin/he/saxon10he-api.dll")
757
    outputs.file("${buildDir}/n/bin/he/saxon-he-api-${saxonMajorVersion}.${saxonMinorVersion}.dll")
758 758

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

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

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

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

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

  
src/dotnet/ee.iss
17 17
AppCopyright=Copyright (c) @@COPYRIGHT_YEAR@@ Saxonica
18 18

  
19 19
[Files]
20
; GAC Files
20
; GAC Files-
21 21

  
22 22
Source: "IKVM.Runtime.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "IKVM.Runtime, @@IKVM_STRONGNAME@@"
23 23
Source: "IKVM.OpenJDK.Core.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Core, @@IKVM_STRONGNAME@@"
......
26 26
Source: "IKVM.OpenJDK.Util.dll"; DestDir: "{app}\bin" ; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Util, @@IKVM_STRONGNAME@@"
27 27
Source: "IKVM.OpenJDK.Text.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Text, @@IKVM_STRONGNAME@@"
28 28
Source: "IKVM.OpenJDK.XML.API.dll"; DestDir: "{app}\bin"; Flags: gacinstall ; StrongAssemblyName: "IKVM.OpenJDK.XML.API, @@IKVM_STRONGNAME@@"
29
Source: "saxon10ee.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10ee, ${saxon.strongname}"
30
Source: "saxon10ee-api.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10ee-api, ${saxon.strongname}"
31
Source: "saxon10ee-api.xml"; DestDir: "{app}\bin"
29
Source: "saxon-ee-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10ee, ${saxon.strongname}"
30
Source: "saxon-ee-api-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10ee-api, ${saxon.strongname}"
31
Source: "saxon-ee-api-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.xml"; DestDir: "{app}\bin"
32 32
Source: "..\..\notices\APACHE-RESOLVER.txt" ; DestDir: "{app}\notices"
33 33
Source: "..\..\notices\APACHE-XERCES.txt" ; DestDir: "{app}\notices"
34 34
Source: "..\..\notices\ASM.txt" ; DestDir: "{app}\notices"
src/dotnet/he.iss
25 25
Source: "IKVM.OpenJDK.Util.dll"; DestDir: "{app}\bin" ; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Util, @@IKVM_STRONGNAME@@"
26 26
Source: "IKVM.OpenJDK.Text.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Text, @@IKVM_STRONGNAME@@"
27 27
Source: "IKVM.OpenJDK.XML.API.dll"; DestDir: "{app}\bin"; Flags: gacinstall ; StrongAssemblyName: "IKVM.OpenJDK.XML.API, @@IKVM_STRONGNAME@@"
28
Source: "saxon10he.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10he, ${saxon.strongname}"
29
Source: "saxon10he-api.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10he-api, ${saxon.strongname}"
30
Source: "saxon10he-api.xml"; DestDir: "{app}\bin"
28
Source: "saxon-he-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10he, ${saxon.strongname}"
29
Source: "saxon-he-api-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10he-api, ${saxon.strongname}"
30
Source: "saxon-he-api-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.xml"; DestDir: "{app}\bin"
31 31
Source: "..\..\notices\APACHE-RESOLVER.txt" ; DestDir: "{app}\notices"
32 32
Source: "..\..\notices\APACHE-XERCES.txt" ; DestDir: "{app}\notices"
33 33
Source: "..\..\notices\CERN.txt" ; DestDir: "{app}\notices"
src/dotnet/pe.iss
26 26
Source: "IKVM.OpenJDK.Util.dll"; DestDir: "{app}\bin" ; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Util, @@IKVM_STRONGNAME@@"
27 27
Source: "IKVM.OpenJDK.Text.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "IKVM.OpenJDK.Text, @@IKVM_STRONGNAME@@"
28 28
Source: "IKVM.OpenJDK.XML.API.dll"; DestDir: "{app}\bin"; Flags: gacinstall ; StrongAssemblyName: "IKVM.OpenJDK.XML.API, @@IKVM_STRONGNAME@@"
29
Source: "saxon10pe.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10pe, ${saxon.strongname}"
30
Source: "saxon10pe-api.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10pe-api, ${saxon.strongname}"
31
Source: "saxon10pe-api.xml"; DestDir: "{app}\bin"
29
Source: "saxon-pe-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10pe, ${saxon.strongname}"
30
Source: "saxon-pe-api-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.dll"; DestDir: "{app}\bin"; Flags: gacinstall; StrongAssemblyName: "saxon10pe-api, ${saxon.strongname}"
31
Source: "saxon-pe-api-@@MAJOR_VERSION@@.@@MINOR_VERSION@@.xml"; DestDir: "{app}\bin"
32 32
Source: "..\..\notices\APACHE-RESOLVER.txt" ; DestDir: "{app}\notices"
33 33
Source: "..\..\notices\APACHE-XERCES.txt" ; DestDir: "{app}\notices"
34 34
Source: "..\..\notices\CERN.txt" ; DestDir: "{app}\notices"

Also available in: Unified diff