From b63f98580efb63d56a2273e3a7ffc98b6d72d557 Mon Sep 17 00:00:00 2001
From: Antonin Hildebrand <antonin@hildebrand.cz>
Date: Thu, 5 May 2016 23:52:40 +0200
Subject: [PATCH] scripts: fix incomplete build_applications.py compilation
 step

---
 .../unpacked/devtools/scripts/compile_frontend.py     | 11 ++++++++++-
 scripts/release.sh                                    |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/resources/unpacked/devtools/scripts/compile_frontend.py b/resources/unpacked/devtools/scripts/compile_frontend.py
index 14835ab0bb..fd72485d02 100755
--- a/resources/unpacked/devtools/scripts/compile_frontend.py
+++ b/resources/unpacked/devtools/scripts/compile_frontend.py
@@ -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
diff --git a/scripts/release.sh b/scripts/release.sh
index 052c009d46..049bfa1497 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -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