Integrate rewrite: uNew

.github/workflows/main.yml

@@ -1,19 +1,28 @@
 
 name: Build uLaunch
 
-on: [push]
+on: [push, pull_request]
+
 jobs:
   uLaunch:
     runs-on: ubuntu-latest
-
-    container:
-      image: devkitpro/devkita64
+    container: devkitpro/devkita64:latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Update repository
+    - uses: actions/checkout@master
+      with:
+        submodules: recursive
+
+    - name: Update packages and install Python
       run: |
-        git submodule update --init --recursive
+        sudo -n apt-get update
+        sudo -n apt-get upgrade -y patch autoconf automake diffutils pkgconf fakeroot git maven file tar bzip2 zstd python3 python3-pip python-is-python3
+        python -m pip install requests
+        sudo -n dkp-pacman --noconfirm -U \
+          "https://wii.leseratte10.de/devkitPro/other-stuff/dkp-toolchain-vars-1.0.2-1-any.pkg.tar.xz"
+
+    - name: Set workspace permissions
+      run: chmod 777 -R "$GITHUB_WORKSPACE"
 
     - name: Prepare master libnx
       run: |
@@ -30,3 +39,4 @@ jobs:
       with:
         name: SdOut
         path: SdOut.zip
+        if-no-files-found: error

.gitignore

@@ -6,6 +6,13 @@ SdOut/
 *.npdm
 *.nso
 *.nsp
+*.nacp
+*.nro
+*.lst
+*.gen.hpp
 .vs/
 bin/
-obj/
+obj/
+old/
+out/
+target/

.gitmodules

@@ -1,6 +1,15 @@
 [submodule "Plutonium"]
-	path = Plutonium
+	path = libs/Plutonium
 	url = https://github.com/XorTroll/Plutonium
 [submodule "Atmosphere-libs"]
-	path = Atmosphere-libs
+	path = libs/Atmosphere-libs
 	url = https://github.com/Atmosphere-NX/Atmosphere-libs
+[submodule "arc"]
+	path = arc
+	url = https://github.com/XorTroll/arc
+[submodule "libs/json"]
+	path = libs/json
+	url = https://github.com/nlohmann/json
+[submodule "libs/zip"]
+	path = libs/zip
+	url = https://github.com/kuba--/zip

Makefile

@@ -1,57 +1,62 @@
+VERSION_MAJOR	:=	1
+VERSION_MINOR	:=	0
+VERSION_MICRO	:=	0
+export VERSION	:=	$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
 
-export UL_MAJOR	:=	0
-export UL_MINOR	:=	3
-export UL_MICRO :=	4
-export UL_VERSION	:=	$(UL_MAJOR).$(UL_MINOR).$(UL_MICRO)
+export UL_DEFS	:=	-DUL_MAJOR=$(VERSION_MAJOR) -DUL_MINOR=$(VERSION_MINOR) -DUL_MICRO=$(VERSION_MICRO) -DUL_VERSION=\"$(VERSION)\"
 
-export UL_DEFS	:=	-DUL_MAJOR=$(UL_MAJOR) -DUL_MINOR=$(UL_MINOR) -DUL_MICRO=$(UL_MICRO) -DUL_VERSION=\"$(UL_VERSION)\"
+.PHONY: all fresh clean pu arc usystem uloader umenu umanager uscreen
 
-export UL_COMMON_SOURCES	:=	../uLaunch/source ../uLaunch/source/am ../uLaunch/source/dmi ../uLaunch/source/cfg ../uLaunch/source/db ../uLaunch/source/fs ../uLaunch/source/net ../uLaunch/source/os ../uLaunch/source/util
-export UL_COMMON_INCLUDES	:=	../uLaunch/include
+all: arc usystem uloader umenu umanager uscreen
 
-export UL_CXXFLAGS	:=	-fno-rtti -fexceptions -fpermissive -std=gnu++20
+fresh: clean all
 
-.PHONY: all base make_hbtarget hbtarget make_daemon daemon make_menu menu clean
+pu:
+	@$(MAKE) -C libs/Plutonium/
 
-all: hbtarget daemon menu
+arc:
+	@python arc/arc.py gen_db default+./libs/uCommon/include/ul/ul_Results.rc.hpp
+	@python arc/arc.py gen_cpp rc UL ./libs/uCommon/include/ul/ul_Results.gen.hpp
 
-base:
-	@mkdir -p SdOut/
-
-make_hbtarget:
-	@$(MAKE) -C uHbTarget/
-	@mkdir -p SdOut/ulaunch/bin/uHbTarget
-	@mkdir -p SdOut/ulaunch/bin/uHbTarget/sys
-	@mkdir -p SdOut/ulaunch/bin/uHbTarget/applet
-	@mkdir -p SdOut/ulaunch/bin/uHbTarget/app
-	@cp uHbTarget/uHbTarget.nso SdOut/ulaunch/bin/uHbTarget/sys/main
-	@cp uHbTarget/uHbTarget.nso SdOut/ulaunch/bin/uHbTarget/applet/main
-	@cp uHbTarget/uHbTarget.nso SdOut/ulaunch/bin/uHbTarget/app/main
-	@cp uHbTarget/uHbTarget_sys.npdm SdOut/ulaunch/bin/uHbTarget/sys/main.npdm
-	@cp uHbTarget/uHbTarget_applet.npdm SdOut/ulaunch/bin/uHbTarget/applet/main.npdm
-	@cp uHbTarget/uHbTarget_app.npdm SdOut/ulaunch/bin/uHbTarget/app/main.npdm
-
-hbtarget: base make_hbtarget
-
-make_daemon:
-	@$(MAKE) -C uDaemon/
+clean:
+	@$(MAKE) clean -C projects/uSystem
+	@$(MAKE) clean -C projects/uLoader
+	@$(MAKE) clean -C projects/uMenu
+	@$(MAKE) clean -C projects/uManager
+	@cd projects/uScreen && mvn clean
+	@rm -rf SdOut
+
+usystem: arc
+	@$(MAKE) -C projects/uSystem
 	@mkdir -p SdOut/atmosphere/contents/0100000000001000
-	@cp uDaemon/out/nintendo_nx_arm64_armv8a/release/uDaemon.nsp SdOut/atmosphere/contents/0100000000001000/exefs.nsp
-
-daemon: base make_daemon
-
-make_menu:
-	@$(MAKE) -C Plutonium/
-	@$(MAKE) -C uMenu/
+	@cp projects/uSystem/out/nintendo_nx_arm64_armv8a/release/uSystem.nsp SdOut/atmosphere/contents/0100000000001000/exefs.nsp
+	@mkdir -p SdOut/ulaunch/bin/uSystem
+	@cp projects/uSystem/out/nintendo_nx_arm64_armv8a/release/uSystem.nsp SdOut/ulaunch/bin/uSystem/exefs.nsp
+
+uloader: arc
+	@$(MAKE) -C projects/uLoader
+	@mkdir -p SdOut/ulaunch/bin/uLoader
+	@mkdir -p SdOut/ulaunch/bin/uLoader/applet
+	@cp projects/uLoader/uLoader.nso SdOut/ulaunch/bin/uLoader/applet/main
+	@cp projects/uLoader/uLoader_applet.npdm SdOut/ulaunch/bin/uLoader/applet/main.npdm
+	@mkdir -p SdOut/ulaunch/bin/uLoader/application
+	@cp projects/uLoader/uLoader.nso SdOut/ulaunch/bin/uLoader/application/main
+	@cp projects/uLoader/uLoader_application.npdm SdOut/ulaunch/bin/uLoader/application/main.npdm
+
+umenu: arc pu
+	@$(MAKE) -C projects/uMenu
 	@mkdir -p SdOut/ulaunch/bin/uMenu
-	@cp uMenu/uMenu.nso SdOut/ulaunch/bin/uMenu/main
-	@cp uMenu/uMenu.npdm SdOut/ulaunch/bin/uMenu/main.npdm
-	@build_romfs uMenu/romfs SdOut/ulaunch/bin/uMenu/romfs.bin
-
-menu: base make_menu
-
-clean:
-	@rm -rf SdOut/
-	@$(MAKE) clean -C uDaemon/
-	@$(MAKE) clean -C uMenu/
-	@$(MAKE) clean -C uHbTarget/
+	@mkdir -p SdOut/ulaunch/lang/uMenu
+	@mkdir -p SdOut/ulaunch/themes
+	@cp projects/uMenu/uMenu.nso SdOut/ulaunch/bin/uMenu/main
+	@cp projects/uMenu/uMenu.npdm SdOut/ulaunch/bin/uMenu/main.npdm
+	@build_romfs projects/uMenu/romfs SdOut/ulaunch/bin/uMenu/romfs.bin
+
+umanager: arc pu
+	@$(MAKE) -C projects/uManager
+	@mkdir -p SdOut/ulaunch/lang/uManager
+	@mkdir -p SdOut/switch
+	@cp projects/uManager/uManager.nro SdOut/switch/uManager.nro
+
+uscreen:
+	@cd projects/uScreen && mvn package