Bug 49776 – Windows vcproj configuration names should be normalized across projects

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Steve Falkenburg]

Windows vcproj configuration names should be normalized across projects

[Steve Falkenburg]

Created attachment 74331 [details]
Patch

[Steve Falkenburg]

Created attachment 74334 [details]
Patch

[Adam Roben (:aroben)]

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
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

nmake /nologo -f JavaScriptCoreGenerated.make"
> -				ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

nmake /nologo -f JavaScriptCoreGenerated.make clean
nmake -f JavaScriptCoreGenerated.make"
> -				CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c

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
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash build-generated-files.sh "$(WebKitOutputDir)" "$(WebKitLibrariesDir)" cairo
bash migrate-scripts.sh "$(WebKitOutputDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"

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?

[Steve Falkenburg]

Committed r72418: <http://trac.webkit.org/changeset/72418>