Skip to content

Commit

Permalink
Rename Executables
Browse files Browse the repository at this point in the history
  • Loading branch information
@graphemecluster
graphemecluster committed Aug 14, 2023
1 parent 9379bef commit 263b028
Show file tree
Hide file tree
Showing 18 changed files with 118 additions and 181 deletions.
3 changes: 2 additions & 1 deletion PyWeasel/PyWeasel.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8C75C43E-E9AD-4D2D-81F2-5608F36CE77B}</ProjectGuid>
<RootNamespace>PyWeasel</RootNamespace>
<RootNamespace>PyTypeDuck</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>PyTypeDuck</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
3 changes: 2 additions & 1 deletion RimeWithWeasel/RimeWithWeasel.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1C497821-BD63-4F02-9094-32B185B62F23}</ProjectGuid>
<RootNamespace>RimeWithWeasel</RootNamespace>
<RootNamespace>RimeWithTypeDuck</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>RimeWithTypeDuck</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
3 changes: 2 additions & 1 deletion WeaselDeployer/WeaselDeployer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{F53F3E9C-CC4D-4D1D-9C2E-719FE60A7E6B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>WeaselDeployer</RootNamespace>
<RootNamespace>TypeDuckDeployer</RootNamespace>
<ProjectName>TypeDuckDeployer</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
28 changes: 15 additions & 13 deletions WeaselIME/WeaselIME.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A958FE3D-9F6E-44CB-981E-F2AE181657B3}</ProjectGuid>
<RootNamespace>WeaselIME</RootNamespace>
<RootNamespace>TypeDuckIME</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>TypeDuckIME</ProjectName>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down Expand Up @@ -121,13 +123,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)output\</OutDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>weasel</TargetName>
<TargetName>typeduck</TargetName>
<TargetExt>.ime</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseHant|Win32'">
<OutDir>$(SolutionDir)output\</OutDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>weaselt</TargetName>
<TargetName>typeduckt</TargetName>
<TargetExt>.ime</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseHans|Win32'">
Expand All @@ -139,13 +141,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)output\</OutDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>weasel$(Platform)</TargetName>
<TargetName>typeduck$(Platform)</TargetName>
<TargetExt>.ime</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseHant|x64'">
<OutDir>$(SolutionDir)output\</OutDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>weaselt$(Platform)</TargetName>
<TargetName>typeduckt$(Platform)</TargetName>
<TargetExt>.ime</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseHans|x64'">
Expand All @@ -167,7 +169,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)output\weasel$(TargetExt)</OutputFile>
<OutputFile>$(SolutionDir)output\typeduck$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -194,7 +196,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)output\weasel$(TargetExt)</OutputFile>
<OutputFile>$(SolutionDir)output\typeduck$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -230,7 +232,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)output\weaselt$(TargetExt)</OutputFile>
<OutputFile>$(SolutionDir)output\typeduckt$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -263,7 +265,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\output\weasels.ime</OutputFile>
<OutputFile>$(SolutionDir)\output\typeducks.ime</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -295,7 +297,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)output\weasel$(Platform)$(TargetExt)</OutputFile>
<OutputFile>$(SolutionDir)output\typeduck$(Platform)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down Expand Up @@ -324,7 +326,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)output\weasel$(Platform)$(TargetExt)</OutputFile>
<OutputFile>$(SolutionDir)output\typeduck$(Platform)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -363,7 +365,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)output\weaselt$(Platform)$(TargetExt)</OutputFile>
<OutputFile>$(SolutionDir)output\typeduckt$(Platform)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -399,7 +401,7 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)\output\weaselsx64.ime</OutputFile>
<OutputFile>$(SolutionDir)\output\typeducksx64.ime</OutputFile>
<AdditionalLibraryDirectories>$(SolutionDir)\lib;$(BOOST_ROOT)\stage_x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>weasel.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down
3 changes: 2 additions & 1 deletion WeaselIPC/WeaselIPC.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{CE11A2DF-8D20-4B07-A935-4B0D03F0303D}</ProjectGuid>
<RootNamespace>WeaselIPC</RootNamespace>
<RootNamespace>TypeDuckIPC</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>TypeDuckIPC</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
3 changes: 2 additions & 1 deletion WeaselIPCServer/WeaselIPCServer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{26930622-CFA2-43DF-A9F3-4AA4A313B2A4}</ProjectGuid>
<RootNamespace>WeaselIPCServer</RootNamespace>
<RootNamespace>TypeDuckIPCServer</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>TypeDuckIPCServer</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
2 changes: 1 addition & 1 deletion WeaselServer/WeaselServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR lp
WeaselServerApp::explore(WeaselUserDataPath());
return 0;
}
if (!wcscmp(L"/weaseldir", lpstrCmdLine))
if (!wcscmp(L"/typeduckdir", lpstrCmdLine))
{
WeaselServerApp::explore(WeaselServerApp::install_dir());
return 0;
Expand Down
11 changes: 2 additions & 9 deletions WeaselServer/WeaselServer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{A68C2A5C-D74D-4CB2-9E22-A4D2FC256A2D}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>WeaselServer</RootNamespace>
<RootNamespace>TypeDuckServer</RootNamespace>
<ProjectName>TypeDuckServer</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down Expand Up @@ -163,7 +164,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -206,7 +206,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -246,7 +245,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -294,7 +292,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -333,7 +330,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -370,7 +366,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -407,7 +402,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down Expand Up @@ -444,7 +438,6 @@
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(SolutionDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
Expand Down
8 changes: 4 additions & 4 deletions WeaselServer/WeaselServerApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ void WeaselServerApp::SetupMenuHandlers()
{
std::wstring dir(install_dir());
m_server.AddMenuHandler(ID_WEASELTRAY_QUIT, [this] { return m_server.Stop() == 0; });
m_server.AddMenuHandler(ID_WEASELTRAY_DEPLOY, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/deploy")));
m_server.AddMenuHandler(ID_WEASELTRAY_SETTINGS, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring()));
m_server.AddMenuHandler(ID_WEASELTRAY_DICT_MANAGEMENT, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/dict")));
m_server.AddMenuHandler(ID_WEASELTRAY_SYNC, std::bind(execute, dir + L"\\WeaselDeployer.exe", std::wstring(L"/sync")));
m_server.AddMenuHandler(ID_WEASELTRAY_DEPLOY, std::bind(execute, dir + L"\\TypeDuckDeployer.exe", std::wstring(L"/deploy")));
m_server.AddMenuHandler(ID_WEASELTRAY_SETTINGS, std::bind(execute, dir + L"\\TypeDuckDeployer.exe", std::wstring()));
m_server.AddMenuHandler(ID_WEASELTRAY_DICT_MANAGEMENT, std::bind(execute, dir + L"\\TypeDuckDeployer.exe", std::wstring(L"/dict")));
m_server.AddMenuHandler(ID_WEASELTRAY_SYNC, std::bind(execute, dir + L"\\TypeDuckDeployer.exe", std::wstring(L"/sync")));
m_server.AddMenuHandler(ID_WEASELTRAY_HOMEPAGE, std::bind(open, L"https://typeduck.hk/"));
m_server.AddMenuHandler(ID_WEASELTRAY_CHECKUPDATE, check_update);
m_server.AddMenuHandler(ID_WEASELTRAY_INSTALLDIR, std::bind(explore, dir));
Expand Down
3 changes: 2 additions & 1 deletion WeaselSetup/WeaselSetup.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{04B795DB-A22B-4657-9350-29F04B8FB8F6}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>WeaselSetup</RootNamespace>
<RootNamespace>TypeDuckSetup</RootNamespace>
<ProjectName>TypeDuckSetup</ProjectName>
</PropertyGroup>
<Import Project="..\weasel.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
4 changes: 2 additions & 2 deletions WeaselSetup/imesetup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int install_ime_file(std::wstring& srcPath, const std::wstring& ext, bool hant,
WCHAR path[MAX_PATH];
GetModuleFileNameW(GetModuleHandle(NULL), path, _countof(path));

std::wstring srcFileName = (hant ? L"weaselt" : L"weasel");
std::wstring srcFileName = (hant ? L"typeduckt" : L"typeduck");
srcFileName += ext;
WCHAR drive[_MAX_DRIVE];
WCHAR dir[_MAX_DIR];
Expand Down Expand Up @@ -444,7 +444,7 @@ int install(bool hant, bool silent)
return 1;
}

const std::wstring executable = L"WeaselServer.exe";
const std::wstring executable = L"TypeDuckServer.exe";
ret = RegSetValueEx(hKey, L"ServerExecutable", 0, REG_SZ,
(const BYTE*)executable.c_str(),
(executable.length() + 1) * sizeof(WCHAR));
Expand Down
Loading

0 comments on commit 263b028

Please sign in to comment.