scons now passes copyright info to the launcher and uninstaler. By default its versio...

diff --git a/launcher/nvdaLauncher.nsi b/launcher/nvdaLauncher.nsi
index f3d107b..d231669 100644 (file)
--- a/launcher/nvdaLauncher.nsi
+++ b/launcher/nvdaLauncher.nsi
@@ -14,7 +14,7 @@ ReserveFile "..\installer\waves\nvda_logo.wav"
 Name "NVDA"\r
 VIProductVersion "0.0.0.0" ;Needs to be here so other version info shows up\r
 VIAddVersionKey "ProductName" "NVDA"\r
-VIAddVersionKey "LegalCopyright" "Copyright 2006 - 2011 NVDA Contributors"\r
+VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"\r
 VIAddVersionKey "FileDescription" "NVDA launcher file"\r
 VIAddVersionKey "ProductVersion" "${VERSION}"\r
 \r

diff --git a/sconstruct b/sconstruct
index bc1d38f..8f9cfe3 100755 (executable)
--- a/sconstruct
+++ b/sconstruct
@@ -75,6 +75,7 @@ keyCommandsLangBlacklist=set([])
 \r
 vars = Variables()\r
 vars.Add("version", "The version of this build", versionInfo.version)\r
+vars.Add("copyright", "The copyright string of this build", versionInfo.copyright)\r
 vars.Add(BoolVariable("release", "Whether this is a release version", False))\r
 vars.Add("publisher", "The publisher of this build", versionInfo.publisher)\r
 vars.Add(PathVariable("certFile", "The certificate file with which to sign executables", "",\r
@@ -228,7 +229,7 @@ signExec.append("$TARGET")
 uninstFile=File("dist/uninstall.exe")\r
 uninstGen = env.Command(File("uninstaller/uninstGen.exe"), "uninstaller/uninst.nsi",\r
        [[makensis, "/V2",\r
-       "/DVERSION=$version", '/DPUBLISHER="$publisher"',\r
+       "/DVERSION=$version", '/DPUBLISHER="$publisher"','/DCOPYRIGHT="$copyright"',\r
        "/DUNINSTEXE=%s"%uninstFile.abspath,\r
        "/XOutFile ${TARGET.abspath}",\r
        "$SOURCE"]])\r
@@ -245,7 +246,7 @@ env.Clean([dist], buildDir)
 \r
 launcher = env.Command(outputDir.File("%s_launcher.exe" % outFilePrefix), ["launcher/nvdaLauncher.nsi", dist],\r
        [[makensis, "/V2",\r
-       "/DVERSION=$version", '/DPUBLISHER="$publisher"',\r
+       "/DVERSION=$version", '/DPUBLISHER="$publisher"','/DCOPYRIGHT="$copyright"',\r
        "/DNVDADistDir=${SOURCES[1].abspath}", "/XOutFile ${TARGET.abspath}",\r
        "$SOURCE"]])\r
 if certFile:\r

diff --git a/uninstaller/uninst.nsi b/uninstaller/uninst.nsi
index 93c16fe..f37a50b 100644 (file)
--- a/uninstaller/uninst.nsi
+++ b/uninstaller/uninst.nsi
@@ -17,7 +17,7 @@ ReserveFile "UAC.dll"
 Name "${appName}"\r
 VIProductVersion "0.0.0.0" ;Needs to be here so other version info shows up\r
 VIAddVersionKey "ProductName" "${appName}"\r
-VIAddVersionKey "LegalCopyright" "Copyright 2006 - 2011 NVDA Contributors"\r
+VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"\r
 VIAddVersionKey "FileDescription" "${appName} installer"\r
 VIAddVersionKey "ProductVersion" "${VERSION}"\r
 \r