Title: [164354] trunk/Source/_javascript_Core
- Revision
- 164354
- Author
- fpi...@apple.com
- Date
- 2014-02-18 21:46:34 -0800 (Tue, 18 Feb 2014)
Log Message
Correctly install libllvmForJSC.dylib in production builds
https://bugs.webkit.org/show_bug.cgi?id=129023
Reviewed by Mark Rowe.
In non-production builds, we copy it as before. In production builds, we use the install
path.
Also roll http://trac.webkit.org/changeset/164348 back in.
* Configurations/Base.xcconfig:
* Configurations/LLVMForJSC.xcconfig:
* _javascript_Core.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164353 => 164354)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-19 05:32:01 UTC (rev 164353)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-19 05:46:34 UTC (rev 164354)
@@ -1,5 +1,21 @@
2014-02-18 Filip Pizlo <fpi...@apple.com>
+ Correctly install libllvmForJSC.dylib in production builds
+ https://bugs.webkit.org/show_bug.cgi?id=129023
+
+ Reviewed by Mark Rowe.
+
+ In non-production builds, we copy it as before. In production builds, we use the install
+ path.
+
+ Also roll http://trac.webkit.org/changeset/164348 back in.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/LLVMForJSC.xcconfig:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+
+2014-02-18 Filip Pizlo <fpi...@apple.com>
+
Unreviewed, roll out http://trac.webkit.org/changeset/164348 because it broke some
builds.
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (164353 => 164354)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-02-19 05:32:01 UTC (rev 164353)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-02-19 05:46:34 UTC (rev 164354)
@@ -100,11 +100,14 @@
_javascript_CORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
_javascript_CORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-_javascript_CORE_RESOURCES_DIR = $(_javascript_CORE_RESOURCES_DIR_$(PLATFORM_NAME));
-_javascript_CORE_RESOURCES_DIR_iphoneos = _javascript_Core.framework/Resources;
-_javascript_CORE_RESOURCES_DIR_iphonesimulator = $(_javascript_CORE_RESOURCES_DIR_iphoneos);
-_javascript_CORE_RESOURCES_DIR_macosx = _javascript_Core.framework/Versions/A/Resources;
+_javascript_CORE_CONTENTS_DIR = $(_javascript_CORE_CONTENTS_DIR_$(PLATFORM_NAME));
+_javascript_CORE_CONTENTS_DIR_iphoneos = _javascript_Core.framework;
+_javascript_CORE_CONTENTS_DIR_iphonesimulator = $(_javascript_CORE_CONTENTS_DIR_iphoneos);
+_javascript_CORE_CONTENTS_DIR_macosx = _javascript_Core.framework/Versions/A;
+_javascript_CORE_RESOURCES_DIR = $(_javascript_CORE_CONTENTS_DIR)/Resources;
+_javascript_CORE_LIBRARIES_DIR = $(_javascript_CORE_CONTENTS_DIR)/Libraries;
+
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
DEBUG_DEFINES_debug = ;
Modified: trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig (164353 => 164354)
--- trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-02-19 05:32:01 UTC (rev 164353)
+++ trunk/Source/_javascript_Core/Configurations/LLVMForJSC.xcconfig 2014-02-19 05:46:34 UTC (rev 164354)
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Apple Inc. All rights reserved.
+// Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -45,3 +45,4 @@
PRODUCT_NAME = llvmForJSC;
EXECUTABLE_PREFIX = lib;
+INSTALL_PATH_ACTUAL = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_LIBRARIES_DIR);
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (164353 => 164354)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-02-19 05:32:01 UTC (rev 164353)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-02-19 05:46:34 UTC (rev 164354)
@@ -5777,7 +5777,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/\"\n\n/usr/bin/env ruby \"${SRCROOT}/offlineasm/generate_offset_extractor.rb\" \"${SRCROOT}/llint/LowLevelInterpreter.asm\" \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/LLIntDesiredOffsets.h\"\n";
+ shellScript = "set -e\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/\"\n\n/usr/bin/env ruby \"${SRCROOT}/offlineasm/generate_offset_extractor.rb\" \"${SRCROOT}/llint/LowLevelInterpreter.asm\" \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/LLIntDesiredOffsets.h\"\n";
};
0FCEFAD91806191800472CE4 /* Copy LLVM Library Into Framework */ = {
isa = PBXShellScriptBuildPhase;
@@ -5792,7 +5792,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ $ENABLE_FTL_JIT != \"ENABLE_FTL_JIT\" ]]\nthen\n exit 0\nfi\n\n# Copy the llvmForJSC library into the framework.\nditto \"${BUILT_PRODUCTS_DIR}/libllvmForJSC.dylib\" \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libllvmForJSC.dylib\"\nif [ ! -e \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\" ]\nthen\n ln -fs \"Versions/Current/Libraries\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\"\nfi";
+ shellScript = "set -e\n\nif [[ $ENABLE_FTL_JIT != \"ENABLE_FTL_JIT\" ]]\nthen\n exit 0\nfi\n\nif [[ ${CONFIGURATION:=Debug} != \"Production\" ]]\nthen\n # Copy the llvmForJSC library into the framework.\n ditto \"${BUILT_PRODUCTS_DIR}/libllvmForJSC.dylib\" \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries/libllvmForJSC.dylib\"\nfi\n\nif [ ! -e \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\" ]\nthen\n ln -fs \"Versions/Current/Libraries\" \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries\"\nfi";
};
3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
isa = PBXShellScriptBuildPhase;
@@ -5807,7 +5807,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names JS || exit $?\nfi";
+ shellScript = "set -e\n\nif [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n ../../Tools/Scripts/check-for-inappropriate-objc-class-names JS\nfi";
};
3732811A17FCD235004AD519 /* Postprocess Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -5842,7 +5842,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ -f ../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n ../../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi";
+ shellScript = "set -e\n\nif [ -f ../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n ../../Tools/Scripts/check-for-weak-vtables-and-externals\nfi";
};
5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */ = {
isa = PBXShellScriptBuildPhase;
@@ -5874,7 +5874,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "TRACING_D=\"$SRCROOT/runtime/Tracing.d\";\nTRACING_H=\"$BUILT_PRODUCTS_DIR/DerivedSources/_javascript_Core/TracingDtrace.h\";\n\nif [[ \"$HAVE_DTRACE\" = \"1\" && \"$TRACING_D\" -nt \"$TRACING_H\" ]];\nthen\n\tdtrace -h -o \"$TRACING_H\" -s \"$TRACING_D\";\nfi;\n";
+ shellScript = "set -e\n\nTRACING_D=\"$SRCROOT/runtime/Tracing.d\";\nTRACING_H=\"$BUILT_PRODUCTS_DIR/DerivedSources/_javascript_Core/TracingDtrace.h\";\n\nif [[ \"$HAVE_DTRACE\" = \"1\" && \"$TRACING_D\" -nt \"$TRACING_H\" ]];\nthen\n\tdtrace -h -o \"$TRACING_H\" -s \"$TRACING_D\";\nfi;\n";
};
5DAFD6CD146B6B6E00FBEFB4 /* Install Support Script */ = {
isa = PBXShellScriptBuildPhase;
@@ -5906,7 +5906,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Skip for Production builds.\nif [[ ${CONFIGURATION:=Debug} == \"Production\" ]]; then\n exit\nfi\n\n# Copy and update the jsc binary to refer to _javascript_Core.framework relative to its location.\nditto \"${BUILT_PRODUCTS_DIR}/jsc\" \"${BUILT_PRODUCTS_DIR}/${_javascript_CORE_RESOURCES_DIR}/jsc\"\ninstall_name_tool -change \"${_javascript_CORE_FRAMEWORKS_DIR}/_javascript_Core.framework/Versions/A/_javascript_Core\" \"@loader_path/../_javascript_Core\" \"${BUILT_PRODUCTS_DIR}/${_javascript_CORE_RESOURCES_DIR}/jsc\"\n";
+ shellScript = "set -e\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 _javascript_Core.framework relative to its location.\nditto \"${BUILT_PRODUCTS_DIR}/jsc\" \"${BUILT_PRODUCTS_DIR}/${_javascript_CORE_RESOURCES_DIR}/jsc\"\ninstall_name_tool -change \"${_javascript_CORE_FRAMEWORKS_DIR}/_javascript_Core.framework/Versions/A/_javascript_Core\" \"@loader_path/../_javascript_Core\" \"${BUILT_PRODUCTS_DIR}/${_javascript_CORE_RESOURCES_DIR}/jsc\"\n";
};
65FB3F6509D11E9100F49DEB /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
@@ -5920,7 +5920,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\n\n/bin/ln -sfh \"${SRCROOT}\" _javascript_Core\nexport _javascript_Core=\"_javascript_Core\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake --no-builtin-rules -f \"_javascript_Core/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu` || exit 1\n\nif [[ \"${ACTION}\" == \"installhdrs\" ]]; then\n exit 0\nfi\n\n/usr/bin/env ruby _javascript_Core/offlineasm/asm.rb _javascript_Core/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1\n";
+ shellScript = "set -e\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core\"\n\n/bin/ln -sfh \"${SRCROOT}\" _javascript_Core\nexport _javascript_Core=\"_javascript_Core\"\nexport BUILT_PRODUCTS_DIR=\"../..\"\n\nmake --no-builtin-rules -f \"_javascript_Core/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.ncpu`\n\nif [[ \"${ACTION}\" == \"installhdrs\" ]]; then\n exit 0\nfi\n\n/usr/bin/env ruby _javascript_Core/offlineasm/asm.rb _javascript_Core/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h\n";
};
A55DEAA416703DF7003DB841 /* Check For Inappropriate Macros in External Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -5935,7 +5935,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders/JSBasePrivate.h || exit $?\nfi";
+ shellScript = "set -e\n\nif [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders/JSBasePrivate.h\nfi";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
