Reorganize EAPMethods projects to scale better

Signed-off-by: Simon Rozman <simon@rozman.si>

EAPMethods/EAPTTLSUI/.gitignore

@@ -1,2 +0,0 @@
-/temp
-/*.user

EAPMethods/build/EAPTTLS.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="..\build\Common.props" />
+    <Import Project="Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -10,7 +10,7 @@
       <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>..\build\EAPMethod.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>EAPMethod.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />

EAPMethods/build/EAPTTLS.vcxproj

@@ -121,11 +121,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
-    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Main.cpp" />
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -135,7 +135,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLS.rc" />
+    <ResourceCompile Include="..\res\EAPTTLS.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
@@ -167,7 +167,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethod.def" />
+    <None Include="EAPMethod.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

EAPMethods/build/EAPTTLS.vcxproj.filters

@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StdAfx.h">
+    <ClInclude Include="..\src\StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\Main.cpp">
@@ -28,12 +28,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLS.rc">
+    <ResourceCompile Include="..\res\EAPTTLS.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethod.def">
+    <None Include="EAPMethod.def">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>

EAPMethods/build/EAPTTLSUI.props

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="..\build\Common.props" />
+    <Import Project="Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>StdAfxUI.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>..\build\EAPMethodUI.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>EAPMethodUI.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />

EAPMethods/build/EAPTTLSUI.vcxproj

@@ -121,11 +121,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
-    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="..\src\StdAfxUI.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Main_UI.cpp" />
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\MainUI.cpp" />
+    <ClCompile Include="..\src\StdAfxUI.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -135,7 +135,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLSUI.rc" />
+    <ResourceCompile Include="..\res\EAPTTLSUI.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
@@ -191,7 +191,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethodUI.def" />
+    <None Include="EAPMethodUI.def" />
     <None Include="..\locale\EAPMethods.pot" />
   </ItemGroup>
   <ItemGroup>

EAPMethods/build/EAPTTLSUI.vcxproj.filters

@@ -19,25 +19,25 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StdAfx.h">
+    <ClInclude Include="..\src\StdAfxUI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\StdAfxUI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Main_UI.cpp">
+    <ClCompile Include="..\src\MainUI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLSUI.rc">
+    <ResourceCompile Include="..\res\EAPTTLSUI.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethodUI.def">
+    <None Include="EAPMethodUI.def">
       <Filter>Source Files</Filter>
     </None>
     <None Include="..\locale\EAPMethods.pot">

EAPMethods/src/Main.cpp

@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <StdAfx.h>
+#include "StdAfx.h"
 
 using namespace std;
 using namespace winstd;

EAPMethods/src/MainUI.cpp

@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <StdAfx.h>
+#include "StdAfxUI.h"
 
 #pragma comment(lib, "msxml6.lib")
 

EAPMethods/src/StdAfxUI.cpp

@@ -1,21 +1,21 @@
 /*
     Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
 
-    This file is part of GÉANTLink.
+    This file is part of GÉANTLink.
 
-    GÉANTLink is free software: you can redistribute it and/or modify it
+    GÉANTLink is free software: you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    GÉANTLink is distributed in the hope that it will be useful, but
+    GÉANTLink is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "StdAfx.h"
+#include "StdAfxUI.h"