From d4935d1011550133165f749529b642ecbade055e Mon Sep 17 00:00:00 2001 From: "bfulgham@apple.com" Date: Fri, 24 Jan 2014 22:01:10 +0000 Subject: [PATCH] [Win] Convert some NMake files to MSBuild project files https://bugs.webkit.org/show_bug.cgi?id=127579 Reviewed by Tim Horton. ../JavaScriptCore: * JavaScriptCore.vcxproj/JavaScriptCore.make: Removed. * JavaScriptCore.vcxproj/JavaScriptCore.proj: Added. ../WebCore: * WebCore.vcxproj/WebCore.make: Removed. * WebCore.vcxproj/WebCore.proj: Added. ../WTF: * WTF.vcxproj/WTF.make: Removed. * WTF.vcxproj/WTF.proj: Added. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162723 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/JavaScriptCore/ChangeLog | 10 ++ .../JavaScriptCore.make | 55 -------- .../JavaScriptCore.proj | 121 ++++++++++++++++++ Source/WTF/ChangeLog | 10 ++ Source/WTF/WTF.vcxproj/WTF.make | 31 ----- Source/WTF/WTF.vcxproj/WTF.proj | 96 ++++++++++++++ Source/WebCore/ChangeLog | 10 ++ Source/WebCore/WebCore.vcxproj/WebCore.make | 24 ---- Source/WebCore/WebCore.vcxproj/WebCore.proj | 112 ++++++++++++++++ 9 files changed, 359 insertions(+), 110 deletions(-) delete mode 100644 Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make create mode 100644 Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj delete mode 100644 Source/WTF/WTF.vcxproj/WTF.make create mode 100644 Source/WTF/WTF.vcxproj/WTF.proj delete mode 100644 Source/WebCore/WebCore.vcxproj/WebCore.make create mode 100644 Source/WebCore/WebCore.vcxproj/WebCore.proj diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 8c404fb8a3ef..7330ec6e1a22 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2014-01-24 Brent Fulgham + + [Win] Convert some NMake files to MSBuild project files + https://bugs.webkit.org/show_bug.cgi?id=127579 + + Reviewed by Tim Horton. + + * JavaScriptCore.vcxproj/JavaScriptCore.make: Removed. + * JavaScriptCore.vcxproj/JavaScriptCore.proj: Added. + 2014-01-24 Mark Lam Fixed a bad assertion in CodeBlock::removeBreakpoint(). diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make deleted file mode 100644 index 9fa90dad4c75..000000000000 --- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make +++ /dev/null @@ -1,55 +0,0 @@ -!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG" -BUILDSTYLE=DebugSuffix -!ELSE -BUILDSTYLE=Production -!ENDIF - -install: - set OFFICIAL_BUILD=1 - set WebKit_Libraries=$(SRCROOT)\AppleInternal - set WebKit_OutputDir=$(OBJROOT) - set OriginalPath = %PATH% - - set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32 - set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support - set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS% - set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - -mkdir "%ConfigurationBuildDir%\include\private" - xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y - devenv "JavaScriptCore.submit.sln" /clean "%ArchitectureBuildStyle%" - devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%" - -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore_debug.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\jsc.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\jsc.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin32\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin32\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin32\JavaScriptCore.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y - -mkdir "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore" - xcopy "%ConfigurationBuildDir%\obj32\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore" /e/v/i/h/y - - set ArchitectureBuildStyle=$(BUILDSTYLE)|x64 - set ProgramFilesAAS=Program Files\Common Files\Apple\Apple Application Support - set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS% - set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - -mkdir "%ConfigurationBuildDir%\include\private" - xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y - devenv "JavaScriptCore.submit.sln" /clean "%ArchitectureBuildStyle%" - devenv "JavaScriptCore.submit.sln" /build "%ArchitectureBuildStyle%" - -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore_debug.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore_debug.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\jsc.exe" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\jsc_debug.exe" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\jsc.pdb" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y - -xcopy "%ConfigurationBuildDir%\bin64\jsc_debug.pdb" "$(DSTROOT)\AppleInternal\bin64\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\lib64\*" "$(DSTROOT)\AppleInternal\lib64\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin64\JavaScriptCore.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\JavaScriptCore.resources" /e/v/i/h/y - -mkdir "$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore" - xcopy "%ConfigurationBuildDir%\obj64\JavaScriptCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources64\JavaScriptCore" /e/v/i/h/y - \ No newline at end of file diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj new file mode 100644 index 000000000000..1207b01a49c0 --- /dev/null +++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj @@ -0,0 +1,121 @@ + + + + + + Production + + + DebugSuffix + + + + + 1 + $(SRCROOT)\AppleInternal\ + $(OBJROOT) + $(DSTROOT)\AppleInternal + $(AppleInternal)\lib32 + $(AppleInternal)\lib64 + $(AppleInternal)\bin32 + $(AppleInternal)\bin64 + $(AppleInternal)\public32\sym + $(AppleInternal)\public64\sym + Program Files (x86)\Common Files\Apple\Apple Application Support\ + Program Files\Common Files\Apple\Apple Application Support\ + $(OBJROOT)\$(CONFIG) + $(DSTROOT) + + + + + Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD) + + + Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index e95efe2475c5..cb6ff22b8642 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,13 @@ +2014-01-24 Brent Fulgham + + [Win] Convert some NMake files to MSBuild project files + https://bugs.webkit.org/show_bug.cgi?id=127579 + + Reviewed by Tim Horton. + + * WTF.vcxproj/WTF.make: Removed. + * WTF.vcxproj/WTF.proj: Added. + 2014-01-24 Anders Carlsson Get rid of monotonicallyIncreasingTimeMS and start using std::chrono instead diff --git a/Source/WTF/WTF.vcxproj/WTF.make b/Source/WTF/WTF.vcxproj/WTF.make deleted file mode 100644 index 66e9324e9ae5..000000000000 --- a/Source/WTF/WTF.vcxproj/WTF.make +++ /dev/null @@ -1,31 +0,0 @@ -!IF defined(BUILDSTYLE) && "$(BUILDSTYLE)"=="DEBUG" -BUILDSTYLE=DebugSuffix -!ELSE -BUILDSTYLE=Production -!ENDIF - -install: - set OFFICIAL_BUILD=1 - set WebKit_Libraries=$(SRCROOT)\AppleInternal - set WebKit_OutputDir=$(OBJROOT) - set OriginalPath = %PATH% - - set ArchitectureBuildStyle=$(BUILDSTYLE)|Win32 - set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support - set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS% - set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%" - devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%" - echo "%ConfigurationBuildDir%\include\*" - xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin32\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y - - set ArchitectureBuildStyle=$(BUILDSTYLE)|x64 - set ProgramFilesAAS=Program Files\Common Files\Apple\Apple Application Support - set Path=%OriginalPath%;$(SRCROOT)\%ProgramFilesAAS% - set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - devenv "WTF.submit.sln" /clean "%ArchitectureBuildStyle%" - devenv "WTF.submit.sln" /build "%ArchitectureBuildStyle%" - xcopy "%ConfigurationBuildDir%\lib64\*" "$(DSTROOT)\AppleInternal\lib64\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin64\*" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y \ No newline at end of file diff --git a/Source/WTF/WTF.vcxproj/WTF.proj b/Source/WTF/WTF.vcxproj/WTF.proj new file mode 100644 index 000000000000..3df791866962 --- /dev/null +++ b/Source/WTF/WTF.vcxproj/WTF.proj @@ -0,0 +1,96 @@ + + + + + + Production + + + DebugSuffix + + + + + 1 + $(SRCROOT)\AppleInternal\ + $(OBJROOT) + $(DSTROOT)\AppleInternal + $(AppleInternal)\lib32 + $(AppleInternal)\lib64 + $(AppleInternal)\bin32 + $(AppleInternal)\bin64 + $(AppleInternal)\public32\sym + $(AppleInternal)\public64\sym + Program Files (x86)\Common Files\Apple\Apple Application Support\ + Program Files\Common Files\Apple\Apple Application Support\ + $(OBJROOT)\$(CONFIG) + $(DSTROOT) + + + + + Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD) + + + Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 315ed61f978d..c1352eeb19de 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2014-01-24 Brent Fulgham + + [Win] Convert some NMake files to MSBuild project files + https://bugs.webkit.org/show_bug.cgi?id=127579 + + Reviewed by Tim Horton. + + * WebCore.vcxproj/WebCore.make: Removed. + * WebCore.vcxproj/WebCore.proj: Added. + 2014-01-24 Joseph Pecoraro fast/profiler tests ASSERTing after moving recompileAllJSFunctions off a timer diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.make b/Source/WebCore/WebCore.vcxproj/WebCore.make deleted file mode 100644 index dc7fbb26a8dd..000000000000 --- a/Source/WebCore/WebCore.vcxproj/WebCore.make +++ /dev/null @@ -1,24 +0,0 @@ -!IF "$(BUILDSTYLE)"=="DEBUG" -BUILDSTYLE=DebugSuffix -!ELSE -BUILDSTYLE=Production -!ENDIF - -install: - set OFFICIAL_BUILD=1 - set WebKit_Libraries=$(SRCROOT)\AppleInternal - set WebKit_OutputDir=$(OBJROOT) - set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support - set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS% - set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - -mkdir 2>NUL "%ConfigurationBuildDir%\include\private" - xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y - devenv "WebCore.submit.sln" /rebuild $(BUILDSTYLE) - xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%\" /e/v/i/h/y - xcopy "%ConfigurationBuildDir%\obj32\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y - -mkdir "$(DSTROOT)\AppleInternal\Sources32\WebCore" - xcopy "%ConfigurationBuildDir%\obj32\WebCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources32\WebCore" /e/v/i/h/y diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.proj b/Source/WebCore/WebCore.vcxproj/WebCore.proj new file mode 100644 index 000000000000..12910043487a --- /dev/null +++ b/Source/WebCore/WebCore.vcxproj/WebCore.proj @@ -0,0 +1,112 @@ + + + + + + Production + + + DebugSuffix + + + + + 1 + $(SRCROOT)\AppleInternal\ + $(OBJROOT) + $(DSTROOT)\AppleInternal + $(AppleInternal)\lib32 + $(AppleInternal)\lib64 + $(AppleInternal)\bin32 + $(AppleInternal)\bin64 + $(AppleInternal)\public32\sym + $(AppleInternal)\public64\sym + Program Files (x86)\Common Files\Apple\Apple Application Support\ + Program Files\Common Files\Apple\Apple Application Support\ + $(OBJROOT)\$(CONFIG) + $(DSTROOT) + + + + + Platform=Win32;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD) + + + Platform=x64;WEBKIT_OUTPUTDIR=$(WebKit_OutputDir);WEBKIT_LIBRARIES=$(WebKit_Libraries);OFFICIAL_BUILD=$(OFFICIAL_BUILD) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.36.0