JavaScriptCore:
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Dec 2007 22:30:26 +0000 (22:30 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Dec 2007 22:30:26 +0000 (22:30 +0000)
        Re-named our B&I flag from BUILDBOT to PRODUCTION.

        Reviewed by Sam Weinig.

        * JavaScriptCore.vcproj/JavaScriptCore.make:
        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:

WebCore:

        Re-named our B&I flag from BUILDBOT to PRODUCTION.

        Reviewed by Sam Weinig.

        * WebCore.vcproj/WebCore.make:

WebKit/win:

        Re-named our B&I flag from BUILDBOT to PRODUCTION.
        Fix our tiny versioning.
        Bump our product version.
        Use just the major version in the fallback VERSION files.
        Pick up the version numbers from the production builder.

        Reviewed by Sam Weinig.

        * Interfaces/WebKit.idl:
        * WebKit.vcproj/Interfaces.vcproj:
        * WebKit.vcproj/PRODUCTVERSION:
        * WebKit.vcproj/VERSION:
        * WebKit.vcproj/WebKit.make:
        * WebKit.vcproj/WebKit.rc:
        * WebKit.vcproj/WebKit.vcproj:
        * WebKit.vcproj/auto-version.sh:
        * WebKitDLL.cpp:
        (DllUnregisterServer):

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

15 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore.make
WebKit/win/ChangeLog
WebKit/win/Interfaces/WebKit.idl
WebKit/win/WebKit.vcproj/Interfaces.vcproj
WebKit/win/WebKit.vcproj/PRODUCTVERSION
WebKit/win/WebKit.vcproj/VERSION
WebKit/win/WebKit.vcproj/WebKit.make
WebKit/win/WebKit.vcproj/WebKit.rc
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKit/win/WebKit.vcproj/auto-version.sh
WebKit/win/WebKitDLL.cpp

index 2fb90913724669834d59f2cba651ff96dbb090aa..9c03fd1238265991a7bce778a1b70e31b67a861f 100644 (file)
@@ -1,3 +1,12 @@
+2007-12-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Re-named our B&I flag from BUILDBOT to PRODUCTION.
+
+        Reviewed by Sam Weinig.
+
+        * JavaScriptCore.vcproj/JavaScriptCore.make:
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+
 2007-12-07  Geoffrey Garen  <ggaren@apple.com>
 
         Build fix: removed stray name qualification.
index 86584084555ad458a3a50a2a3581ee803783e24c..34dc93140807efa6540883513bc3e7eaf18835cc 100644 (file)
@@ -5,7 +5,7 @@ BUILDSTYLE=Debug_Internal
 !ENDIF
 
 install:
-    set BuildBot=1
+    set PRODUCTION=1
        set WebKitLibrariesDir="$(SRCROOT)\AppleInternal"
        set WebKitOutputDir=$(OBJROOT)
        devenv "JavaScriptCoreSubmit.sln" /rebuild $(BUILDSTYLE)
index 70eda12739a1c48d380289e401c4af34d57efd30..fe4f8130d946649d0ef6435e493ec8df124b1f5c 100644 (file)
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="if not &quot;$(BuildBot)&quot;==&quot;&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36$(ConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;"\r
+                               CommandLine="if not &quot;$(PRODUCTION)&quot;==&quot;&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt36$(ConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc36$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
index bf1f1e1f1c929423a1ff25cbc5c27027a2fee59b..3901a7554143c7058d25d693a6dda2334d64e92a 100644 (file)
@@ -1,3 +1,11 @@
+2007-12-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Re-named our B&I flag from BUILDBOT to PRODUCTION.
+
+        Reviewed by Sam Weinig.
+
+        * WebCore.vcproj/WebCore.make:
+
 2007-12-07  Geoffrey Garen  <ggaren@apple.com>
 
         Build fix: corrected #include path.
index 51dabc7467a04fd040defe7c451c36edf36c4f81..c33f2b4b843b3377e0236cc09369a76256a633de 100644 (file)
@@ -5,7 +5,7 @@ BUILDSTYLE=Debug_Internal
 !ENDIF
 
 install:
-    set BuildBot=1
+    set PRODUCTION=1
        set WebKitLibrariesDir=$(SRCROOT)\AppleInternal
        set WebKitOutputDir=$(OBJROOT)
        devenv "WebCore.vcproj" /rebuild $(BUILDSTYLE)
index 6015ec8151d1a7226a5ead366f96b2d298a0de58..33ce2cb0627cc39092079519779369c54ca56bd3 100644 (file)
@@ -1,3 +1,24 @@
+2007-12-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Re-named our B&I flag from BUILDBOT to PRODUCTION.
+        Fix our tiny versioning.
+        Bump our product version.
+        Use just the major version in the fallback VERSION files.
+        Pick up the version numbers from the production builder.
+
+        Reviewed by Sam Weinig.
+
+        * Interfaces/WebKit.idl:
+        * WebKit.vcproj/Interfaces.vcproj:
+        * WebKit.vcproj/PRODUCTVERSION:
+        * WebKit.vcproj/VERSION:
+        * WebKit.vcproj/WebKit.make:
+        * WebKit.vcproj/WebKit.rc:
+        * WebKit.vcproj/WebKit.vcproj:
+        * WebKit.vcproj/auto-version.sh:
+        * WebKitDLL.cpp:
+        (DllUnregisterServer):
+
 2007-12-07  Adam Roben  <aroben@apple.com>
 
         Use SoftLinking.h in WebKitClassFactory.
index 4d3f7622aef4f5337780d0ad700f5f8996a7170a..5823013c1fe1fad1f5f23b0f6d38fd6c019d2301 100644 (file)
@@ -87,7 +87,7 @@ import "IWebScrollBarPrivate.idl";
 import "IWebScriptDebugServer.idl";
 
 [
-#if __BUILDBOT__
+#if __PRODUCTION__
     uuid(2a748656-625d-4207-b29f-40c95bfeb3a9),
     helpstring("WebKit 525.2 Type Library"),
 #else
@@ -96,7 +96,7 @@ import "IWebScriptDebugServer.idl";
 #endif
     version(525.2)
 ]
-#if __BUILDBOT__
+#if __PRODUCTION__
 library WebKit
 #else
 library OpenSourceWebKit
@@ -105,7 +105,7 @@ library OpenSourceWebKit
     // TLib : OLE Automation : {00020430-0000-0000-C000-000000000046}
     importlib("STDOLE2.TLB");
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(d6bca079-f61c-4e1e-b453-32a0477d02e3)]
 #else
     [uuid(4FF47097-3FEA-4b47-AC0E-90725C546490)]
@@ -121,7 +121,7 @@ library OpenSourceWebKit
         interface IWebViewPrivate;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(66827ec1-3aef-4241-bac5-f776b44f030f)]
 #else
     [uuid(BE8EE509-9894-44ba-9E2F-E29780BCB25C)]
@@ -130,7 +130,7 @@ library OpenSourceWebKit
         [default] interface IWebIconDatabase;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(a062ecc3-bb1b-4694-a569-f59e0ad6be0c)]
 #else
     [uuid(97F3EB52-9EAC-4062-82E1-E5C1E7789DEE)]
@@ -139,7 +139,7 @@ library OpenSourceWebKit
         [default] interface IWebMutableURLRequest;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(ba590766-0a6f-46c7-b96e-743490d94cb7)]
 #else
     [uuid(99B9D99A-060D-4695-8C8F-3AB53156054C)]
@@ -148,7 +148,7 @@ library OpenSourceWebKit
         [default] interface IWebNotificationCenter;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(a4b9b45d-949f-4c8c-9b92-6fbfcc1caaa2)]
 #else
     [uuid(4D043991-E844-48b0-8EF7-85FE1AB8829E)]
@@ -157,7 +157,7 @@ library OpenSourceWebKit
         [default] interface IWebHistory;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(dd653964-4d37-4fb2-9cb6-6a9a97719332)]
 #else
     [uuid(97795891-293D-4855-800E-E21987568537)]
@@ -166,7 +166,7 @@ library OpenSourceWebKit
         [default] interface IPropertyBag;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(6be190e9-1725-4e4a-88db-6a9fe242c9e5)]
 #else
     [uuid(82F6400A-3CD0-40a3-8EA1-7A23B26D6153)]
@@ -175,7 +175,7 @@ library OpenSourceWebKit
         [default] interface IWebHistoryItem;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(f71071fd-a51b-4b69-9eb6-44374405e80c)]
 #else
     [uuid(CB0111F6-168B-467e-8613-23AB37D0493E)]
@@ -184,7 +184,7 @@ library OpenSourceWebKit
         [default] interface IWebCache;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(1820D883-42FE-4b78-88C8-5456BB19D224)]
 #else
     [uuid(5D911A44-4316-4a02-A2B5-BAE7036357B9)]
@@ -193,7 +193,7 @@ library OpenSourceWebKit
         [default] interface IWebJavaScriptCollector;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(67B89F90-F778-438b-ABBF-34D1ACBF8651)]
 #else
     [uuid(CC914F49-2385-4943-9B3F-E17501383F5B)]
@@ -202,7 +202,7 @@ library OpenSourceWebKit
         [default] interface IWebPreferences;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(E93AA8D7-F362-4a4a-A95D-325906BEB5F0)]
 #else
     [uuid(87689DC6-5F8C-4194-90D5-CE6083837AB5)]
@@ -211,7 +211,7 @@ library OpenSourceWebKit
         [default] interface IWebKitStatistics;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(6C6AF3F9-36B4-4bf7-8BDE-74DCD4AD75A4)]
 #else
     [uuid(319B38AC-2794-47fa-AE18-A14A7576A6D8)]
@@ -220,7 +220,7 @@ library OpenSourceWebKit
         [default] interface IWebError;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(7433F53B-7FE9-484a-9432-72909457A646)]
 #else
     [uuid(BCF988AF-9A2F-403f-A1D8-BD815C46401D)]
@@ -229,7 +229,7 @@ library OpenSourceWebKit
         [default] interface IWebURLCredential;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(C0F98BD9-3B1C-413d-904A-E2D1453EAF1F)]
 #else
     [uuid(3FE547FC-4EC1-4062-9DE2-9FC3DA0A08FF)]
@@ -238,7 +238,7 @@ library OpenSourceWebKit
         [default] interface IWebDownload;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(2FB5499A-BB5D-4469-8517-789FEC8FD9BA)]
 #else
     [uuid(20B9702D-B41F-449b-84FE-3E32DB5D775F)]
@@ -247,7 +247,7 @@ library OpenSourceWebKit
         [default] interface IWebURLRequest;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(F366A6E8-E43C-4fd4-AAB0-8E6E79C73E6E)]
 #else
     [uuid(41EFBA9A-63E4-4c49-A012-CCC48694D7A5)]
@@ -256,7 +256,7 @@ library OpenSourceWebKit
         [default] interface IWebURLProtectionSpace;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(24A53AD5-AA9F-44e6-AA22-2C7C250B661A)]
 #else
     [uuid(0F34FB95-301F-4ea1-943E-B5E6E6D94121)]
@@ -265,7 +265,7 @@ library OpenSourceWebKit
         [default] interface IWebScrollBarPrivate;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(715636C4-59E7-4b85-BBC5-B555888787D7)]
 #else
     [uuid(5BE39DBA-5887-4a69-9157-EBEE96BA3309)]
@@ -274,7 +274,7 @@ library OpenSourceWebKit
         [default] interface IWebScriptDebugServer;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(AB201196-8DD2-4d45-AEBD-029B6A37AA27)]
 #else
     [uuid(EA2FCB14-072B-48b5-B9B5-1BBEFBABC7BC)]
@@ -283,7 +283,7 @@ library OpenSourceWebKit
         [default] interface IWebURLResponse;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(24040cd6-aff4-4a51-9c8b-71539580ee76)]
 #else
     [uuid(1fbff564-5ff4-484f-b3d9-217483f9f5fc)]
@@ -292,7 +292,7 @@ library OpenSourceWebKit
         [default] interface IWebTextRenderer;
     }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     [uuid(C2A1BFC2-1E7C-49fe-8592-D0C7FB440BC0)]
 #else
     [uuid(1F7B8CEE-5D74-4974-8A47-C5733B422644)]
index 37a8c933b7b56faed11288272950247821bacee6..2a1aafa686d61a7f97d66edc23b967c415f8ff72 100644 (file)
@@ -38,7 +38,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="__BUILDBOT__=0$(BuildBot)"\r
+                               PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)"\r
                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\WebKit\DerivedSources&quot;;..\Interfaces"\r
                                WarningLevel="1"\r
                                WarnAsError="true"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="__BUILDBOT__=0$(BuildBot)"\r
+                               PreprocessorDefinitions="__PRODUCTION__=0$(PRODUCTION)"\r
                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\WebKit\DerivedSources&quot;;..\Interfaces"\r
                                WarningLevel="1"\r
                                WarnAsError="true"\r
index b38ebbfce26aa93c94f0743a690abe4929d6b5e1..7da3c16870e856cce1a539d478294b4030dac60d 100644 (file)
@@ -1 +1 @@
-3.0.4
\ No newline at end of file
+3.0.5
\ No newline at end of file
index afeadc52e42be02af3901e2eb234a18042325249..642ea6f491ee177025815efc3e1ef9adb4724133 100644 (file)
@@ -1 +1 @@
-525.2
+525
index 0b9960e306793e8b0bae5ab046a463bf92ce727e..bece07825368df20d788f722b440273f5d0e026a 100755 (executable)
@@ -7,7 +7,7 @@ BUILDSTYLE=Debug_Internal
 install:\r
        set WebKitLibrariesDir="$(SRCROOT)\AppleInternal"\r
        set WebKitOutputDir=$(OBJROOT)\r
-       set BuildBot=1\r
+       set PRODUCTION=1\r
        xcopy "$(SRCROOT)\AppleInternal\obj\WebKit\DOMInterfaces\*" "$(OBJROOT)\obj\WebKit\DOMInterfaces" /e/v/i/h/y\r
        devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)\r
        xcopy "$(OBJROOT)\bin\*" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y\r
index 20d0d2ad28ad10af544c6c0162262641186aa5f4..b3b03fc65c4fa49e1d7ace1be3a5311da643c466 100644 (file)
@@ -23,7 +23,7 @@ IDR_WEBKIT              TYPELIB                 "WebKit.tlb"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __VERSION_MAJOR__,__BUILD_NUMBER_MAJOR__,__BUILD_NUMBER_MINOR__,__BUILD_NUMBER_VARIANT__
- PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,0,0
+ PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
index 7ceeb68e4fdaada0591b874351f4b62c670f723f..e16214874b2641f152e5c16c72ea423b5d6f6143 100644 (file)
@@ -43,7 +43,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include\WebKit&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)&quot;;&quot;$(IntDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\WebKit\DerivedSources&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__BUILDBOT__=0$(BuildBot)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__PRODUCTION__=0$(PRODUCTION)"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
                                BasicRuntimeChecks="3"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include\WebKit&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)&quot;;&quot;$(IntDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\WebKit\DerivedSources&quot;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__BUILDBOT__=0$(BuildBot)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__PRODUCTION__=0$(PRODUCTION)"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="false"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include\WebKit&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)&quot;;&quot;$(IntDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\WebKit\DerivedSources&quot;"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__BUILDBOT__=0$(BuildBot)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBKIT_EXPORTS;_WIN32_WINNT=0x500;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit;__PRODUCTION__=0$(PRODUCTION)"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
                                BasicRuntimeChecks="3"\r
index 4bad242e0c68c02a7fc834b63bc99cb7ec26f7bd..5c0e8790242b96a2837d865748e1a070c9337fef 100755 (executable)
@@ -37,7 +37,11 @@ if [ "$TINYVERSION" == "" ]; then
     TINYVERSION=0
 fi
 
-echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
+if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
+    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
+else
+    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
+fi
 
 if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
     echo "Can't set WebKit's version to something that ends in a 4!"
@@ -58,7 +62,7 @@ BLDNMBR=`cat "$VERSIONFILE"`
 BLDNMBRSHORT=`cat "$VERSIONFILE"`
 BUILDER=""
 
-if [ "$BUILDBOT" == "" -o "$ARCHIVE_BUILD" == "1" ]; then
+if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
     echo -n "+" >> "$VERSIONFILE"
     BLDNMBRSHORT=`cat "$VERSIONFILE"`
     echo -n " " >> "$VERSIONFILE"
index 9de991d8411a6856d70a15cdb9d1d2387f062a6f..e6259b9b92ad98dd8ad49b319281eaa960f54e62 100644 (file)
@@ -111,7 +111,7 @@ STDAPI DllCanUnloadNow(void)
     return S_FALSE;
 }
 
-#if __BUILDBOT__
+#if __PRODUCTION__
 #define VERSION_INDEPENDENT_PROGID(className) VERSION_INDEPENDENT_PRODUCTION_PROGID(className)
 #else
 #define VERSION_INDEPENDENT_PROGID(className) VERSION_INDEPENDENT_OPENSOURCE_PROGID(className)
@@ -171,7 +171,7 @@ STDAPI DllUnregisterServer(void)
     HRESULT hr = S_OK;
     HKEY userClasses;
 
-#if __BUILDBOT__
+#if __PRODUCTION__
     UnRegisterTypeLib(LIBID_WebKit, 3, 0, 0, SYS_WIN32);
 #else
     UnRegisterTypeLib(LIBID_OpenSourceWebKit, 3, 0, 0, SYS_WIN32);