R3Configurator sync

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         apk add cmake
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -29,36 +29,51 @@ jobs:
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
         git fetch --prune --unshallow
 
+    - name: Resolve build version
+      run: |
+        if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
+          VERSION="${GITHUB_REF_NAME#v}"
+        else
+          VERSION="$(git describe --always --dirty --tags --exclude nightly)"
+          VERSION="${VERSION#v}"
+        fi
+        echo "CI_VERSION=${VERSION}" >> $GITHUB_ENV
+
     - name: Compile non-VFS version
       id: make
       run: |
-        cmake -B build
+        cmake -B build -DAPP_VERSION_OVERRIDE=${{ env.CI_VERSION }} -DSAS_TITLE_VERSION=${{ env.CI_VERSION }}
         cmake --build build
 
     - name: Compile VFS version
       id: make-vfs
       run: |
-        cmake -B build -DEMBED_VFS=ON -DOUTDIR=release_vfs
+        cmake -B build -DEMBED_VFS=ON -DOUTDIR=release_vfs -DAPP_VERSION_OVERRIDE=${{ env.CI_VERSION }} -DSAS_TITLE_VERSION=${{ env.CI_VERSION }}
         cmake --build build
         rm -rf build
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: steps.make.outcome == 'success'
       with:
         name: artifacts
         path: |
           release/**
           release_vfs/**
 
-    - name: Get git describe
-      run: |
-        echo "GIT_VERSION=$(git describe --always --dirty --tags --exclude nightly)" >> $GITHUB_ENV
-
     - name: Build release archive
       run: |
-        cd release_vfs
-        zip -r ../osdmenu-configurator-${{ env.GIT_VERSION }}.zip ./*
+        rm -rf package
+        mkdir -p package
+        cp release_vfs/README.md package/README.MD
+        cp release_vfs/r3configurator.elf package/r3configurator.elf
+        cp release_vfs/title.cfg package/title.cfg
+        cp release_vfs/icon.sys package/icon.sys
+        cp release_vfs/copy.icn package/copy.icn
+        cp release_vfs/del.icn package/del.icn
+        cp release_vfs/list.icn package/list.icn
+        cd package
+        zip -r ../SYS_R3CONFIGURATOR.zip README.MD r3configurator.elf title.cfg icon.sys copy.icn del.icn list.icn
 
     - name: Create nightly release
       uses: "marvinpinto/action-automatic-releases@latest"
@@ -69,7 +84,7 @@ jobs:
         prerelease: true
         title: "Nightly build"
         files: |
-          osdmenu-configurator-${{ env.GIT_VERSION }}.zip
+          SYS_R3CONFIGURATOR.zip
 
     - name: Create stable release
       uses: "marvinpinto/action-automatic-releases@latest"
@@ -78,5 +93,5 @@ jobs:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         draft: true
         files: |
-          osdmenu-configurator-${{ env.GIT_VERSION }}.zip
+          SYS_R3CONFIGURATOR.zip
 

.gitignore

@@ -2,8 +2,10 @@
 build*/
 release*/
 .vscode/settings.json
+/.codex
 *.elf
 build/
+thirdparty/
 TODO.md
 # Created by https://www.toptal.com/developers/gitignore/api/macos,windows,linux
 

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "modules/mmceman"]
 	path = modules/mmceman
 	url = https://github.com/ps2-mmce/mmceman.git
+	ignore = dirty

.vscode/tasks.json

@@ -0,0 +1,43 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Lua: Syntax Check",
+      "type": "shell",
+      "command": "bash",
+      "args": [
+        "${workspaceFolder}/tools/lua_syntax_check.sh"
+      ],
+      "windows": {
+        "command": "powershell",
+        "args": [
+          "-NoProfile",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-File",
+          "${workspaceFolder}/tools/lua_syntax_check.ps1"
+        ]
+      },
+      "group": "test",
+      "presentation": {
+        "reveal": "always",
+        "panel": "shared",
+        "clear": true
+      },
+      "problemMatcher": [
+        {
+          "owner": "lua",
+          "fileLocation": [
+            "absolute"
+          ],
+          "pattern": {
+            "regexp": "^(.*):(\\d+):\\s*(.*)$",
+            "file": 1,
+            "line": 2,
+            "message": 3
+          }
+        }
+      ]
+    }
+  ]
+}

CMakeLists.txt

@@ -5,8 +5,8 @@ include($ENV{PS2SDK}/ps2dev.cmake)
 project(osdmenu-configurator)
 
 # Executable names
-set(EE_BIN "osdmenu-configurator_unc.elf")
-set(EE_BIN_PKD "osdmenu-configurator.elf")
+set(EE_BIN "r3configurator_unc.elf")
+set(EE_BIN_PKD "r3configurator.elf")
 
 # Output directory
 set(OUTDIR "release" CACHE STRING "Release directory")
@@ -58,11 +58,40 @@ if(GIT_FOUND)
         ERROR_QUIET
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} rev-parse --short=12 HEAD
+        OUTPUT_VARIABLE GIT_COMMIT
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
 else()
     set(GIT_VERSION "unknown")
+    set(GIT_COMMIT "unknown")
+endif()
+
+if(NOT GIT_VERSION)
+    set(GIT_VERSION "unknown")
+endif()
+
+if(NOT GIT_COMMIT)
+    set(GIT_COMMIT "unknown")
 endif()
 
-add_definitions(-DAPP_VERSION=\"${GIT_VERSION}\")
+# App version shown in UI/splash:
+# - defaults to git describe
+# - can be overridden by CI/release jobs (e.g. 1.2.0)
+set(APP_VERSION_OVERRIDE "" CACHE STRING "Optional override for displayed app version (e.g. 1.2.0)")
+if(APP_VERSION_OVERRIDE STREQUAL "")
+    set(APP_VERSION_VALUE "${GIT_VERSION}")
+else()
+    set(APP_VERSION_VALUE "${APP_VERSION_OVERRIDE}")
+endif()
+if(APP_VERSION_VALUE STREQUAL "")
+    set(APP_VERSION_VALUE "unknown")
+endif()
+
+add_definitions(-DAPP_VERSION=\"${APP_VERSION_VALUE}\")
 add_definitions(-DLUA_USE_PS2)
 
 if(ENABLE_DEBUG)
@@ -116,6 +145,28 @@ target_link_libraries(${EE_BIN}
     mc
 )
 
+# SAS/title.cfg metadata configuration:
+# - Version defaults to the app version shown in UI
+# - Release date is generated at build time (ordinal format)
+set(SAS_TITLE_VERSION "" CACHE STRING "Optional override for SAS/title.cfg Version field; defaults to app display version")
+if(SAS_TITLE_VERSION STREQUAL "")
+    set(SAS_TITLE_VERSION_VALUE "${APP_VERSION_VALUE}")
+else()
+    set(SAS_TITLE_VERSION_VALUE "${SAS_TITLE_VERSION}")
+endif()
+
+if(SAS_TITLE_VERSION_VALUE STREQUAL "")
+    set(SAS_TITLE_VERSION_VALUE "unknown")
+endif()
+
+set(SAS_TITLE_SOURCE "${CMAKE_SOURCE_DIR}/SAS/title.cfg")
+set(SAS_TITLE_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/generated/SAS/title.cfg")
+set(SAS_TITLE_GEN_SCRIPT "${CMAKE_SOURCE_DIR}/cmake/generate_title_cfg.cmake")
+set(SAS_ICON_SYS_SOURCE "${CMAKE_SOURCE_DIR}/SAS/icon.sys")
+set(SAS_COPY_ICN_SOURCE "${CMAKE_SOURCE_DIR}/SAS/copy.icn")
+set(SAS_DEL_ICN_SOURCE "${CMAKE_SOURCE_DIR}/SAS/del.icn")
+set(SAS_LIST_ICN_SOURCE "${CMAKE_SOURCE_DIR}/SAS/list.icn")
+
 # Strip ELF from debug symbols
 # set_target_properties(${EE_BIN} PROPERTIES LINK_FLAGS "-s")
 
@@ -135,19 +186,39 @@ if(EMBED_VFS)
         POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTDIR}/
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/README.md ${OUTDIR}/
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/r3configurator.cnf ${OUTDIR}/r3configurator.cnf
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${EE_BIN_PKD} ${OUTDIR}/${EE_BIN_PKD}
+        COMMAND ${CMAKE_COMMAND} -DINPUT=${SAS_TITLE_SOURCE}
+                                 -DOUTPUT=${SAS_TITLE_GENERATED}
+                                 -DTITLE_VERSION=${SAS_TITLE_VERSION_VALUE}
+                                 -P ${SAS_TITLE_GEN_SCRIPT}
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_TITLE_GENERATED} ${OUTDIR}/title.cfg
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_ICON_SYS_SOURCE} ${OUTDIR}/icon.sys
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_COPY_ICN_SOURCE} ${OUTDIR}/copy.icn
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_DEL_ICN_SOURCE} ${OUTDIR}/del.icn
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_LIST_ICN_SOURCE} ${OUTDIR}/list.icn
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        COMMENT "Copying ELF to release directory"
+        COMMENT "Copying ELF and SAS assets to release directory root"
     )
 else()
     add_custom_command(
         TARGET ${EE_BIN}
         POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTDIR}/
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/README.md ${OUTDIR}/
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/r3configurator.cnf ${OUTDIR}/r3configurator.cnf
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${EE_BIN_PKD} ${OUTDIR}/${EE_BIN_PKD}
         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/scripts ${OUTDIR}/scripts
+        COMMAND ${CMAKE_COMMAND} -DINPUT=${SAS_TITLE_SOURCE}
+                                 -DOUTPUT=${SAS_TITLE_GENERATED}
+                                 -DTITLE_VERSION=${SAS_TITLE_VERSION_VALUE}
+                                 -P ${SAS_TITLE_GEN_SCRIPT}
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_TITLE_GENERATED} ${OUTDIR}/title.cfg
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_ICON_SYS_SOURCE} ${OUTDIR}/icon.sys
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_COPY_ICN_SOURCE} ${OUTDIR}/copy.icn
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_DEL_ICN_SOURCE} ${OUTDIR}/del.icn
+        COMMAND ${CMAKE_COMMAND} -E copy ${SAS_LIST_ICN_SOURCE} ${OUTDIR}/list.icn
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        COMMENT "Copying ELF and scripts to release directory"
+        COMMENT "Copying ELF, scripts, and SAS assets to release directory root"
     )
 endif()