uNew just got some major improvements

Author: XorTroll

.github/workflows/main.yml

@@ -1,28 +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@v3
+    - uses: actions/checkout@master
+      with:
+        submodules: recursive
 
-    - name: Update packages
+    - name: Update packages and install Python
       run: |
         sudo -n apt-get update
-        sudo -n apt-get upgrade -y git maven
+        sudo -n apt-get upgrade -y patch autoconf automake diffutils pkgconf fakeroot git maven file tar bzip2 zstd python3 python3-pip
+        python3 -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: Silence all git safe directory warnings
-      run: git config --system --add safe.directory '*'
-
-    - name: Update repository
-      run: |
-        git submodule update --init --recursive
+    - name: Set workspace permissions
+      run: chmod 777 -R "$GITHUB_WORKSPACE"
 
     - name: Prepare master libnx
       run: |
@@ -39,3 +39,4 @@ jobs:
       with:
         name: SdOut
         path: SdOut.zip
+        if-no-files-found: error

.gitmodules

@@ -7,3 +7,9 @@
 [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,9 +1,9 @@
 VERSION_MAJOR	:=	1
 VERSION_MINOR	:=	0
 VERSION_MICRO	:=	0
-VERSION			:=	$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
+export VERSION	:=	$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
 
-export UL_DEFS	:=	-DUL_VERSION=\"$(VERSION)\"
+export UL_DEFS	:=	-DUL_MAJOR=$(VERSION_MAJOR) -DUL_MINOR=$(VERSION_MINOR) -DUL_MICRO=$(VERSION_MICRO) -DUL_VERSION=\"$(VERSION)\"
 
 .PHONY: all fresh clean pu arc usystem uloader umenu umanager uscreen
 
@@ -47,6 +47,7 @@ umenu: pu
 	@$(MAKE) -C projects/uMenu
 	@mkdir -p SdOut/ulaunch/bin/uMenu
 	@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
@@ -58,4 +59,4 @@ umanager: pu
 	@cp projects/uManager/uManager.nro SdOut/switch/uManager.nro
 
 uscreen:
-	@cd projects/uScreen && mvn package
+	@cd projects/uScreen && mvn package

README.md

@@ -18,7 +18,8 @@ include $(DEVKITPRO)/libnx/switch_rules
 BUILD		:=	build
 TARGET		:=  $(notdir $(CURDIR))
 SOURCES		:=	source source/ul source/ul/fs source/ul/cfg source/ul/menu source/ul/smi source/ul/system source/ul/acc source/ul/net source/ul/os source/ul/util
-INCLUDES	:=	include
+INCLUDES	:=	include ../json/single_include/nlohmann ../zip/src
+SOURCES		+=	../zip/src
 OUT_LIB		:=	lib
 
 #---------------------------------------------------------------------------------