Skip to content

Commit 07c092b

Browse files
IhateTrainsIhateTrains
authored
Replaced VersionParser with commonItems::ConverterVersionParser (#155) #patch
1 parent 9cb2dbe commit 07c092b

15 files changed

Lines changed: 51 additions & 183 deletions

‎ImperatorToCK3/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5)
22
#set(CMAKE_VERBOSE_MAKEFILE on)
33

44
project(ImperatorToCK3)
5-
#SET(CMAKE_CXX_COMPILER g++-9)
65
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/Source)
76
set(PROJECT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source)
87
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Release-Linux)
@@ -15,7 +14,6 @@ add_compile_options("-pthread")
1514
add_link_options(-no-pie)
1615

1716
include_directories("../commonItems")
18-
include_directories("../commonItems/compile-time-regular-expressions/single-header")
1917
include_directories("../ZipLib")
2018
include_directories("/usr/local/include/ImageMagick-7/")
2119
include_directories("../cpp-base64")
@@ -34,6 +32,7 @@ file(GLOB CK3OUTPUTTER_SOURCES "${PROJECT_SOURCE_DIR}/CK3Outputter/*.cpp")
3432
set(BASE64_SOURCES "../cpp-base64/base64.cpp")
3533
set(COMMON_SOURCES "../commonItems/CommonFunctions.cpp")
3634
set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/Color.cpp")
35+
set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/ConverterVersion.cpp")
3736
set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/GameVersion.cpp")
3837
set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/Date.cpp")
3938
set(COMMON_SOURCES ${COMMON_SOURCES} "../commonItems/LinuxUtils.cpp")

‎ImperatorToCK3/ImperatorToCK3.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
<ClCompile Include="..\commonItems\Color.cpp" />
215215
<ClCompile Include="..\commonItems\CommonFunctions.cpp" />
216216
<ClCompile Include="..\commonItems\ConvenientParser.cpp" />
217+
<ClCompile Include="..\commonItems\ConverterVersion.cpp" />
217218
<ClCompile Include="..\commonItems\Date.cpp" />
218219
<ClCompile Include="..\commonItems\GameVersion.cpp" />
219220
<ClCompile Include="..\commonItems\iconvlite.cpp" />
@@ -304,13 +305,13 @@
304305
<ClCompile Include="Source\Mappers\TagTitleMapper\TagTitleMapping.cpp" />
305306
<ClCompile Include="Source\Mappers\TraitMapper\TraitMapper.cpp" />
306307
<ClCompile Include="Source\Mappers\TraitMapper\TraitMapping.cpp" />
307-
<ClCompile Include="Source\Mappers\VersionParser\VersionParser.cpp" />
308308
</ItemGroup>
309309
<ItemGroup>
310310
<ClInclude Include="..\commonItems\Color.h" />
311311
<ClInclude Include="..\commonItems\CommonFunctions.h" />
312312
<ClInclude Include="..\commonItems\CommonRegexes.h" />
313313
<ClInclude Include="..\commonItems\ConvenientParser.h" />
314+
<ClInclude Include="..\commonItems\ConverterVersion.h" />
314315
<ClInclude Include="..\commonItems\Date.h" />
315316
<ClInclude Include="..\commonItems\GameVersion.h" />
316317
<ClInclude Include="..\commonItems\iconvlite.h" />
@@ -402,7 +403,6 @@
402403
<ClInclude Include="Source\Mappers\TagTitleMapper\TagTitleMapping.h" />
403404
<ClInclude Include="Source\Mappers\TraitMapper\TraitMapper.h" />
404405
<ClInclude Include="Source\Mappers\TraitMapper\TraitMapping.h" />
405-
<ClInclude Include="Source\Mappers\VersionParser\VersionParser.h" />
406406
</ItemGroup>
407407
<ItemGroup>
408408
<ProjectReference Include="..\ZipLib\ZipLib.vcxproj">

‎ImperatorToCK3/ImperatorToCK3.vcxproj.filters‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@
8585
<Filter Include="Mappers\NicknameMapper">
8686
<UniqueIdentifier>{2404ac05-3984-4e42-9e9d-b039e3d69238}</UniqueIdentifier>
8787
</Filter>
88-
<Filter Include="Mappers\VersionParser">
89-
<UniqueIdentifier>{0bd26324-6936-4f56-825a-3e90efa339df}</UniqueIdentifier>
90-
</Filter>
9188
<Filter Include="Mappers\ImperatorRegionMapper">
9289
<UniqueIdentifier>{f9b0565f-9991-465b-8df3-67bdce281de6}</UniqueIdentifier>
9390
</Filter>
@@ -331,9 +328,6 @@
331328
<ClInclude Include="Source\Mappers\NicknameMapper\NicknameMapping.h">
332329
<Filter>Mappers\NicknameMapper</Filter>
333330
</ClInclude>
334-
<ClInclude Include="Source\Mappers\VersionParser\VersionParser.h">
335-
<Filter>Mappers\VersionParser</Filter>
336-
</ClInclude>
337331
<ClInclude Include="Source\Mappers\RegionMapper\CK3RegionMapper.h">
338332
<Filter>Mappers\CK3RegionMapper</Filter>
339333
</ClInclude>
@@ -397,6 +391,9 @@
397391
<ClInclude Include="Source\Mappers\SuccessionLawMapper\SuccessionLawMapping.h">
398392
<Filter>Mappers\SuccessionLawMapper</Filter>
399393
</ClInclude>
394+
<ClInclude Include="..\commonItems\ConverterVersion.h">
395+
<Filter>commonItems</Filter>
396+
</ClInclude>
400397
</ItemGroup>
401398
<ItemGroup>
402399
<ClCompile Include="Source\main.cpp" />
@@ -608,9 +605,6 @@
608605
<ClCompile Include="Source\Mappers\NicknameMapper\NicknameMapping.cpp">
609606
<Filter>Mappers\NicknameMapper</Filter>
610607
</ClCompile>
611-
<ClCompile Include="Source\Mappers\VersionParser\VersionParser.cpp">
612-
<Filter>Mappers\VersionParser</Filter>
613-
</ClCompile>
614608
<ClCompile Include="Source\Mappers\RegionMapper\CK3RegionMapper.cpp">
615609
<Filter>Mappers\CK3RegionMapper</Filter>
616610
</ClCompile>
@@ -677,6 +671,9 @@
677671
<ClCompile Include="Source\Mappers\SuccessionLawMapper\SuccessionLawMapping.cpp">
678672
<Filter>Mappers\SuccessionLawMapper</Filter>
679673
</ClCompile>
674+
<ClCompile Include="..\commonItems\ConverterVersion.cpp">
675+
<Filter>commonItems</Filter>
676+
</ClCompile>
680677
</ItemGroup>
681678
<ItemGroup>
682679
<CopyFileToFolders Include="Resources\rakaly.dll">

‎ImperatorToCK3/Source/CK3/CK3World.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "Titles/Title.h"
1010
#include "Log.h"
1111
#include "OSCompatibilityLayer.h"
12+
#include "ConverterVersion.h"
1213
#include <filesystem>
1314
#include <fstream>
1415
#include <cmath>
@@ -19,7 +20,7 @@ namespace fs = std::filesystem;
1920

2021

2122

22-
CK3::World::World(const Imperator::World& impWorld, const Configuration& theConfiguration, const mappers::VersionParser& versionParser) {
23+
CK3::World::World(const Imperator::World& impWorld, const Configuration& theConfiguration, const commonItems::ConverterVersion& converterVersion) {
2324
LOG(LogLevel::Info) << "*** Hello CK3, let's get painting. ***";
2425
// Scraping localizations from Imperator so we may know proper names for our countries.
2526
localizationMapper.scrapeLocalizations(theConfiguration, std::map<std::string, std::string>()); // passes an empty map as second arg because we don't actually load mods yet

‎ImperatorToCK3/Source/CK3/CK3World.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44

55

6-
#include "Mappers/VersionParser/VersionParser.h"
76
#include "Mappers/LocalizationMapper/LocalizationMapper.h"
87
#include "Mappers/TagTitleMapper/TagTitleMapper.h"
98
#include "Mappers/CultureMapper/CultureMapper.h"
@@ -31,11 +30,15 @@ namespace Imperator {
3130
class World;
3231
}
3332

33+
namespace commonItems {
34+
struct ConverterVersion;
35+
}
36+
3437
namespace CK3 {
3538

3639
class World {
3740
public:
38-
World(const Imperator::World& impWorld, const Configuration& theConfiguration, const mappers::VersionParser& versionParser);
41+
World(const Imperator::World& impWorld, const Configuration& theConfiguration, const commonItems::ConverterVersion& converterVersion);
3942

4043
[[nodiscard]] const auto& getCharacters() const { return characters; }
4144
[[nodiscard]] const auto& getDynasties() const { return dynasties; }

‎ImperatorToCK3/Source/CK3Outputter/outVersion.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
#include "outVersion.h"
2-
#include "Mappers/VersionParser/VersionParser.h"
2+
#include "ConverterVersion.h"
3+
#include "Log.h"
34
#include <fstream>
45

56

67

7-
std::ostream& mappers::operator<<(std::ostream& output, const VersionParser& versionParser) {
8+
void logConverterVersion(const commonItems::ConverterVersion& versionParser) {
89
// read commit id
910
std::string commitID;
1011
std::ifstream commitIdFile{ "../commit_id.txt" };
1112
commitIdFile >> commitID;
1213
commitIdFile.close();
1314

14-
output << "\n\n";
15-
output << "************ -= The Paradox Converters Team =- ********************\n";
16-
output << "* Converter build based on commit " << commitID << "\n";
17-
output << "* " << versionParser.descriptionLine << "\n";
18-
output << "* Built on " << __TIMESTAMP__ << "\n";
19-
output << "*********** + Imperator: Rome To Crusader Kings III + **************\n";
20-
return output;
15+
Log(LogLevel::Info) << "************ -= The Paradox Converters Team =- ********************";
16+
Log(LogLevel::Info) << "* Converter build based on commit " << commitID;
17+
Log(LogLevel::Info) << "* " << versionParser.descriptionLine;
18+
Log(LogLevel::Info) << "* Built on " << __TIMESTAMP__;
19+
Log(LogLevel::Info) << "*********** + Imperator: Rome To Crusader Kings III + *************\n";
2120
}

‎ImperatorToCK3/Source/CK3Outputter/outVersion.h‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@
33

44

55

6-
#include <ostream>
6+
namespace commonItems {
7+
struct ConverterVersion;
8+
} // namespace commonItems
79

8-
9-
10-
namespace mappers {
11-
12-
class VersionParser;
13-
std::ostream& operator<<(std::ostream& output, const VersionParser& versionParser);
14-
15-
} // namespace mappers
10+
void logConverterVersion(const commonItems::ConverterVersion& versionParser);
1611

1712

1813

‎ImperatorToCK3/Source/ImperatorToCK3Converter.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
#include "CK3/CK3World.h"
55
#include "CK3Outputter/CK3WorldOutputter.h"
66
#include "Log.h"
7+
#include "ConverterVersion.h"
78

8-
void convertImperatorToCK3(const mappers::VersionParser& versionParser)
9-
{
9+
10+
11+
void convertImperatorToCK3(const commonItems::ConverterVersion& converterVersion) {
1012
const Configuration theConfiguration;
1113

1214
const Imperator::World impWorld(theConfiguration);
13-
const CK3::World ck3World(impWorld, theConfiguration, versionParser);
15+
const CK3::World ck3World(impWorld, theConfiguration, converterVersion);
1416
CK3::outputWorld(ck3World, theConfiguration);
1517

1618
LOG(LogLevel::Info) << "* Conversion complete *";

‎ImperatorToCK3/Source/ImperatorToCK3Converter.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#ifndef IMPERATORTOCK3_CONVERTER_H
22
#define IMPERATORTOCK3_CONVERTER_H
33

4-
namespace mappers {
5-
class VersionParser;
4+
5+
6+
namespace commonItems {
7+
struct ConverterVersion;
68
}
79

8-
void convertImperatorToCK3(const mappers::VersionParser& versionParser);
10+
void convertImperatorToCK3(const commonItems::ConverterVersion& converterVersion);
11+
12+
913

1014
#endif // IMPERATORTOCK3_CONVERTER_H

‎ImperatorToCK3/Source/Mappers/VersionParser/VersionParser.cpp‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)