minidom configurations should be based on ToolExecutable.xcconfig
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Mar 2012 03:00:19 +0000 (03:00 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Mar 2012 03:00:19 +0000 (03:00 +0000)
<http://webkit.org/b/82513>

Reviewed by Mark Rowe.

Note that this patch changes minidom from being installed in
/usr/local/bin to JavaScriptCore.framework/Resources.

* Configurations/ToolExecutable.xcconfig: Add semi-colon.
* JavaScriptCore.xcodeproj/project.pbxproj: Base minidom
configurations on ToolExecutable.xcconfig.  Remove redundant
PRODUCT_NAME and SKIP_INSTALL variables.

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index 84fda67..0769aad 100644 (file)
@@ -1,3 +1,18 @@
+2012-03-28  David Kilzer  <ddkilzer@apple.com>
+
+        minidom configurations should be based on ToolExecutable.xcconfig
+        <http://webkit.org/b/82513>
+
+        Reviewed by Mark Rowe.
+
+        Note that this patch changes minidom from being installed in
+        /usr/local/bin to JavaScriptCore.framework/Resources.
+
+        * Configurations/ToolExecutable.xcconfig: Add semi-colon.
+        * JavaScriptCore.xcodeproj/project.pbxproj: Base minidom
+        configurations on ToolExecutable.xcconfig.  Remove redundant
+        PRODUCT_NAME and SKIP_INSTALL variables.
+
 2012-03-28  Gavin Barraclough  <barraclough@apple.com>
 
         Build fix - some compiles generating NORETURN related warnings.
 2012-03-28  Gavin Barraclough  <barraclough@apple.com>
 
         Build fix - some compiles generating NORETURN related warnings.
index 194c240..3e60d66 100644 (file)
@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources
+INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
 PRODUCT_NAME = $(TARGET_NAME);
 
 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
 PRODUCT_NAME = $(TARGET_NAME);
 
 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
index c26a34d..51d3092 100644 (file)
                };
                1412113A0A48798400480255 /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                1412113A0A48798400480255 /* Debug */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               PRODUCT_NAME = minidom;
-                               SKIP_INSTALL = YES;
                        };
                        name = Debug;
                };
                1412113B0A48798400480255 /* Release */ = {
                        isa = XCBuildConfiguration;
                        };
                        name = Debug;
                };
                1412113B0A48798400480255 /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               PRODUCT_NAME = minidom;
-                               SKIP_INSTALL = YES;
                        };
                        name = Release;
                };
                1412113C0A48798400480255 /* Production */ = {
                        isa = XCBuildConfiguration;
                        };
                        name = Release;
                };
                1412113C0A48798400480255 /* Production */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               PRODUCT_NAME = minidom;
-                               SKIP_INSTALL = YES;
                        };
                        name = Production;
                };
                        };
                        name = Production;
                };
                };
                A76148410E6402F700E357FA /* Profiling */ = {
                        isa = XCBuildConfiguration;
                };
                A76148410E6402F700E357FA /* Profiling */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */;
                        buildSettings = {
                        buildSettings = {
-                               PRODUCT_NAME = minidom;
-                               SKIP_INSTALL = YES;
                        };
                        name = Profiling;
                };
                        };
                        name = Profiling;
                };