[Build] Fix the Dockerfile (DS-Homebrew#412)

* Build: Fix docker build and gl2d linking * Use older devkitarm base * add back libnds.7z * use prebuilt tar * Update PR Template to say provided dkp
malekairmaroc7 · Feb 16, 2019 · 16a08dc · 16a08dc
1 parent 78eeb3d
commit 16a08dc
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 29 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@ _Tell us where have you tested it._
 
 *** 
 #### Pull Request status
-- [ ]  This PR has been tested using latest devkitPro, devkitARM, and EasyGL2D.  
+- [ ]  This PR has been tested using the provided devkitPro, devkitARM, and EasyGL2D.  
 
 _(Do not edit after this point)_
 - [ ]  This PR is fully documented.

diff --git a/README.md b/README.md
@@ -10,14 +10,20 @@ Building this app by yourself requires devkitPRO with devkitARM and [RocketRobz
 
 TWiLight Menu++ comes included with a Docker image for easy building without having to manually set up the required version of devkitARM.
 
-## Building with Docker for Windows users.
+You can compile TWiLight Menu++ with Docker using the provided PowerShell (`.ps1`) scripts. First, install Docker at http://docker.com or through your package manager of choice.
 
-You can compile TWiLight Menu++ with Docker using the provided PowerShell (`.ps1`) scripts. First, install docker at http://docker.com, and [configured Shared Drives](https://blogs.msdn.microsoft.com/stevelasker/2016/06/14/configuring-docker-for-windows-volumes/) for the drive where TWiLight Menu++ is cloned. 
 
-Then run `compile_docker.ps1` in a PowerShell window. The script accepts `make` arguments as well, for example `.\compile_docker.ps1 clean`. Note that Docker compilation is not compatible with native Windows compilation. You should run `.\compile_docker.ps1 clean` to clean the artifacts before attempting to build with Docker.
+Then run `compile_docker.ps1` or `compile_docker.sh`. The script accepts `make` arguments as well, for example `.\compile_docker.ps1 clean`. 
 
 To build all artifacts, run `.\compile_docker.ps1 package`.
 
+## Notes about Docker builds for Windows users
+
+Note that Docker compilation is not compatible with native compilation (if on Windows). You should run `.\compile_docker.ps1 clean` to clean the artifacts before attempting to build with Docker.
+
+If a notification appears 
+
+
 # Credits
 ## Main Developers
 - [RocketRobz](https://github.com/RocketRobz): Lead Developer, implementing the auto-reset power button function used in NTR-mode, and LED functions, to nds-bootstrap.

diff --git a/booter/Makefile b/booter/Makefile
@@ -26,7 +26,7 @@ VERSION	:=	$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
 TARGET		:=	booter
 BUILD		:=	build
 SOURCES		:=	source source/graphics
-INCLUDES	:=	include
+INCLUDES	:=	include source source/graphics
 DATA		:=	data  
 GRAPHICS	:=  gfx
 
@@ -50,7 +50,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/booter/arm9/Makefile b/booter/arm9/Makefile
@@ -20,7 +20,7 @@ include $(DEVKITARM)/ds_rules
 TARGET		:=	booter
 BUILD		:=	build
 SOURCES		:=	source source/graphics
-INCLUDES	:=	include
+INCLUDES	:=	include source
 DATA		:=	../data  
 GRAPHICS	:=  ../gfx
 MUSIC       :=  ../music
@@ -44,7 +44,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/booter/compile_docker.ps1 b/booter/compile_docker.ps1
@@ -5,14 +5,14 @@ if (!$?) {
 }
 
 #check for dsimenuplusplus image
-docker image inspect dsimenuplusplus >$null 2>&1 
+docker image inspect twilightmenu >$null 2>&1 
 
 if (!$?) {
     # build the image if it doesn't exist.
-    docker build -t dsimenuplusplus --label dsimenuplusplus ../docker
+    docker build -t twilightmenu --label twilightmenu ../docker
 }
 
-docker run --rm -t -i -v "$pwd\:/data" dsimenuplusplus make @args
+docker run --rm -t -i -v "$pwd\:/data" twilightmenu make @args
 
 if($args.Count -eq 0 -and $?) {
     Copy-Item "booter.nds" "../7zfile/BOOT.NDS"

diff --git a/compile_docker.ps1 b/compile_docker.ps1
@@ -5,11 +5,11 @@ if (!$?) {
 }
 
 #check for TWiLightMenu image
-docker image inspect TWiLightMenu >$null 2>&1 
+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
 }
 
-docker run --rm -t -i -v "$pwd\:/data" TWiLightMenu make @args
+docker run --rm -t -i -v "$pwd\:/data" twilightmenu make @args
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,7 +1,10 @@
 FROM devkitpro/devkitarm:20180613
-# ADD libnds.tar /devkitpro
+ADD libnds.tar /opt/devkitpro
 RUN \
   apt-get update && \
   apt-get install -y python && \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/* 
+  # git clone https://github.com/RocketRobz/libnds /temp/libnds && \
+  # cd /temp/libnds && \
+  # make install
 WORKDIR /data
diff --git a/docker/libnds.tar b/docker/libnds.tar
diff --git a/mainmenu/Makefile b/mainmenu/Makefile
@@ -51,7 +51,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/mainmenu/arm9/Makefile b/mainmenu/arm9/Makefile
@@ -44,7 +44,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lmm9 -lgl2d -lnds9
+LIBS	:= 	-lfat -lmm9 -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/romsel_dsimenutheme/Makefile b/romsel_dsimenutheme/Makefile
@@ -51,7 +51,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/romsel_dsimenutheme/arm9/Makefile b/romsel_dsimenutheme/arm9/Makefile
@@ -44,7 +44,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lmm9 -lgl2d -lnds9
+LIBS	:= 	-lfat -lmm9 -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/romsel_dsimenutheme/compile_docker.ps1 b/romsel_dsimenutheme/compile_docker.ps1
@@ -5,14 +5,14 @@ if (!$?) {
 }
 
 #check for TWiLightMenu image
-docker image inspect TWiLightMenu >$null 2>&1 
+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
 }
 
-docker run --rm -t -i -v "$pwd\:/data" TWiLightMenu make @args
+docker run --rm -t -i -v "$pwd\:/data" twilightmenu make @args
 
 if($args.Count -eq 0 -and $?) {
     Copy-Item "romsel_dsimenutheme.nds" "../7zfile/_nds/TWiLightMenu/dsimenu.srldr"

diff --git a/romsel_r4theme/Makefile b/romsel_r4theme/Makefile
@@ -51,7 +51,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/romsel_r4theme/arm9/Makefile b/romsel_r4theme/arm9/Makefile
@@ -44,7 +44,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lmm9 -lgl2d -lnds9
+LIBS	:= 	-lfat -lmm9 -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/settings/Makefile b/settings/Makefile
@@ -51,7 +51,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/settings/arm9/Makefile b/settings/arm9/Makefile
@@ -44,7 +44,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lmm9 -lgl2d -lnds9
+LIBS	:= 	-lfat -lmm9 -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/title/Makefile b/title/Makefile
@@ -51,7 +51,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g -Wl,--gc-sections $(ARCH) -Wl,-Map,$(notdir $*
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lgl2d -lnds9
+LIBS	:= 	-lfat -lnds9
 
 
 #---------------------------------------------------------------------------------

diff --git a/title/arm9/Makefile b/title/arm9/Makefile
@@ -44,7 +44,7 @@ LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project (order is important)
 #---------------------------------------------------------------------------------
-LIBS	:= 	-lfat -lmm9 -lgl2d -lnds9
+LIBS	:= 	-lfat -lmm9 -lnds9
 
 
 #---------------------------------------------------------------------------------