Clarify output directory for EXE (#224)

Co-authored-by: Toby Allen <toby@cookingisfun.ie>
tobya · May 12, 2024 · 62e9612 · 62e9612
1 parent cf65535
commit 62e9612
Show file tree

Hide file tree

Showing 44 changed files with 158 additions and 120 deletions.
diff --git a/src/ExtraFiles.res b/src/ExtraFiles.res
diff --git a/src/MainUtils.pas b/src/MainUtils.pas
@@ -33,8 +33,8 @@ interface
   MSVISIO = 4;
 
 
-  DOCTO_VERSION = '1.14.44';  // dont use 0x - choco needs incrementing versions.
-  DOCTO_VERSION_NOTE = ' x64 Release ';
+  DOCTO_VERSION = '1.15.45';  // dont use 0x - choco needs incrementing versions.
+  DOCTO_VERSION_NOTE = ' x32 Release ABC';
 type
 
 
@@ -240,14 +240,14 @@   TDocumentConverter = class
     procedure Log(Msg: String; Level  : Integer = ERRORS); overload;
 
     procedure Log(Msg: String; List:  TStrings; Level: Integer); overload;
-        procedure LogInfo(Msg: String; Level  : Integer = ERRORS);
-        procedure LogDebug(Msg: String; Level  : Integer = ERRORS);
+    procedure LogInfo(Msg: String; Level  : Integer = ERRORS);
+    procedure LogDebug(Msg: String; Level  : Integer = ERRORS);
     procedure LogError(Msg: String);
     function ConvertErrorText(Msg: String) : String;
     function CallWebHook(Params: String) : string;
     FUNCTION AfterConversion(InputFile, OutputFile: String):string;
     Function OnConversionError(InputFile, OutputFile, Error: String):string;
-
+    Procedure LoadFileList();
 
     procedure LogResourceHelp(HelpResName : String);
     procedure LogVersionInfo(ForceReload : boolean = true);
@@ -1363,7 +1363,17 @@ procedure TDocumentConverter.LoadConfig(Params: TStrings);
 
   // Code to run when all parameters have been loaded.
   // Get Files
+     LoadFileList;
+
+
+
+end;
 
+
+
+procedure TDocumentConverter.LoadFileList;
+var f : integer;
+begin
    // IsFileInput := true;
     // If input is Dir rather than file, enumerate files.
     if DirectoryExists(InputFile) then
@@ -1378,18 +1388,21 @@ procedure TDocumentConverter.LoadConfig(Params: TStrings);
        end;
        log('File List', FInputFiles,STANDARD);
        logInfo('Beginning to convert files....',STANDARD);
+
+       // remove temp files
+       for f := 0 to FInputFiles.Count -1 do
+       begin
+           HaltWithError(204, 'No File Matches in Input Directory: ' + finputfile + '*' + InputExtension );
+
+       end;
+
     end
     else
     begin
       InputIsFile := true;
     end;
-
-
-
 end;
 
-
-
 procedure TDocumentConverter.Log(Msg: String; Level : Integer = ERRORS );
 var
   OutputLog, OutputTimeStamp : Boolean;

diff --git a/src/docto.dproj b/src/docto.dproj
@@ -3,12 +3,12 @@
         <ProjectGuid>{2F967344-8067-49DA-9E3E-F6B7D7BC6CE5}</ProjectGuid>
         <MainSource>docto.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">TobyBuild</Config>
+        <Config Condition="'$(Config)'==''">Release</Config>
         <AppType>Console</AppType>
         <FrameworkType>None</FrameworkType>
         <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
         <ProjectVersion>18.8</ProjectVersion>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <Platform>Win32</Platform>
     </PropertyGroup>
@@ -40,6 +40,18 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+        <Cfg_1_Win64>true</Cfg_1_Win64>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
         <Cfg_2>true</Cfg_2>
         <CfgParent>Base</CfgParent>
@@ -187,6 +199,17 @@
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
         <DCC_DebugInformation>0</DCC_DebugInformation>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <DCC_ExeOutput>C:\Development\github\docto\exe\32\</DCC_ExeOutput>
+        <Manifest_File>(None)</Manifest_File>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+        <DCC_ExeOutput>C:\Development\github\docto\exe\64\</DCC_ExeOutput>
+        <VerInfo_IncludeVerInfo>false</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <Manifest_File>(None)</Manifest_File>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_ExeOutput>../exe</DCC_ExeOutput>
         <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
@@ -215,13 +238,13 @@
     <PropertyGroup Condition="'$(Cfg_3_Win32)'!=''">
         <VerInfo_MajorVer>1</VerInfo_MajorVer>
         <Debugger_RunParams>-VS -f &quot;..\test\inputfilesvs/payslips.vsdx&quot; -o &quot;..\test\generatedfiles\&quot; -t vsPDF -l 10</Debugger_RunParams>
-        <VerInfo_Build>73</VerInfo_Build>
+        <VerInfo_Build>74</VerInfo_Build>
         <VerInfo_PreRelease>false</VerInfo_PreRelease>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
         <VerInfo_AutoGenVersion>false</VerInfo_AutoGenVersion>
         <VerInfo_Release>43</VerInfo_Release>
         <Icon_MainIcon>docto_Icon2.ico</Icon_MainIcon>
-        <VerInfo_Keys>CompanyName=Toflidium Software;FileDescription=DocTo - Convert doc files to any available format;FileVersion=1.12.43.73;InternalName=;LegalCopyright=Toby Allen;LegalTrademarks=;OriginalFilename=docto.exe;ProductName=DocTo;ProductVersion=1.6;Comments=https://github.com/tobya/DocTo;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Toflidium Software;FileDescription=DocTo - Convert doc files to any available format;FileVersion=1.12.43.74;InternalName=;LegalCopyright=Toby Allen;LegalTrademarks=;OriginalFilename=docto.exe;ProductName=DocTo;ProductVersion=1.6;Comments=https://github.com/tobya/DocTo;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_ExeOutput>..\exe</DCC_ExeOutput>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>

diff --git a/src/docto.res b/src/docto.res
diff --git a/test/TestDocTo_Quiet.bat b/test/TestDocTo_Quiet.bat
@@ -2,5 +2,5 @@ REM ---------------------------------
 REM Convert All files in Input Directory to PDF
 REM ---------------------------------
 
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf  -q
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf  -q
 
diff --git a/test/Test_WordMacros.bat b/test/Test_WordMacros.bat
@@ -1,16 +1,16 @@
 REM If output Dir left out default to input
 REM copy  ".\Inputfiles\pie3.doc"  ".\GeneratedFiles\PieNoOutputTest.doc"
 REM Try on Single
- "../exe/docto.exe"  -f ".\Inputfiles\DocWithMacro.docm"  -o ".\GeneratedFiles\DocWithMacro.pdf"    -T  wdFormatPDF -l 10
+ "../exe/32/docto.exe"  -f ".\Inputfiles\DocWithMacro.docm"  -o ".\GeneratedFiles\DocWithMacro.pdf"    -T  wdFormatPDF -l 10
 
-"../exe/docto.exe"  -f ".\Inputfiles\DocWithMacro_oldext.doc"  -o ".\GeneratedFiles\DocWithMacro_oldext.pdf"    -T  wdFormatPDF -l 10
+"../exe/32/docto.exe"  -f ".\Inputfiles\DocWithMacro_oldext.doc"  -o ".\GeneratedFiles\DocWithMacro_oldext.pdf"    -T  wdFormatPDF -l 10
 
 
- "../exe/docto.exe"  -f ".\Inputfiles\DocWithMacro.docm"  -o ".\GeneratedFiles\DocWithMacro2.pdf"    -T  wdFormatPDF -l 10 --enable-macroautorun
+ "../exe/32/docto.exe"  -f ".\Inputfiles\DocWithMacro.docm"  -o ".\GeneratedFiles\DocWithMacro2.pdf"    -T  wdFormatPDF -l 10 --enable-macroautorun
 
-"../exe/docto.exe"  -f ".\Inputfiles\DocWithMacro_oldext.doc"  -o ".\GeneratedFiles\DocWithMacro_oldext3.pdf"    -T  wdFormatPDF -l 10 
+"../exe/32/docto.exe"  -f ".\Inputfiles\DocWithMacro_oldext.doc"  -o ".\GeneratedFiles\DocWithMacro_oldext3.pdf"    -T  wdFormatPDF -l 10 
 
 REM Raises an error. 301
 
-"../exe/docto.exe" -XL  -f ".\inputfilesxl\Week 1 Test.xls"  -o "C:\dev\github\docto\test\GeneratedFiles"    -T  xlPDF -l 10 --enable-macroautorun
+"../exe/32/docto.exe" -XL  -f ".\inputfilesxl\Week 1 Test.xls"  -o "C:\dev\github\docto\test\GeneratedFiles"    -T  xlPDF -l 10 --enable-macroautorun
 
diff --git a/test/pptestrelative.bat b/test/pptestrelative.bat
@@ -1,5 +1,5 @@
 REM If output Dir left out default to input
 REM copy  ".\Inputfiles\pie3.doc"  ".\GeneratedFiles\PieNoOutputTest.doc"
 REM Try on Single
-"../exe/docto.exe" -PP -f ".\Inputfilespp\Presentation1.ppt"  -o ".\GeneratedFiles\res3.jpg"    -T  17 -l 10
-"../exe/docto.exe" -PP -f ".\Inputfilespp\Presentation1.ppt"  -o ".\GeneratedFiles\res3.pdf"    -T  ppSaveAsPDF -l 10
+"../exe/32/docto.exe" -PP -f ".\Inputfilespp\Presentation1.ppt"  -o ".\GeneratedFiles\res3.jpg"    -T  17 -l 10
+"../exe/32/docto.exe" -PP -f ".\Inputfilespp\Presentation1.ppt"  -o ".\GeneratedFiles\res3.pdf"    -T  ppSaveAsPDF -l 10
diff --git a/test/testDocTo.bat b/test/testDocTo.bat
@@ -9,7 +9,7 @@ REM Remove all generated files from output directory that may exist.
 
 
 REM Output Help Text
-"../exe/docto.exe" -h
+"../exe/32/docto.exe" -h
 
 
 REM ---------------------------------
@@ -18,55 +18,55 @@ REM Loop through each format provided in doctoFormatList and try to convert our
 REM test file to each format.
 REM ---------------------------------
 
-FOR /F "eol=; tokens=1,2* delims=, " %%i in (doctoFormatList.txt) do "../exe/docto.exe"  -f "%~d0%~p0\Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\pie3out_%%i.%%j"  -T  %%i
+FOR /F "eol=; tokens=1,2* delims=, " %%i in (doctoFormatList.txt) do "../exe/32/docto.exe"  -f "%~d0%~p0\Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\pie3out_%%i.%%j"  -T  %%i
 
 
 
 REM ---------------------------------
 REM Convert All files in Input Directory to PDF
 REM ---------------------------------
 
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf
 
 
 REM Try on Single
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF
 
 REM Try on Single no output file with Verbose Logging
-"../exe/docto.exe" -L 10 -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatPDF  
+"../exe/32/docto.exe" -L 10 -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatPDF  
 
 REM Try on Single no output file with Verbose Logging
-"../exe/docto.exe" -L 10 -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDirNoSlash"    -T  wdFormatXMLDocument 
+"../exe/32/docto.exe" -L 10 -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDirNoSlash"    -T  wdFormatXMLDocument 
 
 
 
 REM Should produce an error incorrect format.
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatTestPDF
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatTestPDF
 
 REM Should produce an error - input file does not exist
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3_doesntexist.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\pie3_doesntexist.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF
 
 REM Test http Webhook
 REM ---------------------------------
 REM To view visit https://toflidium.com/webhooks/docto/docto_test_values.txt
 REM ---------------------------------
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -W http://toflidium.com/webhooks/docto/webhook_test.php
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -W http://toflidium.com/webhooks/docto/webhook_test.php
 REM Check https webhook.
 
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -W https://toflidium.com/webhooks/docto/webhook_test.php
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -W https://toflidium.com/webhooks/docto/webhook_test.php
 
 
 REM If output Dir left out default to input
 copy  "%~d0%~p0Inputfiles\pie3.doc"  "%~d0%~p0GeneratedFiles\PieNoOutputTest.doc"
-"../exe/docto.exe"  -f "%~d0%~p0GeneratedFiles\PieNoOutputTest.doc"    -T  wdFormatPDF
+"../exe/32/docto.exe"  -f "%~d0%~p0GeneratedFiles\PieNoOutputTest.doc"    -T  wdFormatPDF
 
 REM Check that works with -o before -f
-"../exe/docto.exe"    -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -f "%~d0%~p0Inputfiles\pie3.doc" 
+"../exe/32/docto.exe"    -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -f "%~d0%~p0Inputfiles\pie3.doc" 
 
 REM Check Unicode to txt conversion. issue #32
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\UnicodeTest.doc"  -o "%~d0%~p0GeneratedFiles\UnicodeTest.txt"    -T  wdFormatEncodedText -E 65001 
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\UnicodeTest.doc"  -o "%~d0%~p0GeneratedFiles\UnicodeTest.txt"    -T  wdFormatEncodedText -E 65001 
 
 REM Check Logging
-"../exe/docto.exe"    -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -f "%~d0%~p0Inputfiles\pie3.doc"  -G -L 10
-"../exe/docto.exe"    -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -f "%~d0%~p0Inputfiles\pie3.doc"  -GL outputlog.log -L 10
+"../exe/32/docto.exe"    -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -f "%~d0%~p0Inputfiles\pie3.doc"  -G -L 10
+"../exe/32/docto.exe"    -o "%~d0%~p0GeneratedFiles\Pie3.pdf"    -T  wdFormatPDF -f "%~d0%~p0Inputfiles\pie3.doc"  -GL outputlog.log -L 10
 
diff --git a/test/testDocToRelative.bat b/test/testDocToRelative.bat
@@ -9,7 +9,7 @@ REM Remove all generated files from output directory that may exist.
 
 
 REM Output Help Text
-"../exe/docto.exe" -h
+"../exe/32/docto.exe" -h
 
 
 REM ---------------------------------
@@ -19,4 +19,4 @@ REM test file to each format.
 REM Use a relative path
 REM ---------------------------------
 
-FOR /F "eol=; tokens=1,2* delims=, " %%i in (doctoFormatList.txt) do "../exe/docto.exe"  -f "Inputfiles\pie3.doc"  -o "GeneratedFiles\pie3out_%%i.%%j"  -T  %%i
+FOR /F "eol=; tokens=1,2* delims=, " %%i in (doctoFormatList.txt) do "../exe/32/docto.exe"  -f "Inputfiles\pie3.doc"  -o "GeneratedFiles\pie3out_%%i.%%j"  -T  %%i
diff --git a/test/testDocTo_basic.bat b/test/testDocTo_basic.bat
@@ -9,25 +9,25 @@ REM Remove all generated files from output directory that may exist.
 
 
 REM Output Help Text
-"../exe/docto.exe" -h
+"../exe/32/docto.exe" -h
 
 
 REM Try on Single
-"../exe/docto.exe" -wd  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF
+"../exe/32/docto.exe" -wd  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF
 
 REM Try on Single no output file with Verbose Logging
-"../exe/docto.exe" -WD  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatText  
+"../exe/32/docto.exe" -WD  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatText  
 
 
 REM try xl
-"../exe/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.pdf"    -T  XLPDF
+"../exe/32/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.pdf"    -T  XLPDF
 
 REM try xl
-"../exe/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.csv"    -T  XLcsv 
+"../exe/32/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.csv"    -T  XLcsv 
 
 REM try xl
-"../exe/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.pdf"    -T  ppSaveasPDF
+"../exe/32/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.pdf"    -T  ppSaveasPDF
 
 REM try xl
-"../exe/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.rtf"    -T  ppSaveasRTF  
+"../exe/32/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.rtf"    -T  ppSaveasRTF  
 
diff --git a/test/testDocTo_basic_withlog.bat b/test/testDocTo_basic_withlog.bat
@@ -9,25 +9,25 @@ REM Remove all generated files from output directory that may exist.
 
 
 REM Output Help Text
-"../exe/docto.exe" -h
+"../exe/32/docto.exe" -h
 
 
 REM Try on Single
-"../exe/docto.exe" -wd  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF -G 
+"../exe/32/docto.exe" -wd  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\Pie3Single.pdf"    -T  wdFormatPDF -G 
 
 REM Try on Single no output file with Verbose Logging
-"../exe/docto.exe" -WD  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatText  -G -L 2 
+"../exe/32/docto.exe" -WD  -f "%~d0%~p0Inputfiles\pie3.doc"  -o "%~d0%~p0GeneratedFiles\SingleDir\"    -T  wdFormatText  -G -L 2 
 
 
 REM try xl
-"../exe/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.pdf"    -T  XLPDF -G -L 2
+"../exe/32/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.pdf"    -T  XLPDF -G -L 2
 
 REM try xl
-"../exe/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.csv"    -T  XLcsv  -G -L 2
+"../exe/32/docto.exe" -XL -f "%~d0%~p0Inputfilesxl\Week 1 Test.xls"  -o "%~d0%~p0GeneratedFiles\Week1.csv"    -T  XLcsv  -G -L 2
 
 REM try xl
-"../exe/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.pdf"    -T  ppSaveasPDF -G -L 2
+"../exe/32/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.pdf"    -T  ppSaveasPDF -G -L 2
 
 REM try xl
-"../exe/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.rtf"    -T  ppSaveasRTF   -G -L 2
+"../exe/32/docto.exe" -PP -f "%~d0%~p0Inputfilespp\Presentation1.ppt"  -o "%~d0%~p0GeneratedFiles\pres1.rtf"    -T  ppSaveasRTF   -G -L 2
 
diff --git a/test/testIgnoreDocs.bat b/test/testIgnoreDocs.bat
@@ -4,4 +4,4 @@ REM ---------------------------------
 REM Convert All files in Input Directory to PDF 
 REM ---------------------------------
 
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf -N 5 -NX -L 5
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf -N 5 -NX -L 5
diff --git a/test/testSkipExistingConverts.bat b/test/testSkipExistingConverts.bat
@@ -4,4 +4,4 @@ REM ---------------------------------
 REM Convert All files in Input Directory to PDF 
 REM ---------------------------------
 
-"../exe/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf --donotoverwrite -L 5
+"../exe/32/docto.exe"  -f "%~d0%~p0Inputfiles\"  -o "%~d0%~p0GeneratedFiles"    -T  wdFormatPDF -OX pdf --donotoverwrite -L 5
diff --git a/test/test_DocProp.bat b/test/test_DocProp.bat
@@ -1,4 +1,4 @@
 REM Try optimize options on large file.
- "../exe/docto.exe"  -f ".\Inputfiles\GEOCADx (1).docx"  -o ".\GeneratedFiles\GEOCADx_OptimizedforPrint_NoProps.pdf"   -T  wdFormatPDF --no-INCLUDEDOCPROPERTIES   --PDF-OptimizeFor forPrint    -l 10
- "../exe/docto.exe"  -f ".\Inputfiles\GEOCADx (1).docx"  -o ".\GeneratedFiles\GEOCADx_OptimizedforPrint_NoProps2.pdf"   -T  wdFormatPDF --no-docprop   --PDF-OptimizeFor forPrint    -l 10
+ "../exe/32/docto.exe"  -f ".\Inputfiles\GEOCADx (1).docx"  -o ".\GeneratedFiles\GEOCADx_OptimizedforPrint_NoProps.pdf"   -T  wdFormatPDF --no-INCLUDEDOCPROPERTIES   --PDF-OptimizeFor forPrint    -l 10
+ "../exe/32/docto.exe"  -f ".\Inputfiles\GEOCADx (1).docx"  -o ".\GeneratedFiles\GEOCADx_OptimizedforPrint_NoProps2.pdf"   -T  wdFormatPDF --no-docprop   --PDF-OptimizeFor forPrint    -l 10
 
diff --git a/test/test_DocStructure.bat b/test/test_DocStructure.bat
@@ -1,4 +1,4 @@
 REM Try optimize options on large file.
- "../exe/docto.exe"  -f ".\Inputfiles\GEOCADx (1).docx"  -o ".\GeneratedFiles\GEOCADx_Nostructure.pdf"   -T  wdFormatPDF --PDF-No-DocStructureTags     -l 10
+ "../exe/32/docto.exe"  -f ".\Inputfiles\GEOCADx (1).docx"  -o ".\GeneratedFiles\GEOCADx_Nostructure.pdf"   -T  wdFormatPDF --PDF-No-DocStructureTags     -l 10