Bug 49776

Summary: Windows vcproj configuration names should be normalized across projects
Product: WebKit Reporter: Steve Falkenburg <sfalken>
Component: New BugsAssignee: Steve Falkenburg <sfalken>
Status: RESOLVED FIXED    
Severity: Normal CC: aroben
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Other   
OS: OS X 10.5   
Attachments:
Description Flags
Patch
none
Patch aroben: review+

Description Steve Falkenburg 2010-11-18 17:42:33 PST
Windows vcproj configuration names should be normalized across projects
Comment 1 Steve Falkenburg 2010-11-18 17:48:59 PST
Created attachment 74331 [details]
Patch
Comment 2 Steve Falkenburg 2010-11-18 18:02:43 PST
Created attachment 74334 [details]
Patch
Comment 3 Adam Roben (:aroben) 2010-11-18 21:50:22 PST
Comment on attachment 74334 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=74334&action=review

> JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:48
> -				BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"
> -				ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"
> -				CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"
> -				Output=""
> -				PreprocessorDefinitions="WIN32;NDEBUG"
> -				IncludeSearchPath=""
> -				ForcedIncludes=""
> -				AssemblySearchPath=""
> -				ForcedUsingAssemblies=""
> -				CompileAsManaged=""
>  			/>

Where did this code go?

> WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops:9
> +		BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot; cairo&#x0D;&#x0A;bash migrate-scripts.sh &quot;$(WebKitOutputDir)/obj/WebCore/scripts&quot;&#x0D;&#x0A;cmd /C copyForwardingHeaders.cmd cairo curl&#x0D;&#x0A;cmd /C copyInspectorFiles.cmd&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"

Maybe we could abstract the Apple vs. Cairo differences using a macro?

> WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops:18
> +		CleanCommandLine=""
> +		Output=""
> +		PreprocessorDefinitions=""
> +		IncludeSearchPath=""
> +		ForcedIncludes=""
> +		AssemblySearchPath=""
> +		ForcedUsingAssemblies=""
> +		CompileAsManaged=""

Are these needed?A

> WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops:20
> +		Output=""
> +		PreprocessorDefinitions=""
> +		IncludeSearchPath=""
> +		ForcedIncludes=""
> +		AssemblySearchPath=""
> +		ForcedUsingAssemblies=""
> +		CompileAsManaged=""

Are these needed?

> WebKit2/win/WebKit2GeneratedCommon.vsprops:20
> +		Output=""
> +		PreprocessorDefinitions=""
> +		IncludeSearchPath=""
> +		ForcedIncludes=""
> +		AssemblySearchPath=""
> +		ForcedUsingAssemblies=""
> +		CompileAsManaged=""

Are these needed?

> WebKitTools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops:18
> +		Output=""
> +		PreprocessorDefinitions=""
> +		IncludeSearchPath=""
> +		ForcedIncludes=""
> +		AssemblySearchPath=""
> +		ForcedUsingAssemblies=""
> +		CompileAsManaged=""

Are these needed?

> WebKitTools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops:20
> +		Output=""
> +		PreprocessorDefinitions=""
> +		IncludeSearchPath=""
> +		ForcedIncludes=""
> +		AssemblySearchPath=""
> +		ForcedUsingAssemblies=""
> +		CompileAsManaged=""

Are these needed?
Comment 4 Steve Falkenburg 2010-11-19 10:40:23 PST
Committed r72418: <http://trac.webkit.org/changeset/72418>