[Scummvm-cvs-logs] SF.net SVN: scummvm:[41619] scummvm/trunk
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Thu Jun 18 01:36:00 CEST 2009
Revision: 41619
http://scummvm.svn.sourceforge.net/scummvm/?rev=41619&view=rev
Author: dhewg
Date: 2009-06-17 23:36:00 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
Moved the wiidist target to ports.mk, cleaned it up and automated meta.xml generation.
Modified Paths:
--------------
scummvm/trunk/backends/platform/wii/wii.mk
scummvm/trunk/configure
scummvm/trunk/dists/wii/READMII
scummvm/trunk/dists/wii/meta.xml
scummvm/trunk/ports.mk
scummvm/trunk/tools/update-version.pl
Added Paths:
-----------
scummvm/trunk/dists/wii/meta.xml.in
Modified: scummvm/trunk/backends/platform/wii/wii.mk
===================================================================
--- scummvm/trunk/backends/platform/wii/wii.mk 2009-06-17 23:16:21 UTC (rev 41618)
+++ scummvm/trunk/backends/platform/wii/wii.mk 2009-06-17 23:36:00 UTC (rev 41619)
@@ -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
+ $(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE) -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
+.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug
-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
-
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2009-06-17 23:16:21 UTC (rev 41618)
+++ scummvm/trunk/configure 2009-06-17 23:36:00 UTC (rev 41619)
@@ -1311,8 +1311,10 @@
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 @@
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 @@
DEFINES="$DEFINES -D__WII__ -DGEKKO"
case $_host_os in
gamecube)
- DEFINES="$DEFINES -DGAMECUBE"
LIBS="$LIBS -lfat -logc -ldb"
;;
*)
Modified: scummvm/trunk/dists/wii/READMII
===================================================================
--- scummvm/trunk/dists/wii/READMII 2009-06-17 23:16:21 UTC (rev 41618)
+++ scummvm/trunk/dists/wii/READMII 2009-06-17 23:36:00 UTC (rev 41619)
@@ -1,9 +1,6 @@
Wii/Gamecube port of ScummVM README
-----------------------------------
-features not compiled in:
-- the AGI game engine
-
REQUIREMENTS
wii:
Modified: scummvm/trunk/dists/wii/meta.xml
===================================================================
--- scummvm/trunk/dists/wii/meta.xml 2009-06-17 23:16:21 UTC (rev 41618)
+++ scummvm/trunk/dists/wii/meta.xml 2009-06-17 23:36:00 UTC (rev 41619)
@@ -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 at REVISION@</version>
+ <release_date>@TIMESTAMP@</release_date>
<short_description>Point & 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!
Added: scummvm/trunk/dists/wii/meta.xml.in
===================================================================
--- scummvm/trunk/dists/wii/meta.xml.in (rev 0)
+++ scummvm/trunk/dists/wii/meta.xml.in 2009-06-17 23:36:00 UTC (rev 41619)
@@ -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 & 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>
+
Property changes on: scummvm/trunk/dists/wii/meta.xml.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk 2009-06-17 23:16:21 UTC (rev 41618)
+++ scummvm/trunk/ports.mk 2009-06-17 23:36:00 UTC (rev 41619)
@@ -188,4 +188,32 @@
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
Modified: scummvm/trunk/tools/update-version.pl
===================================================================
--- scummvm/trunk/tools/update-version.pl 2009-06-17 23:16:21 UTC (rev 41618)
+++ scummvm/trunk/tools/update-version.pl 2009-06-17 23:36:00 UTC (rev 41619)
@@ -35,6 +35,7 @@
dists/redhat/scummvm.spec
dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
+ dists/wii/meta.xml
backends/platform/psp/README.PSP
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list