From 7dcca50fca6ca58a8383ad0f5f27469426d4de13 Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Tue, 22 Aug 2023 07:35:39 +0200 Subject: [PATCH] - changed default packages.config to use python from nuget packages - the previous standard used by Dave Brotherstone with a local debug build of python is now available as packages_local_pydebug.config - removed 2010 from VS project files - adapted appveyor.yml and github CI accordingly --- .github/workflows/CI_build.yml | 16 +- .github/workflows/msvc_analysis.yml | 13 +- PythonScript.sln | 2 +- ...{PythonScript2010.sln => PythonScript.sln} | 82 +- ...cript2010.vcxproj => PythonScript.vcxproj} | 1110 ++++++++--------- ...j.filters => PythonScript.vcxproj.filters} | 790 ++++++------ PythonScript/project/PythonSettings.props | 8 +- ...ops => PythonSettings_local_pydebug.props} | 8 +- PythonScript/project/packages.config | 2 + ...r.config => packages_local_pydebug.config} | 2 - appveyor.yml | 5 - 11 files changed, 1005 insertions(+), 1033 deletions(-) rename PythonScript/project/{PythonScript2010.sln => PythonScript.sln} (95%) rename PythonScript/project/{PythonScript2010.vcxproj => PythonScript.vcxproj} (95%) rename PythonScript/project/{PythonScript2010.vcxproj.filters => PythonScript.vcxproj.filters} (97%) rename PythonScript/project/{PythonSettings_appveyor.props => PythonSettings_local_pydebug.props} (80%) rename PythonScript/project/{packages_appveyor.config => packages_local_pydebug.config} (60%) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index a91712d5..f5ce7859 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -5,13 +5,12 @@ on: [push, pull_request] jobs: build: - runs-on: windows-2022 + runs-on: windows-latest strategy: - max-parallel: 4 matrix: build_configuration: [Release, Debug] build_platform: [x64, Win32] - + steps: - name: Checkout repo uses: actions/checkout@v3 @@ -21,17 +20,6 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1 - - name: "Use CI config files" - run: | - Write-Host "remove PythonSettings.props" -ForegroundColor Green - Remove-Item '.\PythonScript\project\PythonSettings.props' - Rename-Item -Path ".\PythonScript\project\PythonSettings_appveyor.props" -NewName "PythonSettings.props" - Write-Host "remove packages.config" -ForegroundColor Green - Remove-Item '.\PythonScript\project\packages.config' - Rename-Item -Path ".\PythonScript\project\packages_appveyor.config" -NewName "packages.config" - shell: pwsh - working-directory: . - - name: Setup NuGet.exe uses: nuget/setup-nuget@v1 diff --git a/.github/workflows/msvc_analysis.yml b/.github/workflows/msvc_analysis.yml index 5e1abfe6..3cc48478 100644 --- a/.github/workflows/msvc_analysis.yml +++ b/.github/workflows/msvc_analysis.yml @@ -12,7 +12,7 @@ on: [push, pull_request] jobs: Analyze: - runs-on: windows-2022 + runs-on: windows-latest strategy: fail-fast: false @@ -26,17 +26,6 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1 - - name: "Use CI config files" - run: | - Write-Host "remove PythonSettings.props" -ForegroundColor Green - Remove-Item '.\PythonScript\project\PythonSettings.props' - Rename-Item -Path ".\PythonScript\project\PythonSettings_appveyor.props" -NewName "PythonSettings.props" - Write-Host "remove packages.config" -ForegroundColor Green - Remove-Item '.\PythonScript\project\packages.config' - Rename-Item -Path ".\PythonScript\project\packages_appveyor.config" -NewName "packages.config" - shell: pwsh - working-directory: . - - name: Setup NuGet.exe uses: nuget/setup-nuget@v1 diff --git a/PythonScript.sln b/PythonScript.sln index a1238feb..7fc3ce12 100644 --- a/PythonScript.sln +++ b/PythonScript.sln @@ -4,7 +4,7 @@ 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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript\project\PythonScript.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}" ProjectSection(ProjectDependencies) = postProject {69CC76EB-0183-4622-929C-02E860A66A23} = {69CC76EB-0183-4622-929C-02E860A66A23} EndProjectSection diff --git a/PythonScript/project/PythonScript2010.sln b/PythonScript/project/PythonScript.sln similarity index 95% rename from PythonScript/project/PythonScript2010.sln rename to PythonScript/project/PythonScript.sln index 413541b5..b4937b22 100644 --- a/PythonScript/project/PythonScript2010.sln +++ b/PythonScript/project/PythonScript.sln @@ -1,41 +1,41 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript2010.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "..\..\NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug-ANSI|Win32 = Debug-ANSI|Win32 - DebugStartup|Win32 = DebugStartup|Win32 - Release|Win32 = Release|Win32 - Release-ANSI|Win32 = Release-ANSI|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32 - {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32 - {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.ActiveCfg = DebugStartup|Win32 - {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.Build.0 = DebugStartup|Win32 - {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-ANSI|Win32.ActiveCfg = Release-ANSI|Win32 - {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32 - {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-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32 - {69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32 - {69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.ActiveCfg = Debug|Win32 - {69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.Build.0 = Debug|Win32 - {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-ANSI|Win32.ActiveCfg = Release-ANSI|Win32 - {69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonScript", "PythonScript.vcxproj", "{8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppPlugin", "..\..\NppPlugin\project\NppPlugin.vcxproj", "{69CC76EB-0183-4622-929C-02E860A66A23}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug-ANSI|Win32 = Debug-ANSI|Win32 + DebugStartup|Win32 = DebugStartup|Win32 + Release|Win32 = Release|Win32 + Release-ANSI|Win32 = Release-ANSI|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32 + {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32 + {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.ActiveCfg = DebugStartup|Win32 + {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.DebugStartup|Win32.Build.0 = DebugStartup|Win32 + {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-ANSI|Win32.ActiveCfg = Release-ANSI|Win32 + {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32 + {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-ANSI|Win32.ActiveCfg = Debug-ANSI|Win32 + {69CC76EB-0183-4622-929C-02E860A66A23}.Debug-ANSI|Win32.Build.0 = Debug-ANSI|Win32 + {69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.ActiveCfg = Debug|Win32 + {69CC76EB-0183-4622-929C-02E860A66A23}.DebugStartup|Win32.Build.0 = Debug|Win32 + {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-ANSI|Win32.ActiveCfg = Release-ANSI|Win32 + {69CC76EB-0183-4622-929C-02E860A66A23}.Release-ANSI|Win32.Build.0 = Release-ANSI|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/PythonScript/project/PythonScript2010.vcxproj b/PythonScript/project/PythonScript.vcxproj similarity index 95% rename from PythonScript/project/PythonScript2010.vcxproj rename to PythonScript/project/PythonScript.vcxproj index d8db418d..b0a31b63 100644 --- a/PythonScript/project/PythonScript2010.vcxproj +++ b/PythonScript/project/PythonScript.vcxproj @@ -1,556 +1,556 @@ - - - - - DebugStartup - Win32 - - - DebugStartup - x64 - - - Debug - Win32 - - - Debug - x64 - - - PythonDebug - Win32 - - - PythonDebug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6} - Win32Proj - PythonScript2010 - PythonScript - 10.0 - - - - DynamicLibrary - true - Unicode - v143 - - - DynamicLibrary - true - Unicode - v143 - - - DynamicLibrary - true - Unicode - v143 - - - DynamicLibrary - true - Unicode - v143 - - - DynamicLibrary - true - Unicode - v143 - - - DynamicLibrary - true - Unicode - v143 - - - DynamicLibrary - false - true - Unicode - v143 - - - DynamicLibrary - false - true - Unicode - v143 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath) - $(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath) - $(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) - $(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath) - $(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) - $(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath) - $(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 - Level4 - Disabled - NOMINMAX;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - ../include;../res;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - stdc17 - - - 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 - - - - - Use - Level4 - Disabled - NOMINMAX;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - ../include;../res;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - stdc17 - - - 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 - - - - - Use - Level4 - Disabled - NOMINMAX;WIN32;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - ../include;../res;%(AdditionalIncludeDirectories) - true - true - false - stdcpp17 - stdc17 - - - 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 - - - - - Use - Level4 - Disabled - NOMINMAX;WIN32;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - ../include;../res;%(AdditionalIncludeDirectories) - true - true - false - stdcpp17 - stdc17 - - - 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 - - - - - Use - Level4 - Disabled - NOMINMAX;DEBUG_STARTUP;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - ../include;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - stdc17 - - - Windows - true - python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - $(HtmlHelpBase)\lib - - - copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins" - - - - - Use - Level4 - Disabled - NOMINMAX;DEBUG_STARTUP;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - ../include;%(AdditionalIncludeDirectories) - true - false - stdcpp17 - stdc17 - - - Windows - true - python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - $(HtmlHelpBase)\lib - - - copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins" - - - - - Level4 - Use - MaxSpeed - true - true - NOMINMAX;WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreaded - ../include;../res;%(AdditionalIncludeDirectories) - true - stdcpp17 - stdc17 - - - Windows - true - true - true - python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - $(HtmlHelpBase)\lib - - - - - Level4 - Use - MaxSpeed - true - true - NOMINMAX;WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) - MultiThreaded - ../include;../res;%(AdditionalIncludeDirectories) - true - stdcpp17 - stdc17 - - - Windows - true - true - true - python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) - $(HtmlHelpBase)\lib - - - - - Document - - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - Document - - - CppHeader - - - Document - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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}. - - - - + + + + + DebugStartup + Win32 + + + DebugStartup + x64 + + + Debug + Win32 + + + Debug + x64 + + + PythonDebug + Win32 + + + PythonDebug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8ACDC1F7-75BD-44CA-9F35-6521DEDC5DF6} + Win32Proj + PythonScript + PythonScript + 10.0 + + + + DynamicLibrary + true + Unicode + v143 + + + DynamicLibrary + true + Unicode + v143 + + + DynamicLibrary + true + Unicode + v143 + + + DynamicLibrary + true + Unicode + v143 + + + DynamicLibrary + true + Unicode + v143 + + + DynamicLibrary + true + Unicode + v143 + + + DynamicLibrary + false + true + Unicode + v143 + + + DynamicLibrary + false + true + Unicode + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath) + $(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath) + $(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) + $(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath) + $(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) + $(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath) + $(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 + Level4 + Disabled + NOMINMAX;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../include;../res;%(AdditionalIncludeDirectories) + true + false + stdcpp17 + stdc17 + + + 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 + + + + + Use + Level4 + Disabled + NOMINMAX;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../include;../res;%(AdditionalIncludeDirectories) + true + false + stdcpp17 + stdc17 + + + 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 + + + + + Use + Level4 + Disabled + NOMINMAX;WIN32;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../include;../res;%(AdditionalIncludeDirectories) + true + true + false + stdcpp17 + stdc17 + + + 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 + + + + + Use + Level4 + Disabled + NOMINMAX;WIN32;BOOST_DEBUG_PYTHON;BOOST_LINKING_PYTHON;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../include;../res;%(AdditionalIncludeDirectories) + true + true + false + stdcpp17 + stdc17 + + + 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 + + + + + Use + Level4 + Disabled + NOMINMAX;DEBUG_STARTUP;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../include;%(AdditionalIncludeDirectories) + true + false + stdcpp17 + stdc17 + + + Windows + true + python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) + $(HtmlHelpBase)\lib + + + copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins" + + + + + Use + Level4 + Disabled + NOMINMAX;DEBUG_STARTUP;WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../include;%(AdditionalIncludeDirectories) + true + false + stdcpp17 + stdc17 + + + Windows + true + python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) + $(HtmlHelpBase)\lib + + + copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins" + + + + + Level4 + Use + MaxSpeed + true + true + NOMINMAX;WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreaded + ../include;../res;%(AdditionalIncludeDirectories) + true + stdcpp17 + stdc17 + + + Windows + true + true + true + python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) + $(HtmlHelpBase)\lib + + + + + Level4 + Use + MaxSpeed + true + true + NOMINMAX;WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions) + MultiThreaded + ../include;../res;%(AdditionalIncludeDirectories) + true + stdcpp17 + stdc17 + + + Windows + true + true + true + python310.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies) + $(HtmlHelpBase)\lib + + + + + Document + + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + CppHeader + + + Document + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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}. + + + + \ No newline at end of file diff --git a/PythonScript/project/PythonScript2010.vcxproj.filters b/PythonScript/project/PythonScript.vcxproj.filters similarity index 97% rename from PythonScript/project/PythonScript2010.vcxproj.filters rename to PythonScript/project/PythonScript.vcxproj.filters index e7456807..4287cdc7 100644 --- a/PythonScript/project/PythonScript2010.vcxproj.filters +++ b/PythonScript/project/PythonScript.vcxproj.filters @@ -1,396 +1,396 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {7e396fa8-3272-4fba-8b7d-dffbe553882b} - - - {115908ee-33ec-46b0-885a-a4f9c37e203e} - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - - PythonTests\Tests - - - PythonTests - - - PythonTests\Tests - - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - PythonTests - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - Header Files - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - PythonTests\Tests - - - PythonTests\Tests - - - PythonTests\Tests - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {7e396fa8-3272-4fba-8b7d-dffbe553882b} + + + {115908ee-33ec-46b0-885a-a4f9c37e203e} + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + PythonTests\Tests + + + PythonTests + + + PythonTests\Tests + + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + PythonTests + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + Header Files + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + PythonTests\Tests + + + PythonTests\Tests + + + PythonTests\Tests + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/PythonScript/project/PythonSettings.props b/PythonScript/project/PythonSettings.props index 7a9e79b4..541a7c66 100644 --- a/PythonScript/project/PythonSettings.props +++ b/PythonScript/project/PythonSettings.props @@ -4,10 +4,10 @@ - l:\code\cpython - l:\code\x64\cpython - $(PythonBase)\PCbuild - $(PythonBaseX64)\PCbuild + $(SolutionDir)packages\pythonx86.3.10.11\tools + $(SolutionDir)packages\python.3.10.11\tools + $(PythonBase)\libs + $(PythonBaseX64)\libs C:\Program Files (x86)\HTML Help Workshop diff --git a/PythonScript/project/PythonSettings_appveyor.props b/PythonScript/project/PythonSettings_local_pydebug.props similarity index 80% rename from PythonScript/project/PythonSettings_appveyor.props rename to PythonScript/project/PythonSettings_local_pydebug.props index 390d90f0..0955697b 100644 --- a/PythonScript/project/PythonSettings_appveyor.props +++ b/PythonScript/project/PythonSettings_local_pydebug.props @@ -4,10 +4,10 @@ - $(SolutionDir)packages\pythonx86.3.10.11\tools - $(SolutionDir)packages\python.3.10.11\tools - $(PythonBase)\libs - $(PythonBaseX64)\libs + l:\code\cpython + l:\code\x64\cpython + $(PythonBase)\PCbuild + $(PythonBaseX64)\PCbuild C:\Program Files (x86)\HTML Help Workshop diff --git a/PythonScript/project/packages.config b/PythonScript/project/packages.config index e3fddabf..e8bdd3f2 100644 --- a/PythonScript/project/packages.config +++ b/PythonScript/project/packages.config @@ -2,4 +2,6 @@ + + \ No newline at end of file diff --git a/PythonScript/project/packages_appveyor.config b/PythonScript/project/packages_local_pydebug.config similarity index 60% rename from PythonScript/project/packages_appveyor.config rename to PythonScript/project/packages_local_pydebug.config index e8bdd3f2..e3fddabf 100644 --- a/PythonScript/project/packages_appveyor.config +++ b/PythonScript/project/packages_local_pydebug.config @@ -2,6 +2,4 @@ - - \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index d9a6fb82..6c8bd80b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,16 +27,11 @@ install: - if "%PlatformToolset%"=="v143" call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% - - del "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages.config - - copy "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages_appveyor.config "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages.config - - nuget restore "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages.config -PackagesDirectory "%APPVEYOR_BUILD_FOLDER%"\packages - nuget restore "%APPVEYOR_BUILD_FOLDER%"\PythonScript.Tests\packages.config -PackagesDirectory "%APPVEYOR_BUILD_FOLDER%"\packages build_script: - cd "%APPVEYOR_BUILD_FOLDER%" - - del "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\PythonSettings.props - - copy "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\PythonSettings_appveyor.props "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\PythonSettings.props - msbuild PythonScript.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" after_build: