make OWL Exporter more like Daisy Exporter

Author: dromer

Source/Heavy/DaisyExporter.h

@@ -360,7 +360,6 @@ class DaisyExporter final : public ExporterBase {
         bool heavyExitCode = getExitCode();
 
         if (compile) {
-
             auto bin = Toolchain::dir.getChildFile("bin");
             auto libDaisy = Toolchain::dir.getChildFile("lib").getChildFile("libdaisy");
             auto make = bin.getChildFile("make" + exeSuffix);

Source/Heavy/OWLExporter.h

@@ -123,28 +123,29 @@ class OWLExporter : public ExporterBase {
         if (shouldQuit)
             return true;
 
+        // Delay to get correct exit code
+        Time::waitForMillisecondCounter(Time::getMillisecondCounter() + 300);
+
         auto outputFile = File(outdir);
         auto sourceDir = outputFile.getChildFile("Source");
 
         bool heavyExitCode = getExitCode();
 
-        outputFile.getChildFile("ir").deleteRecursively();
-        outputFile.getChildFile("hv").deleteRecursively();
-        outputFile.getChildFile("c").deleteRecursively();
-
-        auto OWL = Toolchain::dir.getChildFile("lib").getChildFile("OwlProgram");
-        OWL.copyDirectoryTo(outputFile.getChildFile("OwlProgram"));
-
-        // Delay to get correct exit code
-        Time::waitForMillisecondCounter(Time::getMillisecondCounter() + 300);
-
         if (compile) {
             auto workingDir = File::getCurrentWorkingDirectory();
 
             auto bin = Toolchain::dir.getChildFile("bin");
+            auto OWL = Toolchain::dir.getChildFile("lib").getChildFile("OwlProgram");
             auto make = bin.getChildFile("make" + exeSuffix);
             auto compiler = bin.getChildFile("arm-none-eabi-gcc" + exeSuffix);
 
+            OWL.copyDirectoryTo(outputFile.getChildFile("OwlProgram"));
+
+            outputFile.getChildFile("ir").deleteRecursively();
+            outputFile.getChildFile("hv").deleteRecursively();
+            outputFile.getChildFile("c").deleteRecursively();
+
+            // Run from within OwlProgram directory
             auto OwlDir = outputFile.getChildFile("OwlProgram");
             OwlDir.setAsCurrentWorkingDirectory();
             OwlDir.getChildFile("Tools/FirmwareSender" + exeSuffix).setExecutePermission(1);
@@ -218,6 +219,9 @@ class OWLExporter : public ExporterBase {
         } else {
             auto outputFile = File(outdir);
 
+            auto OWL = Toolchain::dir.getChildFile("lib").getChildFile("OwlProgram");
+            OWL.copyDirectoryTo(outputFile.getChildFile("OwlProgram"));
+
             outputFile.getChildFile("ir").deleteRecursively();
             outputFile.getChildFile("hv").deleteRecursively();
             outputFile.getChildFile("c").deleteRecursively();