Update docker, remove custom libmm7a and update azure script (#1066)

* Remove docker and use latest dka libmm7a

1. The audio bug was fixed so there's no reason to continue using the old one
2. Docker isn't needed anymore; DSTWO and R4i booting has been fixed.
Besides, I doubt it would work with the newer code

* Delete libmm7.a

* Fix azure dependency

* Update docker

1. Instead of having it in its own folder, have it at root
2. Remove forked libnds stuff
3. Update it to use the latest image

That way, in case dkA messes up in the future, at least we have a base

* Update path [Part 1]

* Update path [Part 2]

* Delete forked libnds

* Readd docker

but use Ubuntu 20.04 and update script to stay more consistent with the normal one

* Fix spacing

* Fix title

* Remove updating libraries

They're now included in Ubuntu 20.04

Dockerfile

@@ -0,0 +1,7 @@
+FROM devkitpro/devkitarm:20200528
+# ENV TWLNOPATCHSRLHEADER=1
+RUN \
+  apt-get update && \
+  apt-get install -y python && \
+  rm -rf /var/lib/apt/lists/* 
+WORKDIR /data

azure-pipelines.yml

@@ -13,13 +13,10 @@ jobs:
   - job: latest_build
     displayName: "Build with latest devkitARM"
     pool:
-      vmImage: 'Ubuntu-16.04'
+      vmImage: 'Ubuntu-20.04'
     steps:
     - script: |
         curl -L https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb -o pacman.deb
-        sudo apt update
-        # Install haveged to ensure enough entropy
-        sudo apt install p7zip-full jq haveged
         sudo dpkg -i pacman.deb
 
         sudo dkp-pacman -Sy
@@ -30,7 +27,6 @@ jobs:
         export DEVKITPRO="/opt/devkitpro"
         export DEVKITARM="/opt/devkitpro/devkitARM"
         # export TWLNOPATCHSRLHEADER=1
-        sudo cp libmm7.a /opt/devkitpro/libnds/lib/libmm7.a
         make package
       displayName: 'Build TWiLight Menu++ with latest devkitARM'
 
@@ -123,34 +119,43 @@ jobs:
 
   - job: docker_build
     pool:
-      vmImage: 'Ubuntu-16.04'
-    displayName: "Build with Docker using forked libnds and devkitARM r50"
+      vmImage: 'Ubuntu-20.04'
+    displayName: "Build with Docker using devKitARM r54"
     steps:
       - script: |
-          sudo apt update
-          sudo apt install p7zip-full
-        displayName: "Install 7zip"
-      - script: |
-          docker build -t twilightmenu --label twilightmenu ./docker
+          docker build -t twilightmenu --label twilightmenu ./
           docker ps -a
         displayName: "Build Docker image"
       - script: |
           docker run --rm -i -v "$(Build.SourcesDirectory):/data" twilightmenu make package
-        displayName: "Build TWiLightMenu++ with Docker using forked libnds and devkitARM r50"
-
+        displayName: "Build TWiLightMenu++ with devkitARM r54"
       - script: |
           cd booter/
           chmod +x make_cia
           ./make_cia --srl="booter.nds" --id_0=$(git rev-parse --short=7 HEAD) --tikID=$(git rev-parse --short=16 HEAD)
           mkdir -p "../7zfile/3DS - CFW users/"
           cp "booter.cia" "../7zfile/3DS - CFW users/TWiLight Menu.cia"
+
           cd ../rungame/
           chmod +x make_cia
           ./make_cia --srl="rungame.nds" --id_0=$(git rev-parse --short=7 HEAD) --tikID=$(git rev-parse --short=16 HEAD)
           cp "rungame.cia" "../7zfile/3DS - CFW users/TWiLight Menu - Game booter.cia"
         displayName: 'Make booter and TWiLightMenu CIAs'
+      - script: |
+          cd booter_fc/r4_menu_dat/
+          cp "../booter_fc.nds" "_DS_MENU.nds"
+          ./dlditool r4_sd.dldi _DS_MENU.nds
 
+          ./r4enc _DS_MENU.nds
+          mv "_DS_MENU.nds.DAT" "../../7zfile/Flashcard users/Autoboot/akMenu-Wood UI root/_DS_MENU.DAT"
+        name: makeDat
+        displayName: 'Make WoodR4 _DS_MENU.DAT files'
       - script: |
+          rm -r 7zfile/_nds/TWiLightMenu/*menu/
+          # Clean .gitkeep files
+          rm -rf 7zfile/*/.gitkeep
+          rm -rf 7zfile/*/*/.gitkeep
+
           mv 7zfile/ TWiLightMenu/
           7z a TWiLightMenu.7z TWiLightMenu/
           cp TWiLightMenu.7z $(Build.ArtifactStagingDirectory)/TWiLightMenu_docker.7z

compile_docker.ps1

@@ -9,7 +9,7 @@ docker image inspect twilightmenu >$null 2>&1
 
 if (!$?) {
     # build the image if it doesn't exist.
-    docker build -t twilightmenu --label twilightmenu ./docker
+    docker build -t twilightmenu --label twilightmenu ./
 }
 
-docker run --rm -t -i -v "$pwd\:/data" twilightmenu make @args
+docker run --rm -t -i -v "$pwd\:/data" twilightmenu make @args

compile_docker.sh

@@ -10,7 +10,7 @@ docker image inspect twilightmenu >/dev/null 2>&1
 
 if [ $? -ne 0 ]; then
     # build the image if it doesn't exist.
-    docker build -t twilightmenu --label twilightmenu ./docker
+    docker build -t twilightmenu --label twilightmenu ./
 fi
 
-docker run --rm -t -i -v "$(pwd):/data" twilightmenu make $@
+docker run --rm -t -i -v "$(pwd):/data" twilightmenu make $@