Title: [129312] trunk/Source/WebKit2
- Revision
- 129312
- Author
- [email protected]
- Date
- 2012-09-22 17:29:53 -0700 (Sat, 22 Sep 2012)
Log Message
Install WebProcess XPC services into the right places
https://bugs.webkit.org/show_bug.cgi?id=97385
Reviewed by Anders Carlsson.
* Configurations/WebProcessService.xcconfig:
Update INSTALL_PATH to go into WebKit2.framework/Versions/A/XPCServices.
* Configurations/WebProcessServiceForWebKitDevelopment.xcconfig:
Since this config file is almost identical to WebProcessService.xcconfig,
just #include it and change the one thing that is different, the INFOPLIST_FILE
* WebKit2.xcodeproj/project.pbxproj:
Follow XPC procedure and copy the services into the right place, WebKit2.framework/Versions/A/XPCServices
in all builds except production builds where it is not necessary. Also add a symlink like everyone else
does.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (129311 => 129312)
--- trunk/Source/WebKit2/ChangeLog 2012-09-23 00:19:14 UTC (rev 129311)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-23 00:29:53 UTC (rev 129312)
@@ -1,5 +1,24 @@
2012-09-22 Sam Weinig <[email protected]>
+ Install WebProcess XPC services into the right places
+ https://bugs.webkit.org/show_bug.cgi?id=97385
+
+ Reviewed by Anders Carlsson.
+
+ * Configurations/WebProcessService.xcconfig:
+ Update INSTALL_PATH to go into WebKit2.framework/Versions/A/XPCServices.
+
+ * Configurations/WebProcessServiceForWebKitDevelopment.xcconfig:
+ Since this config file is almost identical to WebProcessService.xcconfig,
+ just #include it and change the one thing that is different, the INFOPLIST_FILE
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Follow XPC procedure and copy the services into the right place, WebKit2.framework/Versions/A/XPCServices
+ in all builds except production builds where it is not necessary. Also add a symlink like everyone else
+ does.
+
+2012-09-22 Sam Weinig <[email protected]>
+
Allow setting a custom path to where the plug-in sandbox profiles are being kept
https://bugs.webkit.org/show_bug.cgi?id=97399
Modified: trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig (129311 => 129312)
--- trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig 2012-09-23 00:19:14 UTC (rev 129311)
+++ trunk/Source/WebKit2/Configurations/WebProcessService.xcconfig 2012-09-23 00:29:53 UTC (rev 129312)
@@ -26,7 +26,7 @@
GCC_ENABLE_OBJC_GC = NO;
PRODUCT_NAME = com.apple.WebKit2.$(TARGET_NAME:rfc1034identifier);
INFOPLIST_FILE = WebProcessService/Info.plist;
-INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
+INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Versions/A/XPCServices;
APP_ICON = $(APP_ICON_$(CONFIGURATION));
APP_ICON_Debug = WebKit.icns;
Modified: trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig (129311 => 129312)
--- trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig 2012-09-23 00:19:14 UTC (rev 129311)
+++ trunk/Source/WebKit2/Configurations/WebProcessServiceForWebKitDevelopment.xcconfig 2012-09-23 00:29:53 UTC (rev 129312)
@@ -21,20 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include "BaseTarget.xcconfig"
+#include "WebProcessService.xcconfig"
-GCC_ENABLE_OBJC_GC = NO;
-PRODUCT_NAME = com.apple.WebKit2.$(TARGET_NAME:rfc1034identifier);
INFOPLIST_FILE = WebProcessServiceForWebKitDevelopment/Info.plist;
-INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework;
-
-APP_ICON = $(APP_ICON_$(CONFIGURATION));
-APP_ICON_Debug = WebKit.icns;
-APP_ICON_Release = WebKit.icns;
-APP_ICON_Production = ;
-
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
-EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
-
-WRAPPER_EXTENSION = xpc;
-MACH_O_TYPE = mh_execute;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (129311 => 129312)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-09-23 00:19:14 UTC (rev 129311)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-09-23 00:29:53 UTC (rev 129312)
@@ -12,7 +12,8 @@
buildConfigurationList = 1A50DB48110A3C27000D3FE5 /* Build configuration list for PBXAggregateTarget "All" */;
buildPhases = (
1A50DB70110A3D67000D3FE5 /* CopyFiles */,
- BCA8D46B15BCE33C009DC1F1 /* CopyFiles */,
+ BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */,
+ BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */,
);
dependencies = (
1A50DB3C110A3C19000D3FE5 /* PBXTargetDependency */,
@@ -728,11 +729,9 @@
BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */; };
BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */; };
BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
- BCA8D46C15BCE34B009DC1F1 /* com.apple.WebKit2.WebProcessService.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = BC3DE46615A91763008D26FC /* com.apple.WebKit2.WebProcessService.xpc */; };
BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
BCAE9DFB160C0AA100A33217 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
- BCAE9DFE160C0AC500A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = BCAE9DE9160C097400A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc */; };
BCAE9E05160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */; };
BCAE9E07160C139A00A33217 /* WebProcessServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAE9E06160C139A00A33217 /* WebProcessServiceMain.mm */; };
BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; };
@@ -1050,17 +1049,6 @@
name = "Copy Message Generation Scripts";
runOnlyForDeploymentPostprocessing = 0;
};
- BCA8D46B15BCE33C009DC1F1 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = WebKit2.framework/XPCServices;
- dstSubfolderSpec = 1;
- files = (
- BCA8D46C15BCE34B009DC1F1 /* com.apple.WebKit2.WebProcessService.xpc in CopyFiles */,
- BCAE9DFE160C0AC500A33217 /* com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
BCDE093C13272496001259FB /* Copy Plug-in Process Shim */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -4638,6 +4626,39 @@
shellPath = /bin/sh;
shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n";
};
+ BCFFCA8A160D6DEA003DF315 /* Add XPCServices symlink */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Add XPCServices symlink";
+ outputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/WebKit2.framework/XPCServices",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "ln -sf ${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/Current/XPCServices \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/XPCServices\"\n";
+ };
+ BCFFCA8B160D6E7B003DF315 /* Copy XPC services for engineering builds */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit2.WebProcessService.xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc",
+ );
+ name = "Copy XPC services for engineering builds";
+ outputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit2.WebProcessService.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nXPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit2.WebProcessService.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit2.WebProcessService.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit2.WebProcessServiceForWebKitDevelopment.xpc\"\n";
+ };
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
