Title: [102012] trunk/Source/WebCore
Revision
102012
Author
[email protected]
Date
2011-12-05 10:40:06 -0800 (Mon, 05 Dec 2011)

Log Message

Keep both InspectorBackend.js and InspectorBackendStub.js in Release builds after
they have been combined into inspector.js.

The InspectorBackend.js file split out of the generated InspectorBackendStub.js
in r101670, and both files are needed to be useful.

https://webkit.org/b/73839

Reviewed by Joseph Pecoraro and Brian Weinstein.

* WebCore.xcodeproj/project.pbxproj: Pass -not -name "InspectorBackend*.js" to find
instead of -not -name InspectorBackendStub.js.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (102011 => 102012)


--- trunk/Source/WebCore/ChangeLog	2011-12-05 18:25:45 UTC (rev 102011)
+++ trunk/Source/WebCore/ChangeLog	2011-12-05 18:40:06 UTC (rev 102012)
@@ -1,3 +1,18 @@
+2011-12-05  Timothy Hatcher  <[email protected]>
+
+        Keep both InspectorBackend.js and InspectorBackendStub.js in Release builds after
+        they have been combined into inspector.js.
+
+        The InspectorBackend.js file split out of the generated InspectorBackendStub.js
+        in r101670, and both files are needed to be useful.
+
+        https://webkit.org/b/73839
+
+        Reviewed by Joseph Pecoraro and Brian Weinstein.
+
+        * WebCore.xcodeproj/project.pbxproj: Pass -not -name "InspectorBackend*.js" to find
+        instead of -not -name InspectorBackendStub.js.
+
 2011-12-05  Mikhail Naganov  <[email protected]>
 
         Web Inspector: [Chromium] Heap profiler should designate weak references.

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (102011 => 102012)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2011-12-05 18:25:45 UTC (rev 102011)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2011-12-05 18:40:06 UTC (rev 102012)
@@ -24919,7 +24919,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Don't do anything for Debug builds, so the Inspector is easier to debug.\nif [[ ${CONFIGURATION:=Debug} == \"Debug\" ]]; then\n    exit\nfi\n\n# Combine all script resources in the inspector.html file.\n\"$SRCROOT/inspector/combine-_javascript_-resources.pl\" --input-html \"${SRCROOT}/inspector/front-end/inspector.html\" --generated-scripts-dir \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\" --output-dir \"${DERIVED_FILE_DIR}/WebCore\" --output-script-name inspector.js\n\n# Inline script imports in ScriptFormatterWorker.js file.\n\"$SRCROOT/inspector/inline-_javascript_-imports.py\" \"${SRCROOT}/inspector/front-end/ScriptFormatterWorker.js\" \"${SRCROOT}/inspector/front-end\" \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\"\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n    cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n\n    # Remove any top-level _javascript_ files, since they will be replaced with the combined file.\n    # Keep InspectorBackendStub.js so it can be used by other front-ends.\n    find . -depth 1 -name \"*.js\" -not -name InspectorBackendStub.js | xargs rm -rf\n\n    # Copy the modified HTML file and the combined scripts.\n    cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n    cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\n    cp \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\" scriptFormatterWorker.js\nfi\n";
+			shellScript = "# Don't do anything for Debug builds, so the Inspector is easier to debug.\nif [[ ${CONFIGURATION:=Debug} == \"Debug\" ]]; then\n    exit\nfi\n\n# Combine all script resources in the inspector.html file.\n\"$SRCROOT/inspector/combine-_javascript_-resources.pl\" --input-html \"${SRCROOT}/inspector/front-end/inspector.html\" --generated-scripts-dir \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\" --output-dir \"${DERIVED_FILE_DIR}/WebCore\" --output-script-name inspector.js\n\n# Inline script imports in ScriptFormatterWorker.js file.\n\"$SRCROOT/inspector/inline-_javascript_-imports.py\" \"${SRCROOT}/inspector/front-end/ScriptFormatterWorker.js\" \"${SRCROOT}/inspector/front-end\" \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\"\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n    cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n\n    # Remove any top-level _javascript_ files, since they will be replaced with the combined file.\n    # Keep InspectorBackend*.js files so they can be used by other front-ends.\n    find . -depth 1 -name \"*.js\" -not -name \"InspectorBackend*.js\" | xargs rm -rf\n\n    # Copy the modified HTML file and the combined scripts.\n    cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n    cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\n    cp \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\" scriptFormatterWorker.js\nfi\n";
 		};
 		1C81BA330E97357C00266E07 /* Copy Inspector Resources */ = {
 			isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to