Moved to Folders

XDPXI · Jul 16, 2024 · b85fcc9 · b85fcc9
1 parent 3a7c219
commit b85fcc9
Show file tree

Hide file tree

Showing 77 changed files with 172 additions and 201 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,37 @@
+# Automatically build the project and run any configured tests for every push
+# and submitted pull request. This can help catch issues that only occur on
+# certain platforms or Java versions, and provides a first line of defence
+# against bad commits.
+
+name: build
+on: [pull_request, push]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [
+          21,    # Current Java LTS
+        ]
+    runs-on: ubuntu-22.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v2
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'microsoft'
+      - name: make gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: build/libs/
diff --git a/LICENSE b/LICENSE
diff --git a/build.bat b/build.bat
@@ -0,0 +1,7 @@
+@echo off
+title Ztrolix Libs - Building
+cls
+
+gradlew build
+
+pause
diff --git a/universal/ZtrolixLibsDownloader.java → ...ller/universal/ZtrolixLibsDownloader.java b/universal/ZtrolixLibsDownloader.java → ...ller/universal/ZtrolixLibsDownloader.java
diff --git a/universal/compile.bat → installer/universal/compile.bat b/universal/compile.bat → installer/universal/compile.bat
diff --git a/universal/run.bat → installer/universal/run.bat b/universal/run.bat → installer/universal/run.bat
diff --git a/versions/#1-ZtrolixLibsDownloader.jar → ...ler/versions/#1-ZtrolixLibsDownloader.jar b/versions/#1-ZtrolixLibsDownloader.jar → ...ler/versions/#1-ZtrolixLibsDownloader.jar
diff --git a/...ns/#10-ZtrolixLibsInstaller-Universal.jar → ...ns/#10-ZtrolixLibsInstaller-Universal.jar b/...ns/#10-ZtrolixLibsInstaller-Universal.jar → ...ns/#10-ZtrolixLibsInstaller-Universal.jar
diff --git a/...ions/#10-ZtrolixLibsInstaller-Windows.exe → ...ions/#10-ZtrolixLibsInstaller-Windows.exe b/...ions/#10-ZtrolixLibsInstaller-Windows.exe → ...ions/#10-ZtrolixLibsInstaller-Windows.exe
diff --git a/versions/#2-ZtrolixLibsDownloader.jar → ...ler/versions/#2-ZtrolixLibsDownloader.jar b/versions/#2-ZtrolixLibsDownloader.jar → ...ler/versions/#2-ZtrolixLibsDownloader.jar
diff --git a/versions/#3-ZtrolixLibsDownloader.jar → ...ler/versions/#3-ZtrolixLibsDownloader.jar b/versions/#3-ZtrolixLibsDownloader.jar → ...ler/versions/#3-ZtrolixLibsDownloader.jar
diff --git a/versions/#4-ZtrolixLibsDownloader.jar → ...ler/versions/#4-ZtrolixLibsDownloader.jar b/versions/#4-ZtrolixLibsDownloader.jar → ...ler/versions/#4-ZtrolixLibsDownloader.jar
diff --git a/versions/#5-ZtrolixLibsDownloader.jar → ...ler/versions/#5-ZtrolixLibsDownloader.jar b/versions/#5-ZtrolixLibsDownloader.jar → ...ler/versions/#5-ZtrolixLibsDownloader.jar
diff --git a/versions/#6-ZtrolixLibsInstaller.jar → ...ller/versions/#6-ZtrolixLibsInstaller.jar b/versions/#6-ZtrolixLibsInstaller.jar → ...ller/versions/#6-ZtrolixLibsInstaller.jar
diff --git a/versions/#7-ZtrolixLibsInstaller.exe → ...ller/versions/#7-ZtrolixLibsInstaller.exe b/versions/#7-ZtrolixLibsInstaller.exe → ...ller/versions/#7-ZtrolixLibsInstaller.exe
diff --git a/versions/#7-ZtrolixLibsInstaller.jar → ...ller/versions/#7-ZtrolixLibsInstaller.jar b/versions/#7-ZtrolixLibsInstaller.jar → ...ller/versions/#7-ZtrolixLibsInstaller.jar
diff --git a/...ons/#8-ZtrolixLibsInstaller-Universal.jar → ...ons/#8-ZtrolixLibsInstaller-Universal.jar b/...ons/#8-ZtrolixLibsInstaller-Universal.jar → ...ons/#8-ZtrolixLibsInstaller-Universal.jar
diff --git a/versions/#8-ZtrolixLibsInstaller-Windows.exe → ...sions/#8-ZtrolixLibsInstaller-Windows.exe b/versions/#8-ZtrolixLibsInstaller-Windows.exe → ...sions/#8-ZtrolixLibsInstaller-Windows.exe
diff --git a/...ons/#9-ZtrolixLibsInstaller-Universal.jar → ...ons/#9-ZtrolixLibsInstaller-Universal.jar b/...ons/#9-ZtrolixLibsInstaller-Universal.jar → ...ons/#9-ZtrolixLibsInstaller-Universal.jar
diff --git a/versions/#9-ZtrolixLibsInstaller-Windows.exe → ...sions/#9-ZtrolixLibsInstaller-Windows.exe b/versions/#9-ZtrolixLibsInstaller-Windows.exe → ...sions/#9-ZtrolixLibsInstaller-Windows.exe
diff --git a/...68222bd-2036-46e9-b1a8-16b944a3fb36.vsidx → ...68222bd-2036-46e9-b1a8-16b944a3fb36.vsidx b/...68222bd-2036-46e9-b1a8-16b944a3fb36.vsidx → ...68222bd-2036-46e9-b1a8-16b944a3fb36.vsidx
diff --git a/...c3b874b-0024-45bb-a4c7-cc3ef0d4336c.vsidx → ...c3b874b-0024-45bb-a4c7-cc3ef0d4336c.vsidx b/...c3b874b-0024-45bb-a4c7-cc3ef0d4336c.vsidx → ...c3b874b-0024-45bb-a4c7-cc3ef0d4336c.vsidx
diff --git a/...a59876e-b3ed-4b73-96ee-facebb15d504.vsidx → ...a59876e-b3ed-4b73-96ee-facebb15d504.vsidx b/...a59876e-b3ed-4b73-96ee-facebb15d504.vsidx → ...a59876e-b3ed-4b73-96ee-facebb15d504.vsidx
diff --git a/...56105a9-4e28-4859-9391-c3073f06c9d8.vsidx → ...56105a9-4e28-4859-9391-c3073f06c9d8.vsidx b/...56105a9-4e28-4859-9391-c3073f06c9d8.vsidx → ...56105a9-4e28-4859-9391-c3073f06c9d8.vsidx
diff --git a/...7699c00-f91f-40bd-ad19-6e444984778e.vsidx → ...7699c00-f91f-40bd-ad19-6e444984778e.vsidx b/...7699c00-f91f-40bd-ad19-6e444984778e.vsidx → ...7699c00-f91f-40bd-ad19-6e444984778e.vsidx
diff --git a/windows/.vs/ZtrolixLibs-Win/v17/.suo → ...ller/windows/.vs/ZtrolixLibs-Win/v17/.suo b/windows/.vs/ZtrolixLibs-Win/v17/.suo → ...ller/windows/.vs/ZtrolixLibs-Win/v17/.suo
diff --git a/...s/ZtrolixLibs-Win/v17/DocumentLayout.json → ...s/ZtrolixLibs-Win/v17/DocumentLayout.json b/...s/ZtrolixLibs-Win/v17/DocumentLayout.json → ...s/ZtrolixLibs-Win/v17/DocumentLayout.json
diff --git a/windows/App.config → installer/windows/App.config b/windows/App.config → installer/windows/App.config
diff --git a/windows/App.xaml → installer/windows/App.xaml b/windows/App.xaml → installer/windows/App.xaml
diff --git a/windows/App.xaml.cs → installer/windows/App.xaml.cs b/windows/App.xaml.cs → installer/windows/App.xaml.cs
diff --git a/windows/MainWindow.xaml → installer/windows/MainWindow.xaml b/windows/MainWindow.xaml → installer/windows/MainWindow.xaml
diff --git a/windows/MainWindow.xaml.cs → installer/windows/MainWindow.xaml.cs b/windows/MainWindow.xaml.cs → installer/windows/MainWindow.xaml.cs
diff --git a/windows/Properties/AssemblyInfo.cs → installer/windows/Properties/AssemblyInfo.cs b/windows/Properties/AssemblyInfo.cs → installer/windows/Properties/AssemblyInfo.cs
diff --git a/windows/Properties/Resources.Designer.cs → .../windows/Properties/Resources.Designer.cs b/windows/Properties/Resources.Designer.cs → .../windows/Properties/Resources.Designer.cs
diff --git a/windows/Properties/Resources.resx → installer/windows/Properties/Resources.resx b/windows/Properties/Resources.resx → installer/windows/Properties/Resources.resx
diff --git a/windows/Properties/Settings.Designer.cs → ...r/windows/Properties/Settings.Designer.cs b/windows/Properties/Settings.Designer.cs → ...r/windows/Properties/Settings.Designer.cs
diff --git a/windows/Properties/Settings.settings → ...ller/windows/Properties/Settings.settings b/windows/Properties/Settings.settings → ...ller/windows/Properties/Settings.settings
diff --git a/windows/ZtrolixLibs-Win.csproj → installer/windows/ZtrolixLibs-Win.csproj b/windows/ZtrolixLibs-Win.csproj → installer/windows/ZtrolixLibs-Win.csproj
diff --git a/windows/ZtrolixLibs-Win.sln → installer/windows/ZtrolixLibs-Win.sln b/windows/ZtrolixLibs-Win.sln → installer/windows/ZtrolixLibs-Win.sln
diff --git a/windows/cursor.cur → installer/windows/cursor.cur b/windows/cursor.cur → installer/windows/cursor.cur
diff --git a/windows/cursor.png → installer/windows/cursor.png b/windows/cursor.png → installer/windows/cursor.png
diff --git a/windows/cursor2.cur → installer/windows/cursor2.cur b/windows/cursor2.cur → installer/windows/cursor2.cur
diff --git a/windows/cursor2.png → installer/windows/cursor2.png b/windows/cursor2.png → installer/windows/cursor2.png
diff --git a/windows/download.png → installer/windows/download.png b/windows/download.png → installer/windows/download.png
diff --git a/windows/icon.ico → installer/windows/icon.ico b/windows/icon.ico → installer/windows/icon.ico
diff --git a/...work,Version=v4.8.1.AssemblyAttributes.cs → ...work,Version=v4.8.1.AssemblyAttributes.cs b/...work,Version=v4.8.1.AssemblyAttributes.cs → ...work,Version=v4.8.1.AssemblyAttributes.cs
diff --git a/windows/obj/Debug/App.g.i.cs → installer/windows/obj/Debug/App.g.i.cs b/windows/obj/Debug/App.g.i.cs → installer/windows/obj/Debug/App.g.i.cs
diff --git a/...nTimeResolveAssemblyReferencesInput.cache → ...nTimeResolveAssemblyReferencesInput.cache b/...nTimeResolveAssemblyReferencesInput.cache → ...nTimeResolveAssemblyReferencesInput.cache
diff --git a/windows/obj/Debug/MainWindow.g.i.cs → ...aller/windows/obj/Debug/MainWindow.g.i.cs b/windows/obj/Debug/MainWindow.g.i.cs → ...aller/windows/obj/Debug/MainWindow.g.i.cs
diff --git a/...ixLibs-Win.csproj.AssemblyReference.cache → ...ixLibs-Win.csproj.AssemblyReference.cache b/...ixLibs-Win.csproj.AssemblyReference.cache → ...ixLibs-Win.csproj.AssemblyReference.cache
diff --git a/...bug/ZtrolixLibs-Win_MarkupCompile.i.cache → ...bug/ZtrolixLibs-Win_MarkupCompile.i.cache b/...bug/ZtrolixLibs-Win_MarkupCompile.i.cache → ...bug/ZtrolixLibs-Win_MarkupCompile.i.cache
diff --git a/...ebug/ZtrolixLibs-Win_MarkupCompile.i.lref → ...ebug/ZtrolixLibs-Win_MarkupCompile.i.lref b/...ebug/ZtrolixLibs-Win_MarkupCompile.i.lref → ...ebug/ZtrolixLibs-Win_MarkupCompile.i.lref
diff --git a/...work,Version=v4.8.1.AssemblyAttributes.cs → ...work,Version=v4.8.1.AssemblyAttributes.cs b/...work,Version=v4.8.1.AssemblyAttributes.cs → ...work,Version=v4.8.1.AssemblyAttributes.cs
diff --git a/windows/obj/Release/App.g.cs → installer/windows/obj/Release/App.g.cs b/windows/obj/Release/App.g.cs → installer/windows/obj/Release/App.g.cs
diff --git a/windows/obj/Release/App.g.i.cs → installer/windows/obj/Release/App.g.i.cs b/windows/obj/Release/App.g.i.cs → installer/windows/obj/Release/App.g.i.cs
diff --git a/...nTimeResolveAssemblyReferencesInput.cache → ...nTimeResolveAssemblyReferencesInput.cache b/...nTimeResolveAssemblyReferencesInput.cache → ...nTimeResolveAssemblyReferencesInput.cache
diff --git a/windows/obj/Release/MainWindow.baml → ...aller/windows/obj/Release/MainWindow.baml b/windows/obj/Release/MainWindow.baml → ...aller/windows/obj/Release/MainWindow.baml
diff --git a/windows/obj/Release/MainWindow.g.cs → ...aller/windows/obj/Release/MainWindow.g.cs b/windows/obj/Release/MainWindow.g.cs → ...aller/windows/obj/Release/MainWindow.g.cs
diff --git a/windows/obj/Release/MainWindow.g.i.cs → ...ler/windows/obj/Release/MainWindow.g.i.cs b/windows/obj/Release/MainWindow.g.i.cs → ...ler/windows/obj/Release/MainWindow.g.i.cs
diff --git a/...mpPE/Properties.Resources.Designer.cs.dll → ...mpPE/Properties.Resources.Designer.cs.dll b/...mpPE/Properties.Resources.Designer.cs.dll → ...mpPE/Properties.Resources.Designer.cs.dll
diff --git a/...ixLibs-Win.csproj.AssemblyReference.cache → ...ixLibs-Win.csproj.AssemblyReference.cache b/...ixLibs-Win.csproj.AssemblyReference.cache → ...ixLibs-Win.csproj.AssemblyReference.cache
diff --git a/...ixLibs-Win.csproj.CoreCompileInputs.cache → ...ixLibs-Win.csproj.CoreCompileInputs.cache b/...ixLibs-Win.csproj.CoreCompileInputs.cache → ...ixLibs-Win.csproj.CoreCompileInputs.cache
diff --git a/...rolixLibs-Win.csproj.FileListAbsolute.txt → ...rolixLibs-Win.csproj.FileListAbsolute.txt b/...rolixLibs-Win.csproj.FileListAbsolute.txt → ...rolixLibs-Win.csproj.FileListAbsolute.txt
diff --git a/...lixLibs-Win.csproj.GenerateResource.cache → ...lixLibs-Win.csproj.GenerateResource.cache b/...lixLibs-Win.csproj.GenerateResource.cache → ...lixLibs-Win.csproj.GenerateResource.cache
diff --git a/...lease/ZtrolixLibs-Win_MarkupCompile.cache → ...lease/ZtrolixLibs-Win_MarkupCompile.cache b/...lease/ZtrolixLibs-Win_MarkupCompile.cache → ...lease/ZtrolixLibs-Win_MarkupCompile.cache
diff --git a/...elease/ZtrolixLibs-Win_MarkupCompile.lref → ...elease/ZtrolixLibs-Win_MarkupCompile.lref b/...elease/ZtrolixLibs-Win_MarkupCompile.lref → ...elease/ZtrolixLibs-Win_MarkupCompile.lref
diff --git a/.../Release/ZtrolixLibsInstaller-Windows.exe → .../Release/ZtrolixLibsInstaller-Windows.exe b/.../Release/ZtrolixLibsInstaller-Windows.exe → .../Release/ZtrolixLibsInstaller-Windows.exe
diff --git a/.../ZtrolixLibsInstaller-Windows.g.resources → .../ZtrolixLibsInstaller-Windows.g.resources b/.../ZtrolixLibsInstaller-Windows.g.resources → .../ZtrolixLibsInstaller-Windows.g.resources
diff --git a/.../Release/ZtrolixLibsInstaller-Windows.pdb → .../Release/ZtrolixLibsInstaller-Windows.pdb b/.../Release/ZtrolixLibsInstaller-Windows.pdb → .../Release/ZtrolixLibsInstaller-Windows.pdb
diff --git a/...rolixLibsInstaller-Windows_Content.g.i.cs → ...rolixLibsInstaller-Windows_Content.g.i.cs b/...rolixLibsInstaller-Windows_Content.g.i.cs → ...rolixLibsInstaller-Windows_Content.g.i.cs
diff --git a/...LibsInstaller-Windows_MarkupCompile.cache → ...LibsInstaller-Windows_MarkupCompile.cache b/...LibsInstaller-Windows_MarkupCompile.cache → ...LibsInstaller-Windows_MarkupCompile.cache
diff --git a/...bsInstaller-Windows_MarkupCompile.i.cache → ...bsInstaller-Windows_MarkupCompile.i.cache b/...bsInstaller-Windows_MarkupCompile.i.cache → ...bsInstaller-Windows_MarkupCompile.i.cache
diff --git a/...xLibsInstaller-Windows_MarkupCompile.lref → ...xLibsInstaller-Windows_MarkupCompile.lref b/...xLibsInstaller-Windows_MarkupCompile.lref → ...xLibsInstaller-Windows_MarkupCompile.lref
diff --git a/...lease/ZtrolixLibsInstaller_Content.g.i.cs → ...lease/ZtrolixLibsInstaller_Content.g.i.cs b/...lease/ZtrolixLibsInstaller_Content.g.i.cs → ...lease/ZtrolixLibsInstaller_Content.g.i.cs
diff --git a/...trolixLibsInstaller_MarkupCompile.i.cache → ...trolixLibsInstaller_MarkupCompile.i.cache b/...trolixLibsInstaller_MarkupCompile.i.cache → ...trolixLibsInstaller_MarkupCompile.i.cache
diff --git a/...ixLibs_Win.Properties.Resources.resources → ...ixLibs_Win.Properties.Resources.resources b/...ixLibs_Win.Properties.Resources.resources → ...ixLibs_Win.Properties.Resources.resources
diff --git a/test.bat b/test.bat
@@ -0,0 +1,7 @@
+@echo off
+title Ztrolix Libs - Testing
+cls
+
+gradlew runClient
+
+pause