Reviewed by Dave Hyatt.

        - fixed layout tests

        * WebKit.pbproj/project.pbxproj: Set deployment target to 10.3 in the build styles.
        When built without a build style (by Apple B&I) we want to get the target from the
        environment. But when built with a build style (by Safari engineers and others), we want
        to use 10.3. Because our deployment target was not set, we ran into this bug:

            <rdar://problem/4108717> CTFontGetGlyphWithName doesn't work with some strings

        * Makefile.am: Took out extra parameters that make command-line building different from
        Xcode building. Now that this is fixed, you should not get a full rebuild if you switch
        from command line to Xcode or back.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a9b5887deb3596dc99773ca2c03b501e157348c4..15487d6a19cae1e009e0015acbcd2b1eaad04cdf 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2005-05-04  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fixed layout tests
+
+        * WebKit.pbproj/project.pbxproj: Set deployment target to 10.3 in the build styles.
+        When built without a build style (by Apple B&I) we want to get the target from the
+        environment. But when built with a build style (by Safari engineers and others), we want
+        to use 10.3. Because our deployment target was not set, we ran into this bug:
+
+            <rdar://problem/4108717> CTFontGetGlyphWithName doesn't work with some strings
+
+        * Makefile.am: Took out extra parameters that make command-line building different from
+        Xcode building. Now that this is fixed, you should not get a full rebuild if you switch
+        from command line to Xcode or back.
+
 2005-05-04  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: 
@@ -43,6 +60,7 @@
 
         * WebView.subproj/WebUIDelegate.h: Fixed incorrect comment.
 
+>>>>>>> 1.3131
 2005-05-01  Darin Adler  <darin@apple.com>
 
         - move to Xcode native targets and stop checking in generated files

diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index 2acdb9f942134be64047e710c1a401d271552c5e..ef8cc4a6cf715da9db1b677df5e4e5967fbcd84a 100644 (file)
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -1,9 +1,6 @@
 all-am:
-       xcodebuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
+       xcodebuild -buildstyle $(BUILDSTYLE)
 clean-am:
-       xcodebuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
-       rm -rf $(SYMROOTS)/WebKit.build
-       rm -rf $(SYMROOTS)/WebKit.framework
-
+       xcodebuild clean
 doc: all
        ../Tools/Scripts/make-docs $(SYMROOTS)/Documentation/WebKit $(SYMROOTS)/WebKit.framework/Headers

diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 1feb3ba4332700c53880ea76a990c2ae1e61c17d..14cc3a4bf239bccec2d21617dbc7dcbdbbb55879 100644 (file)
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -10,6 +10,7 @@
                                DEBUG_DEFINES = "";
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
                                PREBINDING = NO;
                                SECTORDER_FLAGS = "";
                                STYLE_LDFLAGS = "";
@@ -20,6 +21,7 @@
                };
                014CEA450018CDF011CA2923 = {
                        buildSettings = {
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
                                PREBINDING = NO;
                                SECTORDER_FLAGS = "";
                                STYLE_LDFLAGS = "";
@@ -4890,6 +4892,7 @@
                F58C8A07025BD3BC018635CA = {
                        buildSettings = {
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               MACOSX_DEPLOYMENT_TARGET = 10.3;
                                PREBINDING = NO;
                                SECTORDER_FLAGS = "";
                                STYLE_LDFLAGS = "";