From 1d0ec0733ff13f6f203e3acce115d1444f630888 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 12 Apr 2016 09:38:25 +0200
Subject: [PATCH] adapting solution to changed project locations, re-structure
projects into folders
---
.../DeclarationCycleZip.csproj | 2 +-
Tools/GraphDrawer/GraphDrawer.csproj | 2 +-
VECTO.sln | 35 ++++++++++++++-----
VECTO/VECTO.vbproj | 4 +--
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 2 +-
.../VectoAuxiliariesTests.vbproj | 2 +-
VectoConsole/VectoConsole.csproj | 2 +-
VectoCore/VectoCore/VectoCore.csproj | 4 +--
8 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
index c500389f35..db48f162dd 100644
--- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
+++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
@@ -48,7 +48,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\VectoCore\VectoCore.csproj">
+ <ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj">
<Project>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</Project>
<Name>VectoCore</Name>
</ProjectReference>
diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index 00d0753aaa..40d271830e 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -51,7 +51,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\VectoCoreTest\VectoCoreTest.csproj">
+ <ProjectReference Include="..\..\VectoCore\VectoCoreTest\VectoCoreTest.csproj">
<Project>{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}</Project>
<Name>VectoCoreTest</Name>
</ProjectReference>
diff --git a/VECTO.sln b/VECTO.sln
index 9d13cccd3f..402f43e9ea 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -5,30 +5,38 @@ VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
EndProject
-Project("{F088123C-0E9E-452A-89E6-6BA2F21D5CAC}") = "VectoCoreArchitecture", "VectoCoreArchitecture\VectoCoreArchitecture.modelproj", "{165DA769-0FC8-44A7-87D6-58D037E765AB}"
+Project("{F088123C-0E9E-452A-89E6-6BA2F21D5CAC}") = "VectoCoreArchitecture", "Documentation\VectoCoreArchitecture\VectoCoreArchitecture.modelproj", "{165DA769-0FC8-44A7-87D6-58D037E765AB}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliaries", "VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj", "{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore", "VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore", "VectoCore\VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
ProjectSection(ProjectDependencies) = postProject
{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD} = {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}
EndProjectSection
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliariesTests", "VECTOAux\VectoAuxiliariesTests\VectoAuxiliariesTests.vbproj", "{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCoreTest", "VectoCoreTest\VectoCoreTest.csproj", "{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCoreTest", "VectoCore\VectoCoreTest\VectoCoreTest.csproj", "{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}"
EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DeclarationConverter", "DeclarationConverter\DeclarationConverter.pyproj", "{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}"
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DeclarationConverter", "Tools\DeclarationConverter\DeclarationConverter.pyproj", "{E23B3A9B-62E7-4476-849E-EEF1C3804A2F}"
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AdvancedAuxiliaryInterfaces", "AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj", "{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AdvancedAuxiliaryInterfaces", "VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj", "{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoConsole", "VectoConsole\VectoConsole.csproj", "{60AD4DF0-6648-4374-83CB-C7A162EFB391}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphDrawer", "GraphDrawer\GraphDrawer.csproj", "{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphDrawer", "Tools\GraphDrawer\GraphDrawer.csproj", "{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeclarationCycleZip", "DeclarationCycleZip\DeclarationCycleZip.csproj", "{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeclarationCycleZip", "Tools\DeclarationCycleZip\DeclarationCycleZip.csproj", "{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LicenceHeader", "LicenceHeader\LicenceHeader.csproj", "{E8B0B447-1A54-4BEC-A160-AF0017000781}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LicenceHeader", "Tools\LicenceHeader\LicenceHeader.csproj", "{E8B0B447-1A54-4BEC-A160-AF0017000781}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdvancedAuxiliaries", "AdvancedAuxiliaries", "{B7C0A40B-E468-44DE-A784-7A5B8DAC1042}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VectoCommon", "VectoCommon", "{73A5BF70-6168-456F-95E5-A1402BFA488C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{351FF7E8-B56B-445E-8E98-A61E07C990DA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VECTO 3", "VECTO 3", "{CC93EA68-F3FE-4BCB-9292-1101F94A4D09}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -140,4 +148,15 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D} = {B7C0A40B-E468-44DE-A784-7A5B8DAC1042}
+ {FDEEE460-0B8A-4EF6-8D9E-72F203A50F65} = {B7C0A40B-E468-44DE-A784-7A5B8DAC1042}
+ {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
+ {E8B0B447-1A54-4BEC-A160-AF0017000781} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
+ {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
+ {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
+ {E23B3A9B-62E7-4476-849E-EEF1C3804A2F} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
+ {CD36938A-ADD9-4C65-96DA-B397CDEEA90A} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09}
+ {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09}
+ EndGlobalSection
EndGlobal
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 71eb870b0f..aa1b195ad7 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -931,11 +931,11 @@
<Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
<Name>VectoAuxiliaries</Name>
</ProjectReference>
- <ProjectReference Include="..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
+ <ProjectReference Include="..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
- <ProjectReference Include="..\VectoCore\VectoCore.csproj">
+ <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj">
<Project>{cd36938a-add9-4c65-96da-b397cdeea90a}</Project>
<Name>VectoCore</Name>
</ProjectReference>
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 87807b4970..dc295c00f2 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -283,7 +283,7 @@
</Resource>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
+ <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index fd67d36bff..1eb64c3bc5 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -386,7 +386,7 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
- <ProjectReference Include="..\..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
+ <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index bf51f2c1eb..bcb35ad8ac 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -110,7 +110,7 @@
</None>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\VectoCore\VectoCore.csproj">
+ <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj">
<Project>{cd36938a-add9-4c65-96da-b397cdeea90a}</Project>
<Name>VectoCore</Name>
</ProjectReference>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 940646ab4c..e7d95ffd54 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -338,11 +338,11 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
+ <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
- <ProjectReference Include="..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
+ <ProjectReference Include="..\..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
<Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
<Name>VectoAuxiliaries</Name>
</ProjectReference>
--
GitLab