Changeset 79131 in webkit


Ignore:
Timestamp:
Feb 19, 2011 1:15:23 PM (13 years ago)
Author:
ddkilzer@apple.com
Message:

<http://webkit.org/b/54808> Change jsc target to build directly into JavaScriptCore.framework/Resources/jsc

Reviewed by Dan Bernstein.

  • Configurations/Base.xcconfig: Added

JAVASCRIPTCORE_FRAMEWORKS_DIR variable.

  • Configurations/JavaScriptCore.xcconfig: Used

JAVASCRIPTCORE_FRAMEWORKS_DIR to define INSTALL_PATH.

for Production configuration of jsc target.
(Copy Into Framework): Removed old build phase.
(Fix Framework Reference): Renamed build phase to "Copy Into
Framework". Added "set -x" call to make the script print the
commands it is running. Added code to exit early for Production
builds since this was never intended for them. Added code to
copy jsc into the JavaScriptCore.framework/Resources directory.

Location:
trunk/Source/JavaScriptCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r79126 r79131  
     12011-02-19  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/54808> Change jsc target to build directly into JavaScriptCore.framework/Resources/jsc
     4
     5        Reviewed by Dan Bernstein.
     6
     7        * Configurations/Base.xcconfig: Added
     8        JAVASCRIPTCORE_FRAMEWORKS_DIR variable.
     9        * Configurations/JavaScriptCore.xcconfig: Used
     10        JAVASCRIPTCORE_FRAMEWORKS_DIR to define INSTALL_PATH.
     11        * JavaScriptCore.xcodeproj/project.pbxproj: Set the INSTALL_PATH
     12        for Production configuration of jsc target.
     13        (Copy Into Framework): Removed old build phase.
     14        (Fix Framework Reference): Renamed build phase to "Copy Into
     15        Framework".  Added "set -x" call to make the script print the
     16        commands it is running.  Added code to exit early for Production
     17        builds since this was never intended for them.  Added code to
     18        copy jsc into the JavaScriptCore.framework/Resources directory.
     19
    1202011-02-19  Siddharth Mathur  <siddharth.mathur@nokia.com>
    221
  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r75766 r79131  
    7878
    7979
     80JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME));
     81JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     82JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
     83JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;
     84
     85
    8086// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
    8187// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
  • trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r77638 r79131  
    4444HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
    4545INFOPLIST_FILE = Info.plist;
    46 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
     46INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR);
    4747PRODUCT_NAME = JavaScriptCore;
    4848
  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r78945 r79131  
    201201                5135FAF312D26AD1003C083B /* Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5135FAD612D26856003C083B /* Encoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
    202202                5D53726F0E1C54880021E549 /* Tracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D53726E0E1C54880021E549 /* Tracing.h */; };
    203                 5D5D8AB60E0D0A7200F9C692 /* jsc in Copy Into Framework */ = {isa = PBXBuildFile; fileRef = 932F5BE10822A1C700736975 /* jsc */; };
    204203                5D5D8AD10E0D0EBE00F9C692 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */; };
    205204                5D63E9AD10F2BD6E00FC8AE9 /* StringHasher.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D63E9AC10F2BD6E00FC8AE9 /* StringHasher.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    638637                };
    639638/* End PBXContainerItemProxy section */
    640 
    641 /* Begin PBXCopyFilesBuildPhase section */
    642                 5D5D8ABA0E0D0A7300F9C692 /* Copy Into Framework */ = {
    643                         isa = PBXCopyFilesBuildPhase;
    644                         buildActionMask = 2147483647;
    645                         dstPath = JavaScriptCore.framework/Resources;
    646                         dstSubfolderSpec = 16;
    647                         files = (
    648                                 5D5D8AB60E0D0A7200F9C692 /* jsc in Copy Into Framework */,
    649                         );
    650                         name = "Copy Into Framework";
    651                         runOnlyForDeploymentPostprocessing = 0;
    652                 };
    653 /* End PBXCopyFilesBuildPhase section */
    654639
    655640/* Begin PBXFileReference section */
     
    25192504                                932F5BDC0822A1C700736975 /* Sources */,
    25202505                                932F5BDE0822A1C700736975 /* Frameworks */,
    2521                                 5D5D8ABA0E0D0A7300F9C692 /* Copy Into Framework */,
    2522                                 5D5D8ABF0E0D0B0300F9C692 /* Fix Framework Reference */,
     2506                                5D5D8ABF0E0D0B0300F9C692 /* Copy Into Framework */,
    25232507                        );
    25242508                        buildRules = (
     
    26372621                        shellScript = "TRACING_D=\"$SRCROOT/runtime/Tracing.d\";\nTRACING_H=\"$BUILT_PRODUCTS_DIR/DerivedSources/JavaScriptCore/TracingDtrace.h\";\n\nif [[ \"$HAVE_DTRACE\" = \"1\" && \"$TRACING_D\" -nt \"$TRACING_H\" ]];\nthen\n\tdtrace -h -o \"$TRACING_H\" -s \"$TRACING_D\";\nfi;\n";
    26382622                };
    2639                 5D5D8ABF0E0D0B0300F9C692 /* Fix Framework Reference */ = {
     2623                5D5D8ABF0E0D0B0300F9C692 /* Copy Into Framework */ = {
    26402624                        isa = PBXShellScriptBuildPhase;
    26412625                        buildActionMask = 2147483647;
     
    26452629                                "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/Resources/jsc",
    26462630                        );
    2647                         name = "Fix Framework Reference";
     2631                        name = "Copy Into Framework";
    26482632                        outputPaths = (
    26492633                        );
    26502634                        runOnlyForDeploymentPostprocessing = 0;
    26512635                        shellPath = /bin/sh;
    2652                         shellScript = "# Update the copied jsc binary to refer to JavaScriptcore.framework relative to its location\ninstall_name_tool -change \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Versions/A/JavaScriptCore\" \"@loader_path/../JavaScriptCore\" \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Resources/jsc\"\n";
     2636                        shellScript = "# Show what the script is doing in the build transcript.\nset -x\n\n# Skip for Production builds.\nif [[ ${CONFIGURATION:=Debug} == \"Production\" ]]; then\n    exit\nfi\n\n# Copy and update the jsc binary to refer to JavaScriptcore.framework relative to its location.\nditto \"${BUILT_PRODUCTS_DIR}/jsc\" \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Resources/jsc\"\ninstall_name_tool -change \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Versions/A/JavaScriptCore\" \"@loader_path/../JavaScriptCore\" \"${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework/Resources/jsc\"\n";
    26532637                };
    26542638                65FB3F6509D11E9100F49DEB /* Generate Derived Sources */ = {
     
    30323016                        isa = XCBuildConfiguration;
    30333017                        buildSettings = {
     3018                                INSTALL_PATH = "$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources";
    30343019                                PRODUCT_NAME = jsc;
    30353020                        };
Note: See TracChangeset for help on using the changeset viewer.