From 019b939f41441fef05c3698d97da7b05261128f0 Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Tue, 20 Mar 2012 15:17:57 +1000 Subject: [PATCH] reorder some uninstaller code in sconstruct to make sure that its definitely compiled and signed before dist is complete. --- sconstruct | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sconstruct b/sconstruct index 6d5f17b08..bc1d38fa2 100755 --- a/sconstruct +++ b/sconstruct @@ -225,7 +225,19 @@ if certTimestampServer: signExec.extend(("/t", certTimestampServer)) signExec.append("$TARGET") +uninstFile=File("dist/uninstall.exe") +uninstGen = env.Command(File("uninstaller/uninstGen.exe"), "uninstaller/uninst.nsi", + [[makensis, "/V2", + "/DVERSION=$version", '/DPUBLISHER="$publisher"', + "/DUNINSTEXE=%s"%uninstFile.abspath, + "/XOutFile ${TARGET.abspath}", + "$SOURCE"]]) +uninstaller=env.Command(uninstFile,uninstGen,[uninstGen]) +if certFile: + env.AddPostAction(uninstaller, [signExec]) + dist = env.NVDADist("dist", sourceDir, uiAccess=bool(certFile)) +env.Depends(dist,uninstaller) # Dir node targets don't get cleaned, so cleaning of the dist nodes has to be explicitly specified. env.Clean(dist, dist) # Clean the intermediate build directory. @@ -240,17 +252,6 @@ if certFile: env.AddPostAction(launcher, [signExec]) env.Alias("launcher", launcher) -uninstFile=File("dist/uninstall.exe") -uninstGen = env.Command(File("uninstaller/uninstGen.exe"), "uninstaller/uninst.nsi", - [[makensis, "/V2", - "/DVERSION=$version", '/DPUBLISHER="$publisher"', - "/DUNINSTEXE=%s"%uninstFile.abspath, - "/XOutFile ${TARGET.abspath}", - "$SOURCE"]]) -uninstaller=env.Command(uninstFile,uninstGen,[uninstGen]) -if certFile: - env.AddPostAction(uninstaller, [signExec]) - env.Alias("launcher", launcher) env.Alias("portable", launcher) -- 2.11.0