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

[sev-]

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

Summary:
4cd928a567 BUILD: Add commands for retrieving calculated binaries & dist files
1dd41fa578 PSP: Add EBOOT.PBP to a dist files list for the Buildbot packager
ae9cb8aa7b BUILD: Simplify print-dists rule


Commit: 4cd928a567104dda2a28f6326a4d1fd27f139cea
    https://github.com/scummvm/scummvm/commit/4cd928a567104dda2a28f6326a4d1fd27f139cea
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-08-18T14:16:45+02:00

Commit Message:
BUILD: Add commands for retrieving calculated binaries & dist files

Instead of hard-coding these lists into the CI system's packaging
code, expose them from Make so that everything is sourced off the
same one list.

Changed paths:
    Makefile


diff --git a/Makefile b/Makefile
index a01c45f..c98cf89 100644
--- a/Makefile
+++ b/Makefile
@@ -111,3 +111,10 @@ config.mk engines/plugins_table.h engines/engines.mk: config.h
 ifneq ($(origin port_mk), undefined)
 include $(srcdir)/$(port_mk)
 endif
+
+.PHONY: print-dists print-executables
+print-dists:
+	@echo $(foreach V, $(filter DIST_FILES_%, $(.VARIABLES)), $($V))
+
+print-executables:
+	@echo $(EXECUTABLE) $(PLUGINS)


Commit: 1dd41fa57809d6fb1a6182a0fd0853edc203c306
    https://github.com/scummvm/scummvm/commit/1dd41fa57809d6fb1a6182a0fd0853edc203c306
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-08-18T14:16:45+02:00

Commit Message:
PSP: Add EBOOT.PBP to a dist files list for the Buildbot packager

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


diff --git a/Makefile b/Makefile
index c98cf89..9958e5e 100644
--- a/Makefile
+++ b/Makefile
@@ -117,4 +117,4 @@ print-dists:
 	@echo $(foreach V, $(filter DIST_FILES_%, $(.VARIABLES)), $($V))
 
 print-executables:
-	@echo $(EXECUTABLE) $(PLUGINS)
+	@echo $(if $(DIST_EXECUTABLES),$(DIST_EXECUTABLES),$(EXECUTABLE) $(PLUGINS))
diff --git a/backends/platform/psp/psp.mk b/backends/platform/psp/psp.mk
index 58f0af2..f3d104f 100644
--- a/backends/platform/psp/psp.mk
+++ b/backends/platform/psp/psp.mk
@@ -3,6 +3,7 @@ PSP_EBOOT = EBOOT.PBP
 PSP_EBOOT_SFO = param.sfo
 PSP_EBOOT_TITLE = ScummVM-PSP
 DATE = $(shell date +%Y%m%d)
+DIST_EXECUTABLES=$(PSP_EBOOT) $(PLUGINS)
 
 MKSFO = mksfoex -d MEMSIZE=1
 PACK_PBP = pack-pbp


Commit: ae9cb8aa7bf4d875880bd36649ab995a5905d4bd
    https://github.com/scummvm/scummvm/commit/ae9cb8aa7bf4d875880bd36649ab995a5905d4bd
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-18T14:16:45+02:00

Commit Message:
BUILD: Simplify print-dists rule

filter DIST_FILES_% matches variables such as DIST_FILES_DOCS_language that shouldn't be included in the output as a result of commit c9f2091.

Changed paths:
    Makefile


diff --git a/Makefile b/Makefile
index 9958e5e..70153e6 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ endif
 
 .PHONY: print-dists print-executables
 print-dists:
-	@echo $(foreach V, $(filter DIST_FILES_%, $(.VARIABLES)), $($V))
+	@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))