diff --git a/NppPlugin/project/NppPlugin.vcxproj b/NppPlugin/project/NppPlugin.vcxproj
index ec6d9b97..5cf9e0b8 100644
--- a/NppPlugin/project/NppPlugin.vcxproj
+++ b/NppPlugin/project/NppPlugin.vcxproj
@@ -5,14 +5,26 @@
Debug
Win32
+
+ Debug
+ x64
+
PythonDebug
Win32
+
+ PythonDebug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{69CC76EB-0183-4622-929C-02E860A66A23}
@@ -26,49 +38,71 @@
true
v140_xp
+
+ StaticLibrary
+ Unicode
+ true
+ v140_xp
+
StaticLibrary
Unicode
v140_xp
+
+ StaticLibrary
+ Unicode
+ v140_xp
+
StaticLibrary
Unicode
v140_xp
+
+ StaticLibrary
+ Unicode
+ v140_xp
+
+
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
$(ProjectDir)\..\bin\$(Configuration)\
$(ProjectDir)\..\bin\$(Configuration)\
+ $(ProjectDir)\..\bin\$(Configuration)\
$(Configuration)\
$(Configuration)\
- $(ProjectDir)\..\bin\$(Configuration)\
$(Configuration)\
- AllRules.ruleset
- AllRules.ruleset
-
-
-
-
- AllRules.ruleset
-
-
+ $(ProjectDir)\..\bin64\$(Configuration)\
+ $(ProjectDir)\..\bin64\$(Configuration)\
+ $(ProjectDir)\..\bin64\$(Configuration)\
$(IncludePath)
+ $(IncludePath)
$(IncludePath)
+ $(IncludePath)
$(IncludePath)
+ $(IncludePath)
@@ -83,6 +117,19 @@
true
+
+
+ Disabled
+ ..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Use
+ Level4
+ ProgramDatabase
+ true
+
+
Disabled
@@ -96,6 +143,19 @@
true
+
+
+ Disabled
+ ..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebug
+ Use
+ Level4
+ ProgramDatabase
+ true
+
+
..\include;..;%(AdditionalIncludeDirectories)
@@ -107,12 +167,26 @@
true
+
+
+ ..\include;..;%(AdditionalIncludeDirectories)
+ WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ Use
+ Level3
+ ProgramDatabase
+ true
+
+
Create
+ Create
Create
+ Create
Create
+ Create
diff --git a/NppPlugin/project/NppPlugin.vcxproj.filters b/NppPlugin/project/NppPlugin.vcxproj.filters
index e67e8660..f6253f6c 100644
--- a/NppPlugin/project/NppPlugin.vcxproj.filters
+++ b/NppPlugin/project/NppPlugin.vcxproj.filters
@@ -21,9 +21,6 @@
Source Files
-
- Source Files
-
diff --git a/PythonScript.Tests/PythonScript.Tests.vcxproj b/PythonScript.Tests/PythonScript.Tests.vcxproj
index eafd619b..333379de 100644
--- a/PythonScript.Tests/PythonScript.Tests.vcxproj
+++ b/PythonScript.Tests/PythonScript.Tests.vcxproj
@@ -5,14 +5,26 @@
Debug
Win32
+
+ Debug
+ x64
+
PythonDebug
Win32
+
+ PythonDebug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}
@@ -26,12 +38,24 @@
Unicode
v140_xp
+
+ Application
+ true
+ Unicode
+ v140_xp
+
Application
true
Unicode
v140_xp
+
+ Application
+ true
+ Unicode
+ v140_xp
+
Application
false
@@ -39,6 +63,13 @@
Unicode
v140_xp
+
+ Application
+ false
+ true
+ Unicode
+ v140_xp
+
@@ -46,29 +77,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
true
$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)
- $(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)
+ $(BoostPythonLibPath);$(PythonLibPath);$(LibraryPath)
+
+
+ true
+ $(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)
true
$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)
- $(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)
+ $(BoostPythonLibPath);$(PythonLibPath);$(LibraryPath)
+
+
+ true
+ $(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)
false
$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)
- $(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)
+ $(BoostPythonLibPath);$(PythonLibPath);$(LibraryPath)
+
+
+ false
+ $(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)
@@ -92,6 +150,28 @@
$(TargetDir)$(TargetFileName)
+
+
+ Use
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+ true
+ false
+
+
+ Console
+ true
+ bin64\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)
+
+
+
+
+ $(TargetDir)$(TargetFileName)
+
+
Use
@@ -114,6 +194,28 @@
$(TargetDir)$(TargetFileName)
+
+
+ Use
+ Level3
+ Disabled
+ WIN32;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+ true
+ false
+
+
+ Console
+ true
+ bin64\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)
+
+
+
+
+ $(TargetDir)$(TargetFileName)
+
+
Level3
@@ -134,6 +236,26 @@
bin\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)
+
+
+ Level3
+ Use
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ gtest\googletest\include;..\PythonScript\src;$(BoostBase);%(AdditionalIncludeDirectories)
+ true
+
+
+ Console
+ true
+ true
+ true
+ bin64\$(Configuration)\gtest.lib;shlwapi.lib;%(AdditionalDependencies)
+
+
@@ -156,8 +278,11 @@
Create
+ Create
Create
+ Create
Create
+ Create
diff --git a/PythonScript.Tests/gtest.proj/gtest.vcxproj b/PythonScript.Tests/gtest.proj/gtest.vcxproj
index 4247949b..a12df5ca 100644
--- a/PythonScript.Tests/gtest.proj/gtest.vcxproj
+++ b/PythonScript.Tests/gtest.proj/gtest.vcxproj
@@ -5,14 +5,26 @@
Debug
Win32
+
+ Debug
+ x64
+
PythonDebug
Win32
+
+ PythonDebug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}
@@ -26,12 +38,24 @@
Unicode
v140_xp
+
+ StaticLibrary
+ true
+ Unicode
+ v140_xp
+
StaticLibrary
true
Unicode
v140_xp
+
+ StaticLibrary
+ true
+ Unicode
+ v140_xp
+
StaticLibrary
false
@@ -39,18 +63,34 @@
Unicode
v140_xp
+
+ StaticLibrary
+ false
+ true
+ Unicode
+ v140_xp
+
+
+
+
+
+
+
+
+
+
$(ProjectDir)..\bin\$(Configuration)\
@@ -61,6 +101,15 @@
$(ProjectDir)..\bin\$(Configuration)\
+
+ $(ProjectDir)..\bin64\$(Configuration)\
+
+
+ $(ProjectDir)..\bin64\$(Configuration)\
+
+
+ $(ProjectDir)..\bin64\$(Configuration)\
+
@@ -78,6 +127,23 @@
true
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ ..\gtest\googletest;..\gtest\googletest\include;%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+ true
+ false
+
+
+ Windows
+ true
+
+
@@ -95,6 +161,23 @@
true
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ ..\gtest\googletest;..\gtest\googletest\include;%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+ true
+ false
+
+
+ Windows
+ true
+
+
Level3
@@ -115,6 +198,26 @@
true
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ ..\gtest\googletest;..\gtest\googletest\include;%(AdditionalIncludeDirectories)
+ MultiThreaded
+ true
+
+
+ Windows
+ true
+ true
+ true
+
+
diff --git a/PythonScript.sln b/PythonScript.sln
index 6ceda52e..343ddaf7 100644
--- a/PythonScript.sln
+++ b/PythonScript.sln
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2036
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript\project\PythonScript2010.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}"
@@ -14,34 +16,61 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
PythonDebug|Win32 = PythonDebug|Win32
+ PythonDebug|x64 = PythonDebug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.ActiveCfg = Debug|Win32
{69CC76EB-0183-4622-929C-02E860A66A23}.Debug|Win32.Build.0 = Debug|Win32
+ {69CC76EB-0183-4622-929C-02E860A66A23}.Debug|x64.ActiveCfg = Debug|x64
+ {69CC76EB-0183-4622-929C-02E860A66A23}.Debug|x64.Build.0 = Debug|x64
{69CC76EB-0183-4622-929C-02E860A66A23}.PythonDebug|Win32.ActiveCfg = PythonDebug|Win32
{69CC76EB-0183-4622-929C-02E860A66A23}.PythonDebug|Win32.Build.0 = PythonDebug|Win32
+ {69CC76EB-0183-4622-929C-02E860A66A23}.PythonDebug|x64.ActiveCfg = PythonDebug|x64
+ {69CC76EB-0183-4622-929C-02E860A66A23}.PythonDebug|x64.Build.0 = PythonDebug|x64
{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.ActiveCfg = Release|Win32
{69CC76EB-0183-4622-929C-02E860A66A23}.Release|Win32.Build.0 = Release|Win32
+ {69CC76EB-0183-4622-929C-02E860A66A23}.Release|x64.ActiveCfg = Release|x64
+ {69CC76EB-0183-4622-929C-02E860A66A23}.Release|x64.Build.0 = Release|x64
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|Win32.ActiveCfg = Debug|Win32
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|Win32.Build.0 = Debug|Win32
+ {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|x64.ActiveCfg = Debug|x64
+ {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug|x64.Build.0 = Debug|x64
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.PythonDebug|Win32.ActiveCfg = PythonDebug|Win32
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.PythonDebug|Win32.Build.0 = PythonDebug|Win32
+ {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.PythonDebug|x64.ActiveCfg = PythonDebug|x64
+ {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.PythonDebug|x64.Build.0 = PythonDebug|x64
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|Win32.ActiveCfg = Release|Win32
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|Win32.Build.0 = Release|Win32
+ {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|x64.ActiveCfg = Release|x64
+ {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release|x64.Build.0 = Release|x64
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Debug|Win32.ActiveCfg = Debug|Win32
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Debug|Win32.Build.0 = Debug|Win32
+ {141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Debug|x64.ActiveCfg = Debug|x64
+ {141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Debug|x64.Build.0 = Debug|x64
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}.PythonDebug|Win32.ActiveCfg = PythonDebug|Win32
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}.PythonDebug|Win32.Build.0 = PythonDebug|Win32
+ {141C090A-DF76-456E-8B54-1E2C9E5AE75A}.PythonDebug|x64.ActiveCfg = PythonDebug|x64
+ {141C090A-DF76-456E-8B54-1E2C9E5AE75A}.PythonDebug|x64.Build.0 = PythonDebug|x64
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Release|Win32.ActiveCfg = Release|Win32
{141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Release|Win32.Build.0 = Release|Win32
+ {141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Release|x64.ActiveCfg = Release|x64
+ {141C090A-DF76-456E-8B54-1E2C9E5AE75A}.Release|x64.Build.0 = Release|x64
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Debug|Win32.ActiveCfg = Debug|Win32
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Debug|Win32.Build.0 = Debug|Win32
+ {2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Debug|x64.ActiveCfg = Debug|x64
+ {2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Debug|x64.Build.0 = Debug|x64
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}.PythonDebug|Win32.ActiveCfg = PythonDebug|Win32
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}.PythonDebug|Win32.Build.0 = PythonDebug|Win32
+ {2DDE822D-E7AC-4650-B875-D33FADC0EED9}.PythonDebug|x64.ActiveCfg = PythonDebug|x64
+ {2DDE822D-E7AC-4650-B875-D33FADC0EED9}.PythonDebug|x64.Build.0 = PythonDebug|x64
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Release|Win32.ActiveCfg = Release|Win32
{2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Release|Win32.Build.0 = Release|Win32
+ {2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Release|x64.ActiveCfg = Release|x64
+ {2DDE822D-E7AC-4650-B875-D33FADC0EED9}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PythonScript/project/PythonScript2010.vcxproj b/PythonScript/project/PythonScript2010.vcxproj
index d851666f..ff30fcea 100644
--- a/PythonScript/project/PythonScript2010.vcxproj
+++ b/PythonScript/project/PythonScript2010.vcxproj
@@ -5,18 +5,34 @@
DebugStartup
Win32
+
+ DebugStartup
+ x64
+
Debug
Win32
+
+ Debug
+ x64
+
PythonDebug
Win32
+
+ PythonDebug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}
@@ -31,18 +47,36 @@
Unicode
v140_xp
+
+ DynamicLibrary
+ true
+ Unicode
+ v140_xp
+
DynamicLibrary
true
Unicode
v140_xp
+
+ DynamicLibrary
+ true
+ Unicode
+ v140_xp
+
DynamicLibrary
true
Unicode
v140_xp
+
+ DynamicLibrary
+ true
+ Unicode
+ v140_xp
+
DynamicLibrary
false
@@ -50,6 +84,13 @@
Unicode
v140_xp
+
+ DynamicLibrary
+ false
+ true
+ Unicode
+ v140_xp
+
@@ -57,18 +98,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
@@ -77,6 +134,11 @@
$(SolutionDir)bin\$(Configuration)\
$(Configuration)2\
+
+ true
+ $(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(ProjectDir)..\..\NppPlugin\bin64\debug;$(LibraryPath)
+
true
$(BoostBase);$(PythonBase)\Include;$(PythonBase)\PC;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)
@@ -84,6 +146,11 @@
$(SolutionDir)bin\$(Configuration)\
$(Configuration)2\
+
+ true
+ $(BoostBase);$(PythonBase)\Include;$(PythonBase)\PC;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(ProjectDir)..\..\NppPlugin\bin64\debug;$(LibraryPath)
+
true
$(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)
@@ -91,12 +158,22 @@
$(SolutionDir)bin\$(Configuration)\
$(Configuration)2\
+
+ true
+ $(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(ProjectDir)..\..\NppPlugin\bin64\debug;$(LibraryPath)
+
false
$(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(PythonBase)\PC;$(IncludePath)
$(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\release;$(LibraryPath)
$(SolutionDir)bin\$(Configuration)\
+
+ false
+ $(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(PythonBase)\PC;$(IncludePath)
+ $(BoostPythonLibPath);$(PythonLibPathX64);$(ProjectDir)..\..\NppPlugin\bin64\release;$(LibraryPath)
+
Use
@@ -117,6 +194,29 @@
copy $(OutDir)$(TargetFileName) "e:\notepadtest\unicode\plugins"
+xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\pythonscript\scripts\npp_unit_tests" /s /I /Y
+
+
+
+
+ Use
+ Level4
+ Disabled
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+ ../include;../res;%(AdditionalIncludeDirectories)
+ true
+ false
+
+
+ Windows
+ true
+ NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;dbghelp.lib;%(AdditionalDependencies)
+ $(HtmlHelpBase)\lib;$(BoostLibPath)
+ LinkVerbose
+
+
+ copy $(OutDir)$(TargetFileName) "e:\notepadtest\unicode\plugins"
xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\pythonscript\scripts\npp_unit_tests" /s /I /Y
@@ -141,6 +241,30 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
copy $(OutDir)$(TargetFileName) "e:\notepadtest\unicode\plugins"
+xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\pythonscript\scripts\npp_unit_tests" /s /I /Y
+
+
+
+
+ Use
+ Level4
+ Disabled
+ WIN32;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+ ../include;../res;%(AdditionalIncludeDirectories)
+ true
+ true
+ false
+
+
+ Windows
+ true
+ NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;dbghelp.lib;%(AdditionalDependencies)
+ $(HtmlHelpBase)\lib;$(BoostLibPath)
+ LinkVerbose
+
+
+ copy $(OutDir)$(TargetFileName) "e:\notepadtest\unicode\plugins"
xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\pythonscript\scripts\npp_unit_tests" /s /I /Y
@@ -165,6 +289,27 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins"
+
+
+ Use
+ Level4
+ Disabled
+ DEBUG_STARTUP;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+ ../include;%(AdditionalIncludeDirectories)
+ true
+ false
+
+
+ Windows
+ true
+ python27.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)
+ $(HtmlHelpBase)\lib
+
+
+ copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins"
+
+
Level4
@@ -186,6 +331,27 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
$(HtmlHelpBase)\lib
+
+
+ Level4
+ Use
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ ../include;../res;%(AdditionalIncludeDirectories)
+ true
+
+
+ Windows
+ true
+ true
+ true
+ python27.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)
+ $(HtmlHelpBase)\lib
+
+
Document
@@ -287,9 +453,13 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
Create
+ Create
Create
+ Create
Create
+ Create
Create
+ Create
diff --git a/PythonScript/project/PythonScript2010.vcxproj.filters b/PythonScript/project/PythonScript2010.vcxproj.filters
index 0500ee67..5e05c978 100644
--- a/PythonScript/project/PythonScript2010.vcxproj.filters
+++ b/PythonScript/project/PythonScript2010.vcxproj.filters
@@ -50,6 +50,7 @@
PythonTests\Tests
+
diff --git a/PythonScript/project/PythonSettings.props b/PythonScript/project/PythonSettings.props
index 270d10a8..7a9e79b4 100644
--- a/PythonScript/project/PythonSettings.props
+++ b/PythonScript/project/PythonSettings.props
@@ -2,10 +2,12 @@
- E:\libs\boost_1_55_0
+
+
l:\code\cpython
+ l:\code\x64\cpython
$(PythonBase)\PCbuild
- $(BoostBase)\stage\lib
+ $(PythonBaseX64)\PCbuild
C:\Program Files (x86)\HTML Help Workshop
@@ -20,6 +22,12 @@
$(PythonLibPath)
+
+ $(PythonBaseX64)
+
+
+ $(PythonLibPathX64)
+
$(BoostPythonLibPath)
diff --git a/PythonScript/project/PythonSettings_appveyor.props b/PythonScript/project/PythonSettings_appveyor.props
index d0b47e64..9ae5c305 100644
--- a/PythonScript/project/PythonSettings_appveyor.props
+++ b/PythonScript/project/PythonSettings_appveyor.props
@@ -3,9 +3,11 @@
+
$(SolutionDir)/packages/python2x86.2.7.14/tools
+ $(SolutionDir)/packages/python2.2.7.14/tools
$(PythonBase)\libs
-
+ $(PythonBaseX64)\libs
C:\Program Files (x86)\HTML Help Workshop
@@ -20,6 +22,12 @@
$(PythonLibPath)
+
+ $(PythonBaseX64)
+
+
+ $(PythonLibPathX64)
+
$(BoostPythonLibPath)
diff --git a/PythonScript/project/packages_appveyor.config b/PythonScript/project/packages_appveyor.config
index f142dea0..ffa66394 100644
--- a/PythonScript/project/packages_appveyor.config
+++ b/PythonScript/project/packages_appveyor.config
@@ -3,5 +3,6 @@
+
\ No newline at end of file
diff --git a/PythonScript/src/PromptDialog.cpp b/PythonScript/src/PromptDialog.cpp
index 77e5b86a..09a537a3 100644
--- a/PythonScript/src/PromptDialog.cpp
+++ b/PythonScript/src/PromptDialog.cpp
@@ -32,7 +32,7 @@ PromptDialog::PROMPT_RESULT PromptDialog::showPrompt(const char *prompt, const c
return m_result;
}
-BOOL CALLBACK PromptDialog::dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK PromptDialog::dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message)
{
@@ -54,7 +54,7 @@ BOOL CALLBACK PromptDialog::dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
}
}
-BOOL CALLBACK PromptDialog::runDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM /* lParam */)
+INT_PTR CALLBACK PromptDialog::runDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM /* lParam */)
{
switch(message)
{
diff --git a/PythonScript/src/PromptDialog.h b/PythonScript/src/PromptDialog.h
index a08240ad..86bbeb34 100644
--- a/PythonScript/src/PromptDialog.h
+++ b/PythonScript/src/PromptDialog.h
@@ -16,11 +16,11 @@ class PromptDialog
PROMPT_RESULT showPrompt(const char *prompt, const char *title, const char *initial);
const std::string& getText() { return m_value; }
- static BOOL CALLBACK dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+ static INT_PTR CALLBACK dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
protected:
- virtual BOOL CALLBACK runDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+ virtual INT_PTR CALLBACK runDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
HINSTANCE m_hInst;
diff --git a/PythonScript/src/ScintillaWrapperGenerated.cpp b/PythonScript/src/ScintillaWrapperGenerated.cpp
index a11cb13c..66d99315 100644
--- a/PythonScript/src/ScintillaWrapperGenerated.cpp
+++ b/PythonScript/src/ScintillaWrapperGenerated.cpp
@@ -21,14 +21,20 @@ class PythonCompatibleStrBuffer
{
if (m_bufferPtr && m_bufferLen > 0) m_bufferPtr[m_bufferLen-1] = '\0';
}
+ inline explicit PythonCompatibleStrBuffer(LRESULT length) :
+ m_bufferLen(length >= 0 ? (size_t)(length + 1) : 0),
+ m_bufferPtr(new char[m_bufferLen])
+ {
+ if (m_bufferPtr && m_bufferLen > 0) m_bufferPtr[m_bufferLen - 1] = '\0';
+ }
inline ~PythonCompatibleStrBuffer() { delete [] m_bufferPtr; }
inline char* operator*() { return m_bufferPtr; }
inline const char* c_str() const { return m_bufferPtr; }
inline size_t size() const { return m_bufferLen; }
private:
- PythonCompatibleStrBuffer(); // default constructor disabled
- PythonCompatibleStrBuffer(const PythonCompatibleStrBuffer&); // copy constructor disabled
- PythonCompatibleStrBuffer& operator = (const PythonCompatibleStrBuffer&); // Disable assignment operator disabled
+ PythonCompatibleStrBuffer() = delete; // default constructor disabled
+ PythonCompatibleStrBuffer(const PythonCompatibleStrBuffer&) = delete; // copy constructor disabled
+ PythonCompatibleStrBuffer& operator = (const PythonCompatibleStrBuffer&) = delete; // Disable assignment operator disabled
size_t m_bufferLen;
char* m_bufferPtr;
};
diff --git a/PythonScript/src/UTF8Iterator.cpp b/PythonScript/src/UTF8Iterator.cpp
index 2f594dd6..60f78de6 100644
--- a/PythonScript/src/UTF8Iterator.cpp
+++ b/PythonScript/src/UTF8Iterator.cpp
@@ -47,7 +47,7 @@ char_class_type u32_regex_traits::lookup_classname(const charT* p1, const charT*
if (class_id < ARRAY_LENGTH(masks))
return masks[class_id]; // The inversion is done by basic_regex_parser, if the character has class regex_constants::escape_type_not_class.
}
- ConstString classname(p1, std::min(p2-p1, 5));
+ ConstString classname(p1, std::min((int)(p2-p1), 5));
if (classname == "inval")
return mask_invalid;
return 0;
diff --git a/appveyor.yml b/appveyor.yml
index abf9f7e3..5c571705 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ environment:
#- PlatformToolset: v141_xp
platform:
- #- x64
+ - x64
- Win32
configuration:
@@ -47,7 +47,7 @@ after_build:
- ps: >-
if ($env:PLATFORM_INPUT -eq "x64") {
- Push-AppveyorArtifact "bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\PythonScript.dll" -FileName PythonScript.dll
+ Push-AppveyorArtifact "$env:PLATFORM_INPUT\$env:CONFIGURATION\PythonScript.dll" -FileName PythonScript.dll
}
if ($env:PLATFORM_INPUT -eq "Win32" ) {
@@ -57,7 +57,7 @@ after_build:
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORM_INPUTTOOLSET -eq "v140_xp") {
if($env:PLATFORM_INPUT -eq "x64"){
$ZipFileName = "PythonScript_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
- 7z a $ZipFileName "%APPVEYOR_BUILD_FOLDER%"\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll
+ 7z a $ZipFileName "%APPVEYOR_BUILD_FOLDER%"\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll
}
if($env:PLATFORM_INPUT -eq "Win32"){
$ZipFileName = "PythonScript_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"