[Scummvm-git-logs] scummvm-tools master -> 239730cf395c9965477c7b3ff1bbe41d1e24811a

[sev-]

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

Summary:
f1145e18ed AMIGAOS: Reflect new destination and path
239730cf39 AMIGAOS: Automate installation process


Commit: f1145e18edb34881cd092c93a161f36913403849
    https://github.com/scummvm/scummvm-tools/commit/f1145e18edb34881cd092c93a161f36913403849
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-09-22T17:55:09+02:00

Commit Message:
AMIGAOS: Reflect new destination and path

Changed paths:
    configure


diff --git a/configure b/configure
index 79ad8c279..18906a419 100755
--- a/configure
+++ b/configure
@@ -105,7 +105,7 @@ _freetype_found="false"
 _freetypepath="$PATH"
 _staticlibpath=""
 _xcodetoolspath=""
-_amigaos4path="Games:ScummVM-Tools"
+_amigaospath="Games:ScummVM/tools"
 _morphospath="PROGDIR:"
 # For cross compiling
 _host=""
@@ -1906,7 +1906,7 @@ ASFLAGS := $ASFLAGS
 WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
 WIN32PATH=$_win32path
-AMIGAOS4PATH=$_amigaos4path
+AMIGAOSPATH=$_amigaospath
 MORPHOSPATH=$_morphospath
 STATICLIBPATH=$_staticlibpath
 XCODETOOLSPATH=$_xcodetoolspath


Commit: 239730cf395c9965477c7b3ff1bbe41d1e24811a
    https://github.com/scummvm/scummvm-tools/commit/239730cf395c9965477c7b3ff1bbe41d1e24811a
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-09-22T17:55:09+02:00

Commit Message:
AMIGAOS: Automate installation process

• Fix alphabetic ordering
• Update amigaos path
• Drop one subdir
• Install docs
• Install cli tool and drawer icons

Changed paths:
    Makefile


diff --git a/Makefile b/Makefile
index a489c2962..0e27ffe1a 100644
--- a/Makefile
+++ b/Makefile
@@ -223,41 +223,51 @@ osxsnap: bundle scummvm-tools-cli-static
 #
 # AmigaOS specific
 #
-
-# Special target to create an AmigaOS snapshot installation
-amigaos4dist: all
-	mkdir -p $(AMIGAOS4PATH)
-	mkdir -p $(AMIGAOS4PATH)/graphics
-	mkdir -p $(AMIGAOS4PATH)/tools
-	mkdir -p $(AMIGAOS4PATH)/tools/media
-	cp $(srcdir)/gui/media/detaillogo.jpg $(AMIGAOS4PATH)/tools/media/
-	cp $(srcdir)/gui/media/logo.jpg $(AMIGAOS4PATH)/tools/media/
-	cp $(srcdir)/gui/media/tile.gif $(AMIGAOS4PATH)/tools/media/
-	$(STRIP) construct_mohawk$(EXEEXT) -o $(AMIGAOS4PATH)/tools/construct_mohawk$(EXEEXT)
+# Special target to create an AmigaOS snapshot installation.
+amigaosdist: all
+	mkdir -p $(AMIGAOSPATH)
+	mkdir -p $(AMIGAOSPATH)/doc
+	mkdir -p $(AMIGAOSPATH)/media
+	# Install documents
+	cp $(srcdir)/COPYING $(AMIGAOSPATH)/doc/
+	cp $(srcdir)/COPYRIGHT $(AMIGAOSPATH)/doc/
+	cp $(srcdir)/NEWS $(AMIGAOSPATH)/doc/
+	cp $(srcdir)/README $(AMIGAOSPATH)/doc/
+	cp $(srcdir)/TODO $(AMIGAOSPATH)/doc/
+	# Install media files
+	cp $(srcdir)/gui/media/detaillogo.jpg $(AMIGAOSPATH)/media/
+	cp $(srcdir)/gui/media/logo.jpg $(AMIGAOSPATH)/media/
+	cp $(srcdir)/gui/media/scummvmtools_128.png $(AMIGAOSPATH)/media/
+	cp $(srcdir)/gui/media/tile.gif $(AMIGAOSPATH)/media/
+	# Install icons
+	cp ${srcdir}/gui/media/scummvm-tools.info $(AMIGAOSPATH)/scummvm-tools-cli.info
+	cp ${srcdir}/gui/media/scummvm-tools_drawer.info $(AMIGAOSPATH).info
+	# Install encoder batch files
+	cp $(srcdir)/convert_dxa.bat $(AMIGAOSPATH)/convert_dxa.bat
+	cp $(srcdir)/convert_dxa.sh $(AMIGAOSPATH)/convert_dxa.sh
+	# Install tools
+	$(STRIP) construct_mohawk$(EXEEXT) -o $(AMIGAOSPATH)/construct_mohawk$(EXEEXT)
 ifeq "$(USE_FREETYPE2)" "1"
 ifeq "$(USE_ICONV)" "1"
-	$(STRIP) create_sjisfnt$(EXEEXT) -o $(AMIGAOS4PATH)/tools/create_sjisfnt$(EXEEXT)
+	$(STRIP) create_sjisfnt$(EXEEXT) -o $(AMIGAOSPATH)/create_sjisfnt$(EXEEXT)
 endif
 endif
-	$(STRIP) decine$(EXEEXT) -o $(AMIGAOS4PATH)/tools/decine$(EXEEXT)
+	$(STRIP) decine$(EXEEXT) -o $(AMIGAOSPATH)/decine$(EXEEXT)
 ifeq "$(USE_BOOST)" "1"
-	$(STRIP) decompile$(EXEEXT) -o $(AMIGAOS4PATH)/tools/decompile$(EXEEXT)
+	$(STRIP) decompile$(EXEEXT) -o $(AMIGAOSPATH)/decompile$(EXEEXT)
 endif
-	$(STRIP) degob$(EXEEXT) -o $(AMIGAOS4PATH)/tools/degob$(EXEEXT)
-	$(STRIP) dekyra$(EXEEXT) -o $(AMIGAOS4PATH)/tools/dekyra$(EXEEXT)
-	$(STRIP) deprince$(EXEEXT) -o $(AMIGAOS4PATH)/tools/deprince$(EXEEXT)
-	$(STRIP) descumm$(EXEEXT) -o $(AMIGAOS4PATH)/tools/descumm$(EXEEXT)
-	$(STRIP) desword2$(EXEEXT) -o $(AMIGAOS4PATH)/tools/desword2$(EXEEXT)
-	$(STRIP) extract_mohawk$(EXEEXT) -o $(AMIGAOS4PATH)/tools/extract_mohawk$(EXEEXT)
-	$(STRIP) gob_loadcalc$(EXEEXT) -o $(AMIGAOS4PATH)/tools/gob_loadcalc$(EXEEXT)
+	$(STRIP) degob$(EXEEXT) -o $(AMIGAOSPATH)/degob$(EXEEXT)
+	$(STRIP) dekyra$(EXEEXT) -o $(AMIGAOSPATH)/dekyra$(EXEEXT)
+	$(STRIP) deprince$(EXEEXT) -o $(AMIGAOSPATH)/deprince$(EXEEXT)
+	$(STRIP) descumm$(EXEEXT) -o $(AMIGAOSPATH)/descumm$(EXEEXT)
+	$(STRIP) desword2$(EXEEXT) -o $(AMIGAOSPATH)/desword2$(EXEEXT)
+	$(STRIP) extract_mohawk$(EXEEXT) -o $(AMIGAOSPATH)/extract_mohawk$(EXEEXT)
+	$(STRIP) gob_loadcalc$(EXEEXT) -o $(AMIGAOSPATH)/gob_loadcalc$(EXEEXT)
 ifeq "$(USE_WXWIDGETS)" "1"
-	$(STRIP) scummvm-tools$(EXEEXT) -o $(AMIGAOS4PATH)/tools/scummvm-tools$(EXEEXT)
+	$(STRIP) scummvm-tools$(EXEEXT) -o $(AMIGAOSPATH)/scummvm-tools$(EXEEXT)
 endif
-	$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(AMIGAOS4PATH)/tools/scummvm-tools-cli$(EXEEXT)
-	#cp ${srcdir}/icons/scummvm-tools.info $(AMIGAOS4PATH)/scummvm-tools.info
-	cp $(srcdir)/COPYING $(AMIGAOS4PATH)/tools/COPYING.txt
-	cp $(srcdir)/README $(AMIGAOS4PATH)/tools/README.txt
-	cp $(srcdir)/NEWS $(AMIGAOS4PATH)/tools/NEWS.txt
+	$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(AMIGAOSPATH)/scummvm-tools-cli$(EXEEXT)
+
 
 #
 # RISC OS specific