[Scummvm-cvs-logs] SF.net SVN: scummvm:[49877] scummvm/trunk

djwillis at users.sourceforge.net djwillis at users.sourceforge.net
Tue Jun 15 19:49:40 CEST 2010


Revision: 49877
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49877&view=rev
Author:   djwillis
Date:     2010-06-15 17:49:40 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
GP2XWiz: Add port distribution rules into a makefile so they can be used with buildbot.

This removes them from the old scripts in /backends/platform/gp2xwiz/build/ and puts them in the right place as make targets.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/gp2xwiz/build/bundle-debug.sh
    scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh
    scummvm/trunk/configure

Added Paths:
-----------
    scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-bundle.mk

Modified: scummvm/trunk/backends/platform/gp2xwiz/build/bundle-debug.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/build/bundle-debug.sh	2010-06-15 17:47:23 UTC (rev 49876)
+++ scummvm/trunk/backends/platform/gp2xwiz/build/bundle-debug.sh	2010-06-15 17:49:40 UTC (rev 49877)
@@ -2,53 +2,8 @@
 
 echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
 
-echo Collecting files.
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib"
+cd ../../../..
 
+echo Building ScummVM for GP2X Wiz.
 
-echo "Please put your save games in this dir" >> "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
-
-cp ./scummvm-gdb.gpe ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/scummvm.gpe
-cp ./scummvm.png ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./README-GP2XWIZ ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./scummvm.ini ./scummvm-wiz-`date '+%Y-%m-%d'`/
-cp ../../../../scummvm.wiz ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../AUTHORS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../README ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYING ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
-cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
-
-# Copy over dynamic libs needed by the app (as the ones in the default filesystem are broken).
-f=`which arm-open2x-linux-g++`
-loc=`dirname "$f"`
-cp $loc/../lib/libz.so.1.2.3 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libz.so.1
-cp $loc/../lib/libvorbisidec.so.1.0.2 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libvorbisidec.so.1
-
-echo Building ZIP bundle.
-if [ -f /usr/bin/zip ]
-	then
-		rm ./"scummvm-wiz-`date '+%Y-%m-%d'`.zip"
-		cd "scummvm-wiz-`date '+%Y-%m-%d'`"
-		zip -r -9 "../scummvm-wiz-`date '+%Y-%m-%d'`.zip" *
-		echo You should have a "scummvm-wiz-`date '+%Y-%m-%d'`.zip" for the GP2X Wiz backend ready to go.
-		cd ..
-		rm -R ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-	else
-		echo - /usr/bin/zip not found, ZIP bundle not created.
-		echo All included files can also be found in ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-		echo - Please use you preferred archive tool to bundle these files.
-fi
-
-echo Please ensure GDB is installed somewhere in the path on your Wiz.
-
+make gp2xwiz-bundle-debug

Modified: scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh	2010-06-15 17:47:23 UTC (rev 49876)
+++ scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh	2010-06-15 17:49:40 UTC (rev 49877)
@@ -2,56 +2,8 @@
 
 echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
 
-echo Collecting files.
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data"
-mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib"
+cd ../../../..
 
+echo Building ScummVM for GP2X Wiz.
 
-echo "Please put your save games in this dir" >> "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
-
-cp ./scummvm.gpe ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./scummvm.png ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./README-GP2XWIZ ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ./scummvm.ini ./scummvm-wiz-`date '+%Y-%m-%d'`/
-cp ../../../../scummvm.wiz ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../AUTHORS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../README ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYING ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
-cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
-cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
-
-# Copy over dynamic libs needed by the app (as the ones in the default filesystem are broken).
-f=`which arm-open2x-linux-g++`
-loc=`dirname "$f"`
-cp $loc/../lib/libz.so.1.2.3 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libz.so.1
-cp $loc/../lib/libvorbisidec.so.1.0.2 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libvorbisidec.so.1
-
-echo Making Stripped Binary.
-arm-open2x-linux-strip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/scummvm.wiz
-
-echo Making Stripped Plugins.
-arm-open2x-linux-strip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins/*
-
-echo Building ZIP bundle.
-if [ -f /usr/bin/zip ]
-	then
-		rm ./"scummvm-wiz-`date '+%Y-%m-%d'`.zip"
-		cd "scummvm-wiz-`date '+%Y-%m-%d'`"
-		zip -r -9 "../scummvm-wiz-`date '+%Y-%m-%d'`.zip" *
-		echo You should have a "scummvm-wiz-`date '+%Y-%m-%d'`.zip" for the GP2X Wiz backend ready to go.
-		cd ..
-		rm -R ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-	else
-		echo - /usr/bin/zip not found, ZIP bundle not created.
-		echo All included files can also be found in ./"scummvm-wiz-`date '+%Y-%m-%d'`"
-		echo - Please use you preferred archive tool to bundle these files.
-fi
+make gp2xwiz-bundle

Added: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-bundle.mk
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-bundle.mk	                        (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-bundle.mk	2010-06-15 17:49:40 UTC (rev 49877)
@@ -0,0 +1,73 @@
+# Special target to create bundles for the GP2X Wiz.
+
+#bundle_name = release/scummvm-wiz-`date '+%Y-%m-%d'`
+bundle_name = release/scummvm-gp2xwiz
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
+
+gp2xwiz-bundle: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/saves"
+	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+	
+	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+	$(STRIP) $(bundle_name)/scummvm/plugins/*
+endif
+	
+	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1
+	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1
+
+	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+	rm -R ./$(bundle_name)	
+
+gp2xwiz-bundle-debug: $(EXECUTABLE)
+	$(MKDIR) "$(bundle_name)"
+	$(MKDIR) "$(bundle_name)/scummvm"
+	$(MKDIR) "$(bundle_name)/scummvm/saves"
+	$(MKDIR) "$(bundle_name)/scummvm/engine-data"
+	$(MKDIR) "$(bundle_name)/scummvm/lib"
+	
+	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/	
+
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+	$(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+endif
+	
+	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1
+	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1
+
+	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
+	rm -R ./$(bundle_name)	
+
+.PHONY: gp2xwiz-bundle gp2xwiz-bundle-debug


Property changes on: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-bundle.mk
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-06-15 17:47:23 UTC (rev 49876)
+++ scummvm/trunk/configure	2010-06-15 17:49:40 UTC (rev 49877)
@@ -1505,6 +1505,7 @@
 			_build_hq_scalers="no"
 			_mt32emu="no"
 			_vkeybd="yes"
+			_port_mk="backends/platform/gp2xwiz/gp2xwiz-bundle.mk"
 			;;
 		iphone)
 			DEFINES="$DEFINES -DIPHONE -DUNIX"


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