Changeset 180224 in webkit


Ignore:
Timestamp:
Feb 17, 2015 9:23:54 AM (9 years ago)
Author:
achristensen@apple.com
Message:

Remove WebCore.exp.in and clean up.
https://bugs.webkit.org/show_bug.cgi?id=141491

Reviewed by Andreas Kling.

Source/WebCore:

  • Configurations/WebCore.xcconfig:

Don't use exported symbols files.

  • DerivedSources.make:

Don't generate export files.

  • WebCore.exp.in: Removed.
  • WebCore.xcodeproj/project.pbxproj:

Removed WebCoreExportFileGenerator targets.

  • make-export-file-generator: Removed.

Tools:

  • Scripts/sort-export-file: Removed.
  • Scripts/webkitpy/style/checker.py:

(_all_categories):
(FileType):
(CheckerDispatcher._file_type):
(CheckerDispatcher._create_checker):
Don't check if the export files are sorted.

  • Scripts/webkitpy/style/checkers/exportfile.py: Removed.
  • Scripts/webkitpy/style/checkers/exportfile_unittest.py: Removed.
Location:
trunk
Files:
5 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r180216 r180224  
     12015-02-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove WebCore.exp.in and clean up.
     4        https://bugs.webkit.org/show_bug.cgi?id=141491
     5
     6        Reviewed by Andreas Kling.
     7
     8        * Configurations/WebCore.xcconfig:
     9        Don't use exported symbols files.
     10        * DerivedSources.make:
     11        Don't generate export files.
     12        * WebCore.exp.in: Removed.
     13        * WebCore.xcodeproj/project.pbxproj:
     14        Removed WebCoreExportFileGenerator targets.
     15        * make-export-file-generator: Removed.
     16
    1172015-02-17  Carlos Garcia Campos  <cgarcia@igalia.com>
    218
  • trunk/Source/WebCore/DerivedSources.make

    r179810 r180224  
    12431243# --------
    12441244
    1245 ifneq ($(ACTION),installhdrs)
    1246 
    1247 ifeq ($(WTF_PLATFORM_IOS),1)
    1248 
    1249 ifeq ($(findstring armv7,$(ARCHS)), armv7)
    1250     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7.exp
    1251 endif
    1252 ifeq ($(findstring armv7k,$(ARCHS)), armv7k)
    1253     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7k.exp
    1254 endif
    1255 ifeq ($(findstring armv7s,$(ARCHS)), armv7s)
    1256     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7s.exp
    1257 endif
    1258 ifeq ($(findstring arm64,$(ARCHS)), arm64)
    1259     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.arm64.exp
    1260 endif
    1261 ifeq ($(findstring i386,$(ARCHS)), i386)
    1262     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.i386.exp
    1263 endif
    1264 ifeq ($(findstring x86_64,$(ARCHS)), x86_64)
    1265     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.x86_64.exp
    1266 endif
    1267 
    1268 all : $(WEBCORE_EXPORT_FILES)
    1269 
    1270 WebCore.%.exp : generate-export-file WebCore.exp.in
    1271         $^ $@
    1272 
    1273 # Switch NSRect, NSSize and NSPoint with their CG counterparts for the 64-bit exports file.
    1274 WebCore.LP64.%.exp : WebCore.%.exp
    1275         cat $^ | sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ > $@
    1276 
    1277 else
    1278 
    1279 all : WebCore.exp WebCore.LP64.exp
    1280 
    1281 WebCore.exp : $(BUILT_PRODUCTS_DIR)/WebCoreExportFileGenerator
    1282         $^ | grep -v '^# ' | sed -e 's/^#//' > $@
    1283 
    1284 # Switch NSRect, NSSize and NSPoint with their CG counterparts for the 64-bit exports file.
    1285 WebCore.LP64.exp : WebCore.exp
    1286         cat $^ | sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ > $@
    1287 
    1288 endif # WTF_PLATFORM_IOS
    1289 
    1290 endif # installhdrs
    1291 
    1292 # --------
    1293 
    12941245# Objective-C bindings
    12951246
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r180193 r180224  
    2121                        productName = All;
    2222                };
    23                 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */ = {
    24                         isa = PBXAggregateTarget;
    25                         buildConfigurationList = 5D87BB6C11E3EC0000702B6F /* Build configuration list for PBXAggregateTarget "WebCoreExportFileGenerator Generator" */;
    26                         buildPhases = (
    27                                 5D87BB6311E3EBC100702B6F /* Generate Export File Generator */,
    28                         );
    29                         dependencies = (
    30                         );
    31                         name = "WebCoreExportFileGenerator Generator";
    32                         productName = "WebCoreExportFileGenerator Generator";
    33                 };
    3423                DD041FBE09D9DDBE0010AF2A /* Derived Sources */ = {
    3524                        isa = PBXAggregateTarget;
     
    3928                        );
    4029                        dependencies = (
    41                                 5D87BB8F11E3EE2B00702B6F /* PBXTargetDependency */,
    4230                        );
    4331                        name = "Derived Sources";
     
    21542142                5D5975B71963637B00D00878 /* UserAgent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D5975B61963637B00D00878 /* UserAgent.mm */; };
    21552143                5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E227DD0AF589AD00D48324 /* NetscapePlugInStreamLoader.cpp */; };
    2156                 5D87BB8311E3ED8600702B6F /* ExportFileGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D87BB8211E3ED8600702B6F /* ExportFileGenerator.cpp */; };
    21572144                5D8C4DBF1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D8C4DBD1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp */; };
    21582145                5D8C4DC01428222C0026CE72 /* DisplaySleepDisablerCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D8C4DBE1428222C0026CE72 /* DisplaySleepDisablerCocoa.h */; };
     
    67516738                        remoteInfo = WebCoreTestSupport;
    67526739                };
    6753                 5D87BB6A11E3EBD200702B6F /* PBXContainerItemProxy */ = {
    6754                         isa = PBXContainerItemProxy;
    6755                         containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
    6756                         proxyType = 1;
    6757                         remoteGlobalIDString = 5D87BB6411E3EBC100702B6F;
    6758                         remoteInfo = "WebCoreExportFileGenerator Generator";
    6759                 };
    6760                 5D87BB8E11E3EE2B00702B6F /* PBXContainerItemProxy */ = {
    6761                         isa = PBXContainerItemProxy;
    6762                         containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
    6763                         proxyType = 1;
    6764                         remoteGlobalIDString = 5D87BB4E11E3EAEB00702B6F;
    6765                         remoteInfo = WebCoreExportFileGenerator;
    6766                 };
    67676740                DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {
    67686741                        isa = PBXContainerItemProxy;
     
    93089281                5D5975B219635F1100D00878 /* SystemVersion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemVersion.mm; sourceTree = "<group>"; };
    93099282                5D5975B61963637B00D00878 /* UserAgent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgent.mm; sourceTree = "<group>"; };
    9310                 5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebCoreExportFileGenerator; sourceTree = BUILT_PRODUCTS_DIR; };
    93119283                5D87BB8211E3ED8600702B6F /* ExportFileGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExportFileGenerator.cpp; path = DerivedSources/WebCore/ExportFileGenerator.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    93129284                5D8C4DBD1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DisplaySleepDisablerCocoa.cpp; sourceTree = "<group>"; };
     
    1435614328                        runOnlyForDeploymentPostprocessing = 0;
    1435714329                };
    14358                 5D87BB4D11E3EAEB00702B6F /* Frameworks */ = {
    14359                         isa = PBXFrameworksBuildPhase;
    14360                         buildActionMask = 2147483647;
    14361                         files = (
    14362                         );
    14363                         runOnlyForDeploymentPostprocessing = 0;
    14364                 };
    1436514330                93F19B1208245E59001E9ABC /* Frameworks */ = {
    1436614331                        isa = PBXFrameworksBuildPhase;
     
    1440914374                        isa = PBXGroup;
    1441014375                        children = (
    14411                                 5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
    1441214376                                E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */,
    1441314377                                417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */,
     
    2696626930                        productType = "com.apple.product-type.library.dynamic";
    2696726931                };
    26968                 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */ = {
    26969                         isa = PBXNativeTarget;
    26970                         buildConfigurationList = 5D87BB5911E3EB0700702B6F /* Build configuration list for PBXNativeTarget "WebCoreExportFileGenerator" */;
    26971                         buildPhases = (
    26972                                 5D87BB4C11E3EAEB00702B6F /* Sources */,
    26973                                 5D87BB4D11E3EAEB00702B6F /* Frameworks */,
    26974                         );
    26975                         buildRules = (
    26976                         );
    26977                         dependencies = (
    26978                                 5D87BB6B11E3EBD200702B6F /* PBXTargetDependency */,
    26979                         );
    26980                         name = WebCoreExportFileGenerator;
    26981                         productName = WebCoreExportFileGenerator;
    26982                         productReference = 5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */;
    26983                         productType = "com.apple.product-type.tool";
    26984                 };
    2698526932                93F198A508245E59001E9ABC /* WebCore */ = {
    2698626933                        isa = PBXNativeTarget;
     
    2705927006                                93F198A508245E59001E9ABC /* WebCore */,
    2706027007                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
    27061                                 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
    27062                                 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */,
    2706327008                                417DA6CF13734E02007C57FB /* WebCoreTestSupport */,
    2706427009                                E1BA66F31742BDE000C20251 /* WebCoreTestShim */,
     
    2714127086                        shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n    touch \"$SRCROOT/Info.plist\";\nfi;\n";
    2714227087                };
    27143                 5D87BB6311E3EBC100702B6F /* Generate Export File Generator */ = {
    27144                         isa = PBXShellScriptBuildPhase;
    27145                         buildActionMask = 2147483647;
    27146                         files = (
    27147                         );
    27148                         inputPaths = (
    27149                                 "$(SRCROOT)/WebCore.exp.in",
    27150                                 "$(SRCROOT)/make-export-file-generator",
    27151                         );
    27152                         name = "Generate Export File Generator";
    27153                         outputPaths = (
    27154                                 "$(BUILT_PRODUCTS_DIR)/DerivedSources/$(PROJECT_NAME)/ExportFileGenerator.cpp",
    27155                         );
    27156                         runOnlyForDeploymentPostprocessing = 0;
    27157                         shellPath = /bin/sh;
    27158                         shellScript = "OUTPUT_DIR=\"${BUILT_PRODUCTS_DIR}/DerivedSources/${PROJECT_NAME}\"\nmkdir -p \"${OUTPUT_DIR}\"\n\"${SRCROOT}\"/make-export-file-generator \"${SRCROOT}/WebCore.exp.in\" \"${OUTPUT_DIR}/ExportFileGenerator.cpp\"\n";
    27159                 };
    2716027088                5D87BC0711E43BDE00702B6F /* Copy Forwarding and ICU Headers */ = {
    2716127089                        isa = PBXShellScriptBuildPhase;
     
    2722127149                                AA5F3B8F16CC4B3900455EB0 /* PlatformSpeechSynthesizerMock.cpp in Sources */,
    2722227150                                41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,
    27223                         );
    27224                         runOnlyForDeploymentPostprocessing = 0;
    27225                 };
    27226                 5D87BB4C11E3EAEB00702B6F /* Sources */ = {
    27227                         isa = PBXSourcesBuildPhase;
    27228                         buildActionMask = 2147483647;
    27229                         files = (
    27230                                 5D87BB8311E3ED8600702B6F /* ExportFileGenerator.cpp in Sources */,
    2723127151                        );
    2723227152                        runOnlyForDeploymentPostprocessing = 0;
     
    3024730167                        targetProxy = 41816F8413859C7D0057AAA4 /* PBXContainerItemProxy */;
    3024830168                };
    30249                 5D87BB6B11E3EBD200702B6F /* PBXTargetDependency */ = {
    30250                         isa = PBXTargetDependency;
    30251                         target = 5D87BB6411E3EBC100702B6F /* WebCoreExportFileGenerator Generator */;
    30252                         targetProxy = 5D87BB6A11E3EBD200702B6F /* PBXContainerItemProxy */;
    30253                 };
    30254                 5D87BB8F11E3EE2B00702B6F /* PBXTargetDependency */ = {
    30255                         isa = PBXTargetDependency;
    30256                         target = 5D87BB4E11E3EAEB00702B6F /* WebCoreExportFileGenerator */;
    30257                         targetProxy = 5D87BB8E11E3EE2B00702B6F /* PBXContainerItemProxy */;
    30258                 };
    3025930169                DD041FF109D9E3250010AF2A /* PBXTargetDependency */ = {
    3026030170                        isa = PBXTargetDependency;
     
    3038430294                        name = Production;
    3038530295                };
    30386                 5D87BB5111E3EAEB00702B6F /* Debug */ = {
    30387                         isa = XCBuildConfiguration;
    30388                         baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
    30389                         buildSettings = {
    30390                                 EXPORTED_SYMBOLS_FILE = "";
    30391                                 GCC_OPTIMIZATION_LEVEL = 0;
    30392                                 INSTALL_PATH = /usr/local/bin;
    30393                                 OTHER_CFLAGS = "$(ASAN_OTHER_CFLAGS)";
    30394                                 OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
    30395                                 OTHER_LDFLAGS = "$(ASAN_OTHER_LDFLAGS)";
    30396                                 PRODUCT_NAME = WebCoreExportFileGenerator;
    30397                                 SKIP_INSTALL = YES;
    30398                         };
    30399                         name = Debug;
    30400                 };
    30401                 5D87BB5211E3EAEB00702B6F /* Release */ = {
    30402                         isa = XCBuildConfiguration;
    30403                         baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
    30404                         buildSettings = {
    30405                                 EXPORTED_SYMBOLS_FILE = "";
    30406                                 INSTALL_PATH = /usr/local/bin;
    30407                                 OTHER_CFLAGS = "$(ASAN_OTHER_CFLAGS)";
    30408                                 OTHER_CPLUSPLUSFLAGS = "$(ASAN_OTHER_CPLUSPLUSFLAGS)";
    30409                                 OTHER_LDFLAGS = "$(ASAN_OTHER_LDFLAGS)";
    30410                                 PRODUCT_NAME = WebCoreExportFileGenerator;
    30411                                 SKIP_INSTALL = YES;
    30412                         };
    30413                         name = Release;
    30414                 };
    30415                 5D87BB5311E3EAEB00702B6F /* Production */ = {
    30416                         isa = XCBuildConfiguration;
    30417                         baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
    30418                         buildSettings = {
    30419                                 EXPORTED_SYMBOLS_FILE = "";
    30420                                 INSTALL_PATH = /usr/local/bin;
    30421                                 OTHER_LDFLAGS = "$(ASAN_OTHER_LDFLAGS)";
    30422                                 PRODUCT_NAME = WebCoreExportFileGenerator;
    30423                                 SKIP_INSTALL = YES;
    30424                         };
    30425                         name = Production;
    30426                 };
    30427                 5D87BB6511E3EBC200702B6F /* Debug */ = {
    30428                         isa = XCBuildConfiguration;
    30429                         buildSettings = {
    30430                                 PRODUCT_NAME = "WebCoreExportFileGenerator Generator";
    30431                         };
    30432                         name = Debug;
    30433                 };
    30434                 5D87BB6611E3EBC200702B6F /* Release */ = {
    30435                         isa = XCBuildConfiguration;
    30436                         buildSettings = {
    30437                                 PRODUCT_NAME = "WebCoreExportFileGenerator Generator";
    30438                         };
    30439                         name = Release;
    30440                 };
    30441                 5D87BB6711E3EBC200702B6F /* Production */ = {
    30442                         isa = XCBuildConfiguration;
    30443                         buildSettings = {
    30444                                 PRODUCT_NAME = "WebCoreExportFileGenerator Generator";
    30445                         };
    30446                         name = Production;
    30447                 };
    3044830296                DD041FC209D9DDDC0010AF2A /* Debug */ = {
    3044930297                        isa = XCBuildConfiguration;
     
    3053430382                        defaultConfigurationName = Production;
    3053530383                };
    30536                 5D87BB5911E3EB0700702B6F /* Build configuration list for PBXNativeTarget "WebCoreExportFileGenerator" */ = {
    30537                         isa = XCConfigurationList;
    30538                         buildConfigurations = (
    30539                                 5D87BB5111E3EAEB00702B6F /* Debug */,
    30540                                 5D87BB5211E3EAEB00702B6F /* Release */,
    30541                                 5D87BB5311E3EAEB00702B6F /* Production */,
    30542                         );
    30543                         defaultConfigurationIsVisible = 0;
    30544                         defaultConfigurationName = Production;
    30545                 };
    30546                 5D87BB6C11E3EC0000702B6F /* Build configuration list for PBXAggregateTarget "WebCoreExportFileGenerator Generator" */ = {
    30547                         isa = XCConfigurationList;
    30548                         buildConfigurations = (
    30549                                 5D87BB6511E3EBC200702B6F /* Debug */,
    30550                                 5D87BB6611E3EBC200702B6F /* Release */,
    30551                                 5D87BB6711E3EBC200702B6F /* Production */,
    30552                         );
    30553                         defaultConfigurationIsVisible = 0;
    30554                         defaultConfigurationName = Production;
    30555                 };
    3055630384                DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */ = {
    3055730385                        isa = XCConfigurationList;
  • trunk/Tools/ChangeLog

    r180221 r180224  
     12015-02-17  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove WebCore.exp.in and clean up.
     4        https://bugs.webkit.org/show_bug.cgi?id=141491
     5
     6        Reviewed by Andreas Kling.
     7
     8        * Scripts/sort-export-file: Removed.
     9        * Scripts/webkitpy/style/checker.py:
     10        (_all_categories):
     11        (FileType):
     12        (CheckerDispatcher._file_type):
     13        (CheckerDispatcher._create_checker):
     14        Don't check if the export files are sorted.
     15        * Scripts/webkitpy/style/checkers/exportfile.py: Removed.
     16        * Scripts/webkitpy/style/checkers/exportfile_unittest.py: Removed.
     17
    1182015-02-17  Carlos Garcia Campos  <cgarcia@igalia.com>
    219
  • trunk/Tools/Scripts/webkitpy/style/checker.py

    r174636 r180224  
    4848from checkers.messagesin import MessagesInChecker
    4949from checkers.png import PNGChecker
    50 from checkers.exportfile import ExportFileChecker
    5150from checkers.python import PythonChecker
    5251from checkers.test_expectations import TestExpectationsChecker
     
    309308_PNG_FILE_EXTENSION = 'png'
    310309
    311 _EXPORT_FILE_PATH = [
    312     'Source/WebCore/WebCore.exp.in',
    313     'Source/WebKit/mac/WebKit.exp',
    314     'Source/WebKit/mac/WebKit.mac.exp',
    315     ]
    316 
    317310_CMAKE_FILE_EXTENSION = 'cmake'
    318311
     
    364357    categories = categories.union(PNGChecker.categories)
    365358    categories = categories.union(FeatureDefinesChecker.categories)
    366     categories = categories.union(ExportFileChecker.categories)
    367359
    368360    # FIXME: Consider adding all of the pep8 categories.  Since they
     
    515507    CMAKE = 11
    516508    FEATUREDEFINES = 12
    517     EXPORTFILE = 13
    518509
    519510class CheckerDispatcher(object):
     
    595586        elif file_extension == _PNG_FILE_EXTENSION:
    596587            return FileType.PNG
    597         elif file_path in _EXPORT_FILE_PATH:
    598             return FileType.EXPORTFILE
    599588        elif ((file_extension == _CMAKE_FILE_EXTENSION) or os.path.basename(file_path) == 'CMakeLists.txt'):
    600589            return FileType.CMAKE
     
    641630        elif file_type == FileType.PNG:
    642631            checker = PNGChecker(file_path, handle_style_error)
    643         elif file_type == FileType.EXPORTFILE:
    644             checker = ExportFileChecker(file_path, handle_style_error)
    645632        elif file_type == FileType.CMAKE:
    646633            checker = CMakeChecker(file_path, handle_style_error)
Note: See TracChangeset for help on using the changeset viewer.