Remove jsc symlink if it already exists
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Feb 2014 21:41:27 +0000 (21:41 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Feb 2014 21:41:27 +0000 (21:41 +0000)
This is a follow-up fix for:

Create symlink to /usr/local/bin/jsc during installation
<http://webkit.org/b/129399>
<rdar://problem/16168734>

* JavaScriptCore.xcodeproj/project.pbxproj:
(Create /usr/local/bin/jsc symlink): If a jsc symlink already
exists where we're about to create the symlink, remove the old
one first.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164828 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index ee2830232a3cd365bb97e6dd2ea39aee652e3d6d..2dfd3e48794a5a1cf9ecc17beae463a48fc668bd 100644 (file)
@@ -1,3 +1,18 @@
+2014-02-27  David Kilzer  <ddkilzer@apple.com>
+
+        Remove jsc symlink if it already exists
+
+        This is a follow-up fix for:
+
+        Create symlink to /usr/local/bin/jsc during installation
+        <http://webkit.org/b/129399>
+        <rdar://problem/16168734>
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        (Create /usr/local/bin/jsc symlink): If a jsc symlink already
+        exists where we're about to create the symlink, remove the old
+        one first.
+
 2014-02-27  Michael Saboff  <msaboff@apple.com>
 
         Unreviewed build fix for Mac tools after r164814
index 756444337f430e285bac6bd93a81e3a35a6f039e..e83455bb48e4e5a619f859bfa10a787d3648a6e7 100644 (file)
                                "$(DSTROOT)$(INSTALL_PATH_PREFIX)/usr/local/bin/jsc",
                        );
                        runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "if [[ \"${SKIP_INSTALL}\" == \"NO\" ]]; then\n    mkdir -p \"${DSTROOT}${INSTALL_PATH_PREFIX}/usr/local/bin\"\n    cd \"${DSTROOT}${INSTALL_PATH_PREFIX}/usr/local/bin\"\n    ln -s \"../../..${INSTALL_PATH_ACTUAL}/jsc\" jsc\n    exit\nfi\n";
+                       shellPath = "/bin/sh -x";
+                       shellScript = "if [[ \"${SKIP_INSTALL}\" == \"NO\" ]]; then\n    mkdir -p \"${DSTROOT}${INSTALL_PATH_PREFIX}/usr/local/bin\"\n    cd \"${DSTROOT}${INSTALL_PATH_PREFIX}/usr/local/bin\"\n    if [ -L jsc ]; then\n        rm -f jsc\n    fi\n    ln -s \"../../..${INSTALL_PATH_ACTUAL}/jsc\" jsc\n    exit\nfi\n";
                };
                5DAFD6CD146B6B6E00FBEFB4 /* Install Support Script */ = {
                        isa = PBXShellScriptBuildPhase;