diff options
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/dirs.proj | 22 | ||||
| -rw-r--r-- | toolsrc/src/MachineType.cpp (renamed from toolsrc/MachineType.cpp) | 0 | ||||
| -rw-r--r-- | toolsrc/src/commands_update.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/vcpkg/vcpkg.vcxproj | 2 | ||||
| -rw-r--r-- | toolsrc/vcpkg/vcpkg.vcxproj.filters | 6 |
5 files changed, 27 insertions, 5 deletions
diff --git a/toolsrc/dirs.proj b/toolsrc/dirs.proj new file mode 100644 index 000000000..06bfd6b5d --- /dev/null +++ b/toolsrc/dirs.proj @@ -0,0 +1,22 @@ +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir> + </PropertyGroup> + <ItemGroup> + <ProjectFile Include="vcpkg\vcpkg.vcxproj"/> + <ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/> + <ProjectFile Include="vcpkgcommon\vcpkgcommon.vcxproj"/> + <ProjectFile Include="vcpkgmetrics\vcpkgmetrics.vcxproj"/> + <ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj"/> + </ItemGroup> + + <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> + + <Target Name="Build"> + <MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Build"/> + </Target> + + <Target Name="Clean"> + <MSBuild Projects="@(ProjectFile)" Properties="SolutionDir=$(SolutionDir)" Targets="Clean"/> + </Target> +</Project>
\ No newline at end of file diff --git a/toolsrc/MachineType.cpp b/toolsrc/src/MachineType.cpp index 0115f3e5e..0115f3e5e 100644 --- a/toolsrc/MachineType.cpp +++ b/toolsrc/src/MachineType.cpp diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp index 12b4dad50..021bfe705 100644 --- a/toolsrc/src/commands_update.cpp +++ b/toolsrc/src/commands_update.cpp @@ -84,7 +84,7 @@ namespace vcpkg::Commands::Update { if (maj1 != maj2 || min1 != min2 || rev1 != rev2) { - System::println("Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use scripts\\bootstrap.ps1 to update.", + System::println("Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use powershell -exec bypass scripts/bootstrap.ps1 to update.", maj2, min2, rev2, maj1, min1, rev1); } diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj index 15673e048..8bf3854a1 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj +++ b/toolsrc/vcpkg/vcpkg.vcxproj @@ -125,7 +125,6 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\MachineType.cpp" /> <ClCompile Include="..\src\coff_file_reader.cpp" /> <ClCompile Include="..\src\commands_available_commands.cpp" /> <ClCompile Include="..\src\commands_build.cpp" /> @@ -143,6 +142,7 @@ <ClCompile Include="..\src\commands_search.cpp" /> <ClCompile Include="..\src\commands_update.cpp" /> <ClCompile Include="..\src\commands_version.cpp" /> + <ClCompile Include="..\src\MachineType.cpp" /> <ClCompile Include="..\src\vcpkg_cmd_arguments.cpp" /> <ClCompile Include="..\src\vcpkg_Dependencies.cpp" /> <ClCompile Include="..\src\vcpkg_Environment.cpp" /> diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/vcpkg/vcpkg.vcxproj.filters index 1f43777b8..7e7ec6912 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj.filters +++ b/toolsrc/vcpkg/vcpkg.vcxproj.filters @@ -66,9 +66,6 @@ <ClCompile Include="..\src\coff_file_reader.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\MachineType.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\src\commands_hash.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -96,6 +93,9 @@ <ClCompile Include="..\src\commands_contact.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\MachineType.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\include\post_build_lint.h"> |