Skip to content

Commit 03e5fc4

Browse files
chcgchcg
committed
- revert vcpkg changes
- add boost directly (1.90 headers, currently 1.87 libs renamed )
1 parent 4812ee4 commit 03e5fc4

2,620 files changed

Lines changed: 503332 additions & 131 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/CI_build.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ jobs:
2121
- name: Add msbuild to PATH
2222
uses: microsoft/setup-msbuild@v2
2323

24-
- name: Setup vcpkg
25-
working-directory: .
26-
run: |
27-
vcpkg install
28-
2924
- name: Setup NuGet.exe
3025
uses: nuget/setup-nuget@v2
3126

@@ -35,7 +30,7 @@ jobs:
3530

3631
- name: MSBuild of solution
3732
working-directory: .
38-
run: msbuild PythonScript.sln /m /verbosity:minimal /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:VcpkgEnableManifest=true
33+
run: msbuild PythonScript.sln /m /verbosity:minimal /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}"
3934

4035
- name: Build docs
4136
if: matrix.build_configuration == 'Release'

‎PythonScript.Tests/PythonScript.Tests.vcxproj‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -187,42 +187,12 @@
187187
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
188188
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)</LibraryPath>
189189
</PropertyGroup>
190-
<PropertyGroup Label="Vcpkg">
191-
<VcpkgEnableManifest>true</VcpkgEnableManifest>
192-
</PropertyGroup>
193-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
194-
<VcpkgUseStatic>true</VcpkgUseStatic>
195-
</PropertyGroup>
196-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">
197-
<VcpkgUseStatic>true</VcpkgUseStatic>
198-
</PropertyGroup>
199-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
200-
<VcpkgUseStatic>true</VcpkgUseStatic>
201-
</PropertyGroup>
202-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
203-
<VcpkgUseStatic>true</VcpkgUseStatic>
204-
</PropertyGroup>
205-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
206-
<VcpkgUseStatic>true</VcpkgUseStatic>
207-
</PropertyGroup>
208-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
209-
<VcpkgUseStatic>true</VcpkgUseStatic>
210-
</PropertyGroup>
211-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
212-
<VcpkgUseStatic>true</VcpkgUseStatic>
213-
</PropertyGroup>
214-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'">
215-
<VcpkgUseStatic>true</VcpkgUseStatic>
216-
</PropertyGroup>
217-
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
218-
<VcpkgUseStatic>true</VcpkgUseStatic>
219-
</PropertyGroup>
220190
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
221191
<ClCompile>
222192
<PrecompiledHeader>NotUsing</PrecompiledHeader>
223193
<WarningLevel>Level3</WarningLevel>
224194
<Optimization>Disabled</Optimization>
225-
<PreprocessorDefinitions>WIN32;NOMINMAX;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
226196
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
227197
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
228198
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -248,7 +218,7 @@
248218
<PrecompiledHeader>NotUsing</PrecompiledHeader>
249219
<WarningLevel>Level3</WarningLevel>
250220
<Optimization>Disabled</Optimization>
251-
<PreprocessorDefinitions>WIN32;NOMINMAX;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
221+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
252222
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
253223
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
254224
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -274,7 +244,7 @@
274244
<PrecompiledHeader>Use</PrecompiledHeader>
275245
<WarningLevel>Level3</WarningLevel>
276246
<Optimization>Disabled</Optimization>
277-
<PreprocessorDefinitions>WIN32;NOMINMAX;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
247+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
278248
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
279249
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
280250
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -300,7 +270,7 @@
300270
<PrecompiledHeader>NotUsing</PrecompiledHeader>
301271
<WarningLevel>Level3</WarningLevel>
302272
<Optimization>Disabled</Optimization>
303-
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
273+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
304274
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
305275
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
306276
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -326,7 +296,7 @@
326296
<PrecompiledHeader>NotUsing</PrecompiledHeader>
327297
<WarningLevel>Level3</WarningLevel>
328298
<Optimization>Disabled</Optimization>
329-
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
299+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
330300
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
331301
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
332302
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -352,7 +322,7 @@
352322
<PrecompiledHeader>Use</PrecompiledHeader>
353323
<WarningLevel>Level3</WarningLevel>
354324
<Optimization>Disabled</Optimization>
355-
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
325+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
356326
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
357327
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
358328
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -380,7 +350,7 @@
380350
<Optimization>MaxSpeed</Optimization>
381351
<FunctionLevelLinking>true</FunctionLevelLinking>
382352
<IntrinsicFunctions>true</IntrinsicFunctions>
383-
<PreprocessorDefinitions>WIN32;NOMINMAX;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
353+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
384354
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
385355
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
386356
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -402,7 +372,7 @@
402372
<Optimization>MaxSpeed</Optimization>
403373
<FunctionLevelLinking>true</FunctionLevelLinking>
404374
<IntrinsicFunctions>true</IntrinsicFunctions>
405-
<PreprocessorDefinitions>WIN32;NOMINMAX;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
375+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
406376
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
407377
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
408378
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -424,7 +394,7 @@
424394
<Optimization>MaxSpeed</Optimization>
425395
<FunctionLevelLinking>true</FunctionLevelLinking>
426396
<IntrinsicFunctions>true</IntrinsicFunctions>
427-
<PreprocessorDefinitions>WIN32;NOMINMAX;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
397+
<PreprocessorDefinitions>WIN32;NOMINMAX;BOOST_REGEX_STANDALONE;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
428398
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
429399
<AdditionalIncludeDirectories>gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
430400
<MultiProcessorCompilation>true</MultiProcessorCompilation>

‎PythonScript.Tests/TestRunner.cpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
#include <gtest/gtest.h>
66
#include "ReplaceEntry.h"
77
#include "Replacer.h"
8+
#include <list>
89

9-
void deleteEntry(NppPythonScript::ReplaceEntry* entry)
10-
{
11-
delete entry;
12-
}
13-
14-
void runReplace()
10+
static void runReplace()
1511
{
1612
NppPythonScript::Replacer<NppPythonScript::Utf8CharTraits> replacer;
17-
std::list<NppPythonScript::ReplaceEntry* > entries;
13+
std::list<NppPythonScript::ReplaceEntry*> entries;
1814
bool moreEntries = replacer.startReplace("aaabbbaaabb", 12, 0, 0, "(b+)", "x$1x", NppPythonScript::python_re_flag_normal, entries);
19-
ASSERT_EQ(2, entries.size());
20-
std::list<NppPythonScript::ReplaceEntry*>::const_iterator it = entries.begin();
21-
for_each(entries.begin(), entries.end(), deleteEntry);
22-
}
15+
ASSERT_EQ(2u, entries.size());
2316

17+
for (auto ptr : entries)
18+
{
19+
delete ptr;
20+
}
21+
entries.clear();
22+
}
2423

2524
int main(int argc, char* argv[])
2625
{
@@ -36,9 +35,8 @@ int main(int argc, char* argv[])
3635
_CrtMemCheckpoint(&state);
3736
#endif
3837

39-
4038
::testing::InitGoogleTest(&argc, argv);
41-
RUN_ALL_TESTS();
39+
int result = RUN_ALL_TESTS();
4240

4341
// This function call is used to check if we've created memory leaks using startReplace
4442
// Gtest creates various static objects, so it can be a bit tricky to identify leaks with Gtest running
@@ -50,5 +48,6 @@ int main(int argc, char* argv[])
5048
_CrtMemDumpAllObjectsSince(&state);
5149
#endif
5250

51+
return result;
5352
}
5453

‎PythonScript.Tests/stdafx.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <iterator>
1919
#include <algorithm>
2020
#include <fstream>
21+
#include <memory>
2122

2223
#include <boost/bind/bind.hpp>
2324
#include <boost/regex.hpp>

0 commit comments

Comments
 (0)