diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 20:05:48 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-18 20:05:48 +0000 |
| commit | 5598ba5a858b341b065909a34610d4bdf6b80596 (patch) | |
| tree | 6b4d652aeef88b17ae1c9a7288ae0bfb47847b90 /o3d | |
| parent | 2c741bfd52568801fa9994a39c015904ef26c240 (diff) | |
| download | chromium_src-5598ba5a858b341b065909a34610d4bdf6b80596.zip chromium_src-5598ba5a858b341b065909a34610d4bdf6b80596.tar.gz chromium_src-5598ba5a858b341b065909a34610d4bdf6b80596.tar.bz2 | |
Change the plugin build file to build the real Mac installer if the o3d-internal tree is present, and otherwise build no installer.
The bowdlerized open source version of the installer was no use at all, and developers can always install the plugin for their own use with a simple drag or a 1 line shell script.
Review URL: http://codereview.chromium.org/131016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/plugin/build.scons | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons index dbb5664..e6c344a 100644 --- a/o3d/plugin/build.scons +++ b/o3d/plugin/build.scons @@ -332,11 +332,11 @@ if env.Bit('mac'): Touch('$ARTIFACTS_DIR/plugin_done') ]) - - env['MAC_INSTALLER_PROJECT'] = 'open_source_o3d_mac_npapi_metapackage.packproj' + env['MAC_INSTALLER_DIR'] = env['SCONSTRUCT_DIR'] + '/../o3d-internal/mac_installer' + env['MAC_INSTALLER_PROJECT'] = 'o3d.packproj' + print "Installer is " + env['MAC_INSTALLER_PROJECT'] # Default is make the installer. - make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 1)) - + make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 1)) and os.path.exists(env['MAC_INSTALLER_DIR'] + '/' + env['MAC_INSTALLER_PROJECT']) if make_installer: @@ -355,7 +355,10 @@ if env.Bit('mac'): # Copy installer project file into artifacts so it can operate on files local to own directory # and so work on debug or release builds without change. Copy("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT", - '$SCONSTRUCT_DIR/plugin/mac/o3d_mac_npapi_metapackage/$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, 'freeze "$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"', @@ -370,6 +373,7 @@ if env.Bit('mac'): [ Delete("$ARTIFACTS_DIR/DMG_SRC"), 'mkdir "$ARTIFACTS_DIR/DMG_SRC"', + 'cp "$MAC_INSTALLER_DIR/.keystone_install" "$ARTIFACTS_DIR/DMG_SRC"', 'ditto "$ARTIFACTS_DIR/O3D.mpkg" "$ARTIFACTS_DIR/DMG_SRC/O3D.mpkg"', 'hdiutil create -srcfolder "$ARTIFACTS_DIR/DMG_SRC" -size 30mb -ov -fs HFS+ -imagekey zlib-level=9 -volname "O3D $O3D_PLUGIN_VERSION" "$ARTIFACTS_DIR/o3d.dmg"', Delete("$ARTIFACTS_DIR/DMG_SRC"), |