JavaScriptCore:

        Reviewed by Mark Rowe.

        Made Version.xcconfig smarter when building for different configurations.
        Now uses the 522+ OpenSource version for Debug and Release, while using the
        full 522.4 version for Production builds. The system prefix is also computed
        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.

        * Configurations/JavaScriptCore.xcconfig:
        * Configurations/Version.xcconfig:

JavaScriptGlue:

        Reviewed by Mark Rowe.

        Made Version.xcconfig smarter when building for different configurations.
        Now uses the 522+ OpenSource version for Debug and Release, while using the
        full 522.4 version for Production builds. The system prefix is also computed
        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.

        * Configurations/JavaScriptGlue.xcconfig:
        * Configurations/Version.xcconfig:

WebCore:

        Reviewed by Mark Rowe.

        Made Version.xcconfig smarter when building for different configurations.
        Now uses the 522+ OpenSource version for Debug and Release, while using the
        full 522.4 version for Production builds. The system prefix is also computed
        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.

        * Configurations/Version.xcconfig:
        * Configurations/WebCore.xcconfig:

WebKit:

        Reviewed by Mark Rowe.

        Made Version.xcconfig smarter when building for different configurations.
        Now uses the 522+ OpenSource version for Debug and Release, while using the
        full 522.4 version for Production builds. The system prefix is also computed
        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.

        * Configurations/Version.xcconfig:
        * Configurations/WebKit.xcconfig:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 09dcc37..6539737 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-17  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Made Version.xcconfig smarter when building for different configurations.
+        Now uses the 522+ OpenSource version for Debug and Release, while using the
+        full 522.4 version for Production builds. The system prefix is also computed
+        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.
+
+        * Configurations/JavaScriptCore.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2007-03-15  Maciej Stachowiak  <mjs@apple.com>
 
         Not reviewed.

diff --git a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
index 90d830d..061cc79 100644 (file)
--- a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
+++ b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
@@ -1,6 +1,4 @@
 #include "Version.xcconfig"
-DYLIB_COMPATIBILITY_VERSION = 1;
-DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
 EXPORTED_SYMBOLS_FILE = JavaScriptCore.exp;
 OTHER_LDFLAGS = -lobjc -sub_library libobjc -Wl,-Y,3;
 GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;

diff --git a/JavaScriptCore/Configurations/Version.xcconfig b/JavaScriptCore/Configurations/Version.xcconfig
index 8558156..92142bb 100644 (file)
--- a/JavaScriptCore/Configurations/Version.xcconfig
+++ b/JavaScriptCore/Configurations/Version.xcconfig
@@ -1,5 +1,26 @@
-SYSTEM_BUNDLE_VERSION_PREFIX = ;
-MAJOR_BUNDLE_VERSION = 522;
-MINOR_BUNDLE_VERSION = 0;
-TINY_BUNDLE_VERSION = 0;
-BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
+MAJOR_VERSION = 522;
+MINOR_VERSION = 4;
+TINY_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+
+// The bundle version is set based on the current build configuration, see below.
+BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
+
+// The local builds are always just the major version with a Plus suffix.
+BUNDLE_VERSION_Release = $(MAJOR_VERSION)+;
+BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release);
+
+// The system version prefix is based on the current system version.
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX_ = ;
+SYSTEM_VERSION_PREFIX_1040 = 4;
+SYSTEM_VERSION_PREFIX_1050 = 5;
+
+// The production build always uses the full version with a system version prefix.
+BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
+
+// If $(CONFIGURATION) is undefined, use the Production version.
+BUNDLE_VERSION_ = $(BUNDLE_VERSION_Production);
+
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(FULL_VERSION);

diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog
index c7de54c..db9ef48 100644 (file)
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-17  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Made Version.xcconfig smarter when building for different configurations.
+        Now uses the 522+ OpenSource version for Debug and Release, while using the    
+        full 522.4 version for Production builds. The system prefix is also computed
+        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.
+
+        * Configurations/JavaScriptGlue.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2007-03-15  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by John.

diff --git a/JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig b/JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig
index 427747f..e873750 100644 (file)
--- a/JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig
+++ b/JavaScriptGlue/Configurations/JavaScriptGlue.xcconfig
@@ -1,6 +1,4 @@
 #include "Version.xcconfig"
-DYLIB_COMPATIBILITY_VERSION = 1;
-DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
 EXPORTED_SYMBOLS_FILE = JavaScriptGlue.exp;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
 HEADER_SEARCH_PATHS = ForwardingHeaders $(HEADER_SEARCH_PATHS);

diff --git a/JavaScriptGlue/Configurations/Version.xcconfig b/JavaScriptGlue/Configurations/Version.xcconfig
index 8558156..92142bb 100644 (file)
--- a/JavaScriptGlue/Configurations/Version.xcconfig
+++ b/JavaScriptGlue/Configurations/Version.xcconfig
@@ -1,5 +1,26 @@
-SYSTEM_BUNDLE_VERSION_PREFIX = ;
-MAJOR_BUNDLE_VERSION = 522;
-MINOR_BUNDLE_VERSION = 0;
-TINY_BUNDLE_VERSION = 0;
-BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
+MAJOR_VERSION = 522;
+MINOR_VERSION = 4;
+TINY_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+
+// The bundle version is set based on the current build configuration, see below.
+BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
+
+// The local builds are always just the major version with a Plus suffix.
+BUNDLE_VERSION_Release = $(MAJOR_VERSION)+;
+BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release);
+
+// The system version prefix is based on the current system version.
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX_ = ;
+SYSTEM_VERSION_PREFIX_1040 = 4;
+SYSTEM_VERSION_PREFIX_1050 = 5;
+
+// The production build always uses the full version with a system version prefix.
+BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
+
+// If $(CONFIGURATION) is undefined, use the Production version.
+BUNDLE_VERSION_ = $(BUNDLE_VERSION_Production);
+
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(FULL_VERSION);

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e210ec9..f09aa0c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-17  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Made Version.xcconfig smarter when building for different configurations.
+        Now uses the 522+ OpenSource version for Debug and Release, while using the
+        full 522.4 version for Production builds. The system prefix is also computed
+        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/WebCore.xcconfig:
+
 2007-03-17  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Adele.

diff --git a/WebCore/Configurations/Version.xcconfig b/WebCore/Configurations/Version.xcconfig
index 8558156..92142bb 100644 (file)
--- a/WebCore/Configurations/Version.xcconfig
+++ b/WebCore/Configurations/Version.xcconfig
@@ -1,5 +1,26 @@
-SYSTEM_BUNDLE_VERSION_PREFIX = ;
-MAJOR_BUNDLE_VERSION = 522;
-MINOR_BUNDLE_VERSION = 0;
-TINY_BUNDLE_VERSION = 0;
-BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
+MAJOR_VERSION = 522;
+MINOR_VERSION = 4;
+TINY_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+
+// The bundle version is set based on the current build configuration, see below.
+BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
+
+// The local builds are always just the major version with a Plus suffix.
+BUNDLE_VERSION_Release = $(MAJOR_VERSION)+;
+BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release);
+
+// The system version prefix is based on the current system version.
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX_ = ;
+SYSTEM_VERSION_PREFIX_1040 = 4;
+SYSTEM_VERSION_PREFIX_1050 = 5;
+
+// The production build always uses the full version with a system version prefix.
+BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
+
+// If $(CONFIGURATION) is undefined, use the Production version.
+BUNDLE_VERSION_ = $(BUNDLE_VERSION_Production);
+
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(FULL_VERSION);

diff --git a/WebCore/Configurations/WebCore.xcconfig b/WebCore/Configurations/WebCore.xcconfig
index 2061f4d..9e689ed 100644 (file)
--- a/WebCore/Configurations/WebCore.xcconfig
+++ b/WebCore/Configurations/WebCore.xcconfig
@@ -1,6 +1,4 @@
 #include "Version.xcconfig"
-DYLIB_COMPATIBILITY_VERSION = 1;
-DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
 EXPORTED_SYMBOLS_FILE_ = WebCore.exp;
 EXPORTED_SYMBOLS_FILE_i386 = WebCore.exp;

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5d7506c..f89bddd 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-17  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Made Version.xcconfig smarter when building for different configurations.
+        Now uses the 522+ OpenSource version for Debug and Release, while using the
+        full 522.4 version for Production builds. The system prefix is also computed
+        based on the current system, so 4522.4 on Tiger and 5522.4 on Leopard.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKit.xcconfig:
+
 2007-03-16  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Hyatt.

diff --git a/WebKit/Configurations/Version.xcconfig b/WebKit/Configurations/Version.xcconfig
index 8558156..92142bb 100644 (file)
--- a/WebKit/Configurations/Version.xcconfig
+++ b/WebKit/Configurations/Version.xcconfig
@@ -1,5 +1,26 @@
-SYSTEM_BUNDLE_VERSION_PREFIX = ;
-MAJOR_BUNDLE_VERSION = 522;
-MINOR_BUNDLE_VERSION = 0;
-TINY_BUNDLE_VERSION = 0;
-BUNDLE_VERSION = $(MAJOR_BUNDLE_VERSION)+;
+MAJOR_VERSION = 522;
+MINOR_VERSION = 4;
+TINY_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+
+// The bundle version is set based on the current build configuration, see below.
+BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
+
+// The local builds are always just the major version with a Plus suffix.
+BUNDLE_VERSION_Release = $(MAJOR_VERSION)+;
+BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release);
+
+// The system version prefix is based on the current system version.
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX_ = ;
+SYSTEM_VERSION_PREFIX_1040 = 4;
+SYSTEM_VERSION_PREFIX_1050 = 5;
+
+// The production build always uses the full version with a system version prefix.
+BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
+
+// If $(CONFIGURATION) is undefined, use the Production version.
+BUNDLE_VERSION_ = $(BUNDLE_VERSION_Production);
+
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(FULL_VERSION);

diff --git a/WebKit/Configurations/WebKit.xcconfig b/WebKit/Configurations/WebKit.xcconfig
index 9f0401c..3f29baf 100644 (file)
--- a/WebKit/Configurations/WebKit.xcconfig
+++ b/WebKit/Configurations/WebKit.xcconfig
@@ -1,6 +1,4 @@
 #include "Version.xcconfig"
-DYLIB_COMPATIBILITY_VERSION = 1;
-DYLIB_CURRENT_VERSION = $(MAJOR_BUNDLE_VERSION).$(MINOR_BUNDLE_VERSION).$(TINY_BUNDLE_VERSION);
 EXPORTED_SYMBOLS_FILE = WebKit.exp;
 FEATURE_DEFINES = ENABLE_SVG ENABLE_XPATH ENABLE_XSLT;
 FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS);