[openMSX-commits] SF.net SVN: openmsx:[12973] openmsx/trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 12973
          http://openmsx.svn.sourceforge.net/openmsx/?rev=12973&view=rev
Author:   manuelbi
Date:     2012-11-17 20:28:36 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Integrate packaging for Dingux into the build system.

Modified Paths:
--------------
    openmsx/trunk/build/main.mk
    openmsx/trunk/build/package-dingux/node.mk

Added Paths:
-----------
    openmsx/trunk/build/package-dingux/README.txt
    openmsx/trunk/build/package-dingux/zip.mk

Removed Paths:
-------------
    openmsx/trunk/build/package-dingux/package-dingux.sh
    openmsx/trunk/doc/dingux-readme.txt

Modified: openmsx/trunk/build/main.mk
===================================================================

--- openmsx/trunk/build/main.mk	2012-11-17 19:11:46 UTC (rev 12972)
+++ openmsx/trunk/build/main.mk	2012-11-17 20:28:36 UTC (rev 12973)
@@ -655,6 +655,10 @@
 # target to create an app folder but no DMG.
 include build/package-darwin/app.mk
 else
+ifeq ($(OPENMSX_TARGET_OS),dingux)
+# ZIP file package for Dingux.
+include build/package-dingux/zip.mk
+else
 # Note: Use OPENMSX_INSTALL only to create binary packages.
 #       To change installation dir for actual installations, edit "custom.mk".
 OPENMSX_INSTALL?=$(INSTALL_BASE)
@@ -664,6 +668,7 @@
 INSTALL_DOC_DIR?=$(OPENMSX_INSTALL)/doc
 INSTALL_VERBOSE?=true
 endif
+endif
 
 # DESTDIR is a convention shared by at least GNU and FreeBSD to specify a path
 # prefix that will be used for all installed files.

Copied: openmsx/trunk/build/package-dingux/README.txt (from rev 12972, openmsx/trunk/doc/dingux-readme.txt)
===================================================================
--- openmsx/trunk/build/package-dingux/README.txt	                        (rev 0)
+++ openmsx/trunk/build/package-dingux/README.txt	2012-11-17 20:28:36 UTC (rev 12973)
@@ -0,0 +1,98 @@
+openMSX for Dingux
+==================
+
+This text is a quick guide for the Dingoo port of openMSX. It is still a bit of
+an early port, so expect it to have some rough edges. For example, startup is
+slow (expect about 10 seconds). Especially important is to not add too many and
+especially too big system roms. This makes start up and loading states (the
+first time) loads slower.
+
+We are releasing it so people can play with it and give us feedback. Please
+help us make this a great way to play MSX games on a handheld.
+Contact info is at the bottom of this text.
+
+About Dingux
+------------
+
+Dingux is Linux for the Dingoo A-320 and possibly other similar devices in the
+future.
+
+About the Dingoo A-320:
+  http://en.wikipedia.org/wiki/Dingoo
+
+Dingux blog:
+  http://www.dingux.com/
+
+Dingux downloads:
+  http://code.google.com/p/dingoo-linux/downloads/list
+
+New Dingux site hub:
+  http://dingoonity.org/
+
+Installing Dingux
+-----------------
+
+First, download the dual boot installer and follow the instructions in its
+README file.
+
+Next, download the Dingux system and copy it to your miniSD card as described
+in its README file. New Dingux system releases are made regularly and we will
+only test openMSX against the latest Dingux system release, so please keep your
+system updated.
+
+Installing openMSX
+------------------
+
+This info is also in the openMSX Compilation Guide:
+  http://openmsx.sourceforge.net/manual/compile.html#installstandalone
+
+Copy the directory named "local" from the openMSX for Dingux ZIP file to the
+root of the miniSD card. If you have run Dingux from the miniSD card before,
+there will already be a directory named "local". You can safely merge both
+directories.
+
+openMSX comes with the C-BIOS system ROMs, which is an open source MSX BIOS.
+If you'd like to use other system ROMs, for example to get disk support or
+because you want to emulate the exact MSX model you had years ago, you have
+to install those yourself. Please read this for more info:
+  http://openmsx.sourceforge.net/manual/setup.html#systemroms
+As mentioned before, currently it's wise to include only those system ROMs you
+really need. Better not install large ones either (e.g. the MoonSound ROM),
+unless you don't care about very long start up times.
+
+Using openMSX
+-------------
+
+The keymappings are documented in the openMSX User's Manual:
+  http://openmsx.sourceforge.net/manual/user.html#keymapping
+
+
+Customizing openMSX
+-------------------
+
+openMSX can be configured using the settings.xml file. This file only stores
+settings that have a non-default value.
+
+Things like key bindings can be customized by writing short Tcl scripts.
+Please have a look in the share/openmsx/scripts directory for examples. Any
+script you place there will be executed by openMSX on startup.
+
+Please read this document to learn about the commands and settings of openMSX:
+  http://openmsx.sourceforge.net/manual/commands.html
+
+Building openMSX
+----------------
+
+If you want to make bigger changes, you have to compile your own openMSX for
+Dingux.
+
+This is described in the Compilation Guide (with specific instructions for
+Dingux):
+  http://openmsx.sourceforge.net/manual/compile.html
+
+Feedback
+--------
+
+If you found a bug, made a patch, created a cool theme or have anything else
+you'd like to share, please contact us, see
+  http://openmsx.sourceforge.net/manual/user.html#contact


Property changes on: openmsx/trunk/build/package-dingux/README.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: openmsx/trunk/build/package-dingux/node.mk
===================================================================
--- openmsx/trunk/build/package-dingux/node.mk	2012-11-17 19:11:46 UTC (rev 12972)
+++ openmsx/trunk/build/package-dingux/node.mk	2012-11-17 20:28:36 UTC (rev 12973)
@@ -3,6 +3,6 @@
 include build/node-start.mk
 
 DIST:= \
-	openmsx-start.sh package-dingux.sh
+	openmsx-start.sh README.txt zip.mk
 
 include build/node-end.mk

Deleted: openmsx/trunk/build/package-dingux/package-dingux.sh
===================================================================
--- openmsx/trunk/build/package-dingux/package-dingux.sh	2012-11-17 19:11:46 UTC (rev 12972)
+++ openmsx/trunk/build/package-dingux/package-dingux.sh	2012-11-17 20:28:36 UTC (rev 12973)
@@ -1,32 +0,0 @@
-#!/bin/bash
-# $Id$
-DISTDIR=derived/dist/dingux
-ZIPFILE=openmsx-dingux-bin-`date +%Y-%m-%d`.zip
-rm -rf $DISTDIR
-mkdir -p $DISTDIR
-rm -rf $DISTDIR/../$ZIPFILE
-
-# Uncomment this if you want to create a zip in a developer's SVN tree.
-# This will also produce patches of what you changed.
-#REVISION=`svnversion -n .`
-#if echo "$REVISION" | grep -q ':'
-#then
-#	echo "Mixed-revision working copy; cannot create consistent patch"
-#	exit 1
-#fi
-#PATCH=$DISTDIR/openmsx-dingux-r`echo "$REVISION" | grep -o '[0-9]*'`.diff
-#svn diff > $PATCH
-
-mkdir -p $DISTDIR/local
-mkdir -p $DISTDIR/local/doc
-mkdir -p $DISTDIR/local/share
-cp -r derived/mipsel-dingux-opt-3rd/bindist/install/bin $DISTDIR/local/bin
-cp build/package-dingux/openmsx-start.sh $DISTDIR/local/bin
-chmod a+x $DISTDIR/local/bin/openmsx-start.sh
-cp -r derived/mipsel-dingux-opt-3rd/bindist/install/doc $DISTDIR/local/doc/openmsx
-cp doc/dingux-readme.txt $DISTDIR/local/doc/openmsx/README.txt
-cp -r derived/mipsel-dingux-opt-3rd/bindist/install/share $DISTDIR/local/share/openmsx
-
-cd $DISTDIR && zip ../$ZIPFILE -r .
-
-echo "Created ZIP: `dirname $DISTDIR`/$ZIPFILE"

Added: openmsx/trunk/build/package-dingux/zip.mk
===================================================================
--- openmsx/trunk/build/package-dingux/zip.mk	                        (rev 0)
+++ openmsx/trunk/build/package-dingux/zip.mk	2012-11-17 20:28:36 UTC (rev 12973)
@@ -0,0 +1,32 @@
+# $Id$
+#
+# Create a zip file for Dingoo.
+
+LOCAL_DIR:=$(BINDIST_DIR)/local
+PACKAGE_SUPPORT_DIR:=build/package-dingux
+
+# Override install locations.
+INSTALL_BINARY_DIR:=$(LOCAL_DIR)/bin
+INSTALL_SHARE_DIR:=$(LOCAL_DIR)/share/openmsx
+INSTALL_DOC_DIR:=$(LOCAL_DIR)/doc/openmsx
+
+BINDIST_OPENMSX_START:=$(INSTALL_BINARY_DIR)/openmsx-start.sh
+BINDIST_README:=$(INSTALL_DOC_DIR)/README.txt
+
+PACKAGE_FULL:=$(shell PYTHONPATH=build $(PYTHON) -c \
+  "import version; print version.getVersionedPackageName()" \
+  )
+BINDIST_PACKAGE:=$(PACKAGE_FULL)-dingux-bin.zip
+
+zip: install
+
+bindist: zip $(BINDIST_OPENMSX_START) $(BINDIST_README)
+	@echo "Creating zip file:"
+	cd $(BINDIST_DIR) && zip ../$(BINDIST_PACKAGE) -r local
+
+$(BINDIST_OPENMSX_START): $(PACKAGE_SUPPORT_DIR)/openmsx-start.sh install
+$(BINDIST_README): $(PACKAGE_SUPPORT_DIR)/README.txt install
+$(BINDIST_OPENMSX_START) $(BINDIST_README):
+	@echo "  Copying $(@F)..."
+	@mkdir -p $(@D)
+	@cp $< $@

Deleted: openmsx/trunk/doc/dingux-readme.txt
===================================================================
--- openmsx/trunk/doc/dingux-readme.txt	2012-11-17 19:11:46 UTC (rev 12972)
+++ openmsx/trunk/doc/dingux-readme.txt	2012-11-17 20:28:36 UTC (rev 12973)
@@ -1,98 +0,0 @@
-openMSX for Dingux
-==================
-
-This text is a quick guide for the Dingoo port of openMSX. It is still a bit of
-an early port, so expect it to have some rough edges. For example, startup is
-slow (expect about 10 seconds). Especially important is to not add too many and
-especially too big system roms. This makes start up and loading states (the
-first time) loads slower.
-
-We are releasing it so people can play with it and give us feedback. Please
-help us make this a great way to play MSX games on a handheld.
-Contact info is at the bottom of this text.
-
-About Dingux
-------------
-
-Dingux is Linux for the Dingoo A-320 and possibly other similar devices in the
-future.
-
-About the Dingoo A-320:
-  http://en.wikipedia.org/wiki/Dingoo
-
-Dingux blog:
-  http://www.dingux.com/
-
-Dingux downloads:
-  http://code.google.com/p/dingoo-linux/downloads/list
-
-New Dingux site hub:
-  http://dingoonity.org/
-
-Installing Dingux
------------------
-
-First, download the dual boot installer and follow the instructions in its
-README file.
-
-Next, download the Dingux system and copy it to your miniSD card as described
-in its README file. New Dingux system releases are made regularly and we will
-only test openMSX against the latest Dingux system release, so please keep your
-system updated.
-
-Installing openMSX
-------------------
-
-This info is also in the openMSX Compilation Guide:
-  http://openmsx.sourceforge.net/manual/compile.html#installstandalone
-
-Copy the directory named "local" from the openMSX for Dingux ZIP file to the
-root of the miniSD card. If you have run Dingux from the miniSD card before,
-there will already be a directory named "local". You can safely merge both
-directories.
-
-openMSX comes with the C-BIOS system ROMs, which is an open source MSX BIOS.
-If you'd like to use other system ROMs, for example to get disk support or
-because you want to emulate the exact MSX model you had years ago, you have
-to install those yourself. Please read this for more info:
-  http://openmsx.sourceforge.net/manual/setup.html#systemroms
-As mentioned before, currently it's wise to include only those system ROMs you
-really need. Better not install large ones either (e.g. the MoonSound ROM),
-unless you don't care about very long start up times.
-
-Using openMSX
--------------
-
-The keymappings are documented in the openMSX User's Manual:
-  http://openmsx.sourceforge.net/manual/user.html#keymapping
-
-
-Customizing openMSX
--------------------
-
-openMSX can be configured using the settings.xml file. This file only stores
-settings that have a non-default value.
-
-Things like key bindings can be customized by writing short Tcl scripts.
-Please have a look in the share/openmsx/scripts directory for examples. Any
-script you place there will be executed by openMSX on startup.
-
-Please read this document to learn about the commands and settings of openMSX:
-  http://openmsx.sourceforge.net/manual/commands.html
-
-Building openMSX
-----------------
-
-If you want to make bigger changes, you have to compile your own openMSX for
-Dingux.
-
-This is described in the Compilation Guide (with specific instructions for
-Dingux):
-  http://openmsx.sourceforge.net/manual/compile.html
-
-Feedback
---------
-
-If you found a bug, made a patch, created a cool theme or have anything else
-you'd like to share, please contact us, see
-  http://openmsx.sourceforge.net/manual/user.html#contact

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



