Merge pull request #442 from hmxmilohax/develop

.github/workflows/build.yml

@@ -3,175 +3,49 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-
-  build_yarg_updates:
+  build_yarg:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v3
-      - name: Remove PS3 files
-        run: |
-          find . -name "*.*_ps3" -type f -delete
-          find . -name "*.*_wii" -type f -delete
-      - name: Clean up files
-        run: |
-           rm _ark/songs/missing_song_data.dta
-           rm _ark/songs/missing_song_data_updates.dta
-           rm  -rf _ark/songs/dta_sections
-           rm  -rf _ark/songs/dta_collection
-           mv _ark/songs/beencaughtstealing _ark/songs/updates/beencaughtstealing
-           mv _ark/songs/getupstandup _ark/songs/updates/getupstandup
-           mv _ark/songs/nooneknows _ark/songs/updates/nooneknows
-           mv _ark/songs/radarlove _ark/songs/updates/radarlove
-           mv _ark/songs/thepoweroflove _ark/songs/updates/thepoweroflove
-           mv _ark/songs/updates _ark/songs/songs_updates
-      
-      - name: Upload result
-        uses: actions/upload-artifact@v2
-        with:
-          name: RB3DX-YARG-Updates
-          path: _ark/songs
-
-  build_wii:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
-      - name: Download Mackiloha
-        run: |
-          pip install requests
-          python dependencies/dev_scripts/download_mackiloha.py
-      - name: Download gen
-        run: |
-          pip install gdown
-          cd _build/wii/wit_input/files/
-          gdown --folder 1wYBxP9WuRicS5MBBWtzOycDzRUVgO6UW
-          cd /home/runner/work/rock-band-3-deluxe/rock-band-3-deluxe/
-          mkdir ./_build/wii/RB3DX
-          mkdir ./_build/wii/RB3DX/gen
-      - name: Set env
+          python-version: '3.11'
+      - name: Build Files
         run: |
-          echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-          chmod a+x dependencies/linux/arkhelper
-          chmod a+x dependencies/linux/dtab
-          chmod a+x dependencies/linux/superfreq
-          pip install gitpython
-          pip install mido
-      - name: Remove other console files
-        run: |
-          find . -name "*.*_ps3" -type f -delete
-          find . -name "*.*_xbox" -type f -delete
-      - name: Print build info
-        run: |
-          echo $GITHUB_SHA_SHORT
-          python dependencies/dev_scripts/add_devbuild.py $GITHUB_SHA_SHORT
-      - name: Build ARK
-        run: sudo dependencies/linux/arkhelper patchcreator ./_build/wii/wit_input/files/gen/main_wii.hdr -a ./_ark -o ./_build/wii/wit_input/files
-        continue-on-error: true
-      - name: remove stuff
-        run: |
-          rm ./_build/wii/wit_input/files/gen/main_wii_9.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_8.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_7.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_6.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_5.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_4.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_3.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_2.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_1.ark
-          rm ./_build/wii/wit_input/files/gen/main_wii_0.ark
-          mv ./_build/wii/wit_input/files/gen/main_wii_10.ark ./_build/wii/RB3DX/gen/main_wii_10.ark
-          mv ./_build/wii/wit_input/files/gen/main_wii.hdr ./_build/wii/RB3DX/gen/main_wii.hdr
-          rm -rf ./_build/wii/wit_input
-      - name: Upload result
-        uses: actions/upload-artifact@v2
-        with:
-          name: RB3DX-Wii
-          path: ./_build/wii
+          sed -i '1d' _ark/dx/song_updates/songs_updates.dta
+          dependencies/python/configure_build.py yarg
+          dependencies/linux/ninja
 
-  build_wii_rawfiles:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-      - name: Download Mackiloha
-        run: |
-          pip install requests
-          python dependencies/dev_scripts/download_mackiloha.py
-      - name: Set env
-        run: |
-          echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-          chmod +x dependencies/linux/arkhelper
-          chmod +x dependencies/linux/dtab
-          chmod +x dependencies/linux/superfreq
-          pip install gitpython
-          pip install mido
-      - name: Revert mid updates to their originals
-        run: |
-          rm -rf _ark/songs/
-      - name: Remove PS3 files
-        run: |
-          find . -name "*.*_ps3" -type f -delete
-          find . -name "*.*_xbox" -type f -delete
-      - name: Print build info
-        run: |
-          echo $GITHUB_SHA_SHORT
-          python dependencies/dev_scripts/add_devbuild.py $GITHUB_SHA_SHORT
-      - name: Build ARK
-        run: |
-          dependencies/linux/arkhelper dir2ark ./_ark ./_build/xbox/gen -n "patch_xbox" -e -v 6
-      - name: Extract ARK
-        run: |
-          dependencies/linux/arkhelper ark2dir ./_build/xbox/gen/patch_xbox.hdr ./rb3/rb3 -a
-      
       - name: Upload result
         uses: actions/upload-artifact@v2
         with:
-          name: RB3DX-Wii-rawfiles
-          path: rb3
+          name: RB3DX-YARG-Updates
+          path: out/yarg
 
   build_xbox:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
-      - name: Download Mackiloha
-        run: |
-          pip install requests
-          python dependencies/dev_scripts/download_mackiloha.py
+          python-version: '3.11'
       - name: Set env
         run: |
           echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-          chmod +x dependencies/linux/arkhelper
-          chmod +x dependencies/linux/dtab
-          chmod +x dependencies/linux/superfreq
-          pip install gitpython
-          pip install mido
-      - name: Remove PS3 files
-        run: |
-          find . -name "*.*_ps3" -type f -delete
       - name: Print build info
         run: |
           echo $GITHUB_SHA_SHORT
           python dependencies/dev_scripts/add_devbuild.py $GITHUB_SHA_SHORT
       - name: Build ARK
         run: |
-          dependencies/linux/arkhelper dir2ark ./_ark ./_build/xbox/gen -n "patch_xbox" -e -v 6
+          dependencies/python/configure_build.py xbox
+          dependencies/linux/ninja
+
       - name: Remove Excess files
         run: |
           find . -name "*.txt" -type f -delete
@@ -181,46 +55,31 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: RB3DX-Xbox
-          path: _build/xbox
+          path: out/xbox
 
   build_ps3:
     runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
-      - name: Download Mackiloha
-        run: |
-          pip install requests
-          python dependencies/dev_scripts/download_mackiloha.py
-      - name: Set env
-        run: |
-          pip install gitpython
-          pip install mido
-          pip install requests
-      - name: fetch TrueAncestor PKG Repacker
-        run: |
-          python dependencies/dev_scripts/download_ta_pkg_repacker.py
-      - name: Remove Xbox files
-        run: |
-          Get-ChildItem _ark/ -recurse -include *.*_xbox | remove-item
-          Get-ChildItem _ark/ -recurse -include *.*_wii | remove-item
+          python-version: '3.11'
       - name: Print build info
         run: |
           $GITHUB_SHA_SHORT="$(git rev-parse --short HEAD)".ToUpper()
           python dependencies/dev_scripts/add_devbuild.py $GITHUB_SHA_SHORT
       - name: Build ARK
         run: |
-          dependencies/windows/arkhelper.exe dir2ark _ark _build/ps3/USRDIR/gen -n "patch_ps3" -e -v 6
+          python dependencies/python/configure_build.py ps3
+          dependencies/windows/ninja.exe
       - name: Build PKG
         run: |
           $sha_short="$(git rev-parse --short HEAD)".ToUpper()
           $content="UP8802-BLUS30463_00-RB3DXNITE"
           $packageversion="1.05"
-          dependencies/ta_pkg_repacker_tools/make_package_npdrm_retail.exe --k-licensee 0x00000000000000000000000000000000 --drm-type Local --package-version $packageversion --content-type GameData --content-id ($content + $sha_short) dependencies/ta_pkg_repacker_tools/package.conf _build/ps3
+          dependencies/ta_pkg_repacker_tools/make_package_npdrm_retail.exe --k-licensee 0x00000000000000000000000000000000 --drm-type Local --package-version $packageversion --content-type GameData --content-id ($content + $sha_short) dependencies/ta_pkg_repacker_tools/package.conf out/ps3
 
       - name: Upload result
         uses: actions/upload-artifact@v2

.gitignore

@@ -1,43 +1,19 @@
 .DS_Store
 *.pyc
 *.tmp
+*.ninja
+.ninja_log
+obj
+out
 rb3_plus
 rbdx_animated_textures
 main_xbox
 patch_xbox
 project_files
 animated_surfaces
-ta_pkg_repacker_tools
 magick
 _xenia
 
-main_xbox_9.ark
-main_xbox_8.ark
-main_xbox_7.ark
-main_xbox_6.ark
-main_xbox_5.ark
-main_xbox_4.ark
-main_xbox_3.ark
-main_xbox_2.ark
-main_xbox_1.ark
-main_xbox_0.ark
-main_xbox.hdr
-patch_xbox_0.ark
-patch_xbox.hdr
-
-main_ps3_9.ark
-main_ps3_8.ark
-main_ps3_7.ark
-main_ps3_6.ark
-main_ps3_5.ark
-main_ps3_4.ark
-main_ps3_3.ark
-main_ps3_2.ark
-main_ps3_1.ark
-main_ps3_0.ark
-patch_ps3.hdr
-patch_ps3_0.ark
-
 dx-settings-loader
 dx-settings-loader.xex
 dxsl_xbox.hdr
@@ -55,15 +31,6 @@ preload_subdirs.dtb
 game_origins.milo_xbox
 list_song_select_browser.milo_xbox
 dependencies/Mackiloha-master.zip
-dependencies/linux/arkhelper
-dependencies/linux/dtab
-dependencies/linux/superfreq
-dependencies/macOS/arkhelper
-dependencies/macOS/dtab
-dependencies/macOS/superfreq
-dependencies/windows/arkhelper.exe
-dependencies/windows/dtab.exe
-dependencies/windows/superfreq.exe
 _build/xbox/log.dta
 _build/xbox/last_log.dta
 _build/xbox/currentsong.txt
@@ -74,18 +41,7 @@ _build/xbox/discordrp.json
 user_scripts/json_path_rpcs3.txt
 user_scripts/rpcs3_directory.txt
 user_scripts/json_path_xenia.txt
-_build/wii/RB3Deluxe.wbfs
-_build/wii/wit_input/files/gen/main_wii.hdr
-_build/wii/wit_input/files/gen/main_wii_0.ark
-_build/wii/wit_input/files/gen/main_wii_1.ark
-_build/wii/wit_input/files/gen/main_wii_10.ark
-_build/wii/wit_input/files/gen/main_wii_2.ark
-_build/wii/wit_input/files/gen/main_wii_3.ark
-_build/wii/wit_input/files/gen/main_wii_4.ark
-_build/wii/wit_input/files/gen/main_wii_5.ark
-_build/wii/wit_input/files/gen/main_wii_6.ark
-_build/wii/wit_input/files/gen/main_wii_7.ark
-_build/wii/wit_input/files/gen/main_wii_8.ark
-_build/wii/wit_input/files/gen/main_wii_9.ark
-_build/wii/wit_input/files/gen/wiiprofile_memtest.dtb
-_build/wii/RB3Deluxe.iso
+rpcs3.bat
+xenia.bat
+scripts/build_rpcs3.bat
+scripts/build_xenia.bat