Skip to content

Maintenance #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xleclercq merged 6 commits into from
Jan 23, 2022
Merged

Maintenance #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
63eb71a
Update CI
xleclercq Jan 23, 2022
12fe321
Update CI
xleclercq Jan 23, 2022
22a02dd
Update CI
xleclercq Jan 23, 2022
ff44f73
Update CI
xleclercq Jan 23, 2022
e270979
Update build files
xleclercq Jan 23, 2022
aee7a91
Updates
xleclercq Jan 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: ishikocpp/gcc-boost:10.1.0-1.73.0
- image: ishiko/gcc-ishiko-cpp-build-prerequisites:0.1.0
steps:
- run:
name: "Set ISHIKO_CPP environment variable and create workspace directory"
Expand All @@ -13,8 +13,8 @@ jobs:
name: Build
command: cd /projects/ishiko/cpp/config/build/gnumake && make
- run:
name: "Install test dependency: Ishiko/C++ Platform"
command: cd /projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/platform.git && cd platform/build/gnumake && make
name: "Install test dependency: Ishiko/C++ BasePlatform"
command: cd /projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/base-platform.git && cd base-platform/build/gnumake && make
- run:
name: "Install test dependency: Ishiko/C++ Errors"
command: cd /projects/ishiko/cpp && git clone https://github.com/ishiko-cpp/errors.git && cd errors/build/gnumake && make
Expand Down Expand Up @@ -45,3 +45,18 @@ jobs:
- run:
name: Run the tests
command: cd /projects/ishiko/cpp/config/tests/build/gnumake && ./IshikoConfigTests
workflows:
version: 2
continuous_build:
jobs:
- build
weekly_build:
jobs:
- build
triggers:
- schedule:
cron: "0 8 * * 0"
filters:
branches:
only:
- main
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2021 Xavier Leclercq
Copyright (c) 2021-2022 Xavier Leclercq

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ None.

## License

Copyright (c) 2021 Xavier Leclercq\
Copyright (c) 2021-2022 Xavier Leclercq\
Released under the MIT License\
See https://github.com/ishiko-cpp/config/blob/main/LICENSE.txt
4 changes: 3 additions & 1 deletion build/bakefile/IshikoConfig.bkl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
toolsets = gnu vs2017 vs2015 vs2013;
toolsets = gnu vs2019 vs2017 vs2015 vs2013;

gnu.makefile = ../gnumake/GNUmakefile;
vs2019.solutionfile = ../vc16/IshikoConfig.sln;
vs2017.solutionfile = ../vc15/IshikoConfig.sln;
vs2015.solutionfile = ../vc14/IshikoConfig.sln;
vs2013.solutionfile = ../vc12/IshikoConfig.sln;
Expand Down Expand Up @@ -33,6 +34,7 @@ library IshikoConfig
../../include/Ishiko/Config/CommandLineParser.h
../../include/Ishiko/Config/CommandLineSpecification.h
../../include/Ishiko/Config/Configuration.h
../../include/Ishiko/Config/linkoptions.hpp
}

sources
Expand Down
9 changes: 5 additions & 4 deletions build/vc12/IshikoConfig.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -103,7 +103,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -120,7 +120,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -139,7 +139,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -159,6 +159,7 @@
<ClInclude Include="..\..\include\Ishiko\Config\CommandLineParser.h" />
<ClInclude Include="..\..\include\Ishiko\Config\CommandLineSpecification.h" />
<ClInclude Include="..\..\include\Ishiko\Config\Configuration.h" />
<ClInclude Include="..\..\include\Ishiko\Config\linkoptions.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
3 changes: 3 additions & 0 deletions build/vc12/IshikoConfig.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<ClInclude Include="..\..\include\Ishiko\Config\Configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Ishiko\Config\linkoptions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\CommandLineParser.cpp">
Expand Down
9 changes: 5 additions & 4 deletions build/vc14/IshikoConfig.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -103,7 +103,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -120,7 +120,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -139,7 +139,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -159,6 +159,7 @@
<ClInclude Include="..\..\include\Ishiko\Config\CommandLineParser.h" />
<ClInclude Include="..\..\include\Ishiko\Config\CommandLineSpecification.h" />
<ClInclude Include="..\..\include\Ishiko\Config\Configuration.h" />
<ClInclude Include="..\..\include\Ishiko\Config\linkoptions.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
3 changes: 3 additions & 0 deletions build/vc14/IshikoConfig.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<ClInclude Include="..\..\include\Ishiko\Config\Configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Ishiko\Config\linkoptions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\CommandLineParser.cpp">
Expand Down
9 changes: 5 additions & 4 deletions build/vc15/IshikoConfig.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -103,7 +103,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -120,7 +120,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -139,7 +139,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\include\Ishiko\Config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
Expand All @@ -159,6 +159,7 @@
<ClInclude Include="..\..\include\Ishiko\Config\CommandLineParser.h" />
<ClInclude Include="..\..\include\Ishiko\Config\CommandLineSpecification.h" />
<ClInclude Include="..\..\include\Ishiko\Config\Configuration.h" />
<ClInclude Include="..\..\include\Ishiko\Config\linkoptions.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
3 changes: 3 additions & 0 deletions build/vc15/IshikoConfig.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<ClInclude Include="..\..\include\Ishiko\Config\Configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Ishiko\Config\linkoptions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\CommandLineParser.cpp">
Expand Down
28 changes: 28 additions & 0 deletions build/vc16/IshikoConfig.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 16
VisualStudioVersion = 16.0.29020.237
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IshikoConfig", "IshikoConfig.vcxproj", "{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Debug|Win32.ActiveCfg = Debug|Win32
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Debug|Win32.Build.0 = Debug|Win32
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Debug|x64.ActiveCfg = Debug|x64
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Debug|x64.Build.0 = Debug|x64
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Release|Win32.ActiveCfg = Release|Win32
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Release|Win32.Build.0 = Release|Win32
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Release|x64.ActiveCfg = Release|x64
{09C72A3F-FC69-5C7F-A57F-AD884C6837D1}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading