don't build the Ptx plugin in x86, since it can't be used there anyway

silnrsi · Apr 30, 2024 · 4aab663 · 4aab663
1 parent ee82692
commit 4aab663
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 27 deletions.
diff --git a/SEC VS2019.sln b/SEC VS2019.sln
@@ -959,7 +959,6 @@ Global
 		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Debug|x64.ActiveCfg = Debug|x64
 		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Debug|x64.Build.0 = Debug|x64
 		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Debug|x86.ActiveCfg = Debug|x86
-		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Debug|x86.Build.0 = Debug|x86
 		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Release|x64.ActiveCfg = Release|x64
 		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Release|x64.Build.0 = Release|x64
 		{0BFFA5D9-FF49-4F16-BBC6-27F9394341A5}.Release|x86.ActiveCfg = Release|x86

diff --git a/src/SILConvertersWordML/TestBwdc/TestBwdc.csproj b/src/SILConvertersWordML/TestBwdc/TestBwdc.csproj
@@ -58,7 +58,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;X64</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>latest</LangVersion>
@@ -67,7 +67,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;X64</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -127,7 +127,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="TestFiles\TestModel.cs" />
-    <Compile Include="UnitTest_PtxBackTrHelper.cs" />
+    <Compile Include="UnitTest_PtxBackTrHelper.cs" Condition="'$(Platform)' == 'x64'" />
     <Compile Include="UnitTest_BulkWordDocConverter.cs" />
     <Compile Include="XmlDiff.cs" />
     <Compile Include="XmlInput.cs" />
@@ -288,25 +288,25 @@
     <EmbeddedResource Include="TestFiles\BulkWordDocConverter\TestFile_ConvertMiddleTableCell_Expected.xml" />
     <EmbeddedResource Include="TestFiles\BulkWordDocConverter\TestFile_ConvertMiddleTableCell_Input.xml" />
     <Content Include="TestFiles\BulkWordDocConverter\TestFile2.xml" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\CombinedInSourceAndTargetWithVaOverride\CombinedInSourceAndTargetWithVaOverride_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\CombinedInSourceSeparateNoEmptyInTarget\CombinedInSourceSeparateNoEmptyInTarget_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SeparateInSourceCombinedButEmptyInTarget\SeparateInSourceCombinedButEmptyInTarget_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVersesWithFootnote\MultipleVersesWithFootnote_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultiplePoeticParagraphs\MultiplePoeticParagraphsMissingInTarget\MultiplePoeticParagraphsMissingInTarget_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVerses\MultipleVersesAndParagraphsMiTJoinedIntoOneParagraphs\MultipleVersesAndParagraphsMiTJoinedIntoOneParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVerses\MultipleVersesAndParagraphsJoinedIntoOneParagraphs\MultipleVersesAndParagraphsJoinedIntoOneParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultipleParagraphs\MultipleParagraphsJoinedIntoOneParagraphs\MultipleParagraphsJoinedIntoOneParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultipleParagraphs\MultipleParagraphsMiTJoinedIntoOneParagraphs\MultipleParagraphsMiTJoinedIntoOneParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultipleParagraphs\MultipleParagraphsMissingInTarget\MultipleParagraphsMissingInTarget_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Simple\SingleVerseSplitIntoTwoParagraphs\SingleVerseSplitIntoTwoParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\SimpleParagraph\SimpleParagraphVerseMiTSplitIntoTwoParagraphs\SimpleParagraphVerseMiTSplitIntoTwoParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\SimpleParagraph\SimpleParagraphVerseSplitIntoTwoParagraphs\SimpleParagraphVerseSplitIntoTwoParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\SimpleParagraph\SimpleParagraphVerseMissingInTarget\SimpleParagraphVerseMissingInTarget_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Simple\SingleVerseMiTSplitIntoTwoParagraphs\SingleVerseMiTSplitIntoTwoParagraphs_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Complex\PartialOverwriteText\Complex_PartialOverwriteText_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Complex\PartialOverwriteMarker\Complex_PartialOverwriteMarker_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Complex\MissingInTarget\Complex_MissingInTarget_TranslatedText.txt" />
-    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVerses\MultipleVersesMissingInTarget\MultipleVersesMissingInTarget_TranslatedText.txt" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\CombinedInSourceAndTargetWithVaOverride\CombinedInSourceAndTargetWithVaOverride_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\CombinedInSourceSeparateNoEmptyInTarget\CombinedInSourceSeparateNoEmptyInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SeparateInSourceCombinedButEmptyInTarget\SeparateInSourceCombinedButEmptyInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVersesWithFootnote\MultipleVersesWithFootnote_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultiplePoeticParagraphs\MultiplePoeticParagraphsMissingInTarget\MultiplePoeticParagraphsMissingInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVerses\MultipleVersesAndParagraphsMiTJoinedIntoOneParagraphs\MultipleVersesAndParagraphsMiTJoinedIntoOneParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVerses\MultipleVersesAndParagraphsJoinedIntoOneParagraphs\MultipleVersesAndParagraphsJoinedIntoOneParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultipleParagraphs\MultipleParagraphsJoinedIntoOneParagraphs\MultipleParagraphsJoinedIntoOneParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultipleParagraphs\MultipleParagraphsMiTJoinedIntoOneParagraphs\MultipleParagraphsMiTJoinedIntoOneParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\MultipleParagraphs\MultipleParagraphsMissingInTarget\MultipleParagraphsMissingInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Simple\SingleVerseSplitIntoTwoParagraphs\SingleVerseSplitIntoTwoParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\SimpleParagraph\SimpleParagraphVerseMiTSplitIntoTwoParagraphs\SimpleParagraphVerseMiTSplitIntoTwoParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\SimpleParagraph\SimpleParagraphVerseSplitIntoTwoParagraphs\SimpleParagraphVerseSplitIntoTwoParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\SimpleParagraph\SimpleParagraphVerseMissingInTarget\SimpleParagraphVerseMissingInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Simple\SingleVerseMiTSplitIntoTwoParagraphs\SingleVerseMiTSplitIntoTwoParagraphs_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Complex\PartialOverwriteText\Complex_PartialOverwriteText_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Complex\PartialOverwriteMarker\Complex_PartialOverwriteMarker_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\SingleVerse\Complex\MissingInTarget\Complex_MissingInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
+    <EmbeddedResource Include="TestFiles\PtxBackTrHelper\MultipleVerses\MultipleVersesMissingInTarget\MultipleVersesMissingInTarget_TranslatedText.txt" Condition="'$(Platform)' == 'x64'" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">

diff --git a/src/SILConvertersWordML/TestBwdc/TestFiles/TestModel.cs b/src/SILConvertersWordML/TestBwdc/TestFiles/TestModel.cs
@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Paratext.PluginInterfaces;
-using SIL.ParatextBackTranslationHelperPlugin;
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
@@ -10,6 +8,10 @@
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+#if X64
+using Paratext.PluginInterfaces;
+using SIL.ParatextBackTranslationHelperPlugin;
+#endif
 
 namespace TestBwdc.TestFiles
 {
@@ -21,6 +23,7 @@ public static string ToJson<T>(T obj)
             return json;
         }
 
+#if X64
         public static Dictionary<string, List<IUSFMToken>> LoadKeyedListOfTokens(string embeddedResourceName)
         {
             var contents = LoadEmbeddedResourceFileAsStringExecutingAssembly(embeddedResourceName);
@@ -80,6 +83,7 @@ public static List<IUSFMToken> ToListTokens(object value)
             }
             return tokens;
         }
+#endif
 
         public static T LoadFromFileJson<T>(string embeddedResourceName)
         {

diff --git a/src/SilConvertersXML/SilConvertersXML.csproj b/src/SilConvertersXML/SilConvertersXML.csproj
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\debug\</OutputPath>
+    <OutputPath>..\..\output\x86\debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -66,7 +66,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\output\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>