Skip to content

Commit

Permalink
scripts: fix incomplete build_applications.py compilation step
Browse files Browse the repository at this point in the history
  • Loading branch information
darwin committed May 5, 2016
1 parent cd92a71 commit b63f985
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
11 changes: 10 additions & 1 deletion resources/unpacked/devtools/scripts/compile_frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,16 @@ def error_excepthook(exctype, value, traceback):
sys.__excepthook__(exctype, value, traceback)
sys.excepthook = error_excepthook

application_descriptors = ['inspector.json', 'toolbox.json', 'formatter_worker.json', 'heap_snapshot_worker.json', 'temp_storage_shared_worker.json']
# <------- cut here
# darwin: I have deliberately touched these descriptors so I bump into conflicts when anyone touches this
# => we need to update our release script in scripts/release.sh
application_descriptors = ['inspector.json',
'toolbox.json',
'formatter_worker.json',
'heap_snapshot_worker.json',
'temp_storage_shared_worker.json']
# <------- cut here

loader = modular_build.DescriptorLoader(devtools_frontend_path)
descriptors = loader.load_applications(application_descriptors)
modules_by_name = descriptors.modules
Expand Down
4 changes: 3 additions & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ cp -r "$ROOT/target/resources/release/devtools/front_end/dirac/compiled" "$WORK_
echo -n "" > "$WORK_DIR/dirac/require-implant.js" # when doing advanced build, all implant files are required automatically

echo "Building devtools in advanced mode..."
./scripts/build_applications.py inspector toolbox --input_path "$WORK_DIR" --output_path "$RELEASE_BUILD_DEVTOOLS_FRONTEND" --debug 0
# DANGER! this list of applications must be the same as specified in resources/unpacked/devtools/scripts/compile_frontend.py (search for "darwin")
./scripts/build_applications.py inspector toolbox formatter_worker heap_snapshot_worker temp_storage_shared_worker \
--input_path "$WORK_DIR" --output_path "$RELEASE_BUILD_DEVTOOLS_FRONTEND" --debug 0

popd

Expand Down

0 comments on commit b63f985

Please sign in to comment.