[Scummvm-git-logs] scummvm master -> 58bbcdc24c750e9a2bfae951c81399151e4c7264

[sev-]

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

Summary:
75ebbc865f AMIGAOS4: Fix positioning of workaround
58bbcdc24c AMIGAOS4: Further update amigaos.mk


Commit: 75ebbc865f9d84a31a97b4dbd2e9434bc15b6335
    https://github.com/scummvm/scummvm/commit/75ebbc865f9d84a31a97b4dbd2e9434bc15b6335
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-10-13T13:08:05+02:00

Commit Message:
AMIGAOS4: Fix positioning of workaround

Otherwise both dos.library and it's interface will remain open in the rare (?) occasion of p.size <= 0,

Changed paths:
    backends/fs/amigaos4/amigaos4-fs.cpp


diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index c6261cf..7657bf2 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -69,6 +69,15 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode() {
 AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
 	ENTER();
 
+	int offset = p.size();
+
+	//assert(offset > 0);
+
+	if (offset <= 0) {
+		debug(6, "Bad offset");
+		return;
+	}
+
 	// WORKAROUND:
 	// This is a bug in AmigaOS4 newlib.library 53.30 and lower.
 	// It will be removed once a fixed version is available to public.
@@ -80,15 +89,6 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
 	// than one engine/(shared) plugin is available.
 	DOSBase = IExec->OpenLibrary("dos.library", 0);
 	IDOS = (struct DOSIFace *)IExec->GetInterface(DOSBase, "main", 1, NULL);
-	
-	int offset = p.size();
-
-	//assert(offset > 0);
-
-	if (offset <= 0) {
-		debug(6, "Bad offset");
-		return;
-	}
 
 	_sPath = p;
 	_sDisplayName = ::lastPathComponent(_sPath);


Commit: 58bbcdc24c750e9a2bfae951c81399151e4c7264
    https://github.com/scummvm/scummvm/commit/58bbcdc24c750e9a2bfae951c81399151e4c7264
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-10-13T13:08:05+02:00

Commit Message:
AMIGAOS4: Further update amigaos.mk

- Reordering, restructuring and updating
- Added shared library plugins copying, if available
- Added copying doc / subdir
- Changed copying DIST_FILES_DOCS to doc/ subdir
- Added some comments

Changed paths:
    backends/platform/sdl/amigaos/amigaos.mk


diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index 2f39951..0edb1b6 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -1,13 +1,12 @@
 # Special target to create an AmigaOS snapshot installation.
+# AmigaOS shell doesn't like indented comments.
 amigaosdist: $(EXECUTABLE)
 	mkdir -p $(AMIGAOSPATH)
-	mkdir -p $(AMIGAOSPATH)/themes
 	mkdir -p $(AMIGAOSPATH)/extras
-	$(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE)
-	cp ${srcdir}/icons/scummvm_drawer.info $(AMIGAOSPATH).info
-	cp ${srcdir}/icons/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
-	cp $(DIST_FILES_THEMES) $(AMIGAOSPATH)/themes/
+	cp ${srcdir}/dists/amiga/scummvm_drawer.info $(AMIGAOSPATH).info
+	cp ${srcdir}/dists/amiga/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
 ifdef DIST_FILES_DOCS
+	cp -r $(srcdir)/doc/ $(AMIGAOSPATH)
 	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)/doc/
 endif
 ifdef DIST_FILES_ENGINEDATA
@@ -19,12 +18,21 @@ endif
 ifdef DIST_FILES_VKEYBD
 	cp $(DIST_FILES_VKEYBD) $(AMIGAOSPATH)/extras/
 endif
-# AmigaOS shell is not happy with indented comments, thus don't do it.
+# Copy shared library plugins, if available.
+ifdef DYNAMIC_MODULES
+	mkdir -p $(AMIGAOSPATH)/plugins
+	cp $(PLUGINS) -o $(AMIGAOSPATH)/plugins/
+endif
+ifdef DIST_FILES_THEMES
+	mkdir -p $(AMIGAOSPATH)/themes
+	cp $(DIST_FILES_THEMES) $(AMIGAOSPATH)/themes/
+endif
+	$(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE)
 # Prepare README.md for AmigaGuide conversion.
 	cat ${srcdir}/README.md | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
-# AREXX seems to have a problem if ${srcdir} is '.'. It will break with
-# a "Program not found" error. Therefore we copy the script to cwd and
-# remove it again, once it has finished.
+# AmigaOS AREXX has a problem when ${srcdir} is '.'.
+# It will break with a "Program not found" error.
+# We copy the script to cwd first and, once it has finished, remove it again.
 	cp ${srcdir}/dists/amiga/RM2AG.rexx .
 	rx RM2AG.rexx README.conv
 	cp README.guide $(AMIGAOSPATH)