git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4ea5bcc)
Build mod: Fix sln to match configs in vcproj.
authorsfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Aug 2007 21:14:01 +0000 (21:14 +0000)
committersfalken <sfalken@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Aug 2007 21:14:01 +0000 (21:14 +0000)
        Reviewed by Adam.

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

JavaScriptCore/ChangeLog patch | blob | history
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make patch | blob | history
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln patch | blob | history
WebCore/ChangeLog patch | blob | history
WebCore/WebCore.vcproj/WebCore.make patch | blob | history
WebKit/win/ChangeLog patch | blob | history
WebKit/win/WebKit.vcproj/WebKit.make patch | blob | history
WebKit/win/WebKit.vcproj/WebKit.submit.sln patch | blob | history

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cd6989ecbed21dbd7c8fc15f97781a4315fee3fc..751cd13b479e0b6228deb2f1c9bf65f19f4e3882 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-01  Steve Falkenburg  <sfalken@apple.com>
+
+        Build mod: Fix sln to match configs in vcproj.
+        
+        Reviewed by Adam.
+
+        * JavaScriptCore.vcproj/JavaScriptCore.make:
+        * JavaScriptCore.vcproj/JavaScriptCore.sln:
+
 2007-07-30  Simon Hausmann  <hausmann@kde.org>
 
         Done with and reviewed by Lars.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
index e62099ca3012b8546e0edc811536e3eefe5bf07f..0515ce5745f9a88d3a25e4cb4b4ab8a3d069ec70 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
@@ -1,5 +1,7 @@
-!if !defined(BUILDSTYLE)
+!IF !defined(BUILDSTYLE)
 BUILDSTYLE=Release
+!ELSEIF "$(BUILDSTYLE)"=="Debug"
+BUILDSTYLE=Debug_Internal
 !ENDIF
 
 install:
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
index 95daeaac2b4cd8750729c04ed010014aacddaef7..896662ccb1b7fb85971f70680c02d2661191320f 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
@@ -18,22 +18,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{A
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug_Internal|Win32 = Debug_Internal|Win32\r
                Debug|Win32 = Debug|Win32\r
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_Internal|Win32.ActiveCfg = Debug|Win32\r
+               {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_Internal|Win32.Build.0 = Debug|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32\r
                {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32\r
+               {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug_Internal|Win32.ActiveCfg = Debug|Win32\r
+               {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug_Internal|Win32.Build.0 = Debug|Win32\r
                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Debug|Win32.Build.0 = Debug|Win32\r
                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.ActiveCfg = Release|Win32\r
                {BC2981C0-67A5-4A3C-879B-784BCBDE2541}.Release|Win32.Build.0 = Release|Win32\r
+               {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32\r
+               {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32\r
                {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32\r
+               {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Internal|Win32.ActiveCfg = Debug|Win32\r
+               {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Internal|Win32.Build.0 = Debug|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32\r
                {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32\r
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 90ee1b964563171786a4393e453cd147eecea70f..747f6a4c587cfe79dc20902f5f18d34400bf2395 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-01  Steve Falkenburg  <sfalken@apple.com>
+
+        Build mod: Fix sln to match configs in vcproj.
+        
+        Reviewed by Adam.
+
+        * WebCore.vcproj/WebCore.make:
+
 2007-07-31  David Harrison  <harrison@apple.com>
 
         Reviewed by Justin.
diff --git a/WebCore/WebCore.vcproj/WebCore.make b/WebCore/WebCore.vcproj/WebCore.make
index a08a9a57b85345c628e200b5bdcd3e5529e81f4e..e3c5d4b84839b922958afc3fe6a511ee658e7336 100755 (executable)
--- a/WebCore/WebCore.vcproj/WebCore.make
+++ b/WebCore/WebCore.vcproj/WebCore.make
@@ -1,5 +1,7 @@
-!if !defined(BUILDSTYLE)
+!IF !defined(BUILDSTYLE)
 BUILDSTYLE=Release
+!ELSEIF "$(BUILDSTYLE)"=="Debug"
+BUILDSTYLE=Debug_Internal
 !ENDIF
 
 install:
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 3186b1685dc6a891365f85cda3ad7eefa3350e3c..f9f652fb2be699ebcbe9b92a64c4ba9b5ef7066a 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-01  Steve Falkenburg  <sfalken@apple.com>
+
+        Build mod: Fix sln to match configs in vcproj.
+        
+        Reviewed by Adam.
+
+        * WebKit.vcproj/WebKit.make:
+        * WebKit.vcproj/WebKit.submit.sln:
+
 2007-07-27  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Tristan.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.make b/WebKit/win/WebKit.vcproj/WebKit.make
index db767ff5bf490333dd27a307df32a8b12601fefa..b2bfa2816cf31dc0ea6cacf6f9eab0e1b75efe21 100755 (executable)
--- a/WebKit/win/WebKit.vcproj/WebKit.make
+++ b/WebKit/win/WebKit.vcproj/WebKit.make
@@ -1,13 +1,15 @@
-!if !defined(BUILDSTYLE)
+!IF !defined(BUILDSTYLE)
 BUILDSTYLE=Release
-!ENDIF
-
-install:
-       set WebKitLibrariesDir="$(SRCROOT)\AppleInternal"
-       set WebKitOutputDir=$(OBJROOT)
-       set BuildBot=1
-       devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
-       xcopy "$(OBJROOT)\bin\*" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
-       xcopy "$(OBJROOT)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y     
-       xcopy "$(OBJROOT)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y
+!ELSEIF "$(BUILDSTYLE)"=="Debug"\r
+BUILDSTYLE=Debug_Internal\r
+!ENDIF\r
+\r
+install:\r
+       set WebKitLibrariesDir="$(SRCROOT)\AppleInternal"\r
+       set WebKitOutputDir=$(OBJROOT)\r
+       set BuildBot=1\r
+       devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)\r
+       xcopy "$(OBJROOT)\bin\*" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y\r
+       xcopy "$(OBJROOT)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y     \r
+       xcopy "$(OBJROOT)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y\r
        xcopy "$(OBJROOT)\bin\WebKit.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit.resources" /e/v/i/h/y\r
diff --git a/WebKit/win/WebKit.vcproj/WebKit.submit.sln b/WebKit/win/WebKit.vcproj/WebKit.submit.sln
index 7d0445d12c723207635391d5ad582a92cc4c4323..735dc0e95932a29d54d90545afe4a046f2d67d30 100644 (file)
--- a/WebKit/win/WebKit.vcproj/WebKit.submit.sln
+++ b/WebKit/win/WebKit.vcproj/WebKit.submit.sln
@@ -16,18 +16,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Interfaces", "Interfaces.vc
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug_Internal|Win32 = Debug_Internal|Win32
                Debug|Win32 = Debug|Win32
                Release|Win32 = Release|Win32
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug_Internal|Win32
-               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug_Internal|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32
+               {B8437A41-67BC-4769-9452-45203827F821}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
+               {B8437A41-67BC-4769-9452-45203827F821}.Debug_Internal|Win32.Build.0 = Debug|Win32
                {B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.ActiveCfg = Debug|Win32
                {B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.Build.0 = Debug|Win32
                {B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.ActiveCfg = Release|Win32
                {B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.Build.0 = Release|Win32
+               {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_Internal|Win32.ActiveCfg = Debug|Win32
+               {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_Internal|Win32.Build.0 = Debug|Win32
                {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.ActiveCfg = Debug|Win32
                {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.Build.0 = Debug|Win32
                {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.ActiveCfg = Release|Win32
Mirror of the WebKit open source project from svn.webkit.org.