Changeset 205418 in webkit


Ignore:
Timestamp:
Sep 4, 2016 12:10:53 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r205415.
​https://bugs.webkit.org/show_bug.cgi?id=161573

Many bots see inspector test failures, rolling out now and
investigating later. (Requested by brrian on #webkit).

Reverted changeset:

"Web Inspector: unify Main.html and Test.html sources and
generate different copies with the preprocessor"
​https://bugs.webkit.org/show_bug.cgi?id=161212
​http://trac.webkit.org/changeset/205415

Location:
trunk
Files:
3 added
5 deleted
16 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r205415 r205418  
     12016-09-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205415.
     4        https://bugs.webkit.org/show_bug.cgi?id=161573
     5
     6        Many bots see inspector test failures, rolling out now and
     7        investigating later. (Requested by brrian on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Inspector: unify Main.html and Test.html sources and
     12        generate different copies with the preprocessor"
     13        https://bugs.webkit.org/show_bug.cgi?id=161212
     14        http://trac.webkit.org/changeset/205415
     15
    1162016-09-01  Brian Burg  <bburg@apple.com>
    217

  • trunk/Source/CMakeLists.txt

    r205415 r205418  
    2525if (ENABLE_WEBCORE)
    2626    add_subdirectory(WebCore)
    27 endif ()
    28 
    29 if (ENABLE_WEBKIT OR ENABLE_WEBKIT2)
    30     add_subdirectory(WebInspectorUI)
    3127endif ()
    3228

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r205415 r205418  
    12001200
    12011201# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
     1202file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
     1203file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
    12021204add_custom_command(
    12031205    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp

  • trunk/Source/JavaScriptCore/ChangeLog

    r205415 r205418  
     12016-09-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205415.
     4        https://bugs.webkit.org/show_bug.cgi?id=161573
     5
     6        Many bots see inspector test failures, rolling out now and
     7        investigating later. (Requested by brrian on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Inspector: unify Main.html and Test.html sources and
     12        generate different copies with the preprocessor"
     13        https://bugs.webkit.org/show_bug.cgi?id=161212
     14        http://trac.webkit.org/changeset/205415
     15
    1162016-09-01  Brian Burg  <bburg@apple.com>
    217

  • trunk/Source/PlatformEfl.cmake

    r205415 r205418  
    11add_subdirectory(${WEBCORE_DIR}/platform/efl/DefaultTheme)
    22
    3 # FIXME: This should move to Source/WebInspectorUI/PlatformWin.cmake and use the WebInspectorUI_RESOURCES list.
     3# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
     4# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
     5add_custom_command(
     6    OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     7    DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
     8    COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     9)
     10
    411add_custom_target(
    512    web-inspector-resources ALL
    613    COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
    714    COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
    8     COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Main.html ${WEB_INSPECTOR_DIR}/UserInterface
    9     COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Test.html ${WEB_INSPECTOR_DIR}/UserInterface
    1015    COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
    1116    COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
    12     DEPENDS JavaScriptCore WebCore ${WebInspectorUI_RESOURCES}
     17    DEPENDS JavaScriptCore WebCore ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
    1318    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    1419)

  • trunk/Source/PlatformWin.cmake

    r205415 r205418  
     1set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
    12set(WEB_INSPECTOR_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/WebInspectorUI)
    23
    3 # FIXME: This should move to Source/WebInspectorUI/PlatformWin.cmake and use the WebInspectorUI_RESOURCES list.
    44add_custom_target(
    55    web-inspector-resources ALL
    66    COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
    7     COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
    8     COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Main.html ${WEB_INSPECTOR_DIR}/UserInterface
    9     COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Test.html ${WEB_INSPECTOR_DIR}/UserInterface
     7    COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
    108    COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
    119    COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
    12     DEPENDS JavaScriptCore WebCore generate-inspector-resources
     10    DEPENDS JavaScriptCore WebCore
    1311    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    1412)

  • trunk/Source/WebInspectorUI/ChangeLog

    r205415 r205418  
     12016-09-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205415.
     4        https://bugs.webkit.org/show_bug.cgi?id=161573
     5
     6        Many bots see inspector test failures, rolling out now and
     7        investigating later. (Requested by brrian on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Inspector: unify Main.html and Test.html sources and
     12        generate different copies with the preprocessor"
     13        https://bugs.webkit.org/show_bug.cgi?id=161212
     14        http://trac.webkit.org/changeset/205415
     15
    1162016-09-01  Brian Burg  <bburg@apple.com>
    217

  • trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig

    r205415 r205418  
    3131JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
    3232
    33 UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
    34 UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
    35 UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
    36 UMBRELLA_FRAMEWORKS_DIR_Production[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    37 UMBRELLA_FRAMEWORKS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
    38 UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    39 UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    40 UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
    41 
    42 WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
    43 
    4433SKIP_INSTALL[sdk=iphone*] = YES;

  • trunk/Source/WebInspectorUI/Scripts/combine-resources.pl

    r205415 r205418  
    3636our $htmlDirectory;
    3737our $htmlFile;
     38our $strip;
    3839
    3940GetOptions('output-dir=s' => \$outputDirectory,
    … …  
    4344           'input-dir=s' => \$inputDirectory,
    4445           'input-html-dir=s' => \$htmlDirectory,
    45            'input-html=s' => \$htmlFile);
     46           'input-html=s' => \$htmlFile,
     47           'strip' => \$strip);
    4648
    47 unless (defined $htmlFile and defined $derivedSourcesDirectory and defined $outputDirectory and (defined $outputScriptName or defined $outputStylesheetName)) {
    48     print "Usage: $0 --input-html <path> --derived-sources-dir <path> --output-dir <path> [--output-script-name <name>] [--output-style-name <name>]\n";
     49unless (defined $htmlFile and defined $derivedSourcesDirectory and defined $outputDirectory and (defined $strip or defined $outputScriptName or defined $outputStylesheetName)) {
     50    print "Usage: $0 --input-html <path> --derived-sources-dir <path> --output-dir <path> [--output-script-name <name>] [--output-style-name <name>] [--strip]\n";
    4951    exit;
    5052}
    … …  
    8991    my $replacementExpression = "([\t ]*)" . $tagExpression . "[\t ]*\n+";
    9092
    91     # Replace the first occurrence with a token so we can inject the concatenated tag in the same place
    92     # as the first file that got consolidated. This makes sure we preserve some order if there are other
    93     # items in the head that we didn't consolidate.
    94     $headContents =~ s/$replacementExpression/$1%CONCATENATED%\n/i;
    95     $headContents =~ s/$replacementExpression//gi;
    96     $headContents =~ s/%CONCATENATED%/$concatenatedTag/;
     93    if (defined $strip) {
     94        # Just strip all occurrences of the pattern.
     95        $headContents =~ s/$replacementExpression//gi;
     96    } else {
     97        # Replace the first occurrence with a token so we can inject the concatenated tag in the same place
     98        # as the first file that got consolidated. This makes sure we preserve some order if there are other
     99        # items in the head that we didn't consolidate.
     100        $headContents =~ s/$replacementExpression/$1%CONCATENATED%\n/i;
     101        $headContents =~ s/$replacementExpression//gi;
     102        $headContents =~ s/%CONCATENATED%/$concatenatedTag/;
     103    }
    97104}
    98105

  • trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb

    r205415 r205418  
    3232end
    3333
    34 JAVASCRIPTCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "JavaScriptCore")
    35 WEBCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "WebCore")
    3634WEB_INSPECTOR_PATH = File.expand_path File.join(File.dirname(__FILE__), "..")
    37 GENERATE_DERIVED_SOURCES_PATH = File.join WEB_INSPECTOR_PATH, "Scripts", "generate-webinspectorui-derived-sources"
    3835COPY_USER_INTERFACE_RESOURCES_PATH = File.join WEB_INSPECTOR_PATH, "Scripts", "copy-user-interface-resources.pl"
    3936
    40 # This script simulates processing user interface resources located in SRCROOT.
    41 # It places processed files in the specified output directory. This is most similar
    42 # to an isolated OBJROOT since it includes DerivedSources. It doesn't place files
    43 # into their DSTROOT locations, such as inside of WebInspectorUI.framework.
    4437$output_directory = File.expand_path ARGV[0]
    45 $start_directory = FileUtils.pwd
    4638
    4739Dir.mktmpdir do |tmpdir|
    … …  
    4941  # Create the output directory if needed.
    5042  FileUtils.mkdir_p $output_directory
    51 
     43 
    5244  # Create empty derived sources expected to exist.
    5345  FileUtils.touch(File.join(tmpdir, 'InspectorBackendCommands.js'))
    54 
    55   # Stage some scripts expected to be in various framework PrivateHeaders.
     46 
     47  # Setup the environment and run.
     48  ENV["DERIVED_SOURCES_DIR"] = tmpdir
    5649  ENV["JAVASCRIPTCORE_PRIVATE_HEADERS_DIR"] = tmpdir
    57   ENV["WEBCORE_PRIVATE_HEADERS_DIR"] = tmpdir
    58   FileUtils.cp(File.join(JAVASCRIPTCORE_PATH, "Scripts", "cssmin.py"), tmpdir)
    59   FileUtils.cp(File.join(JAVASCRIPTCORE_PATH, "Scripts", "jsmin.py"), tmpdir)
    60   FileUtils.cp(File.join(WEBCORE_PATH, "bindings", "scripts", "preprocessor.pm"), tmpdir)
    61 
    62   # Setup the environment and generate derived sources.
    6350  ENV["SRCROOT"] = WEB_INSPECTOR_PATH
    64   ENV["BUILT_PRODUCTS_DIR"] = $output_directory
    65   ENV["ACTION"] = "install"
    66   FileUtils.cd $start_directory
    67   system(GENERATE_DERIVED_SOURCES_PATH) or raise "Failed to generate derived sources."
    68 
    69   # Setup the environment and combine/process/stage resources.
    70   ENV["DERIVED_SOURCES_DIR"] = File.join($output_directory, "DerivedSources", "WebInspectorUI")
    7151  ENV["TARGET_BUILD_DIR"] = $output_directory
    7252  ENV["UNLOCALIZED_RESOURCES_FOLDER_PATH"] = ""
    7353  ENV["COMBINE_INSPECTOR_RESOURCES"] = "YES"
    7454  ENV["COMBINE_TEST_RESOURCES"] = "YES"
    75   ENV["FORCE_TOOL_INSTALL"] = "NO"
    76   FileUtils.cd $start_directory
    77   system(COPY_USER_INTERFACE_RESOURCES_PATH) or raise "Failed to process user interface resources."
     55  exec COPY_USER_INTERFACE_RESOURCES_PATH
    7856
    7957end

  • trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

    r205415 r205418  
    9191my $inspectorLicense = <<'EOF';
    9292/*
    93  * Copyright (C) 2007-2016 Apple Inc. All rights reserved.
     93 * Copyright (C) 2007-2015 Apple Inc. All rights reserved.
    9494 * Copyright (C) 2008 Matt Lilek. All rights reserved.
    9595 * Copyright (C) 2008-2009 Anthony Ricaud <rik@webkit.org>
    … …  
    136136my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
    137137my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
    138 my $sharedScriptsRoot = File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'});
    139138my $uiRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'UserInterface');
    140139my $targetResourcePath = File::Spec->catdir($ENV{'TARGET_BUILD_DIR'}, $ENV{'UNLOCALIZED_RESOURCES_FOLDER_PATH'});
    … …  
    163162    # but overwrite Main.html / Main.js with optimized versions.
    164163    ditto($uiRoot, $targetResourcePath);
    165     copy(File::Spec->catfile($derivedSourcesDir, "Main.html"), $targetResourcePath) or die "Copy of Main.html failed: $!";
    166     copy(File::Spec->catfile($derivedSourcesDir, "Test.html"), $targetResourcePath) or die "Copy of Test.html failed: $!";
    167     unlink File::Spec->catfile($targetResourcePath, "Inspector.html.in");
    168164
    169165    # Also force combining test resources for tool installs.
    … …  
    172168
    173169if ($shouldCombineMain) {
     170    # Remove Debug JavaScript and CSS files in Production builds.
     171    system($perl, $combineResourcesCmd, '--input-dir', 'Debug', '--input-html', File::Spec->catfile($uiRoot, 'Main.html'), '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Debug.js', '--output-style-name', 'Debug.css', '--strip');
     172
    174173    # Combine the JavaScript and CSS files in Production builds into single files (Main.js and Main.css).
    175174    my $derivedSourcesMainHTML = File::Spec->catfile($derivedSourcesDir, 'Main.html');
    176     system($perl, $combineResourcesCmd,
    177         '--input-html', $derivedSourcesMainHTML,
    178         '--input-html-dir', $uiRoot,
    179         '--derived-sources-dir', $derivedSourcesDir,
    180         '--output-dir', $derivedSourcesDir,
    181         '--output-script-name', 'Main.js',
    182         '--output-style-name', 'Main.css');
     175    system($perl, $combineResourcesCmd, '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Main.js', '--output-style-name', 'Main.css');
    183176
    184177    # Combine the CodeMirror JavaScript and CSS files in Production builds into single files (CodeMirror.js and CodeMirror.css).
    185     system($perl, $combineResourcesCmd,
    186         '--input-dir', 'External/CodeMirror',
    187         '--input-html', $derivedSourcesMainHTML,
    188         '--input-html-dir', $uiRoot,
    189         '--derived-sources-dir', $derivedSourcesDir,
    190         '--output-dir', $derivedSourcesDir,
    191         '--output-script-name', 'CodeMirror.js',
    192         '--output-style-name', 'CodeMirror.css');
     178    system($perl, $combineResourcesCmd, '--input-dir', 'External/CodeMirror', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'CodeMirror.js', '--output-style-name', 'CodeMirror.css');
    193179
    194180    # Combine the Esprima JavaScript files in Production builds into a single file (Esprima.js).
    195     system($perl, $combineResourcesCmd,
    196         '--input-dir', 'External/Esprima',
    197         '--input-html', $derivedSourcesMainHTML,
    198         '--input-html-dir', $uiRoot,
    199         '--derived-sources-dir', $derivedSourcesDir,
    200         '--output-dir', $derivedSourcesDir,
    201         '--output-script-name', 'Esprima.js');
     181    system($perl, $combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'Esprima.js');
    202182
    203183    # Combine the ESLint JavaScript files in Production builds into a single file (ESLint.js).
    204     system($perl, $combineResourcesCmd,
    205         '--input-dir', 'External/ESLint',
    206         '--input-html', $derivedSourcesMainHTML,
    207         '--input-html-dir', $uiRoot,
    208         '--derived-sources-dir', $derivedSourcesDir,
    209         '--output-dir', $derivedSourcesDir,
    210         '--output-script-name', 'ESLint.js');
     184    system($perl, $combineResourcesCmd, '--input-dir', 'External/ESLint', '--input-html', $derivedSourcesMainHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'ESLint.js');
    211185
    212186    # Remove console.assert calls from the Main.js file.
    213187    my $derivedSourcesMainJS = File::Spec->catfile($derivedSourcesDir, 'Main.js');
    214     system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'),
    215         '--input-script', $derivedSourcesMainJS,
    216         '--output-script', $derivedSourcesMainJS);
     188    system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-script', $derivedSourcesMainJS, '--output-script', $derivedSourcesMainJS);
    217189
    218190    # Fix Image URLs in the Main.css file by removing the "../".
    … …  
    251223
    252224    # Minify the Main.js and Main.css files, with Main.js appending to the license that was exported above.
    253     my $jsMinScript = File::Spec->catfile($sharedScriptsRoot, 'jsmin.py');
    254     my $cssMinScript = File::Spec->catfile($sharedScriptsRoot, 'cssmin.py');
     225    my $jsMinScript = File::Spec->catfile($scriptsRoot, 'jsmin.py');
     226    my $cssMinScript = File::Spec->catfile($scriptsRoot, 'cssmin.py');
    255227    system(qq("$python" "$jsMinScript" < "$derivedSourcesMainJS" >> "$targetMainJS")) and die "Failed to minify $derivedSourcesMainJS: $!";
    256228    system(qq("$python" "$cssMinScript" < "$derivedSourcesMainCSS" >> "$targetMainCSS")) and die "Failed to minify $derivedSourcesMainCSS: $!";
    … …  
    286258
    287259    # Remove console.assert calls from the Worker js files.
    288     system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'),
    289         '--input-directory', $workersDir);
     260    system($perl, File::Spec->catfile($scriptsRoot, 'remove-console-asserts.pl'), '--input-directory', $workersDir);
    290261
    291262    # Fix import references in Workers directories. This rewrites "../../External/script.js" import paths to their new locations.
    292     system($perl, File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'),
    293         '--input-directory', $workersDir)
    294         and die "Failed to update Worker imports for optimized builds.";
     263    system($perl, File::Spec->catfile($scriptsRoot, 'fix-worker-imports-for-optimized-builds.pl'), '--input-directory', $workersDir) and die "Failed to update Worker imports for optimized builds.";
    295264} else {
    296265    # Keep the files separate for engineering builds.
    297266    ditto($uiRoot, $targetResourcePath);
    298     copy(File::Spec->catfile($derivedSourcesDir, 'Main.html'), File::Spec->catfile($targetResourcePath, 'Main.html')) or die "Copy of Main.html failed: $!";
    299     copy(File::Spec->catfile($derivedSourcesDir, 'Test.html'), File::Spec->catfile($targetResourcePath, 'Test.html')) or die "Copy of Test.html failed: $!";;
    300     unlink File::Spec->catfile($targetResourcePath, 'Inspector.html.in');
    301267}
    302268
    303269if ($shouldCombineTest) {
     270    # Combine the JavaScript files for testing into a single file (TestCombined.js).
     271    system($perl, $combineResourcesCmd, '--input-html', File::Spec->catfile($uiRoot, 'Test.html'), '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestCombined.js', '--output-style-name', 'TestCombined.css');
     272
    304273    my $derivedSourcesTestHTML = File::Spec->catfile($derivedSourcesDir, 'Test.html');
    305 
    306     # Combine the JavaScript files for testing into a single file (TestCombined.js).
    307     system($perl, $combineResourcesCmd,
    308         '--input-html', $derivedSourcesTestHTML,
    309         '--input-html-dir', $uiRoot,
    310         '--derived-sources-dir', $derivedSourcesDir,
    311         '--output-dir', $derivedSourcesDir,
    312         '--output-script-name', 'TestCombined.js',
    313         '--output-style-name', 'TestCombined.css');
    314 
    315     my $derivedSourcesTestCombinedJS = File::Spec->catfile($derivedSourcesDir, 'TestCombined.js');
     274    my $derivedSourcesTestJS = File::Spec->catfile($derivedSourcesDir, 'TestCombined.js');
    316275    # Combine the Esprima JavaScript files for testing into a single file (Esprima.js).
    317     system($perl, $combineResourcesCmd,
    318         '--input-dir', 'External/Esprima',
    319         '--input-html', $derivedSourcesTestHTML,
    320         '--input-html-dir', $uiRoot,
    321         '--derived-sources-dir', $derivedSourcesDir,
    322         '--output-dir', $derivedSourcesDir,
    323         '--output-script-name', 'TestEsprima.js');
     276    system($perl, $combineResourcesCmd, '--input-dir', 'External/Esprima', '--input-html', $derivedSourcesTestHTML, '--input-html-dir', $uiRoot, '--derived-sources-dir', $derivedSourcesDir, '--output-dir', $derivedSourcesDir, '--output-script-name', 'TestEsprima.js');
    324277
    325278    # Export the license into TestCombined.js.
    … …  
    327280    seedFile($targetTestJS, $inspectorLicense);
    328281
    329     # Append TestCombined.js to the license that was exported above.
    330     appendFile($targetTestJS, $derivedSourcesTestCombinedJS);
    331 
    332282    # Export the license into Esprima.js.
    333283    my $targetEsprimaJS = File::Spec->catfile($targetResourcePath, 'TestEsprima.js');
    334284    seedFile($targetEsprimaJS, $esprimaLicense);
    335285
     286    # Append TestCombined.js to the license that was exported above.
     287    appendFile($targetTestJS, $derivedSourcesTestJS);
     288
    336289    # Append Esprima.js to the license that was exported above.
    337290    my $derivedSourcesEsprimaJS = File::Spec->catfile($derivedSourcesDir, 'TestEsprima.js');
    … …  
    339292
    340293    # Copy over Test.html.
    341     copy($derivedSourcesTestHTML, File::Spec->catfile($targetResourcePath, 'Test.html')) or die "Copy of Test.html failed: $!";
     294    copy($derivedSourcesTestHTML, File::Spec->catfile($targetResourcePath, 'Test.html'));
    342295
    343296    # Copy the Legacy directory.

  • trunk/Source/WebInspectorUI/UserInterface/Main.html

    r205417 r205418  
    11<!--
    2  * Copyright (C) 2013, 2014, 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1111 *    documentation and/or other materials provided with the distribution.
    1212 *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS"
     13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    1414 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    1515 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    … …  
    2727<head>
    2828    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    29 #if !INCLUDE_TEST_RESOURCES
    3029    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource:; connect-src * ws:; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
    31 #endif
    32 
    33 #if INCLUDE_UI_RESOURCES
     30
    3431    <link rel="stylesheet" href="External/CodeMirror/codemirror.css">
    3532
    … …  
    202199    <link rel="stylesheet" href="Controllers/CodeMirrorDragToAdjustNumberController.css">
    203200    <link rel="stylesheet" href="Controllers/CodeMirrorTokenTrackingController.css">
    204 #endif // INCLUDE_UI_RESOURCES
    205 
    206 #if ENGINEERING_BUILD && !INCLUDE_TEST_RESOURCES
     201
    207202    <link rel="stylesheet" href="Debug/UncaughtExceptionReporter.css">
     203
    208204    <script src="Debug/UncaughtExceptionReporter.js"></script>
    209 #endif
    210205
    211206    <script src="External/CodeMirror/codemirror.js"></script>
    212207
    213     <script src="External/CodeMirror/css.js"></script>
    214     <script src="External/CodeMirror/htmlmixed.js"></script>
    215     <script src="External/CodeMirror/javascript.js"></script>
    216 
    217 #if INCLUDE_UI_RESOURCES
    218208    <script src="External/CodeMirror/clojure.js"></script>
    219209    <script src="External/CodeMirror/closebrackets.js"></script>
    220210    <script src="External/CodeMirror/coffeescript.js"></script>
    221211    <script src="External/CodeMirror/comment.js"></script>
     212    <script src="External/CodeMirror/css.js"></script>
     213    <script src="External/CodeMirror/htmlmixed.js"></script>
     214    <script src="External/CodeMirror/javascript.js"></script>
    222215    <script src="External/CodeMirror/livescript.js"></script>
    223216    <script src="External/CodeMirror/matchbrackets.js"></script>
    … …  
    230223    <script src="External/CodeMirror/sublime.js"></script>
    231224    <script src="External/CodeMirror/xml.js"></script>
    232 #endif
    233225
    234226    <script src="External/Esprima/esprima.js"></script>
    … …  
    240232    <script src="Base/ListMultimap.js"></script>
    241233    <script src="Base/Object.js"></script>
    242 
    243 #if INCLUDE_TEST_RESOURCES
    244     <script src="Test/TestHarness.js"></script>
    245     <script src="Test/FrontendTestHarness.js"></script>
    246     <script src="Test/TestSuite.js"></script>
    247     <script src="Test/Test.js"></script>
    248 #else
    249     <script src="Base/Main.js"></script>
    250 #endif
    251234
    252235    <script src="Base/DOMUtilities.js"></script>
    … …  
    366349    <script src="Models/PropertyDescriptor.js"></script>
    367350    <script src="Models/PropertyPath.js"></script>
    368     <script src="Models/PropertyPreview.js"></script>
     351    <script src="Models/PropertyPreview.js"></script>   
    369352    <script src="Models/RenderingFrameTimelineRecord.js"></script>
    370353    <script src="Models/ReplayDashboard.js"></script>
    … …  
    407390    <script src="Proxies/HeapSnapshotWorkerProxy.js"></script>
    408391
    409     <script src="Views/CodeMirrorAdditions.js"></script>
    410     <script src="Views/CodeMirrorFormatters.js"></script>
    411 
    412 #if INCLUDE_UI_RESOURCES
    413392    <script src="Views/View.js"></script>
    414393
    … …  
    496475    <script src="Views/CircleChart.js"></script>
    497476    <script src="Views/ClusterContentView.js"></script>
     477    <script src="Views/CodeMirrorAdditions.js"></script>
    498478    <script src="Views/CodeMirrorEditor.js"></script>
     479    <script src="Views/CodeMirrorFormatters.js"></script>
    499480    <script src="Views/CodeMirrorTextMarkers.js"></script>
    500481    <script src="Views/ColorPicker.js"></script>
    … …  
    691672    <script src="Views/VisualStyleURLInput.js"></script>
    692673    <script src="Views/VisualStyleUnitSlider.js"></script>
    693 #endif // INCLUDE_UI_RESOURCES
    694 
    695     <script src="Controllers/Formatter.js"></script>
    696     <script src="Controllers/FormatterSourceMap.js"></script>
    697     <script src="Controllers/ResourceQueryController.js"></script>
     674
     675    <script src="Controllers/Annotator.js"></script>
     676    <script src="Controllers/CodeMirrorEditingController.js"></script>
    698677
    699678    <script src="Controllers/AnalyzerManager.js"></script>
    700679    <script src="Controllers/ApplicationCacheManager.js"></script>
     680    <script src="Controllers/BasicBlockAnnotator.js"></script>
    701681    <script src="Controllers/BranchManager.js"></script>
     682    <script src="Controllers/BreakpointPopoverController.js"></script>
    702683    <script src="Controllers/CSSStyleManager.js"></script>
    703     <script src="Controllers/CSSStyleManager.js"></script>
    704     <script src="Controllers/DashboardManager.js"></script>
    705     <script src="Controllers/DebuggerManager.js"></script>
    706     <script src="Controllers/DOMTreeManager.js"></script>
    707     <script src="Controllers/FrameResourceManager.js"></script>
    708     <script src="Controllers/HeapManager.js"></script>
    709     <script src="Controllers/IssueManager.js"></script>
    710     <script src="Controllers/LayerTreeManager.js"></script>
    711     <script src="Controllers/LogManager.js"></script>
    712     <script src="Controllers/MemoryManager.js"></script>
    713     <script src="Controllers/ProbeManager.js"></script>
    714     <script src="Controllers/ReplayManager.js"></script>
    715     <script src="Controllers/RuntimeManager.js"></script>
    716     <script src="Controllers/SourceMapManager.js"></script>
    717     <script src="Controllers/StorageManager.js"></script>
    718     <script src="Controllers/TimelineManager.js"></script>
    719 
    720 #if INCLUDE_UI_RESOURCES
    721     <script src="Controllers/Annotator.js"></script>
    722     <script src="Controllers/CodeMirrorEditingController.js"></script>
    723 
    724     <script src="Controllers/BasicBlockAnnotator.js"></script>
    725     <script src="Controllers/BreakpointPopoverController.js"></script>
    726684    <script src="Controllers/CodeMirrorColorEditingController.js"></script>
    727685    <script src="Controllers/CodeMirrorCompletionController.js"></script>
    … …  
    732690    <script src="Controllers/CodeMirrorTokenTrackingController.js"></script>
    733691    <script src="Controllers/CodeMirrorTextKillController.js"></script>
     692    <script src="Controllers/DOMTreeManager.js"></script>
     693    <script src="Controllers/DashboardManager.js"></script>
     694    <script src="Controllers/DebuggerManager.js"></script>
    734695    <script src="Controllers/DragToAdjustController.js"></script>
     696    <script src="Controllers/Formatter.js"></script>
     697    <script src="Controllers/FormatterSourceMap.js"></script>
     698    <script src="Controllers/FrameResourceManager.js"></script>
     699    <script src="Controllers/HeapManager.js"></script>
     700    <script src="Controllers/IssueManager.js"></script>
    735701    <script src="Controllers/JavaScriptLogViewController.js"></script>
    736702    <script src="Controllers/JavaScriptRuntimeCompletionProvider.js"></script>
     703    <script src="Controllers/LayerTreeManager.js"></script>
     704    <script src="Controllers/LogManager.js"></script>
     705    <script src="Controllers/MemoryManager.js"></script>
     706    <script src="Controllers/ProbeManager.js"></script>
     707    <script src="Controllers/ReplayManager.js"></script>
     708    <script src="Controllers/ResourceQueryController.js"></script>
     709    <script src="Controllers/RuntimeManager.js"></script>
     710    <script src="Controllers/SourceMapManager.js"></script>
     711    <script src="Controllers/StorageManager.js"></script>
     712    <script src="Controllers/TimelineManager.js"></script>
    737713    <script src="Controllers/TypeTokenAnnotator.js"></script>
    738714    <script src="Controllers/VisualStyleCompletionsController.js"></script>
    739 #endif
    740715
    741716    <script src="Workers/Formatter/FormatterContentBuilder.js"></script>
    742717
    743 #if ENGINEERING_BUILD
     718    <script src="Base/Main.js"></script>
     719
    744720    <script src="Debug/Bootstrap.js"></script>
    745721    <script src="Debug/CapturingProtocolTracer.js"></script>
    746722    <script src="Debug/ProtocolTrace.js"></script>
    747 #endif
    748723
    749724    <script>
    750725        WebInspector.loaded();
    751 
    752 #if INCLUDE_TEST_RESOURCES
    753         // Debug logging is synchronous on the test page.
    754         InspectorTest.forceDebugLogging = false;
    755 
    756         // Tee all TestHarness commands to stderr from within the Inspector.
    757         InspectorTest.dumpActivityToSystemConsole = false;
    758 
    759         // Best used in combination with dumpActivityToSystemConsole.
    760         InspectorBackend.dumpInspectorProtocolMessages = false;
    761 #endif
    762726    </script>
    763727</head>

  • trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj

    r205415 r205418  
    77        objects = {
    88
    9 /* Begin PBXAggregateTarget section */
    10                 99E9A7F21D70BAD300C247A6 /* Derived Sources */ = {
    11                         isa = PBXAggregateTarget;
    12                         buildConfigurationList = 99E9A7F31D70BAD300C247A6 /* Build configuration list for PBXAggregateTarget "Derived Sources" */;
    13                         buildPhases = (
    14                                 99E9A7F91D70BAF600C247A6 /* Generate Derived Sources */,
    15                         );
    16                         dependencies = (
    17                         );
    18                         name = "Derived Sources";
    19                         productName = "Derived Sources";
    20                 };
    21 /* End PBXAggregateTarget section */
    22 
    239/* Begin PBXBuildFile section */
    2410                1C60FF1614E6E3F7006CD77D /* localizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 1C60FF1314E6E35D006CD77D /* localizedStrings.js */; };
    … …  
    2612/* End PBXBuildFile section */
    2713
    28 /* Begin PBXContainerItemProxy section */
    29                 99E9A7F71D70BADD00C247A6 /* PBXContainerItemProxy */ = {
    30                         isa = PBXContainerItemProxy;
    31                         containerPortal = A54C224D148B23DE00373FA3 /* Project object */;
    32                         proxyType = 1;
    33                         remoteGlobalIDString = 99E9A7F21D70BAD300C247A6;
    34                         remoteInfo = "Derived Sources";
    35                 };
    36 /* End PBXContainerItemProxy section */
    37 
    3814/* Begin PBXFileReference section */
     15                1C435CAC14E7B287004E10EA /* cssmin.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = cssmin.py; sourceTree = "<group>"; };
     16                1C435CAD14E7B287004E10EA /* jsmin.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = jsmin.py; sourceTree = "<group>"; };
    3917                1C60FE2F14E5F3CD006CD77D /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    4018                1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
    … …  
    7755                                1C60FF1914E73C64006CD77D /* combine-resources.pl */,
    7856                                1C60FFE114E79B0F006CD77D /* copy-user-interface-resources.pl */,
     57                                1C435CAC14E7B287004E10EA /* cssmin.py */,
     58                                1C435CAD14E7B287004E10EA /* jsmin.py */,
    7959                                1C60FF1A14E73DCA006CD77D /* remove-console-asserts.pl */,
    8060                        );
    … …  
    11696                        );
    11797                        dependencies = (
    118                                 99E9A7F81D70BADD00C247A6 /* PBXTargetDependency */,
    11998                        );
    12099                        name = WebInspectorUI;
    … …  
    132111                                LastUpgradeCheck = 0700;
    133112                                ORGANIZATIONNAME = Apple;
    134                                 TargetAttributes = {
    135                                         99E9A7F21D70BAD300C247A6 = {
    136                                                 CreatedOnToolsVersion = 8.0;
    137                                                 ProvisioningStyle = Automatic;
    138                                         };
    139                                 };
    140113                        };
    141114                        buildConfigurationList = A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */;
    … …  
    152125                        targets = (
    153126                                A54C2256148B23DF00373FA3 /* WebInspectorUI */,
    154                                 99E9A7F21D70BAD300C247A6 /* Derived Sources */,
    155127                        );
    156128                };
    … …  
    175147                        runOnlyForDeploymentPostprocessing = 0;
    176148                        shellPath = /bin/sh;
    177                         shellScript = "# This is defined differently for Make/xcodebuild vs CMake ports.\nDERIVED_SOURCES_DIR=\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebInspectorUI\"\n\n/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"";
    178                 };
    179                 99E9A7F91D70BAF600C247A6 /* Generate Derived Sources */ = {
    180                         isa = PBXShellScriptBuildPhase;
    181                         buildActionMask = 2147483647;
    182                         files = (
    183                         );
    184                         inputPaths = (
    185                         );
    186                         name = "Generate Derived Sources";
    187                         outputPaths = (
    188                         );
    189                         runOnlyForDeploymentPostprocessing = 0;
    190                         shellPath = /bin/sh;
    191                         shellScript = "GENERATE_DERIVED_SOURCES_PATH=\"${SRCROOT}/Scripts/generate-webinspectorui-derived-sources\"\n[[ -x \"${GENERATE_DERIVED_SOURCES_PATH}\" ]] && exec \"${GENERATE_DERIVED_SOURCES_PATH}\"\nexit 0\n";
     149                        shellScript = "/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"";
    192150                };
    193151/* End PBXShellScriptBuildPhase section */
    … …  
    204162/* End PBXSourcesBuildPhase section */
    205163
    206 /* Begin PBXTargetDependency section */
    207                 99E9A7F81D70BADD00C247A6 /* PBXTargetDependency */ = {
    208                         isa = PBXTargetDependency;
    209                         target = 99E9A7F21D70BAD300C247A6 /* Derived Sources */;
    210                         targetProxy = 99E9A7F71D70BADD00C247A6 /* PBXContainerItemProxy */;
    211                 };
    212 /* End PBXTargetDependency section */
    213 
    214164/* Begin PBXVariantGroup section */
    215165                1C60FF1314E6E35D006CD77D /* localizedStrings.js */ = {
    … …  
    239189                        name = Production;
    240190                };
    241                 99E9A7F41D70BAD300C247A6 /* Debug */ = {
     191                A54C226A148B23DF00373FA3 /* Debug */ = {
     192                        isa = XCBuildConfiguration;
     193                        baseConfigurationReference = 1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */;
     194                        buildSettings = {
     195                                DEBUG_DEFINES = "";
     196                        };
     197                        name = Debug;
     198                };
     199                A54C226B148B23DF00373FA3 /* Release */ = {
     200                        isa = XCBuildConfiguration;
     201                        baseConfigurationReference = 1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */;
     202                        buildSettings = {
     203                                DEBUG_DEFINES = NDEBUG;
     204                        };
     205                        name = Release;
     206                };
     207                A54C226D148B23DF00373FA3 /* Debug */ = {
    242208                        isa = XCBuildConfiguration;
    243209                        baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
    244210                        buildSettings = {
    245                                 PRODUCT_NAME = "$(TARGET_NAME)";
    246211                        };
    247212                        name = Debug;
    248213                };
    249                 99E9A7F51D70BAD300C247A6 /* Release */ = {
     214                A54C226E148B23DF00373FA3 /* Release */ = {
    250215                        isa = XCBuildConfiguration;
    251216                        baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
    252217                        buildSettings = {
    253                                 PRODUCT_NAME = "$(TARGET_NAME)";
    254218                        };
    255219                        name = Release;
    256220                };
    257                 99E9A7F61D70BAD300C247A6 /* Production */ = {
    258                         isa = XCBuildConfiguration;
    259                         baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
    260                         buildSettings = {
    261                                 PRODUCT_NAME = "$(TARGET_NAME)";
    262                         };
    263                         name = Production;
    264                 };
    265                 A54C226A148B23DF00373FA3 /* Debug */ = {
    266                         isa = XCBuildConfiguration;
    267                         baseConfigurationReference = 1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */;
    268                         buildSettings = {
    269                                 DEBUG_DEFINES = "";
    270                         };
    271                         name = Debug;
    272                 };
    273                 A54C226B148B23DF00373FA3 /* Release */ = {
    274                         isa = XCBuildConfiguration;
    275                         baseConfigurationReference = 1C60FE3114E5F3CD006CD77D /* DebugRelease.xcconfig */;
    276                         buildSettings = {
    277                                 DEBUG_DEFINES = NDEBUG;
    278                         };
    279                         name = Release;
    280                 };
    281                 A54C226D148B23DF00373FA3 /* Debug */ = {
    282                         isa = XCBuildConfiguration;
    283                         baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
    284                         buildSettings = {
    285                         };
    286                         name = Debug;
    287                 };
    288                 A54C226E148B23DF00373FA3 /* Release */ = {
    289                         isa = XCBuildConfiguration;
    290                         baseConfigurationReference = 1C60FE3314E5F3CD006CD77D /* WebInspectorUIFramework.xcconfig */;
    291                         buildSettings = {
    292                         };
    293                         name = Release;
    294                 };
    295221/* End XCBuildConfiguration section */
    296222
    297223/* Begin XCConfigurationList section */
    298                 99E9A7F31D70BAD300C247A6 /* Build configuration list for PBXAggregateTarget "Derived Sources" */ = {
    299                         isa = XCConfigurationList;
    300                         buildConfigurations = (
    301                                 99E9A7F41D70BAD300C247A6 /* Debug */,
    302                                 99E9A7F51D70BAD300C247A6 /* Release */,
    303                                 99E9A7F61D70BAD300C247A6 /* Production */,
    304                         );
    305                         defaultConfigurationIsVisible = 0;
    306                         defaultConfigurationName = Production;
    307                 };
    308224                A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */ = {
    309225                        isa = XCConfigurationList;

  • trunk/Source/WebKit2/ChangeLog

    r205415 r205418  
     12016-09-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205415.
     4        https://bugs.webkit.org/show_bug.cgi?id=161573
     5
     6        Many bots see inspector test failures, rolling out now and
     7        investigating later. (Requested by brrian on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Web Inspector: unify Main.html and Test.html sources and
     12        generate different copies with the preprocessor"
     13        https://bugs.webkit.org/show_bug.cgi?id=161212
     14        http://trac.webkit.org/changeset/205415
     15
    1162016-09-01  Brian Burg  <bburg@apple.com>
    217

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r205415 r205418  
    553553
    554554list(APPEND WebKit2_DERIVED_SOURCES
     555    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
    555556    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
    556557    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
    … …  
    963964)
    964965
     966set(InspectorFiles
     967    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
     968    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
     969    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
     970    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.js
     971    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.css
     972    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.js
     973    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.css
     974    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.js
     975    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/ESLint/*.js
     976    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/Esprima/*.js
     977    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
     978    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Protocol/*.js
     979    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Proxies/*.js
     980    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Test/*.js
     981    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.css
     982    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
     983    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/Formatter/*.js
     984    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/*.js
     985    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png
     986    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
     987    ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
     988)
     989
     990file(GLOB InspectorFilesDependencies
     991    ${InspectorFiles}
     992)
     993
     994# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
     995# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
     996add_custom_command(
     997    OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     998    DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
     999    COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     1000)
     1001
    9651002# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
    9661003list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
    … …  
    11101147
    11111148add_custom_command(
     1149    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     1150    DEPENDS ${InspectorFilesDependencies}
     1151            ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     1152            ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
     1153    COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     1154    VERBATIM
     1155)
     1156
     1157add_custom_command(
     1158    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
     1159    DEPENDS ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     1160    COMMAND glib-compile-resources --generate --sourcedir=${CMAKE_SOURCE_DIR}/Source/WebInspectorUI --sourcedir=${DERIVED_SOURCES_WEBINSPECTORUI_DIR} --target=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     1161    VERBATIM
     1162)
     1163
     1164add_custom_command(
    11121165    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
    11131166    DEPENDS ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKit2InspectorGResourceBundle.xml
    … …  
    11361189    )
    11371190endif ()
    1138 
    1139 add_custom_command(
    1140     OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
    1141     DEPENDS ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
    1142     COMMAND cp ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectrGResourceBundle.c
    1143 )
    1144 list(APPEND WebKit2_DERIVED_SOURCES
    1145     ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
    1146 )
    11471191
    11481192file(WRITE ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.xml

  • trunk/Source/cmake/WebKitFS.cmake

    r205415 r205418  
    1010if (NOT WEBCORE_DIR)
    1111    set(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
    12 endif ()
    13 if (NOT WEBINSPECTORUI_DIR)
    14     set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
    1512endif ()
    1613if (NOT WEBKIT_DIR)
    … …  
    3633
    3734file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
    38 file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
    3935file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
    4036

  • trunk/Source/cmake/WebKitMacros.cmake

    r205415 r205418  
    374374
    375375endmacro()
    376 
    377 # Converts a CMake list to a string containing elements separated by spaces.
    378 macro(TO_LIST_WITH_SPACES _in_list _out_string)
    379     set(${_out_string} "")
    380     foreach (_item ${_in_list})
    381         set(${_out_string} "${${_out_string}} ${_item}")
    382     endforeach ()
    383     string(STRIP "${${_out_string}}" ${_out_string})
    384 endmacro()
Note: See TracChangeset for help on using the changeset viewer.