Changeset 83040 in webkit


Ignore:
Timestamp:
Apr 6, 2011 6:18:29 AM (13 years ago)
Author:
podivilov@chromium.org
Message:

2011-04-06 Pavel Podivilov <podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: inline script imports in ScriptFormatterWorker.js so it works in Safari release.
https://bugs.webkit.org/show_bug.cgi?id=57641

  • WebCore.xcodeproj/project.pbxproj:
  • gyp/streamline-inspector-source.sh:
  • inspector/combine-javascript-resources.pl: Renamed from Source/WebCore/combine-javascript-resources.
  • inspector/inline-javascript-imports.py: Added.
Location:
trunk/Source/WebCore
Files:
1 added
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r83039 r83040  
     12011-04-06  Pavel Podivilov  <podivilov@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: inline script imports in ScriptFormatterWorker.js so it works in Safari release.
     6        https://bugs.webkit.org/show_bug.cgi?id=57641
     7
     8        * WebCore.xcodeproj/project.pbxproj:
     9        * gyp/streamline-inspector-source.sh:
     10        * inspector/combine-javascript-resources.pl: Renamed from Source/WebCore/combine-javascript-resources.
     11        * inspector/inline-javascript-imports.py: Added.
     12
    1132011-04-06  Ryosuke Niwa  <rniwa@webkit.org>
    214
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r83000 r83040  
    2296422964                        inputPaths = (
    2296522965                                "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/inspector",
    22966                                 "$(SRCROOT)/combine-javascript-resources",
     22966                                "$(SRCROOT)/inspector/combine-javascript-resources.pl",
     22967                                "$(SRCROOT)/inspector/inline-javascript-imports.py",
    2296722968                        );
    2296822969                        name = "Streamline Inspector Source";
     
    2297022971                                "$(DERIVED_FILE_DIR)/WebCore/inspector.html",
    2297122972                                "$(DERIVED_FILE_DIR)/WebCore/inspector.js",
     22973                                "$(DERIVED_FILE_DIR)/WebCore/scriptFormatterWorker.js",
    2297222974                        );
    2297322975                        runOnlyForDeploymentPostprocessing = 0;
    2297422976                        shellPath = /bin/sh;
    22975                         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/combine-javascript-resources\" --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\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n    # Remove any JavaScript files, since they will be replaced with the combined file.\n    cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n    rm *.js\n\n    # Copy the modified HTML file and the combined script.\n    cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n    cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\nfi\n";
     22977                        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/UglifyJS\" \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\"\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n    # Remove any JavaScript files, since they will be replaced with the combined file.\n    cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n    rm *.js\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";
    2297622978                };
    2297722979                1C81BA330E97357C00266E07 /* Copy Inspector Resources */ = {
  • trunk/Source/WebCore/gyp/streamline-inspector-source.sh

    r81695 r83040  
    77
    88# Combine all script resources in the inspector.html file.
    9 "$SRCROOT/../combine-javascript-resources" --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
     9"$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
     10
     11# Inline script imports in ScriptFormatterWorker.js file.
     12"$SRCROOT/../inspector/inline-javascript-imports.py" "${SRCROOT}/../inspector/front-end/ScriptFormatterWorker.js" "${SRCROOT}/../inspector/front-end/UglifyJS" "${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js"
    1013
    1114if [ -d "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector" ]; then
    12     # Remove any JavaScript files, since they will be replaced with the combined file.
     15    # Remove any JavaScript files, since they will be replaced with the combined files.
    1316    cd "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector"
    1417    rm *.js
    1518
    16     # Copy the modified HTML file and the combined script.
     19    # Copy the modified HTML file and the combined scripts.
    1720    cp "${DERIVED_FILE_DIR}/WebCore/inspector.html" inspector.html
    1821    cp "${DERIVED_FILE_DIR}/WebCore/inspector.js" inspector.js
     22    cp "${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js" scriptFormatterWorker.js
    1923fi
  • trunk/Source/WebCore/inspector/combine-javascript-resources.pl

    • Property svn:eol-style set to LF
Note: See TracChangeset for help on using the changeset viewer.