Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] マクロの Python 対応 #1327

Closed
wants to merge 3 commits into from
Closed

[WIP] マクロの Python 対応 #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a0cf1
マクロの Python 対応
beru Jun 26, 2020
cc085fb
コミットし忘れ
beru Jun 27, 2020
e363653
tests1 プロジェクトのビルドが通るように python.props 使用
beru Jun 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions sakura/python.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<PYTHON_DIR>C:\Python38</PYTHON_DIR>
</PropertyGroup>
<PropertyGroup>
<IncludePath>$(PYTHON_DIR)\include;$(IncludePath)</IncludePath>
<LibraryPath>$(PYTHON_DIR)\libs;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Link />
<Link>
<DelayLoadDLLs>python38.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="PYTHON_DIR">
<Value>$(PYTHON_DIR)</Value>
</BuildMacro>
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions sakura/sakura.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="python.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="python.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="python.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="python.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Expand Down Expand Up @@ -440,6 +444,7 @@
<ClInclude Include="..\sakura_core\macro\CMacroManagerBase.h" />
<ClInclude Include="..\sakura_core\macro\CPPA.h" />
<ClInclude Include="..\sakura_core\macro\CPPAMacroMgr.h" />
<ClInclude Include="..\sakura_core\macro\CPythonMacroManager.h" />
<ClInclude Include="..\sakura_core\macro\CSMacroMgr.h" />
<ClInclude Include="..\sakura_core\macro\CWSH.h" />
<ClInclude Include="..\sakura_core\macro\CWSHIfObj.h" />
Expand Down Expand Up @@ -805,6 +810,7 @@
<ClCompile Include="..\sakura_core\macro\CMacroManagerBase.cpp" />
<ClCompile Include="..\sakura_core\macro\CPPA.cpp" />
<ClCompile Include="..\sakura_core\macro\CPPAMacroMgr.cpp" />
<ClCompile Include="..\sakura_core\macro\CPythonMacroManager.cpp" />
<ClCompile Include="..\sakura_core\macro\CSMacroMgr.cpp" />
<ClCompile Include="..\sakura_core\macro\CWSH.cpp" />
<ClCompile Include="..\sakura_core\macro\CWSHIfObj.cpp" />
Expand Down
6 changes: 6 additions & 0 deletions sakura/sakura.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,9 @@
<ClInclude Include="..\sakura_core\GrepInfo.h">
<Filter>Cpp Source Files</Filter>
</ClInclude>
<ClInclude Include="..\sakura_core\macro\CPythonMacroManager.h">
<Filter>Cpp Source Files\macro</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\resource\auto_scroll_center.cur">
Expand Down Expand Up @@ -2276,6 +2279,9 @@
<ClCompile Include="..\sakura_core\GrepInfo.cpp">
<Filter>Cpp Source Files</Filter>
</ClCompile>
<ClCompile Include="..\sakura_core\macro\CPythonMacroManager.cpp">
<Filter>Cpp Source Files\macro</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\resource\auto_scroll_center.bmp">
Expand Down
1 change: 1 addition & 0 deletions sakura_core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ macro/CMacroFactory.o \
macro/CMacroManagerBase.o \
macro/CPPA.o \
macro/CPPAMacroMgr.o \
macro/CPythonMacroManager.o \
macro/CSMacroMgr.o \
macro/CWSH.o \
macro/CWSHIfObj.o \
Expand Down
3 changes: 2 additions & 1 deletion sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,10 +735,11 @@ bool CDlgOpenFile_CommonFileDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi
cFileExt.AppendExtRaw( LS(STR_DLGOPNFL_EXTNAME2), L"*.txt" );
break;
case EFITER_MACRO:
cFileExt.AppendExtRaw( L"Macros", L"*.js;*.vbs;*.ppa;*.mac" );
cFileExt.AppendExtRaw( L"Macros", L"*.js;*.vbs;*.ppa;*.py;*.mac" );
cFileExt.AppendExtRaw( L"JScript", L"*.js" );
cFileExt.AppendExtRaw( L"VBScript", L"*.vbs" );
cFileExt.AppendExtRaw( L"Pascal", L"*.ppa" );
cFileExt.AppendExtRaw( L"Python", L"*.py" );
cFileExt.AppendExtRaw( L"Key Macro", L"*.mac" );
break;
case EFITER_NONE:
Expand Down
3 changes: 2 additions & 1 deletion sakura_core/dlg/CDlgOpenFile_CommonItemDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,11 @@ bool CDlgOpenFile_CommonItemDialog::DoModal_GetOpenFileName( WCHAR* pszPath, EFi
specs.push_back(COMDLG_FILTERSPEC{strs.back().c_str(), L"*.txt"});
break;
case EFITER_MACRO:
specs.push_back(COMDLG_FILTERSPEC{L"Macros", L"*.js;*.vbs;*.ppa;*.mac"});
specs.push_back(COMDLG_FILTERSPEC{L"Macros", L"*.js;*.vbs;*.ppa;*.py;*.mac"});
specs.push_back(COMDLG_FILTERSPEC{L"JScript", L"*.js"});
specs.push_back(COMDLG_FILTERSPEC{L"VBScript", L"*.vbs"});
specs.push_back(COMDLG_FILTERSPEC{L"Pascal", L"*.ppa"});
specs.push_back(COMDLG_FILTERSPEC{L"Python", L"*.py"});
specs.push_back(COMDLG_FILTERSPEC{L"Key Macro", L"*.mac"});
break;
case EFITER_NONE:
Expand Down