[Scummvm-cvs-logs] scummvm-tools master -> fbd0f86111cef055dbcf2529a2d3d7b2f55f714a

[digitall]

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:
e133bf4c76 BUILD: Fix AmigaOS4 build variable naming to be clearer.
fbd0f86111 BUILD: Change AmigaOS4 packaging target to "amigaos4dist".


Commit: e133bf4c767e4731ea6ec5a4f097ca4de115c70d
    https://github.com/scummvm/scummvm-tools/commit/e133bf4c767e4731ea6ec5a4f097ca4de115c70d
Author: D G Turner (digitall at scummvm.org)
Date: 2014-07-20T03:38:25+01:00

Commit Message:
BUILD: Fix AmigaOS4 build variable naming to be clearer.

Changed paths:
    Makefile
    configure



diff --git a/Makefile b/Makefile
index cc56f59..b644e17 100644
--- a/Makefile
+++ b/Makefile
@@ -173,35 +173,35 @@ endif
 
 # Special target to create an AmigaOS snapshot installation
 aos4dist: all
-	mkdir -p $(AOS4PATH)
-	mkdir -p $(AOS4PATH)/graphics
-	mkdir -p $(AOS4PATH)/tools
-	mkdir -p $(AOS4PATH)/tools/media
-	cp $(srcdir)/gui/media/detaillogo.jpg $(AOS4PATH)/tools/media/
-	cp $(srcdir)/gui/media/logo.jpg $(AOS4PATH)/tools/media/
-	cp $(srcdir)/gui/media/tile.gif $(AOS4PATH)/tools/media/
-	$(STRIP) construct_mohawk$(EXEEXT) -o $(AOS4PATH)/tools/construct_mohawk$(EXEEXT)
+	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)
 ifeq "$(USE_FREETYPE)" "1"
 ifeq "$(USE_ICONV)" "1"
-	$(STRIP) create_sjisfnt$(EXEEXT) -o $(AOS4PATH)/tools/create_sjisfnt$(EXEEXT)
+	$(STRIP) create_sjisfnt$(EXEEXT) -o $(AMIGAOS4PATH)/tools/create_sjisfnt$(EXEEXT)
 endif
 endif
-	$(STRIP) decine$(EXEEXT) -o $(AOS4PATH)/tools/decine$(EXEEXT)
+	$(STRIP) decine$(EXEEXT) -o $(AMIGAOS4PATH)/tools/decine$(EXEEXT)
 ifeq "$(USE_BOOST)" "1"
-	$(STRIP) decompile$(EXEEXT) -o $(AOS4PATH)/tools/decompile$(EXEEXT)
-endif
-	$(STRIP) degob$(EXEEXT) -o $(AOS4PATH)/tools/degob$(EXEEXT)
-	$(STRIP) dekyra$(EXEEXT) -o $(AOS4PATH)/tools/dekyra$(EXEEXT)
-	$(STRIP) deriven$(EXEEXT) -o $(AOS4PATH)/tools/deriven$(EXEEXT)
-	$(STRIP) descumm$(EXEEXT) -o $(AOS4PATH)/tools/descumm$(EXEEXT)
-	$(STRIP) desword2$(EXEEXT) -o $(AOS4PATH)/tools/desword2$(EXEEXT)
-	$(STRIP) extract_mohawk$(EXEEXT) -o $(AOS4PATH)/tools/extract_mohawk$(EXEEXT)
-	$(STRIP) gob_loadcalc$(EXEEXT) -o $(AOS4PATH)/tools/gob_loadcalc$(EXEEXT)
+	$(STRIP) decompile$(EXEEXT) -o $(AMIGAOS4PATH)/tools/decompile$(EXEEXT)
+endif
+	$(STRIP) degob$(EXEEXT) -o $(AMIGAOS4PATH)/tools/degob$(EXEEXT)
+	$(STRIP) dekyra$(EXEEXT) -o $(AMIGAOS4PATH)/tools/dekyra$(EXEEXT)
+	$(STRIP) deriven$(EXEEXT) -o $(AMIGAOS4PATH)/tools/deriven$(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)
 ifeq "$(USE_WXWIDGETS)" "1"
-	$(STRIP) scummvm-tools$(EXEEXT) -o $(AOS4PATH)/tools/scummvm-tools$(EXEEXT)
+	$(STRIP) scummvm-tools$(EXEEXT) -o $(AMIGAOS4PATH)/tools/scummvm-tools$(EXEEXT)
 endif
-	$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(AOS4PATH)/tools/scummvm-tools-cli$(EXEEXT)
-	#cp ${srcdir}/icons/scummvm-tools.info $(AOS4PATH)/scummvm-tools.info
-	cp $(srcdir)/COPYING $(AOS4PATH)/tools/COPYING.txt
-	cp $(srcdir)/README $(AOS4PATH)/tools/README.txt
-	cp $(srcdir)/NEWS $(AOS4PATH)/tools/NEWS.txt
+	$(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
diff --git a/configure b/configure
index b962fc3..3b7c42f 100755
--- a/configure
+++ b/configure
@@ -98,7 +98,7 @@ _wxincludes=""
 _wxlibs=""
 _freetypeincludes=""
 _freetypelibs=""
-_aos4path="Games:ScummVM-Tools"
+_amigaos4path="Games:ScummVM-Tools"
 
 # For cross compiling
 _host=""
@@ -1622,7 +1622,7 @@ ASFLAGS := $ASFLAGS
 WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
 WIN32PATH=$_win32path
-AOS4PATH=$_aos4path
+AMIGAOS4PATH=$_amigaos4path
 STATICLIBPATH=$_staticlibpath
 
 EXEEXT := $HOSTEXEEXT


Commit: fbd0f86111cef055dbcf2529a2d3d7b2f55f714a
    https://github.com/scummvm/scummvm-tools/commit/fbd0f86111cef055dbcf2529a2d3d7b2f55f714a
Author: D G Turner (digitall at scummvm.org)
Date: 2014-07-20T03:39:40+01:00

Commit Message:
BUILD: Change AmigaOS4 packaging target to "amigaos4dist".

This is a clearer naming, but needs update to buildbot to support.
AmigaOS4 Porter (raziel_) is already aware of this.

Changed paths:
    Makefile



diff --git a/Makefile b/Makefile
index b644e17..afc4473 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ endif
 #
 
 # Special target to create an AmigaOS snapshot installation
-aos4dist: all
+amigaos4dist: all
 	mkdir -p $(AMIGAOS4PATH)
 	mkdir -p $(AMIGAOS4PATH)/graphics
 	mkdir -p $(AMIGAOS4PATH)/tools