move fusion code to ./src

velopack · Feb 26, 2024 · 6940dc5 · 6940dc5
1 parent ddd55a1
commit 6940dc5
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 7 deletions.
diff --git a/build.cs b/build.cs
@@ -138,7 +138,7 @@ Dictionary<string, List<string>> LoadNativeMacros()
     macros["CS"] = new List<string>();
     macros["JS"] = new List<string>();
 
-    var includeDir = Path.Combine(projectDir, "include");
+    var includeDir = Path.Combine(projectDir, "src", "include");
 
     foreach (var f in Directory.EnumerateFiles(includeDir, "*.cs"))
     {
@@ -185,7 +185,7 @@ void RunAll(params Action<StringBuilder>[] actions)
             sw.Start();
             action(sb);
             sw.Stop();
-            Log($"Completed: {name} in {sw.Elapsed.TotalSeconds}s");
+            Log($"Completed: {name} in {Math.Round(sw.Elapsed.TotalSeconds, 2)}s");
         }
         catch (Exception ex)
         {
@@ -218,12 +218,12 @@ void RunAll(params Action<StringBuilder>[] actions)
 string FusionBuild(StringBuilder sb, string outputFile, string defineLang, bool includeVeloApp = true)
 {
     var fusionPath = Path.GetFullPath(Path.Combine(projectDir, "fut.exe"));
-    var sourceFiles = Directory.EnumerateFiles(projectDir, "*.fu", SearchOption.TopDirectoryOnly)
-        .Select(x => Path.GetFileName(x))
+    var sourceFiles = Directory.EnumerateFiles(Path.Combine(projectDir, "src"), "*.fu", SearchOption.TopDirectoryOnly)
+        .Select(x => Path.Join("src", Path.GetFileName(x)))
         .ToList();
 
     if (!includeVeloApp)
-        sourceFiles.Remove("VelopackApp.fu");
+        sourceFiles.RemoveAll((s) => s.EndsWith("VelopackApp.fu"));
 
     var fusionArgs = $"-o {outputFile} -D {defineLang} -n Velopack {String.Join(" ", sourceFiles)}";
 
@@ -279,7 +279,7 @@ void PrependTextIfNot(string finalFile, string prependText, Func<string, bool> p
 
 void PrependFiles(string finalFile, params string[] includeFiles)
 {
-    var includeFilesContent = includeFiles.Select(x => File.ReadAllText(Path.Join(projectDir, "include", x))).ToList();
+    var includeFilesContent = includeFiles.Select(x => File.ReadAllText(Path.Join(projectDir, "src", "include", x))).ToList();
     var original = File.ReadAllText(finalFile);
 
     using var fs = File.Create(finalFile);
@@ -298,7 +298,7 @@ void PrependFiles(string finalFile, params string[] includeFiles)
 
 void AppendFiles(string finalFile, params string[] includeFiles)
 {
-    var includeFilesContent = includeFiles.Select(x => File.ReadAllText(Path.Join(projectDir, "include", x))).ToList();
+    var includeFilesContent = includeFiles.Select(x => File.ReadAllText(Path.Join(projectDir, "src", "include", x))).ToList();
     var original = File.ReadAllText(finalFile);
 
     using var fs = File.Create(finalFile);

diff --git a/Json.fu → src/Json.fu b/Json.fu → src/Json.fu
diff --git a/Platform.fu → src/Platform.fu b/Platform.fu → src/Platform.fu
diff --git a/StringStream.fu → src/StringStream.fu b/StringStream.fu → src/StringStream.fu
diff --git a/UpdateInfo.fu → src/UpdateInfo.fu b/UpdateInfo.fu → src/UpdateInfo.fu
diff --git a/UpdateManager.fu → src/UpdateManager.fu b/UpdateManager.fu → src/UpdateManager.fu
diff --git a/VelopackApp.fu → src/VelopackApp.fu b/VelopackApp.fu → src/VelopackApp.fu
diff --git a/include/disclaimer.txt → src/include/disclaimer.txt b/include/disclaimer.txt → src/include/disclaimer.txt
diff --git a/include/subprocess.h → src/include/subprocess.h b/include/subprocess.h → src/include/subprocess.h
diff --git a/include/ts_begin.ts → src/include/ts_begin.ts b/include/ts_begin.ts → src/include/ts_begin.ts
diff --git a/include/ts_end.ts → src/include/ts_end.ts b/include/ts_end.ts → src/include/ts_end.ts
diff --git a/include/velopack.cpp → src/include/velopack.cpp b/include/velopack.cpp → src/include/velopack.cpp
diff --git a/include/velopack.cs → src/include/velopack.cs b/include/velopack.cs → src/include/velopack.cs
diff --git a/include/velopack.hpp → src/include/velopack.hpp b/include/velopack.hpp → src/include/velopack.hpp