Moved the wiidist target to ports.mk, cleaned it up and automated meta.xml generation.

svn-id: r41619

7 files changed, 62 insertions, 56 deletions

diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index 030cc997eb..f99288c4a6 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -1,61 +1,25 @@
-WII_ELF=scummvm.elf
-WII_DOL=scummvm.dol
-WII_DISTPATH=$(srcdir)/dists/wii
-all: $(WII_DOL)
+WII_EXE := scummvm$(EXEEXT)
+WII_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 
-$(WII_DOL): $(WII_ELF)
-	$(DEVKITPPC)/bin/elf2dol $< $@
+$(WII_EXE_STRIPPED): $(WII_EXE)
+	$(STRIP) $< -o $@
 
 clean: wiiclean
 
 wiiclean:
-	$(RM) $(WII_DOL)
+	$(RM) $(WII_EXE_STRIPPED)
 
-wiiload: $(WII_DOL)
-	$(DEVKITPPC)/bin/wiiload $(WII_DOL) -d3
+wiiload: $(WII_EXE_STRIPPED)
+	$(DEVKITPPC)/bin/wiiload $<
 
-geckoupload: $(WII_DOL)
-	$(DEVKITPPC)/bin/geckoupload $(WII_DOL)
+geckoupload: $(WII_EXE_STRIPPED)
+	$(DEVKITPPC)/bin/geckoupload $<
 
 wiigdb:
-	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_ELF)
+	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE)
 
 wiidebug:
-	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_ELF) -x $(srcdir)/backends/platform/wii/gdb.txt
-
-wiidist:
-	$(MKDIR) dist/scummvm
-	$(CP) $(WII_DOL) dist/scummvm/boot.dol
-	$(CP) $(WII_DISTPATH)/meta.xml dist/scummvm/
-	$(CP) $(WII_DISTPATH)/icon.png dist/scummvm/
-	$(CP) $(WII_DISTPATH)/READMII dist/scummvm/
-	$(CP) $(srcdir)/AUTHORS dist/scummvm/
-	$(CP) $(srcdir)/COPYING dist/scummvm/
-	$(CP) $(srcdir)/COPYING.LGPL dist/scummvm/
-	$(CP) $(srcdir)/COPYRIGHT dist/scummvm/
-	$(CP) $(srcdir)/NEWS dist/scummvm/
-	$(CP) $(srcdir)/README dist/scummvm/
-	$(CP) $(srcdir)/dists/pred.dic dist/scummvm/
-	$(CP) $(DIST_FILES_THEMES) dist/scummvm/
-ifneq ($(DIST_FILES_ENGINEDATA),)
-	$(CP) $(DIST_FILES_ENGINEDATA) dist/scummvm/
-endif
-
-gcdist:
-	$(MKDIR) dist/scummvm
-	$(CP) $(WII_DOL) dist/scummvm/
-	$(CP) $(WII_DISTPATH)/READMII dist/scummvm/
-	$(CP) $(srcdir)/AUTHORS dist/scummvm/
-	$(CP) $(srcdir)/COPYING dist/scummvm/
-	$(CP) $(srcdir)/COPYING.LGPL dist/scummvm/
-	$(CP) $(srcdir)/COPYRIGHT dist/scummvm/
-	$(CP) $(srcdir)/NEWS dist/scummvm/
-	$(CP) $(srcdir)/README dist/scummvm/
-	$(CP) $(srcdir)/dists/pred.dic dist/scummvm/
-	$(CP) $(DIST_FILES_THEMES) dist/scummvm/
-ifneq ($(DIST_FILES_ENGINEDATA),)
-	$(CP) $(DIST_FILES_ENGINEDATA) dist/scummvm/
-endif
-
-.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug wiidist gcdist
+	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE) -x $(srcdir)/backends/platform/wii/gdb.txt
+
+.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug
 
diff --git a/configure b/configure
index 65e516de1a..0d2af6ab4e 100755
--- a/configure
+++ b/configure
@@ -1311,8 +1311,10 @@ if test -n "$_host"; then
 			type_4_byte='int'
 			_ar="$_host_alias-ar cru"
 			_ranlib=$_host_alias-ranlib
+			_strip=$_host_alias-strip
 			_backend="wii"
 			_build_hq_scalers="no"
+			add_line_to_config_mk 'GAMECUBE = 0'
 			add_line_to_config_mk 'include $(srcdir)/backends/platform/wii/wii.mk'
 			add_line_to_config_h "#define DEBUG_WII_USBGECKO"
 			add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"
@@ -1329,10 +1331,13 @@ if test -n "$_host"; then
 			type_4_byte='int'
 			_ar="$_host_alias-ar cru"
 			_ranlib=$_host_alias-ranlib
+			_strip=$_host_alias-strip
 			_backend="wii"
 			_build_hq_scalers="no"
 			_mt32emu="no"
+			add_line_to_config_mk 'GAMECUBE = 1'
 			add_line_to_config_mk 'include $(srcdir)/backends/platform/wii/wii.mk'
+			add_line_to_config_h '#define GAMECUBE'
 			add_line_to_config_h "/* #define DEBUG_WII_USBGECKO */"
 			add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"
 			add_line_to_config_h "/* #define DEBUG_WII_GDB */"
@@ -1929,7 +1934,6 @@ case $_backend in
 		DEFINES="$DEFINES -D__WII__ -DGEKKO"
 		case $_host_os in
 		gamecube)
-			DEFINES="$DEFINES -DGAMECUBE"
 			LIBS="$LIBS -lfat -logc -ldb"
 			;;
 		*)
diff --git a/dists/wii/READMII b/dists/wii/READMII
index c0c67eafd7..b9460a9863 100644
--- a/dists/wii/READMII
+++ b/dists/wii/READMII
@@ -1,9 +1,6 @@
 Wii/Gamecube port of ScummVM README
 -----------------------------------
 
-features not compiled in:
-- the AGI game engine
-
 REQUIREMENTS
 
   wii:
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index fb53474052..f8ccbde5e8 100644
--- a/dists/wii/meta.xml
+++ b/dists/wii/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>ScummVM</name>
   <coder>The ScummVM Team</coder>
-  <version>rev FIXME</version>
-  <release_date>FIXME</release_date>
+  <version>0.14.0svn@REVISION@</version>
+  <release_date>@TIMESTAMP@</release_date>
   <short_description>Point &amp; Click Adventures</short_description>
   <long_description>ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
 
diff --git a/dists/wii/meta.xml.in b/dists/wii/meta.xml.in
new file mode 100644
index 0000000000..7df9f6d350
--- /dev/null
+++ b/dists/wii/meta.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<app version="1">
+  <name>ScummVM</name>
+  <coder>The ScummVM Team</coder>
+  <version>@VERSION@@REVISION@</version>
+  <release_date>@TIMESTAMP@</release_date>
+  <short_description>Point &amp; Click Adventures</short_description>
+  <long_description>ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
+
+Some of the adventures ScummVM supports include Adventure Soft's Simon the Sorcerer 1 and 2; Revolution's Beneath A Steel Sky, Broken Sword 1 and Broken Sword 2; Flight of the Amazon Queen; Wyrmkeep's Inherit the Earth; Coktel Vision's Gobliiins; Westwood Studios' The Legend of Kyrandia and games based on LucasArts' SCUMM (Script Creation Utility for Maniac Mansion) system such as Monkey Island, Day of the Tentacle, Sam and Max and more.</long_description>
+</app>
+
diff --git a/ports.mk b/ports.mk
index e3a9df2640..ffe7b02116 100644
--- a/ports.mk
+++ b/ports.mk
@@ -188,4 +188,32 @@ aos4dist: $(EXECUTABLE)
 	cp $(srcdir)/NEWS $(AOS4PATH)/NEWS.txt
 	cp $(srcdir)/README $(AOS4PATH)/README.txt
 
-.PHONY: deb bundle osxsnap win32dist install uninstall
+#
+# Wii/Gamecube specific
+#
+
+# Special target to create an Wii snapshot
+wiidist: $(EXECUTABLE)
+	$(MKDIR) wiidist/scummvm
+ifeq ($(GAMECUBE),1)
+	$(DEVKITPPC)/bin/elf2dol $(EXECUTABLE) wiidist/scummvm/scummvm.dol
+else
+	$(STRIP) $(EXECUTABLE) -o wiidist/scummvm/boot.elf
+	$(CP) $(srcdir)/dists/wii/icon.png wiidist/scummvm/
+	sed "s/@REVISION@/$(VER_SVNREV)/;s/@TIMESTAMP@/`date +%Y%m%d%H%M%S`/" < $(srcdir)/dists/wii/meta.xml > wiidist/scummvm/meta.xml
+endif
+	$(CP) $(srcdir)/dists/wii/READMII wiidist/scummvm/
+	$(CP) $(srcdir)/AUTHORS wiidist/scummvm/AUTHORS.txt
+	$(CP) $(srcdir)/COPYING wiidist/scummvm/COPYING.txt
+	$(CP) $(srcdir)/COPYING.LGPL wiidist/scummvm/COPYING.LGPL.txt
+	$(CP) $(srcdir)/COPYRIGHT wiidist/scummvm/COPYRIGHT.txt
+	$(CP) $(srcdir)/NEWS wiidist/scummvm/NEWS.txt
+	$(CP) $(srcdir)/README wiidist/scummvm/README.txt
+	$(CP) $(srcdir)/dists/pred.dic wiidist/scummvm/
+	$(CP) $(DIST_FILES_THEMES) wiidist/scummvm/
+ifneq ($(DIST_FILES_ENGINEDATA),)
+	$(CP) $(DIST_FILES_ENGINEDATA) wiidist/scummvm/
+endif
+	sed -i 's/$$/\r/' wiidist/scummvm/*.txt
+
+.PHONY: deb bundle osxsnap win32dist wiidist install uninstall
diff --git a/tools/update-version.pl b/tools/update-version.pl
index dda4fcbcf9..ec0249c872 100755
--- a/tools/update-version.pl
+++ b/tools/update-version.pl
@@ -35,6 +35,7 @@ my @subs_files = qw(
 	dists/redhat/scummvm.spec
 	dists/scummvm.rc
 	dists/slackware/scummvm.SlackBuild
+	dists/wii/meta.xml
 	backends/platform/psp/README.PSP
 	);