pEp.foundation
/
pEpJSONServerAdapter
9
1
Fork 4
Code Issues 1 Pull Requests Releases 1 Wiki Activity

re-sync with "sync" branch. :-)

Browse Source
JSON-123
Roker 4 years ago
parent 895f4b6ac6 9129ff71f4
commit 35084a2bef
7 changed files with 62 additions and 105 deletions
Show Stats Download Patch File Download Diff File

34
build-windows/libevent/libevent.vcxproj
Unescape View File

@ -9,14 +9,6 @@
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
@ -35,16 +27,6 @@
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@ -56,12 +38,6 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<NMakeBuildCommandLine>cd "$(ProjectDir)..\..\libevent-2.0.22-stable\" &amp;&amp; nmake -f Makefile.nmake</NMakeBuildCommandLine>
@ -71,11 +47,6 @@
<NMakeReBuildCommandLine>cd "$(ProjectDir)..\..\libevent-2.0.22-stable\" &amp;&amp; nmake -f Makefile.nmake /a</NMakeReBuildCommandLine>
<OutDir>..\..\libevent-2.0.22-stable</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>nmake -f Makefile.nmake</NMakeBuildCommandLine>
<NMakeOutput>libevent.exe</NMakeOutput>
<NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd "$(ProjectDir)..\..\libevent-2.0.22-stable\" &amp;&amp; nmake -f Makefile.nmake</NMakeBuildCommandLine>
<NMakeOutput>libevent.lib</NMakeOutput>
@ -84,11 +55,6 @@
<NMakeReBuildCommandLine>cd "$(ProjectDir)..\..\libevent-2.0.22-stable\" &amp;&amp; nmake -f Makefile.nmake /a</NMakeReBuildCommandLine>
<OutDir>..\..\libevent-2.0.22-stable</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>nmake -f Makefile.nmake</NMakeBuildCommandLine>
<NMakeOutput>libevent.exe</NMakeOutput>
<NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>

73
build-windows/pEpJSONServerAdapter/pEpJSONServerAdapter.vcxproj
Unescape View File

@ -9,14 +9,6 @@
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
@ -39,19 +31,6 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@ -63,25 +42,13 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -99,20 +66,6 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@ -134,28 +87,11 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\server\base64.hh" />
<ClInclude Include="..\..\server\context.hh" />
<ClInclude Include="..\..\server\c_string.hh" />
<ClInclude Include="..\..\server\daemonize.hh" />
<ClInclude Include="..\..\server\ev_server.hh" />
<ClInclude Include="..\..\server\function_map.hh" />
<ClInclude Include="..\..\server\inout.hh" />
@ -180,6 +116,7 @@
<ClCompile Include="..\..\server\base64.cc" />
<ClCompile Include="..\..\server\context.cc" />
<ClCompile Include="..\..\server\c_string.cc" />
<ClCompile Include="..\..\server\daemonize.cc" />
<ClCompile Include="..\..\server\ev_server.cc" />
<ClCompile Include="..\..\server\function_map.cc" />
<ClCompile Include="..\..\server\inout.cc" />
@ -191,8 +128,10 @@
<ClCompile Include="..\..\server\nfc_sets.cc" />
<ClCompile Include="..\..\server\nulllogger.cc" />
<ClCompile Include="..\..\server\pep-types.cc" />
<ClCompile Include="..\..\server\pep-utils.cc" />
<ClCompile Include="..\..\server\registry.cc" />
<ClCompile Include="..\..\server\security-token.cc" />
<ClCompile Include="..\..\server\servertest.cc" />
<ClCompile Include="..\..\server\server_version.cc" />
</ItemGroup>
<ItemGroup>
@ -200,12 +139,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\packages\boost.1.69.0.0\build\boost.targets" Condition="Exists('..\..\..\packages\boost.1.69.0.0\build\boost.targets')" />
<Import Project="..\..\..\packages\boost.1.70.0.0\build\boost.targets" Condition="Exists('..\..\..\packages\boost.1.70.0.0\build\boost.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\boost.1.69.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\boost.1.69.0.0\build\boost.targets'))" />
<Error Condition="!Exists('..\..\..\packages\boost.1.70.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\boost.1.70.0.0\build\boost.targets'))" />
</Target>
</Project>

12
build-windows/pEpJSONServerAdapter/pEpJSONServerAdapter.vcxproj.filters
Unescape View File

@ -81,6 +81,9 @@
<ClInclude Include="..\..\server\pep-utils.hh">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\server\daemonize.hh">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\server\base64.cc">
@ -134,6 +137,15 @@
<ClCompile Include="..\..\server\server_version.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\server\daemonize.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\server\pep-utils.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\server\servertest.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />

4
build-windows/pEpJSONServerAdapter/packages.config
Unescape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.70.0.0" targetFramework="native" />
</packages>

36
server/nfc_sets.cc
Unescape View File

@ -390,6 +390,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x07F1, 230},
{0x07F2, 220},
{0x07F3, 230},
{0x07FD, 220},
{0x0816, 230},
{0x0817, 230},
{0x0818, 230},
@ -414,6 +415,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x0859, 220},
{0x085A, 220},
{0x085B, 220},
{0x08D3, 220},
{0x08D4, 230},
{0x08D5, 230},
{0x08D6, 230},
@ -465,6 +467,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x0954, 230},
{0x09BC, 7},
{0x09CD, 9},
{0x09FE, 230},
{0x0A3C, 7},
{0x0A4D, 9},
{0x0ABC, 7},
@ -477,6 +480,8 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x0C56, 91},
{0x0CBC, 7},
{0x0CCD, 9},
{0x0D3B, 9},
{0x0D3C, 9},
{0x0D4D, 9},
{0x0DCA, 9},
{0x0E38, 103},
@ -650,6 +655,10 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x1DF3, 230},
{0x1DF4, 230},
{0x1DF5, 230},
{0x1DF6, 232},
{0x1DF7, 228},
{0x1DF8, 228},
{0x1DF9, 220},
{0x1DFB, 230},
{0x1DFC, 233},
{0x1DFD, 220},
@ -809,6 +818,21 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x10A3F, 9},
{0x10AE5, 230},
{0x10AE6, 220},
{0x10D24, 230},
{0x10D25, 230},
{0x10D26, 230},
{0x10D27, 230},
{0x10F46, 220},
{0x10F47, 220},
{0x10F48, 230},
{0x10F49, 230},
{0x10F4A, 230},
{0x10F4B, 220},
{0x10F4C, 230},
{0x10F4D, 220},
{0x10F4E, 220},
{0x10F4F, 220},
{0x10F50, 220},
{0x11046, 9},
{0x1107F, 9},
{0x110B9, 9},
@ -825,6 +849,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x11236, 7},
{0x112E9, 7},
{0x112EA, 9},
{0x1133B, 7},
{0x1133C, 7},
{0x1134D, 9},
{0x11366, 230},
@ -841,6 +866,7 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x11374, 230},
{0x11442, 9},
{0x11446, 7},
{0x1145E, 230},
{0x114C2, 9},
{0x114C3, 7},
{0x115BF, 9},
@ -849,7 +875,16 @@ const std::map<unsigned, unsigned char> NFC_CombiningClass = {
{0x116B6, 9},
{0x116B7, 7},
{0x1172B, 9},
{0x11839, 9},
{0x1183A, 7},
{0x11A34, 9},
{0x11A47, 9},
{0x11A99, 9},
{0x11C3F, 9},
{0x11D42, 7},
{0x11D44, 9},
{0x11D45, 9},
{0x11D97, 9},
{0x16AF0, 1},
{0x16AF1, 1},
{0x16AF2, 1},
@ -3015,3 +3050,4 @@ const std::map<unsigned, std::pair<int,int>> NFC_Decompose = {
std::map< std::pair<unsigned, unsigned>, unsigned> generate_nfc_compose();
const std::map< std::pair<unsigned, unsigned>, unsigned> NFC_Compose = generate_nfc_compose();

6
server/scripts/gen_sets.sh
Unescape View File

@ -7,7 +7,7 @@
#
################################# ### ## # # # #
cat /usr/share/unicode/DerivedNormalizationProps.txt | sed -e 's/#.*//g' | grep NFC_QC | sed -e 's/; NFC_QC;//g' |
cat ./unicode/DerivedNormalizationProps.txt | sed -e 's/#.*//g' | grep NFC_QC | sed -e 's/; NFC_QC;//g' |
(
@ -77,7 +77,7 @@ echo -en '\n\t};\n\n'
echo 'const std::map<unsigned, unsigned char> NFC_CombiningClass = {'
cat /usr/share/unicode/UnicodeData.txt | cut -d';' -f 1,4 | grep -v -E ';0$' | sed 's/\([0-9A-F]*\);\([0-9]*\)/ {0x\1, \2},/g'
cat ./unicode/UnicodeData.txt | cut -d';' -f 1,4 | grep -v -E ';0$' | sed 's/\([0-9A-F]*\);\([0-9]*\)/ {0x\1, \2},/g'
echo -en '};\n\n'
@ -85,7 +85,7 @@ echo -en '};\n\n'
echo 'const std::map<unsigned, std::pair<int,int>> NFC_Decompose = {'
# cut codepoint and Decomposition_Mapping, remove compat mappings (containing <…>), add -1 for one-element mappings:
cat /usr/share/unicode/UnicodeData.txt | cut -d';' -f 1,6 | grep -v '<' | \
cat ./unicode/UnicodeData.txt | cut -d';' -f 1,6 | grep -v '<' | \
sed -e 's/\([0-9A-F]*\);\([0-9A-F ]*\)/\1 @\2@/g' | grep -v @@ | \
sed -e 's/@\([0-9A-F]*\) \([0-9A-F]*\)@/0x\1 0x\2/' | \
sed -e 's/@\([0-9A-F]*\)@/0x\1 -1/' | \

2
server/unittest_pEp.cc
Unescape View File

@ -1,7 +1,7 @@
#include <gtest/gtest.h>
#include "inout.hh" // for to_json() and from_json()
#include "pEp-types.hh"
#include "pep-types.hh"
#include "json_spirit/json_spirit_writer.h"
#include "json_spirit/json_spirit_reader.h"
#include <pEp/message.h>

Write Preview
Loading…
Cancel
Save