change to output mecab files under the 'mecab' directory

smdn · Dec 24, 2022 · 69108dc · 69108dc
1 parent 9df3d9b
commit 69108dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Smdn.Text.Ondulish/Smdn.Text.Ondulish.csproj b/src/Smdn.Text.Ondulish/Smdn.Text.Ondulish.csproj
@@ -17,7 +17,8 @@ SPDX-License-Identifier: MIT
     <MeCabMakefileDirectory>$(MSBuildThisFileDirectory)..\MeCab\</MeCabMakefileDirectory>
     <MeCabBindingsDirectory>$(MSBuildThisFileDirectory)..\MeCab\mecab-bindings\</MeCabBindingsDirectory>
     <MeCabIpaDicDirectory>$(MSBuildThisFileDirectory)..\MeCab\mecab\mecab-ipadic\</MeCabIpaDicDirectory>
-    <MeCabIpaDicDeploymentBasePath>dic\ipadic\</MeCabIpaDicDeploymentBasePath>
+    <MeCabDeploymentBasePath>mecab\</MeCabDeploymentBasePath>
+    <MeCabIpaDicDeploymentBasePath>$(MeCabDeploymentBasePath)dic\ipadic\</MeCabIpaDicDeploymentBasePath>
   </PropertyGroup>
 
   <PropertyGroup Label="assembly attributes">
@@ -69,9 +70,10 @@ SPDX-License-Identifier: MIT
     <!-- MeCab configuration file -->
     <Content
       Include="mecabrc"
+      TargetPath="$(MeCabDeploymentBasePath)%(Filename)"
       CopyToOutputDirectory="PreserveNewest"
       Pack="true"
-      PackagePath="contentFiles\any\any"
+      PackagePath="contentFiles\any\any\$([System.IO.Path]::TrimEndingDirectorySeparator('$(MeCabDeploymentBasePath)'))"
       PackageCopyToOutput="true"
     />
 

diff --git a/tests/Smdn.Text.Ondulish/Smdn.Text.Ondulish/Translator.cs b/tests/Smdn.Text.Ondulish/Smdn.Text.Ondulish/Translator.cs
@@ -13,7 +13,7 @@ public class TranslatorTests {
   private static Translator Create()
   {
     var codeBaseDir = TestContext.CurrentContext.TestDirectory;
-    var taggerArg = "-r " + Path.Combine(codeBaseDir, "mecabrc");
+    var taggerArg = "-r " + Path.Combine(codeBaseDir, "mecab", "mecabrc");
 
     return new Translator(taggerArg, dictionaryDirectory: codeBaseDir);
   }