| OLD | NEW |
| 1 # Copyright 2009, Google Inc. | 1 # Copyright 2009, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 Touch('$ARTIFACTS_DIR/plugin_done') | 334 Touch('$ARTIFACTS_DIR/plugin_done') |
| 335 ]) | 335 ]) |
| 336 | 336 |
| 337 env['MAC_INSTALLER_DIR'] = env['SCONSTRUCT_DIR'] + '/../o3d-internal/mac_insta
ller' | 337 env['MAC_INSTALLER_DIR'] = env['SCONSTRUCT_DIR'] + '/../o3d-internal/mac_insta
ller' |
| 338 env['MAC_INSTALLER_PROJECT'] = 'o3d.packproj' | 338 env['MAC_INSTALLER_PROJECT'] = 'o3d.packproj' |
| 339 # Default is to make the installer. | 339 # Default is to make the installer. |
| 340 make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 1)) and os.path.exists(en
v['MAC_INSTALLER_DIR'] + '/' + env['MAC_INSTALLER_PROJECT']) | 340 make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 1)) and os.path.exists(en
v['MAC_INSTALLER_DIR'] + '/' + env['MAC_INSTALLER_PROJECT']) |
| 341 | 341 |
| 342 | 342 |
| 343 if make_installer: | 343 if make_installer: |
| 344 env.ReplaceStrings( |
| 345 "$ARTIFACTS_DIR/postflight.sh", '$MAC_INSTALLER_DIR/postflight.sh', |
| 346 REPLACE_STRINGS = plugin_replace_strings |
| 347 ) |
| 344 if int(ARGUMENTS.get('MAC_KILLSWITCH', 0)): | 348 if int(ARGUMENTS.get('MAC_KILLSWITCH', 0)): |
| 345 kill_command = 'rm "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/o3d"' | 349 kill_command = 'rm "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/o3d"' |
| 346 else: | 350 else: |
| 347 kill_command = 'echo normal binary' | 351 kill_command = 'echo normal binary' |
| 348 # Cleanup end result and build the installer | 352 # Cleanup end result and build the installer |
| 349 env.Command(env.Dir('$ARTIFACTS_DIR/O3D.mpkg'), | 353 env.Command(env.Dir('$ARTIFACTS_DIR/O3D.mpkg'), |
| 350 [ | 354 [ |
| 351 "$ARTIFACTS_DIR/plugin_done", | 355 "$ARTIFACTS_DIR/plugin_done", |
| 352 ], | 356 ], |
| 353 [ | 357 [ |
| 354 # Delete first as Copy can fail to overwrite if the packproj is
locked | 358 # Delete first as Copy can fail to overwrite if the packproj is
locked |
| 355 Delete("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"), | 359 Delete("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"), |
| 356 # Copy installer project file into artifacts so it can operate o
n files local to own directory | 360 # Copy installer project file into artifacts so it can operate o
n files local to own directory |
| 357 # and so work on debug or release builds without change. | 361 # and so work on debug or release builds without change. |
| 358 Copy("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT", | 362 Copy("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT", |
| 359 '$MAC_INSTALLER_DIR/$MAC_INSTALLER_PROJECT'), | 363 '$MAC_INSTALLER_DIR/$MAC_INSTALLER_PROJECT'), |
| 360 Copy("$ARTIFACTS_DIR/postflight.sh", | |
| 361 '$MAC_INSTALLER_DIR/postflight.sh'), | |
| 362 'ditto "$MAC_INSTALLER_DIR/GoogleSoftwareUpdate.pkg" "$ARTIFACT
S_DIR/GoogleSoftwareUpdate.pkg"', | 364 'ditto "$MAC_INSTALLER_DIR/GoogleSoftwareUpdate.pkg" "$ARTIFACT
S_DIR/GoogleSoftwareUpdate.pkg"', |
| 363 # Make the installer. | 365 # Make the installer. |
| 364 kill_command, | 366 kill_command, |
| 365 'freeze "$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"', | 367 'freeze "$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"', |
| 366 # Delete temp files in artifacts now we are done. | 368 # Delete temp files in artifacts now we are done. |
| 367 Delete("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT") | 369 Delete("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT") |
| 368 ]) | 370 ]) |
| 369 | 371 |
| 370 env.Command('$ARTIFACTS_DIR/o3d.dmg', | 372 env.Command('$ARTIFACTS_DIR/o3d.dmg', |
| 371 [ | 373 [ |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 if os.path.exists(swiftshader_path): | 416 if os.path.exists(swiftshader_path): |
| 415 env.Requires(plugin_install, | 417 env.Requires(plugin_install, |
| 416 env.Replicate('$FIREFOX_PLUGIN_DIR/O3DExtras', swiftshader_path)) | 418 env.Replicate('$FIREFOX_PLUGIN_DIR/O3DExtras', swiftshader_path)) |
| 417 | 419 |
| 418 if env.Bit('windows'): | 420 if env.Bit('windows'): |
| 419 # Make the logging program | 421 # Make the logging program |
| 420 exe = env.ComponentProgram('statsLogger', | 422 exe = env.ComponentProgram('statsLogger', |
| 421 logging_lib + ['win/logger_main.cc']) | 423 logging_lib + ['win/logger_main.cc']) |
| 422 # Copy the resulting executable to the Artifacts directory. | 424 # Copy the resulting executable to the Artifacts directory. |
| 423 env.Replicate('$ARTIFACTS_DIR', [exe]) | 425 env.Replicate('$ARTIFACTS_DIR', [exe]) |
| OLD | NEW |