Merge pull request livecode#3445 from peter-b/bugfix-16696

peter-b · peter-b · commit af07da059dcd · 2016-01-08T12:10:59.000Z
[Bug 16696] Ensure that the correct release notes are installed
diff --git a/Installer/package.txt b/Installer/package.txt
@@ -144,7 +144,7 @@ component Misc
 			textfile "private:License Agreement.txt"
 			textfile "private:about.txt"
 		textfile "ide:Open Source Licenses.txt"
-		file "ide:Release Notes.pdf"
+		file "repo:LiveCodeNotes-[[EscapedVersionTag]].pdf" as "Release Notes.pdf"
 
 component Plugins
 	into [[ToolsFolder]]/Plugins place
diff --git a/builder/tools_builder.livecodescript b/builder/tools_builder.livecodescript
@@ -80,6 +80,10 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
          put "Commercial" into tBaseEditionType
          break
    end switch
+
+   -- Escape the version (by replacing all non-alphanumeric characters with "_")
+   local tVersionEscaped
+   put replaceText(pVersion,"\W","_") into tVersionEscaped
    
    -- Compute the package temp folder
    local tTempFolder
@@ -137,6 +141,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
    end if
    packageCompilerConfigureVariable tPackager, "TodaysDate", "[[todaysDate]]"
    packageCompilerConfigureVariable tPackager, "VersionTag", pVersion
+   packageCompilerConfigureVariable tPackager, "EscapedVersionTag", tVersionEscaped
    packageCompilerConfigureVariable tPackager, "ProductBranch", char 1 to 3 of pVersion
    packageCompilerConfigureVariable tPackager, "TargetArchitectures", "i386"
    if pPlatform is "linux-x86" then
diff --git a/docs/notes/bugfix-16696.md b/docs/notes/bugfix-16696.md
@@ -0,0 +1 @@
+# Include the correct version's release notes in the installer

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Include the correct version's release notes in the installer`