Skip to content

Commit

Permalink
- added boost header only regex version from boost_1_76_0_b1
Browse files Browse the repository at this point in the history
- removed nuget packages
- removed options BOOSTPATH and BOOSTREGEXLIBPATH from nmake scintilla.mak call and always build with own boost regex
- not adapted yet is the mingw build to also use own boost regex
  • Loading branch information
chcg committed Mar 21, 2021
1 parent 2dd086c commit 6c64e55
Show file tree
Hide file tree
Showing 64 changed files with 23,467 additions and 42 deletions.
10 changes: 0 additions & 10 deletions PowerEditor/visual.net/notepadPlus.vcxproj
Expand Up @@ -541,7 +541,6 @@ copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
<None Include="..\src\cursors\drag.cur" />
<None Include="..\src\cursors\drag_interdit.cur" />
<None Include="..\src\cursors\drag_plus.cur" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\clipboardFormats.h" />
Expand Down Expand Up @@ -705,14 +704,5 @@ copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="packages\boost.1.72.0.0\build\boost.targets" Condition="Exists('packages\boost.1.72.0.0\build\boost.targets')" />
<Import Project="packages\boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets" Condition="Exists('packages\boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\boost.1.72.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost.1.72.0.0\build\boost.targets'))" />
<Error Condition="!Exists('packages\boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets'))" />
</Target>
</Project>
5 changes: 0 additions & 5 deletions PowerEditor/visual.net/packages.config

This file was deleted.

2 changes: 0 additions & 2 deletions appveyor.yml
Expand Up @@ -24,8 +24,6 @@ install:
- if "%Platform%"=="mingw-w64_810_X64" set PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=%
- if "%archi%" NEQ "" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%

- if "%archi%" NEQ "" nuget restore "%APPVEYOR_BUILD_FOLDER%"\PowerEditor\visual.net\packages.config -PackagesDirectory "%APPVEYOR_BUILD_FOLDER%"\PowerEditor\visual.net\packages

build_script:
- ps: |
Write-Output "Configuration: $env:CONFIGURATION"
Expand Down
41 changes: 41 additions & 0 deletions scintilla/boostregex/boost/regex.hpp
@@ -0,0 +1,41 @@
/*
*
* Copyright (c) 1998-2002
* John Maddock
*
* Use, modification and distribution are subject to the
* Boost Software License, Version 1.0. (See accompanying file
* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*
*/

/*
* LOCATION: see http://www.boost.org/libs/regex for documentation.
* FILE regex.cpp
* VERSION see <boost/version.hpp>
* DESCRIPTION: Declares boost::basic_regex<> and associated
* functions and classes. This header is the main
* entry point for the template regex code.
*/


/* start with C compatibility API */

#ifndef BOOST_RE_REGEX_HPP
#define BOOST_RE_REGEX_HPP

#ifndef BOOST_REGEX_CONFIG_HPP
#include <boost/regex/config.hpp>
#endif

#ifdef BOOST_REGEX_CXX03
#include <boost/regex/v4/regex.hpp>
#else
#include <boost/regex/v5/regex.hpp>
#endif

#endif // include




0 comments on commit 6c64e55

Please sign in to comment.