Bug 49776 - Windows vcproj configuration names should be normalized across projects
Summary: Windows vcproj configuration names should be normalized across projects
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other OS X 10.5
: P2 Normal
Assignee: Steve Falkenburg
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-11-18 17:42 PST by Steve Falkenburg
Modified: 2010-11-19 10:40 PST (History)
1 user (show)

See Also:

Attachments
Patch (118.57 KB, patch)
2010-11-18 17:48 PST, Steve Falkenburg 		no flags Details | Formatted Diff | Diff
Patch (115.92 KB, patch)
2010-11-18 18:02 PST, Steve Falkenburg 		aroben: review+
Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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
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?
Comment 4 Steve Falkenburg 2010-11-19 10:40:23 PST 
Committed r72418: <http://trac.webkit.org/changeset/72418>