diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-16 19:43:00 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-16 19:43:00 +0000 |
| commit | 4ed077a820dca166e3e2bf9785311331df0190b0 (patch) | |
| tree | 9d6e57c77afb0449d53ab6b42c1f83d1e388620a | |
| parent | 49bd49a6438dccf100904804f1675d13e31a8d97 (diff) | |
| download | chromium_src-4ed077a820dca166e3e2bf9785311331df0190b0.zip chromium_src-4ed077a820dca166e3e2bf9785311331df0190b0.tar.gz chromium_src-4ed077a820dca166e3e2bf9785311331df0190b0.tar.bz2 | |
- Stop rlz from constantly "rebuilding".
- Changes dependencies from
rlz
browser
interactive_ui_tests
unit_tests
to
rlz
interactive_ui_tests
mini_installer
unit_tests
Review URL: http://codereview.chromium.org/10760
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5548 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/chrome.sln | 2 | ||||
| -rw-r--r-- | chrome/chrome_kjs.sln | 2 | ||||
| -rw-r--r-- | rlz/copy_files.bat | 6 | ||||
| -rw-r--r-- | rlz/output_rlz_copy.rules | 6 | ||||
| -rw-r--r-- | rlz/rlz.vcproj | 6 |
5 files changed, 9 insertions, 13 deletions
diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 89f49cd..0183355 100755 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -20,7 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser. ProjectSection(ProjectDependencies) = postProject
{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
- {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
EndProjectSection
EndProject
@@ -1048,6 +1047,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer", "installer {B2D715CE-4CBB-415A-A032-E700C90ADF91} = {B2D715CE-4CBB-415A-A032-E700C90ADF91}
{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}
{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}
+ {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {C0C7DA58-C90D-4BDE-AE44-588997339F5D}
{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln index 7ff7e18..705ccf5 100644 --- a/chrome/chrome_kjs.sln +++ b/chrome/chrome_kjs.sln @@ -20,7 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser. ProjectSection(ProjectDependencies) = postProject
{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
- {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
EndProjectSection
EndProject
@@ -1051,6 +1050,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer", "installer {B2D715CE-4CBB-415A-A032-E700C90ADF91} = {B2D715CE-4CBB-415A-A032-E700C90ADF91}
{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F} = {B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}
{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}
+ {BF4F447B-72B5-4059-BE1B-F94337B1F385} = {BF4F447B-72B5-4059-BE1B-F94337B1F385}
{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9} = {C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}
{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {C0C7DA58-C90D-4BDE-AE44-588997339F5D}
{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}
diff --git a/rlz/copy_files.bat b/rlz/copy_files.bat index 022c54f..ebc5382 100644 --- a/rlz/copy_files.bat +++ b/rlz/copy_files.bat @@ -6,8 +6,4 @@ setlocal set InputPath=%~1 set OutDir=%~2 -if NOT "%CHROMIUM_BUILD%" == "_google_chrome" goto END - -xcopy /R /C /Y %InputPath% %OutDir% - -:END +if exist "%InputPath%" xcopy /R /C /Y "%InputPath%" "%OutDir%" diff --git a/rlz/output_rlz_copy.rules b/rlz/output_rlz_copy.rules index 40c1dff..1120d76 100644 --- a/rlz/output_rlz_copy.rules +++ b/rlz/output_rlz_copy.rules @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <VisualStudioToolFile Name="Output RLZ copy" Version="8.00" @@ -6,9 +6,11 @@ <Rules> <CustomBuildRule Name="Output RLZ copy" - CommandLine="$(SolutionDir)..\rlz\copy_files.bat $(ProjectDir)Binaries\* $(OutDir)" + DisplayName="Output RLZ copy" + CommandLine="$(SolutionDir)..\rlz\copy_files.bat "$(InputPath)" "$(OutDir)"" Outputs="$(OutDir)\$(InputFileName)" FileExtensions="*.dll;*.pdb" + ExecutionDescription="Executing tool..." > <Properties> </Properties> diff --git a/rlz/rlz.vcproj b/rlz/rlz.vcproj index 777ce87..560ada7 100644 --- a/rlz/rlz.vcproj +++ b/rlz/rlz.vcproj @@ -20,9 +20,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj\$(ProjectName)" ConfigurationType="10" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -42,9 +41,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj\$(ProjectName)" ConfigurationType="10" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops" > <Tool Name="VCPreBuildEventTool" |