summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 22:29:37 +0000
committermaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 22:29:37 +0000
commite872a2f877340b4e7fa83ce67332143c9f071a71 (patch)
tree5a919b60965dbf99d087e6a3fb484980f8cc112b
parent3190b5fcc78fb83115b8719167f928884c5bb337 (diff)
downloadchromium_src-e872a2f877340b4e7fa83ce67332143c9f071a71.zip
chromium_src-e872a2f877340b4e7fa83ce67332143c9f071a71.tar.gz
chromium_src-e872a2f877340b4e7fa83ce67332143c9f071a71.tar.bz2
Fix Mac installer build. We were not inserting the version number into the Keystone registration script, which gave it a bogus registered version that caused a silent update once a day.
Review URL: http://codereview.chromium.org/151106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19678 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/plugin/build.scons6
1 files changed, 4 insertions, 2 deletions
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons
index 0989eaa..efd99bc 100644
--- a/o3d/plugin/build.scons
+++ b/o3d/plugin/build.scons
@@ -341,6 +341,10 @@ if env.Bit('mac'):
if make_installer:
+ env.ReplaceStrings(
+ "$ARTIFACTS_DIR/postflight.sh", '$MAC_INSTALLER_DIR/postflight.sh',
+ REPLACE_STRINGS = plugin_replace_strings
+ )
if int(ARGUMENTS.get('MAC_KILLSWITCH', 0)):
kill_command = 'rm "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/o3d"'
else:
@@ -357,8 +361,6 @@ if env.Bit('mac'):
# and so work on debug or release builds without change.
Copy("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT",
'$MAC_INSTALLER_DIR/$MAC_INSTALLER_PROJECT'),
- Copy("$ARTIFACTS_DIR/postflight.sh",
- '$MAC_INSTALLER_DIR/postflight.sh'),
'ditto "$MAC_INSTALLER_DIR/GoogleSoftwareUpdate.pkg" "$ARTIFACTS_DIR/GoogleSoftwareUpdate.pkg"',
# Make the installer.
kill_command,