summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authormaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 00:52:34 +0000
committermaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-02 00:52:34 +0000
commit7a37de37359341143f01045aa1a0c5cb1843e252 (patch)
tree4e5399ac1a4631d9d9c973b983c377813dc5f107 /o3d
parent8024ddc635ee8ce349a49de249a737e130233021 (diff)
downloadchromium_src-7a37de37359341143f01045aa1a0c5cb1843e252.zip
chromium_src-7a37de37359341143f01045aa1a0c5cb1843e252.tar.gz
chromium_src-7a37de37359341143f01045aa1a0c5cb1843e252.tar.bz2
Add a dependency to the Mac installer build stage so that the postflight.sh script always gets processed before it tries to build the installer than needs it.
Review URL: http://codereview.chromium.org/150184 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/plugin/build.scons7
1 files changed, 4 insertions, 3 deletions
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons
index efd99bc..6449232 100644
--- a/o3d/plugin/build.scons
+++ b/o3d/plugin/build.scons
@@ -275,8 +275,8 @@ if env.Bit('mac'):
# insert version number into Info.plist
env.ReplaceStrings(
- 'mac/processed/Info.plist', '$SCONSTRUCT_DIR/plugin/mac/Info.plist',
- REPLACE_STRINGS = plugin_replace_strings
+ 'mac/processed/Info.plist', '$SCONSTRUCT_DIR/plugin/mac/Info.plist',
+ REPLACE_STRINGS = plugin_replace_strings
)
# copy mac resource data
@@ -303,7 +303,7 @@ if env.Bit('mac'):
else:
stripCmd = 'strip -S "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/o3d"'
- # Cleanup end result and build the installer
+ # Cleanup end result
created_installer = env.Command('$ARTIFACTS_DIR/plugin_done',
[env.Dir('$ARTIFACTS_DIR/O3D.plugin')],
[
@@ -353,6 +353,7 @@ if env.Bit('mac'):
env.Command(env.Dir('$ARTIFACTS_DIR/O3D.mpkg'),
[
"$ARTIFACTS_DIR/plugin_done",
+ "$ARTIFACTS_DIR/postflight.sh",
],
[
# Delete first as Copy can fail to overwrite if the packproj is locked