[Scummvm-git-logs] scummvm master -> b8948c332643da2be296cf3df4daa1fa6eeb1f08
criezy
criezy at scummvm.org
Tue Sep 6 00:40:23 CEST 2016
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:
77357ff71a CLOUD: Fix looking for the wwwroot.zip archive
02827d0dab BUILD: Add wwwroot.zip to resource files for Windows builds
b8948c3326 BUILD: Copy wwwroot.zip in POSIX, MacOS X and iOS installation targets
Commit: 77357ff71ac144f553bbd390c6f2585d7ad9da9d
https://github.com/scummvm/scummvm/commit/77357ff71ac144f553bbd390c6f2585d7ad9da9d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T23:39:59+01:00
Commit Message:
CLOUD: Fix looking for the wwwroot.zip archive
If the themepath was defined but the wwwroot.zip file was not in
that path, looking for it failed as it never reached the part of the
code using SearchMan to look for it.
Changed paths:
backends/networking/sdl_net/handlerutils.cpp
diff --git a/backends/networking/sdl_net/handlerutils.cpp b/backends/networking/sdl_net/handlerutils.cpp
index 121fd1a..73ddf9e 100644
--- a/backends/networking/sdl_net/handlerutils.cpp
+++ b/backends/networking/sdl_net/handlerutils.cpp
@@ -39,15 +39,14 @@ Common::Archive *HandlerUtils::getZipArchive() {
// first search in themepath
if (ConfMan.hasKey("themepath")) {
const Common::FSNode &node = Common::FSNode(ConfMan.get("themepath"));
- if (!node.exists() || !node.isReadable() || !node.isDirectory())
- return nullptr;
-
- Common::FSNode fileNode = node.getChild(ARCHIVE_NAME);
- if (fileNode.exists() && fileNode.isReadable() && !fileNode.isDirectory()) {
- Common::SeekableReadStream *const stream = fileNode.createReadStream();
- Common::Archive *zipArchive = Common::makeZipArchive(stream);
- if (zipArchive)
- return zipArchive;
+ if (node.exists() && node.isReadable() && node.isDirectory()) {
+ Common::FSNode fileNode = node.getChild(ARCHIVE_NAME);
+ if (fileNode.exists() && fileNode.isReadable() && !fileNode.isDirectory()) {
+ Common::SeekableReadStream *const stream = fileNode.createReadStream();
+ Common::Archive *zipArchive = Common::makeZipArchive(stream);
+ if (zipArchive)
+ return zipArchive;
+ }
}
}
Commit: 02827d0dab916eef94f1a2cda733bf0193e288f2
https://github.com/scummvm/scummvm/commit/02827d0dab916eef94f1a2cda733bf0193e288f2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T23:39:59+01:00
Commit Message:
BUILD: Add wwwroot.zip to resource files for Windows builds
The file had already been added to scummvm.rc, but not to
scummvm.rc.in. As a result running update-version.pl would
have caused the change to be lost.
Changed paths:
dists/scummvm.rc
dists/scummvm.rc.in
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 00d71ef..d52d97d 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -20,7 +20,7 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip"
translations.dat FILE "gui/themes/translations.dat"
#endif
#ifdef USE_SDL_NET
-wwwroot.zip FILE "backends/networking/wwwroot.zip"
+wwwroot.zip FILE "backends/networking/wwwroot.zip"
#endif
#if ENABLE_ACCESS == STATIC_PLUGIN
@@ -88,7 +88,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "1.9.0git\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2016 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright � 2001-2016 The ScummVM Team\0"
VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
VALUE "OriginalFilename", "scummvm.exe\0"
VALUE "ProductName", "ScummVM\0"
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 2e0a5ff..60fa44b 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -19,6 +19,9 @@ scummmodern.zip FILE "gui/themes/scummmodern.zip"
#ifdef USE_TRANSLATION
translations.dat FILE "gui/themes/translations.dat"
#endif
+#ifdef USE_SDL_NET
+wwwroot.zip FILE "backends/networking/wwwroot.zip"
+#endif
#if ENABLE_ACCESS == STATIC_PLUGIN
access.dat FILE "dists/engine-data/access.dat"
@@ -85,7 +88,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2016 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright � 2001-2016 The ScummVM Team\0"
VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
VALUE "OriginalFilename", "scummvm.exe\0"
VALUE "ProductName", "ScummVM\0"
Commit: b8948c332643da2be296cf3df4daa1fa6eeb1f08
https://github.com/scummvm/scummvm/commit/b8948c332643da2be296cf3df4daa1fa6eeb1f08
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T23:40:00+01:00
Commit Message:
BUILD: Copy wwwroot.zip in POSIX, MacOS X and iOS installation targets
Changed paths:
Makefile.common
ports.mk
diff --git a/Makefile.common b/Makefile.common
index 762b905..cbd87ed 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -244,6 +244,12 @@ DIST_FILES_THEMES+=translations.dat
endif
DIST_FILES_THEMES:=$(addprefix $(srcdir)/gui/themes/,$(DIST_FILES_THEMES))
+# Networking files
+DIST_FILES_NETWORKING=
+ifdef USE_SDL_NET
+DIST_FILES_NETWORKING:=$(addprefix $(srcdir)/backends/networking/,wwwroot.zip)
+endif
+
# Engine data files
DIST_FILES_ENGINEDATA=
ifdef ENABLE_ACCESS
diff --git a/ports.mk b/ports.mk
index 4b5fa6b..a98268b 100644
--- a/ports.mk
+++ b/ports.mk
@@ -17,7 +17,7 @@ install:
$(INSTALL) -d "$(DESTDIR)$(docdir)"
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
$(INSTALL) -d "$(DESTDIR)$(datadir)"
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/appdata"
@@ -39,7 +39,7 @@ install-strip:
$(INSTALL) -d "$(DESTDIR)$(docdir)"
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
$(INSTALL) -d "$(DESTDIR)$(datadir)"
- $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
$(INSTALL) -d "$(DESTDIR)$(datarootdir)/appdata"
@@ -113,6 +113,9 @@ endif
cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
cp $(DIST_FILES_DOCS) $(bundle_name)/
cp $(DIST_FILES_THEMES) $(bundle_name)/Contents/Resources/
+ifdef DIST_FILES_NETWORKING
+ cp $(DIST_FILES_NETWORKING) $(bundle_name)/Contents/Resources/
+endif
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/
endif
@@ -131,6 +134,9 @@ iphonebundle: iphone
cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
cp $(DIST_FILES_DOCS) $(bundle_name)/
cp $(DIST_FILES_THEMES) $(bundle_name)/
+ifdef DIST_FILES_NETWORKING
+ cp $(DIST_FILES_NETWORKING) $(bundle_name)/
+endif
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
endif
@@ -239,6 +245,9 @@ ios7bundle: iphone
sed -i'' -e 's/$$(PRODUCT_BUNDLE_IDENTIFIER)/org.scummvm.scummvm/' $(bundle_name)/Info.plist
cp $(DIST_FILES_DOCS) $(bundle_name)/
cp $(DIST_FILES_THEMES) $(bundle_name)/
+ifdef DIST_FILES_NETWORKING
+ cp $(DIST_FILES_NETWORKING) $(bundle_name)/
+endif
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
endif
@@ -434,7 +443,7 @@ publish-appcast:
# Windows specific
#
-scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc
+scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc
$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
# Special target to create a win32 snapshot binary (for Inno Setup)
More information about the Scummvm-git-logs
mailing list