[Scummvm-cvs-logs] scummvm master -> c74fcf19d8e9059d23d9e3cae9cf373edd99071a

Sun May 1 23:50:25 CEST 2011

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1d1ee5c979 WEBOS: Added a default prefix and enforcing docdir, datadir and plugin directory.
ec05f3dc4f WEBOS: No longer creating paths which are not used anymore.
f9014f1aab WEBOS: Removed special paths from default configuration.
c74fcf19d8 WEBOS: Rewritten webos packaging again. No fancy settings needed anymore. Just "make package".


Commit: 1d1ee5c9793b96858d53c006c8448ffe288b100f
    https://github.com/scummvm/scummvm/commit/1d1ee5c9793b96858d53c006c8448ffe288b100f
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-01T14:48:23-07:00

Commit Message:
WEBOS: Added a default prefix and enforcing docdir, datadir and plugin directory.

Changed paths:
    configure

diff --git a/configure b/configure
index 6077d86..e4167f3 100755
--- a/configure
+++ b/configure
@@ -1138,6 +1138,10 @@ webos)
 	_host_os=webos
 	_host_cpu=arm
 	_host_alias=arm-none-linux-gnueabi
+	test "x$prefix" = xNONE && prefix=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm
+	datarootdir='${prefix}/data'
+	datadir='${datarootdir}'
+	docdir='${prefix}/doc'
 	;;
 wii)
 	_host_os=wii
@@ -2928,6 +2932,9 @@ case $_backend in
 		# Add ../plugins as a path so plugins can be found when running from a .PND.
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
 		;;
+	webos)
+		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir\\\""
+		;;
 	*)
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/scummvm\\\""
 		;;


Commit: ec05f3dc4f4cf9632e749b02e54cf3aaa2842cae
    https://github.com/scummvm/scummvm/commit/ec05f3dc4f4cf9632e749b02e54cf3aaa2842cae
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-01T14:48:39-07:00

Commit Message:
WEBOS: No longer creating paths which are not used anymore.

Changed paths:
    dists/webos/mojo/start



diff --git a/dists/webos/mojo/start b/dists/webos/mojo/start
index 3bdb9a5..446ce83 100755
--- a/dists/webos/mojo/start
+++ b/dists/webos/mojo/start
@@ -4,14 +4,10 @@
 APPDIR=$(readlink -f $(dirname $0))
 SCUMMVMDIR=/media/internal/ScummVM
 
-
 # Create the initial ScummVM directory structure
 mkdir -p $SCUMMVMDIR/Games
 mkdir -p $SCUMMVMDIR/Saves
 mkdir -p $SCUMMVMDIR/Screenshots
-mkdir -p $SCUMMVMDIR/Themes
-mkdir -p $SCUMMVMDIR/Extras
-mkdir -p $SCUMMVMDIR/Plugins
 
 # Install default configuration file if not already present
 if [ ! -f $SCUMMVMDIR/scummvmrc ]
@@ -19,14 +15,8 @@ then
     cp $APPDIR/scummvmrc-default $SCUMMVMDIR/scummvmrc
 fi
 
-# Copy themes to theme directory
-cp -f $APPDIR/share/scummvm/*.zip $SCUMMVMDIR/Themes
-
 # Change into the screenshots directory so screenshots are saved there
 cd $SCUMMVMDIR/Screenshots
 
-# Set library path so the app finds its custom shared libraries
-export LD_LIBRARY_PATH=$APPDIR/lib
-
 # Run the game
 exec $APPDIR/bin/scummvm -c $SCUMMVMDIR/scummvmrc


Commit: f9014f1aabbe364468787577b9d4c26617b87142
    https://github.com/scummvm/scummvm/commit/f9014f1aabbe364468787577b9d4c26617b87142
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-01T14:48:39-07:00

Commit Message:
WEBOS: Removed special paths from default configuration.

Changed paths:
    dists/webos/mojo/scummvmrc-default



diff --git a/dists/webos/mojo/scummvmrc-default b/dists/webos/mojo/scummvmrc-default
index d29a0fc..aefc5fd 100644
--- a/dists/webos/mojo/scummvmrc-default
+++ b/dists/webos/mojo/scummvmrc-default
@@ -17,11 +17,7 @@ aspect_ratio=false
 speech_mute=false
 enable_gs=false
 browser_lastpath=/media/internal/ScummVM/Games
-themepath=/media/internal/ScummVM/Themes
 savepath=/media/internal/ScummVM/Saves
-extrapath=/media/internal/ScummVM/Extras
-pluginspath=/media/internal/ScummVM/Plugins
-vkeybdpath=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm/share/scummvm
 
 [keymapper]
 keymap_global_MEN=FORWARD


Commit: c74fcf19d8e9059d23d9e3cae9cf373edd99071a
    https://github.com/scummvm/scummvm/commit/c74fcf19d8e9059d23d9e3cae9cf373edd99071a
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-01T14:48:39-07:00

Commit Message:
WEBOS: Rewritten webos packaging again. No fancy settings needed anymore. Just "make package".

Changed paths:
    backends/platform/webos/webos.mk



diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk
index 22df562..2b145b0 100644
--- a/backends/platform/webos/webos.mk
+++ b/backends/platform/webos/webos.mk
@@ -1,15 +1,27 @@
 # WebOS specific build targets
 # ============================================================================
 #
-# Run "make webosrelease" to create a release package to be uploaded to the
-# Palm app catalog.
+# Build instructions:
 #
-# Run "make webosbeta" to create a beta package to be uploaded to the Palm
-# Beta app catalog.
+# 1. Install the WebOS SDK and PDK and setup the environment variables
+#    WEBOS_SDK and WEBOS_PDK accordingly.
 #
-# Before calling these targets the ScummVM source must be configured for a
-# WebOS build.  See
-# http://wiki.scummvm.org/index.php/Compiling_ScummVM/WebOS for details.
+# 2. Cross-compile zlib, flac, mad and tremor and install it into the PDK.
+#
+# 3. Prepare the ScummVM source for a webOS build:
+#    $ ./configure --host=webos --enable-plugins --default-dynamic \
+#          --enable-release
+#
+# 4. Create the package:
+#    $ make package
+#
+# The package is now in the "portdist" folder.
+#
+# See http://wiki.scummvm.org/index.php/Compiling_ScummVM/WebOS for
+# more detailed build instructions.
+#
+#
+# Palm App catalog instructions:
 #
 # VER_PACKAGE must be set to a number which is higher than the currently
 # used package version in the app catalog.  So when creating an updated
@@ -25,46 +37,55 @@
 # to use a user-specific app name when submitting the created package to the
 # Palm app catalog.  Use "ScummVM (<username>)" instead of "ScummVM" and
 # "ScummVM Beta (<username>)" instead of "ScummVM Beta".
+#
+# The app id is automatically parsed from the installation prefix.  So add a
+# configure parameter like this to prepare a build of a package for the Palm
+# App Catalog:
+#
+#   --prefix=/media/cryptofs/apps/usr/palm/applications/com.github.kayahr.scummvm
+#
+# To build a package for the Palm Beta App Catalog add "-beta" to the prefix:
+#
+#   --prefix=/media/cryptofs/apps/usr/palm/applications/com.github.kayahr.scummvm-beta
+# ============================================================================
+
+# Increment this number when the packaging of the app has been changed while
+# ScummVM itself has the same version as before. The number can be reset to 
+# 1 when the ScummVM version is increased.
+VER_PACKAGE = 5
 
 PATH_DIST = $(srcdir)/dists/webos
 PATH_MOJO = $(PATH_DIST)/mojo
-BASE_APP_ID = org.scummvm
-APP_ID = $(BASE_APP_ID).scummvm
-BETA_APP_ID = $(APP_ID)-beta
+APP_ID = $(shell basename $(prefix))
 APP_VERSION = $(shell printf "%d.%d.%02d%02d" $(VER_MAJOR) $(VER_MINOR) $(VER_PATCH) $(VER_PACKAGE))
-STAGING_DIR=STAGING/$(APP_ID)
-
-webosprepare: all
-	$(QUIET)if [ "$(VER_PACKAGE)" = "" ]; \
-	then \
-	    echo "ERROR: VER_PACKAGE is not set"; \
-            echo "Example: export VER_PACKAGE=1"; \
-	    exit 1; \
-	fi
-	$(QUIET)$(RM_REC) $(STAGING_DIR)
-	$(QUIET)$(MKDIR) $(STAGING_DIR)
-	$(QUIET)$(MKDIR) $(STAGING_DIR)/bin
-	$(QUIET)$(MKDIR) $(STAGING_DIR)/lib
-	$(QUIET)$(MKDIR) $(STAGING_DIR)/share/scummvm
-	$(QUIET)$(CP) $(PATH_MOJO)/* $(STAGING_DIR)
-	$(QUIET)$(CP) gui/themes/translations.dat $(STAGING_DIR)/share/scummvm
-	$(QUIET)$(CP) gui/themes/scummmodern.zip $(STAGING_DIR)/share/scummvm
-	$(QUIET)$(CP) scummvm $(STAGING_DIR)/bin
-	$(QUIET)$(STRIP) $(STAGING_DIR)/bin/scummvm
-	$(QUIET)sed -i s/'APP_VERSION'/'$(APP_VERSION)'/ $(STAGING_DIR)/appinfo.json
+DESTDIR ?= portdist
 
-webosrelease: webosprepare
-	$(QUIET)$(RM) $(APP_ID)_*.ipk
-	$(QUIET)sed -i s/'APP_ID'/'$(APP_ID)'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format $(STAGING_DIR)
-	$(QUIET)$(RM_REC) STAGING
+install: all
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(prefix)"
+	$(QUIET)$(INSTALL) -m 0644 -t "$(DESTDIR)$(prefix)/" "$(PATH_MOJO)/"*
+	$(QUIET)$(INSTALL) -m 0755 "$(PATH_MOJO)/start" "$(DESTDIR)$(prefix)/"
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(bindir)"
+	$(QUIET)$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+	$(QUIET)$(STRIP) "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(docdir)"
+	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(datadir)"
+	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+ifdef DYNAMIC_MODULES
+	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(libdir)/"
+	$(QUIET)$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/"
+	$(QUIET)$(STRIP) "$(DESTDIR)$(libdir)/"*
+endif
+	$(QUIET)sed -i s/'APP_VERSION'/'$(APP_VERSION)'/ "$(DESTDIR)$(prefix)/appinfo.json"
+	$(QUIET)sed -i s/'APP_ID'/'$(APP_ID)'/ "$(DESTDIR)$(prefix)/appinfo.json"
+ifneq (,$(findstring -beta,$(APP_ID)))
+	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM Beta'/ "$(DESTDIR)$(prefix)/appinfo.json"
+else
+	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM'/ "$(DESTDIR)$(prefix)/appinfo.json"
+endif
 
-webosbeta: webosprepare
-	$(QUIET)$(RM) $(BETA_APP_ID)_*.ipk
-	$(QUIET)sed -i s/'APP_ID'/'$(BETA_APP_ID)'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)sed -i s/'APP_TITLE'/'ScummVM Beta'/ $(STAGING_DIR)/appinfo.json
-	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format $(STAGING_DIR)
-	$(QUIET)$(RM_REC) STAGING
+uninstall:
+	$(QUIET)$(RM_REC) "$(DESTDIR)$(prefix)"
 
-.PHONY: webosrelease webosbeta
+package: install
+	$(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(DESTDIR)"




