[Scummvm-git-logs] scummvm master -> cf1d0354fe399a21068a59d210becc0cbc162e8e

[digitall]

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:
6227cc8bd6 BUILD: Add a rule to print the current ScummVM version
0170f396f5 PSP: Don't hard-code the version and list of data files in the build script
6360c7eb31 PSP: Add README.PSP to the output of the print-dists rule
cf1d0354fe PSP: Copy the extracted keyboard files instead of kbd.zip


Commit: 6227cc8bd66fc0f418a891f16c5079281a09cc15
    https://github.com/scummvm/scummvm/commit/6227cc8bd66fc0f418a891f16c5079281a09cc15
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-16T05:19:19Z

Commit Message:
BUILD: Add a rule to print the current ScummVM version

Changed paths:
    Makefile


diff --git a/Makefile b/Makefile
index 70153e6..3e72d86 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,15 @@ ifneq ($(origin port_mk), undefined)
 include $(srcdir)/$(port_mk)
 endif
 
-.PHONY: print-dists print-executables
+.PHONY: print-dists print-executables print-version print-distversion
 print-dists:
 	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) $(srcdir)/doc
 
 print-executables:
 	@echo $(if $(DIST_EXECUTABLES),$(DIST_EXECUTABLES),$(EXECUTABLE) $(PLUGINS))
+
+print-version:
+	@echo $(VERSION)
+
+print-distversion:
+	@echo $(DISTVERSION)


Commit: 0170f396f57047624b0aceedc43d664e8c72e277
    https://github.com/scummvm/scummvm/commit/0170f396f57047624b0aceedc43d664e8c72e277
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-16T05:19:19Z

Commit Message:
PSP: Don't hard-code the version and list of data files in the build script

Changed paths:
    backends/platform/psp/build-psp.sh


diff --git a/backends/platform/psp/build-psp.sh b/backends/platform/psp/build-psp.sh
index 1fbeb40..5779555 100755
--- a/backends/platform/psp/build-psp.sh
+++ b/backends/platform/psp/build-psp.sh
@@ -9,7 +9,9 @@ export LD_LIBRARY_PATH=/opt/toolchains/legacy-shared-objects
 make distclean
 ./configure --host=psp --disable-debug --enable-plugins --default-dynamic --enable-release
 make -j4
-mkdir scummvm-1.9.0
-cp -r AUTHORS COPYING COPYING.LGPL COPYING.BSD COPYRIGHT NEWS README gui/themes/translations.dat gui/themes/scummclassic.zip gui/themes/scummmodern.zip dists/engine-data/access.dat dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/mort.dat dists/engine-data/neverhood.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/tony.dat dists/engine-data/toon.dat dists/engine-data/wintermute.zip dists/pred.dic EBOOT.PBP plugins backends/platform/psp/kbd.zip scummvm-1.9.0
-zip -r9 scummvm-1.9.0-psp.zip scummvm-1.9.0
+VERSION=`make print-distversion`
+DISTS=`make print-dists`
+mkdir scummvm-$VERSION
+cp -r $DISTS EBOOT.PBP plugins backends/platform/psp/kbd.zip scummvm-$VERSION
+zip -r9 scummvm-$VERSION-psp.zip scummvm-$VERSION
 


Commit: 6360c7eb318211b2603f759bde2c74dbc58ab831
    https://github.com/scummvm/scummvm/commit/6360c7eb318211b2603f759bde2c74dbc58ab831
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-16T05:19:19Z

Commit Message:
PSP: Add README.PSP to the output of the print-dists rule

Changed paths:
    Makefile
    backends/platform/psp/psp.mk


diff --git a/Makefile b/Makefile
index 3e72d86..bbba24f 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ endif
 
 .PHONY: print-dists print-executables print-version print-distversion
 print-dists:
-	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) $(srcdir)/doc
+	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_PLATFORM) $(srcdir)/doc
 
 print-executables:
 	@echo $(if $(DIST_EXECUTABLES),$(DIST_EXECUTABLES),$(EXECUTABLE) $(PLUGINS))
diff --git a/backends/platform/psp/psp.mk b/backends/platform/psp/psp.mk
index f3d104f..63f34e7 100644
--- a/backends/platform/psp/psp.mk
+++ b/backends/platform/psp/psp.mk
@@ -4,6 +4,7 @@ PSP_EBOOT_SFO = param.sfo
 PSP_EBOOT_TITLE = ScummVM-PSP
 DATE = $(shell date +%Y%m%d)
 DIST_EXECUTABLES=$(PSP_EBOOT) $(PLUGINS)
+DIST_FILES_PLATFORM=$(srcdir)/backends/platform/psp/README.PSP
 
 MKSFO = mksfoex -d MEMSIZE=1
 PACK_PBP = pack-pbp


Commit: cf1d0354fe399a21068a59d210becc0cbc162e8e
    https://github.com/scummvm/scummvm/commit/cf1d0354fe399a21068a59d210becc0cbc162e8e
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-16T05:19:19Z

Commit Message:
PSP: Copy the extracted keyboard files instead of kbd.zip

Changed paths:
    backends/platform/psp/build-psp.sh


diff --git a/backends/platform/psp/build-psp.sh b/backends/platform/psp/build-psp.sh
index 5779555..b018529 100755
--- a/backends/platform/psp/build-psp.sh
+++ b/backends/platform/psp/build-psp.sh
@@ -12,6 +12,8 @@ make -j4
 VERSION=`make print-distversion`
 DISTS=`make print-dists`
 mkdir scummvm-$VERSION
-cp -r $DISTS EBOOT.PBP plugins backends/platform/psp/kbd.zip scummvm-$VERSION
+cp -r $DISTS EBOOT.PBP plugins scummvm-$VERSION
+mkdir scummvm-$VERSION/kbd
+cp -r backends/platform/psp/kbd/*.png scummvm-$VERSION/kbd
 zip -r9 scummvm-$VERSION-psp.zip scummvm-$VERSION