[Webkit-unassigned] [Bug 49185] Debug and Release builds on Windows clobber each other

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Wed Jan 5 15:06:02 PST 2011 

https://bugs.webkit.org/show_bug.cgi?id=49185





--- Comment #7 from Adam Roben (aroben) <aroben at apple.com>  2011-01-05 15:06:02 PST ---
View in context: https://bugs.webkit.org/attachment.cgi?id=78047&action=review

Might want to let the EWS bot chew on this before landing.

> Source/JavaScriptCore/ChangeLog:34
> +2011-01-05  Steve Falkenburg  <sfalken at apple.com>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        Debug and Release builds on Windows clobber each other
> +        https://bugs.webkit.org/show_bug.cgi?id=49185
> +
> +        * JavaScriptCore.vcproj/JavaScriptCore.make:
> +        * JavaScriptCore.vcproj/JavaScriptCore.sln:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePGOOptimize.vsprops: Added.
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd:
> +        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd:
> +        * JavaScriptCore.vcproj/JavaScriptCore/build-generated-files.sh:
> +        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
> +        * JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln:
> +        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
> +        * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops:
> +        * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd:
> +        * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd:
> +        * JavaScriptCore.vcproj/jsc/jsc.vcproj:
> +        * JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
> +        * JavaScriptCore.vcproj/jsc/jscPostBuild.cmd:
> +        * JavaScriptCore.vcproj/jsc/jscPreBuild.cmd:
> +        * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops:
> +        * JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd:
> +        * JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd:
> +
>  2011-01-05  Brent Fulgham  <bfulgham at webkit.org>
>  

It would be great to have some more description here, e.g., how we used to build, how we build now, the new variables, the way the PGO build works, etc. Ditto for your other ChangeLogs.

> Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make:17
> +    xcopy "$(SRCROOT)\AppleInternal\tests\SunSpider\*" "$(OBJROOT)\$(BUILDSTYLE)\tests\SunSpider" /e/v/i/h/y
> +    cd "$(OBJROOT)\$(BUILDSTYLE)\tests\SunSpider"

I think defining a CONFIGURATIONBUILDDIR variable in this file would be nice.

> Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePGOOptimize.vsprops:11
> +	OutputDirectory="$(WebKitOutputDir)\Release_PGO\bin"
> +	IntermediateDirectory="$(WebKitOutputDir)\Release_PGO\obj\$(ProjectName)"
> +	>
> +  <Tool
> +		Name="VCLinkerTool"
> +		ImportLibrary="$(WebKitOutputDir)\Release_PGO\lib\$(TargetName).lib"

I wonder if you can use $(ConfigurationBuildDir) here, given that you define it later on?

> Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePGOOptimize.vsprops:16
> +  <UserMacro
> +    Name="ConfigurationBuildDir"
> +    Value="$(WebKitOutputDir)\Release_PGO"
> +  />

Maybe you can add a comment about why this is needed.

> Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:21
> -    obj_directory = os.path.join(os.environ['WEBKITOUTPUTDIR'], 'obj')
> +    obj_directory = os.path.join(os.environ['WEBKITOUTPUTDIR'], os.environ['WEBKITCONFIGURATIONNAME'], 'obj')

Can you use ConfigurationBuildDir here? I think you probably can.

> Tools/TestWebKitAPI/win/TestWebKitAPIGeneratedCommon.vsprops:6
> +	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"

Don't you need to remove common.vsprops from TestWebKitAPIGenerated.vcproj?

> Tools/WebKitTestRunner/win/InjectedBundleGeneratedCommon.vsprops:7
> +	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"

Don't you need to remove common.vsprops from InjectedBundleGenerated.vcproj?

> WebCore/WebCore.vcproj/WebCore.make:22
> -	xcopy "$(OBJROOT)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y	
> -	xcopy "$(OBJROOT)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y	
> -	xcopy "$(OBJROOT)\bin\WebKit.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit.resources" /e/v/i/h/y
> -	xcopy "$(OBJROOT)\obj\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
> -	xcopy "$(OBJROOT)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> -	xcopy "$(OBJROOT)\bin\*.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y	
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y	
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\WebKit.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit.resources" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\obj\WebCore\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
>  	-mkdir "$(DSTROOT)\AppleInternal\Sources\WebCore"
> -	xcopy "$(OBJROOT)\obj\WebCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebCore" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\obj\WebCore\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebCore" /e/v/i/h/y

This is another place where defining CONFIGURATIONBUILDDIR would be helpful.

> WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops:6
> +	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"

Don't you need to remove common.vsprops from WebCoreGenerated.vcproj?

> WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops:7
> +	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"

Ditto.

> WebKit2/win/WebKit2.make:20
> -	-xcopy "$(OBJROOT)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> -	xcopy "$(OBJROOT)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> -	xcopy "$(OBJROOT)\bin\*.dll" "$(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
> -	-xcopy "$(OBJROOT)\bin\WebKit2.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2.resources" /e/v/i/h/y
> +	-xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y	
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y
> +	-xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\WebKit2.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2.resources" /e/v/i/h/y
>  	-mkdir "$(DSTROOT)\AppleInternal\Sources\WebKit2"
> -	xcopy "$(OBJROOT)\obj\WebKit\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebKit2" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\obj\WebKit\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebKit2" /e/v/i/h/y

Another opportunity for defining CONFIGURATIONBUILDDIR.

> WebKit2/win/WebKit2GeneratedCommon.vsprops:7
> +	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\WebKitLibraries\win\tools\vsprops\common.vsprops"

Don't you need to remove common.vsprops from WebKit2Generated.vcproj?

> WebKit/win/WebKit.vcproj/WebKit.make:18
> -	-xcopy "$(OBJROOT)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> -	xcopy "$(OBJROOT)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> -	-xcopy "$(OBJROOT)\bin\*.dll" "$(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
> -	xcopy "$(OBJROOT)\bin\WebKit.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit.resources" /e/v/i/h/y
> +	-xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	-xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\*.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y	
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y
> +	xcopy "$(OBJROOT)\$(BUILDSTYLE)\bin\WebKit.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit.resources" /e/v/i/h/y

Another opportunity for defining CONFIGURATIONBUILDDIR.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

More information about the webkit-unassigned mailing list