[GitHub] ltapilot commented on a change in pull request #178: Created Windows MSI installer package.
ltapilot commented on a change in pull request #178: Created Windows MSI installer package. URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255680533 ## File path: daffodil-cli/src/windows/Product_en-us.wxl ## @@ -0,0 +1,52 @@ + Review comment: Done. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] ltapilot commented on a change in pull request #178: Created Windows MSI installer package.
ltapilot commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255679191
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
+maintainer in Windows := "Apache Daffodil Developers "
+
+// The Windows packager SBT plug-in maps the packageSummary variable
+// into the WiX productName field. Another strange choice.
+packageSummary in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in limits the length of the
+// packageDescription field to a single line. Originally this was a
+// full paragraph, as seen in the RPM section, above.
+packageDescription in Windows := """Apache Daffodil (incubating) is the open
source implementation of the Data Format Description Language (DFDL)""".trim
+
+// Calculate the version number dynamically and pass it in.
+// Windows permits up to four numeric values (e.g. 2.1.5.1820)
+// where the numbers represent major, minor, patch and build
+// respectively. In RPM packaging we add 'incubating', but
+// Windows will barf on this. Here we suffix a zero (0) build
+// number for snapshot/development/debug builds. A one (1)
+// in the build number could be used to differentiate official
+// production builds that are destined for release.
+version in Windows := {
+ val parts = version.value.split("-", 2)
+ val ver = parts(0) // removes snapshot if it exists
+ ver + ".0"
+}
+
+// Required and critical GUIDs. Ironically the ProductId is unique
+// to a given release, but UpgradeId must NEVER change! This may
+// seem conter-intuitive, but the UpgradeId is actually what ties
+// the product to it's upgrades and the product is actually unique
+// each time it is released, so there is some semblance of logic
+// to this scheme.
+wixProductUpgradeId := "4C966AFF-585E-4E17-8CC2-059FD70FEC77"
+
+// Light options. Bring in standard dialog boxes and localization.
+// The suppression of ICE61 is required as we *DO* permit
+// re-installation of the same version. Despite the presence of
+// specific XML to enable this, the WiX compiler and linker
+// complain about it unless you specifically suppress the warning.
+lightOptions := Seq(
+ "-sice:ICE61",
+ "-ext", "WixUIExtension",
+ "-cultures:en-us",
+ "-loc", ((sourceDirectory in Windows).value /
"Product_en-us.wxl").toString
+ )
+
+// Point to the RTF license file so it will appear in the license
+// acceptance dialog box. BTW, this file was hand-sweetened to permit
+// flexible line/word wrap in support of variable display width as the
+// file will be rendered in both the (relatively narrow) dialog box
+// and ()optionally) sent to the (relatively wide) printer when the
+// user asks for hard copy.
+wixProductLicense := {
+ // Note: this target file doesn't exist until placed there by the build.
+ val targetLicense = (target in Windows).value / "LICENSE.rtf"
+ val sourceLicense = baseDirectory.value / "bin.LICENSE"
+ // somehow convert sourceLicense into RTF and store at targetLicense
+ val rtfHeader = """{\rtf {\fonttbl {\f0 Arial;}} \f0\fs18"""
+ val rtfFooter = """}"""
+
+ val licenseLines = scala.io.Source.fromFile(sourceLicense, "UTF-8").getLines
+ val writer = new java.io.PrintWriter(targetLicense, "UTF-8")
+ writer.println(rtfHeader)
+ licenseLines.foreach { line =>
+writer.println(line + """\line""")
+ }
+ writer.println(rtfFooter)
+ writer.close
+ Option(targetLicense)
+}
+// Use the wixFiles variable to add in the Daffodil-specific dialog
+// boxes and sequence.
+wixFiles ++= Seq(
+ (sourceDirectory in Windows).value / "WixUI_Daffodil.wxs",
+ (sourceDirectory in Windows).value / "DisclaimerDlg_Daffodil.wxs"
+)
+
+// The SBT Native Packager plug-in assumes that we want to give the user
+// a Feature Tree to
[GitHub] ltapilot commented on a change in pull request #178: Created Windows MSI installer package.
ltapilot commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255678730
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
+maintainer in Windows := "Apache Daffodil Developers "
+
+// The Windows packager SBT plug-in maps the packageSummary variable
+// into the WiX productName field. Another strange choice.
+packageSummary in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in limits the length of the
+// packageDescription field to a single line. Originally this was a
+// full paragraph, as seen in the RPM section, above.
+packageDescription in Windows := """Apache Daffodil (incubating) is the open
source implementation of the Data Format Description Language (DFDL)""".trim
+
+// Calculate the version number dynamically and pass it in.
+// Windows permits up to four numeric values (e.g. 2.1.5.1820)
+// where the numbers represent major, minor, patch and build
+// respectively. In RPM packaging we add 'incubating', but
+// Windows will barf on this. Here we suffix a zero (0) build
+// number for snapshot/development/debug builds. A one (1)
+// in the build number could be used to differentiate official
+// production builds that are destined for release.
+version in Windows := {
+ val parts = version.value.split("-", 2)
+ val ver = parts(0) // removes snapshot if it exists
+ ver + ".0"
+}
+
+// Required and critical GUIDs. Ironically the ProductId is unique
+// to a given release, but UpgradeId must NEVER change! This may
+// seem conter-intuitive, but the UpgradeId is actually what ties
+// the product to it's upgrades and the product is actually unique
+// each time it is released, so there is some semblance of logic
+// to this scheme.
+wixProductUpgradeId := "4C966AFF-585E-4E17-8CC2-059FD70FEC77"
+
+// Light options. Bring in standard dialog boxes and localization.
+// The suppression of ICE61 is required as we *DO* permit
+// re-installation of the same version. Despite the presence of
+// specific XML to enable this, the WiX compiler and linker
+// complain about it unless you specifically suppress the warning.
+lightOptions := Seq(
+ "-sice:ICE61",
+ "-ext", "WixUIExtension",
+ "-cultures:en-us",
+ "-loc", ((sourceDirectory in Windows).value /
"Product_en-us.wxl").toString
+ )
+
+// Point to the RTF license file so it will appear in the license
+// acceptance dialog box. BTW, this file was hand-sweetened to permit
+// flexible line/word wrap in support of variable display width as the
+// file will be rendered in both the (relatively narrow) dialog box
+// and ()optionally) sent to the (relatively wide) printer when the
+// user asks for hard copy.
+wixProductLicense := {
+ // Note: this target file doesn't exist until placed there by the build.
+ val targetLicense = (target in Windows).value / "LICENSE.rtf"
+ val sourceLicense = baseDirectory.value / "bin.LICENSE"
+ // somehow convert sourceLicense into RTF and store at targetLicense
Review comment:
Done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] ltapilot commented on a change in pull request #178: Created Windows MSI installer package.
ltapilot commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255678623
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
+maintainer in Windows := "Apache Daffodil Developers "
+
+// The Windows packager SBT plug-in maps the packageSummary variable
+// into the WiX productName field. Another strange choice.
+packageSummary in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in limits the length of the
+// packageDescription field to a single line. Originally this was a
+// full paragraph, as seen in the RPM section, above.
+packageDescription in Windows := """Apache Daffodil (incubating) is the open
source implementation of the Data Format Description Language (DFDL)""".trim
+
+// Calculate the version number dynamically and pass it in.
+// Windows permits up to four numeric values (e.g. 2.1.5.1820)
+// where the numbers represent major, minor, patch and build
+// respectively. In RPM packaging we add 'incubating', but
+// Windows will barf on this. Here we suffix a zero (0) build
+// number for snapshot/development/debug builds. A one (1)
+// in the build number could be used to differentiate official
+// production builds that are destined for release.
+version in Windows := {
+ val parts = version.value.split("-", 2)
+ val ver = parts(0) // removes snapshot if it exists
+ ver + ".0"
+}
+
+// Required and critical GUIDs. Ironically the ProductId is unique
+// to a given release, but UpgradeId must NEVER change! This may
+// seem conter-intuitive, but the UpgradeId is actually what ties
+// the product to it's upgrades and the product is actually unique
+// each time it is released, so there is some semblance of logic
+// to this scheme.
+wixProductUpgradeId := "4C966AFF-585E-4E17-8CC2-059FD70FEC77"
+
+// Light options. Bring in standard dialog boxes and localization.
+// The suppression of ICE61 is required as we *DO* permit
+// re-installation of the same version. Despite the presence of
+// specific XML to enable this, the WiX compiler and linker
+// complain about it unless you specifically suppress the warning.
+lightOptions := Seq(
+ "-sice:ICE61",
+ "-ext", "WixUIExtension",
+ "-cultures:en-us",
+ "-loc", ((sourceDirectory in Windows).value /
"Product_en-us.wxl").toString
+ )
+
+// Point to the RTF license file so it will appear in the license
+// acceptance dialog box. BTW, this file was hand-sweetened to permit
+// flexible line/word wrap in support of variable display width as the
+// file will be rendered in both the (relatively narrow) dialog box
+// and ()optionally) sent to the (relatively wide) printer when the
+// user asks for hard copy.
Review comment:
Corrected the comment.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] ltapilot commented on a change in pull request #178: Created Windows MSI installer package.
ltapilot commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255671884
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
Review comment:
Corrected.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[jira] [Resolved] (DAFFODIL-2063) DPath: long div long results in double. Should be decimal.
[ https://issues.apache.org/jira/browse/DAFFODIL-2063?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Josh Adams resolved DAFFODIL-2063. -- Resolution: Fixed Assignee: Dave Thompson (was: Josh Adams) Fix Version/s: 2.3.0 This has been fixed in commit a20ff4172807f5e0264ce68142f15f9798df1e8b > DPath: long div long results in double. Should be decimal. > > > Key: DAFFODIL-2063 > URL: https://issues.apache.org/jira/browse/DAFFODIL-2063 > Project: Daffodil > Issue Type: Bug > Components: Middle End >Affects Versions: 2.2.0 >Reporter: Michael Beckerle >Assignee: Dave Thompson >Priority: Major > Fix For: 2.3.0 > > > Expression ( (9 * xs:long(5) ) div 1600) results in a double. This is because > it creates the DivLong operation internally, which incorrectly produces > double type as result when it should be decimal. > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[GitHub] jadams-tresys merged pull request #179: Return xs:decimal when dividing xs:long
jadams-tresys merged pull request #179: Return xs:decimal when dividing xs:long URL: https://github.com/apache/incubator-daffodil/pull/179 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[jira] [Created] (DAFFODIL-2065) Incorrectly attempting to cast signed to unsigned type
Brandon Sloane created DAFFODIL-2065:
Summary: Incorrectly attempting to cast signed to unsigned type
Key: DAFFODIL-2065
URL: https://issues.apache.org/jira/browse/DAFFODIL-2065
Project: Daffodil
Issue Type: Bug
Components: Back End
Affects Versions: 2.2.0
Environment: Ubuntu 18.04.1 LTS
Reporter: Brandon Sloane
Attachments: test.dfdl.xsd
When adding a signed and unsigned type, Daffodil attempts to cast the signed
value to unsigned. The correct behaviour would be to cast the unsigned to
signed.
When running the attached schema on an empty file, the following error is
produced:
{quote}[error] Schema Definition Error: Cannot convert '-1' from Long type to
UnsignedInt (Negative value -1 cannot be converted to an unsigned int.).
Schema context: element reference tns:x Location line 3 in
file:/home/bsloane/Documents/incubator-daffodil/test/test.dfdl.xsd
The relevent piece of schema is:
{quote}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[GitHub] stevedlawrence commented on a change in pull request #178: Created Windows MSI installer package.
stevedlawrence commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255515024
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
+maintainer in Windows := "Apache Daffodil Developers "
+
+// The Windows packager SBT plug-in maps the packageSummary variable
+// into the WiX productName field. Another strange choice.
+packageSummary in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in limits the length of the
+// packageDescription field to a single line. Originally this was a
+// full paragraph, as seen in the RPM section, above.
+packageDescription in Windows := """Apache Daffodil (incubating) is the open
source implementation of the Data Format Description Language (DFDL)""".trim
+
+// Calculate the version number dynamically and pass it in.
+// Windows permits up to four numeric values (e.g. 2.1.5.1820)
+// where the numbers represent major, minor, patch and build
+// respectively. In RPM packaging we add 'incubating', but
+// Windows will barf on this. Here we suffix a zero (0) build
+// number for snapshot/development/debug builds. A one (1)
+// in the build number could be used to differentiate official
+// production builds that are destined for release.
+version in Windows := {
+ val parts = version.value.split("-", 2)
+ val ver = parts(0) // removes snapshot if it exists
+ ver + ".0"
+}
+
+// Required and critical GUIDs. Ironically the ProductId is unique
+// to a given release, but UpgradeId must NEVER change! This may
+// seem conter-intuitive, but the UpgradeId is actually what ties
+// the product to it's upgrades and the product is actually unique
+// each time it is released, so there is some semblance of logic
+// to this scheme.
+wixProductUpgradeId := "4C966AFF-585E-4E17-8CC2-059FD70FEC77"
+
+// Light options. Bring in standard dialog boxes and localization.
+// The suppression of ICE61 is required as we *DO* permit
+// re-installation of the same version. Despite the presence of
+// specific XML to enable this, the WiX compiler and linker
+// complain about it unless you specifically suppress the warning.
+lightOptions := Seq(
+ "-sice:ICE61",
+ "-ext", "WixUIExtension",
+ "-cultures:en-us",
+ "-loc", ((sourceDirectory in Windows).value /
"Product_en-us.wxl").toString
+ )
+
+// Point to the RTF license file so it will appear in the license
+// acceptance dialog box. BTW, this file was hand-sweetened to permit
+// flexible line/word wrap in support of variable display width as the
+// file will be rendered in both the (relatively narrow) dialog box
+// and ()optionally) sent to the (relatively wide) printer when the
+// user asks for hard copy.
+wixProductLicense := {
+ // Note: this target file doesn't exist until placed there by the build.
+ val targetLicense = (target in Windows).value / "LICENSE.rtf"
+ val sourceLicense = baseDirectory.value / "bin.LICENSE"
+ // somehow convert sourceLicense into RTF and store at targetLicense
Review comment:
This comment can be removed or changed to something like "manually create
RTF license file "
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] stevedlawrence commented on a change in pull request #178: Created Windows MSI installer package.
stevedlawrence commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255512017
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
Review comment:
I think this comment may be inaccurant now? This field is no longer used in
the installation directory hierarchy, so there are no really issues with length
inregards to that. I beleive this field only shows up in the File > Properties
> Details tab?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] stevedlawrence commented on a change in pull request #178: Created Windows MSI installer package.
stevedlawrence commented on a change in pull request #178: Created Windows MSI installer package. URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255516473 ## File path: daffodil-cli/src/windows/Product_en-us.wxl ## @@ -0,0 +1,52 @@ + Review comment: The above LICENSE.rtf file should be deleted since that is now autogenerated. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] stevedlawrence commented on a change in pull request #178: Created Windows MSI installer package.
stevedlawrence commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255515633
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
+maintainer in Windows := "Apache Daffodil Developers "
+
+// The Windows packager SBT plug-in maps the packageSummary variable
+// into the WiX productName field. Another strange choice.
+packageSummary in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in limits the length of the
+// packageDescription field to a single line. Originally this was a
+// full paragraph, as seen in the RPM section, above.
+packageDescription in Windows := """Apache Daffodil (incubating) is the open
source implementation of the Data Format Description Language (DFDL)""".trim
+
+// Calculate the version number dynamically and pass it in.
+// Windows permits up to four numeric values (e.g. 2.1.5.1820)
+// where the numbers represent major, minor, patch and build
+// respectively. In RPM packaging we add 'incubating', but
+// Windows will barf on this. Here we suffix a zero (0) build
+// number for snapshot/development/debug builds. A one (1)
+// in the build number could be used to differentiate official
+// production builds that are destined for release.
+version in Windows := {
+ val parts = version.value.split("-", 2)
+ val ver = parts(0) // removes snapshot if it exists
+ ver + ".0"
+}
+
+// Required and critical GUIDs. Ironically the ProductId is unique
+// to a given release, but UpgradeId must NEVER change! This may
+// seem conter-intuitive, but the UpgradeId is actually what ties
+// the product to it's upgrades and the product is actually unique
+// each time it is released, so there is some semblance of logic
+// to this scheme.
+wixProductUpgradeId := "4C966AFF-585E-4E17-8CC2-059FD70FEC77"
+
+// Light options. Bring in standard dialog boxes and localization.
+// The suppression of ICE61 is required as we *DO* permit
+// re-installation of the same version. Despite the presence of
+// specific XML to enable this, the WiX compiler and linker
+// complain about it unless you specifically suppress the warning.
+lightOptions := Seq(
+ "-sice:ICE61",
+ "-ext", "WixUIExtension",
+ "-cultures:en-us",
+ "-loc", ((sourceDirectory in Windows).value /
"Product_en-us.wxl").toString
+ )
+
+// Point to the RTF license file so it will appear in the license
+// acceptance dialog box. BTW, this file was hand-sweetened to permit
+// flexible line/word wrap in support of variable display width as the
+// file will be rendered in both the (relatively narrow) dialog box
+// and ()optionally) sent to the (relatively wide) printer when the
+// user asks for hard copy.
+wixProductLicense := {
+ // Note: this target file doesn't exist until placed there by the build.
+ val targetLicense = (target in Windows).value / "LICENSE.rtf"
+ val sourceLicense = baseDirectory.value / "bin.LICENSE"
+ // somehow convert sourceLicense into RTF and store at targetLicense
+ val rtfHeader = """{\rtf {\fonttbl {\f0 Arial;}} \f0\fs18"""
+ val rtfFooter = """}"""
+
+ val licenseLines = scala.io.Source.fromFile(sourceLicense, "UTF-8").getLines
+ val writer = new java.io.PrintWriter(targetLicense, "UTF-8")
+ writer.println(rtfHeader)
+ licenseLines.foreach { line =>
+writer.println(line + """\line""")
+ }
+ writer.println(rtfFooter)
+ writer.close
+ Option(targetLicense)
+}
+// Use the wixFiles variable to add in the Daffodil-specific dialog
+// boxes and sequence.
+wixFiles ++= Seq(
+ (sourceDirectory in Windows).value / "WixUI_Daffodil.wxs",
+ (sourceDirectory in Windows).value / "DisclaimerDlg_Daffodil.wxs"
+)
+
+// The SBT Native Packager plug-in assumes that we want to give the user
+// a Feature Tree
[GitHub] stevedlawrence commented on a change in pull request #178: Created Windows MSI installer package.
stevedlawrence commented on a change in pull request #178: Created Windows MSI
installer package.
URL: https://github.com/apache/incubator-daffodil/pull/178#discussion_r255514609
##
File path: daffodil-cli/build.sbt
##
@@ -71,3 +78,188 @@ rpmRelease := {
rpmLicense := Some(licenses.value.map { case (n: String, _) => n }.mkString("
and "))
rpmPrefix := Some(defaultLinuxInstallLocation.value)
+
+//
+// Windows configuration
+//
+
+//
+// Here we set the variables that are supported by the SBT Native Packager
plug-in.
+// We also get fairly aggressive in editing/modifying the XML in order
+// to control and use some specific features that are supported by WiX
+// but which are not properly suported by the SBT plug-in.
+//
+
+// Force the correct installation directory name. This overwrites
+// 'daffodil-cli', which is the directory that we invoke sbt in.
+// The SBT WiX plug-in incorrectly assumes that the directory of
+// invocation is the same name as the direcotry you eventually
+// want to install into.
+name in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in maps the maintainer variable into
+// the WiX ManufacturerFullName field. This is a very strange choice.
+// It also maps it to the manufacturer name in the installation
+// directory heirarchy. Among other things, this means it needs to be
+// short so as to not blow out the path length.
+maintainer in Windows := "Apache Daffodil Developers "
+
+// The Windows packager SBT plug-in maps the packageSummary variable
+// into the WiX productName field. Another strange choice.
+packageSummary in Windows := "Daffodil"
+
+// The Windows packager SBT plug-in limits the length of the
+// packageDescription field to a single line. Originally this was a
+// full paragraph, as seen in the RPM section, above.
+packageDescription in Windows := """Apache Daffodil (incubating) is the open
source implementation of the Data Format Description Language (DFDL)""".trim
+
+// Calculate the version number dynamically and pass it in.
+// Windows permits up to four numeric values (e.g. 2.1.5.1820)
+// where the numbers represent major, minor, patch and build
+// respectively. In RPM packaging we add 'incubating', but
+// Windows will barf on this. Here we suffix a zero (0) build
+// number for snapshot/development/debug builds. A one (1)
+// in the build number could be used to differentiate official
+// production builds that are destined for release.
+version in Windows := {
+ val parts = version.value.split("-", 2)
+ val ver = parts(0) // removes snapshot if it exists
+ ver + ".0"
+}
+
+// Required and critical GUIDs. Ironically the ProductId is unique
+// to a given release, but UpgradeId must NEVER change! This may
+// seem conter-intuitive, but the UpgradeId is actually what ties
+// the product to it's upgrades and the product is actually unique
+// each time it is released, so there is some semblance of logic
+// to this scheme.
+wixProductUpgradeId := "4C966AFF-585E-4E17-8CC2-059FD70FEC77"
+
+// Light options. Bring in standard dialog boxes and localization.
+// The suppression of ICE61 is required as we *DO* permit
+// re-installation of the same version. Despite the presence of
+// specific XML to enable this, the WiX compiler and linker
+// complain about it unless you specifically suppress the warning.
+lightOptions := Seq(
+ "-sice:ICE61",
+ "-ext", "WixUIExtension",
+ "-cultures:en-us",
+ "-loc", ((sourceDirectory in Windows).value /
"Product_en-us.wxl").toString
+ )
+
+// Point to the RTF license file so it will appear in the license
+// acceptance dialog box. BTW, this file was hand-sweetened to permit
+// flexible line/word wrap in support of variable display width as the
+// file will be rendered in both the (relatively narrow) dialog box
+// and ()optionally) sent to the (relatively wide) printer when the
+// user asks for hard copy.
Review comment:
Comment about hand mantained licese is now innacurate. The below generates
an RTF file based on bin.LICENSE file.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] jadams-tresys commented on a change in pull request #179: Return xs:decimal when dividing xs:long
jadams-tresys commented on a change in pull request #179: Return xs:decimal when dividing xs:long URL: https://github.com/apache/incubator-daffodil/pull/179#discussion_r255514531 ## File path: daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml ## @@ -7184,6 +7185,11 @@ 7.290005321703885E-5 + + + 0.028125 Review comment: Just pushed up the tests. Meant to do that last week, but forgot about adding tests then. I was struggling with getting the unit tests working to verify the types, so I did what you originally suggested and had tests expecting incorrect types and then made sure the appropriate error message was displayed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] stevedlawrence commented on a change in pull request #179: Return xs:decimal when dividing xs:long
stevedlawrence commented on a change in pull request #179: Return xs:decimal when dividing xs:long URL: https://github.com/apache/incubator-daffodil/pull/179#discussion_r255510903 ## File path: daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml ## @@ -7184,6 +7185,11 @@ 7.290005321703885E-5 + + + 0.028125 Review comment: New updates look good, but this could use some tests to make sure we're doing the right thing. This is a corner case that really needs tests to ensure we're doing the right thing. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
