Changeset 79131 in webkit
- Timestamp:
- Feb 19, 2011 1:15:23 PM (13 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r79126 r79131 1 2011-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 1 20 2011-02-19 Siddharth Mathur <siddharth.mathur@nokia.com> 2 21 -
trunk/Source/JavaScriptCore/Configurations/Base.xcconfig
r75766 r79131 78 78 79 79 80 JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME)); 81 JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 82 JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos); 83 JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks; 84 85 80 86 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. 81 87 // 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 44 44 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS); 45 45 INFOPLIST_FILE = Info.plist; 46 INSTALL_PATH = $( SYSTEM_LIBRARY_DIR)/Frameworks;46 INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR); 47 47 PRODUCT_NAME = JavaScriptCore; 48 48 -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r78945 r79131 201 201 5135FAF312D26AD1003C083B /* Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5135FAD612D26856003C083B /* Encoder.h */; settings = {ATTRIBUTES = (Private, ); }; }; 202 202 5D53726F0E1C54880021E549 /* Tracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D53726E0E1C54880021E549 /* Tracing.h */; }; 203 5D5D8AB60E0D0A7200F9C692 /* jsc in Copy Into Framework */ = {isa = PBXBuildFile; fileRef = 932F5BE10822A1C700736975 /* jsc */; };204 203 5D5D8AD10E0D0EBE00F9C692 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */; }; 205 204 5D63E9AD10F2BD6E00FC8AE9 /* StringHasher.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D63E9AC10F2BD6E00FC8AE9 /* StringHasher.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 638 637 }; 639 638 /* 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 */654 639 655 640 /* Begin PBXFileReference section */ … … 2519 2504 932F5BDC0822A1C700736975 /* Sources */, 2520 2505 932F5BDE0822A1C700736975 /* Frameworks */, 2521 5D5D8ABA0E0D0A7300F9C692 /* Copy Into Framework */, 2522 5D5D8ABF0E0D0B0300F9C692 /* Fix Framework Reference */, 2506 5D5D8ABF0E0D0B0300F9C692 /* Copy Into Framework */, 2523 2507 ); 2524 2508 buildRules = ( … … 2637 2621 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"; 2638 2622 }; 2639 5D5D8ABF0E0D0B0300F9C692 /* Fix Framework Reference*/ = {2623 5D5D8ABF0E0D0B0300F9C692 /* Copy Into Framework */ = { 2640 2624 isa = PBXShellScriptBuildPhase; 2641 2625 buildActionMask = 2147483647; … … 2645 2629 "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/Resources/jsc", 2646 2630 ); 2647 name = " Fix Framework Reference";2631 name = "Copy Into Framework"; 2648 2632 outputPaths = ( 2649 2633 ); 2650 2634 runOnlyForDeploymentPostprocessing = 0; 2651 2635 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"; 2653 2637 }; 2654 2638 65FB3F6509D11E9100F49DEB /* Generate Derived Sources */ = { … … 3032 3016 isa = XCBuildConfiguration; 3033 3017 buildSettings = { 3018 INSTALL_PATH = "$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources"; 3034 3019 PRODUCT_NAME = jsc; 3035 3020 };
Note: See TracChangeset
for help on using the changeset viewer.