From 1a2a66ed31e9b74b7b3f4ee306fcda710da380e9 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Wed, 25 Apr 2012 12:54:08 +0300
Subject: GDB build: Be more quiet

Change-Id: I775ddc04e50b10d35993d1390bf8bd8e35f1dbbf
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 dist/gdb/Makefile.linux | 42 ++++++++++++++++++++++++++----------------
 dist/gdb/Makefile.mingw | 45 +++++++++++++++++++++++++++------------------
 dist/gdb/Makefile.osx   | 40 +++++++++++++++++++++++++---------------
 3 files changed, 78 insertions(+), 49 deletions(-)

(limited to 'dist/gdb')

diff --git a/dist/gdb/Makefile.linux b/dist/gdb/Makefile.linux
index 6459ba4283..676f8a602a 100644
--- a/dist/gdb/Makefile.linux
+++ b/dist/gdb/Makefile.linux
@@ -21,34 +21,44 @@ clean:
 	rm -rf  ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir
-	cd ${source}; wget http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	wget -q http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
-	cd ${source}; wget http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
+	cd ${source} && \
+	echo "Downloading python..." && \
+	wget -q http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
 	touch ${source}/Python-${pyversion}.tgz
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir
-	cd ${source} &&\
-	wget http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	wget -O gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	cd ${source} && \
+	echo "Downloading gdb..." && \
+	wget -q http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	wget -Oq gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-*.tar.bz2
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
-	cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	cd ${staging} && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
-	unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
+	unset PYTHONHOME && cd ${staging} && \
+	echo "Extracting python..." && \
+	tar xf ${source}/Python-${pyversion}.tgz && \
+	cd Python-${pyversion} && \
 	export LDFLAGS="-pthread -lm" && \
 	./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
 
@@ -58,7 +68,8 @@ ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpyt
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
         patch -p2 < ${broot}/patches/pythonhome-7.4.patch && \
@@ -75,8 +86,7 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	${staging}/gdb-${version}/configure --disable-nls --target=$* --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	sleep 3 && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	cp -T gdb/gdb ${targetdir}/gdb-$*
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
 	test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
@@ -86,10 +96,10 @@ ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${
 	cd ${staging}/gdb-${version}-${arch} && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	cp -T gdb/gdb ${targetdir}/gdb
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
 	mv ${targetdir} ${targetdir}-${arch}
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
+	echo "Packing..."
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch}
 	mv ${targetdir}-${arch} ${targetdir}
diff --git a/dist/gdb/Makefile.mingw b/dist/gdb/Makefile.mingw
index fc01c53b9a..30179e69e5 100644
--- a/dist/gdb/Makefile.mingw
+++ b/dist/gdb/Makefile.mingw
@@ -27,48 +27,55 @@ distclean:
 	rm -rf ${staging} ${source} ${broot}/qtcreator-gdb-*
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 checkunzip:
 	unzip -v &> /dev/null || mingw-get install msys-unzip
 
 ${source}/python.zip: | makesourcedir checkwget
 	cd ${source} && \
-	wget http://download.qt.nokia.com/misc/gdb/7.4/build-prerequisits/python.zip && \
+	echo "Downloading python..." && \
+	wget -q http://download.qt.nokia.com/misc/gdb/7.4/build-prerequisits/python.zip && \
 	touch python.zip
 
 ${broot}/python/python.exe: ${source}/python.zip | checkunzip
 	cd ${broot} && \
-	unzip ${source}/python.zip
+	echo "Extracting python..." && \
+	unzip -oq ${source}/python.zip && \
+	touch python/python.exe
 
 checkwget:
 	wget -V &> /dev/null || mingw-get install msys-wget-bin
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir checkwget
 	cd ${source} && \
-	wget http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	wget -O gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	echo "Downloading gdb..." && \
+	wget -q http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	wget -Oq gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-${version}.tar.bz2
 
 ${source}/libiconv-${iconvversion}.tar.gz: | makesourcedir checkwget
 	cd ${source} && \
-	wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconvversion}.tar.gz  && \
+	echo "Downloading iconv..." && \
+	wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconvversion}.tar.gz  && \
 	touch ${source}/libiconv-${iconvversion}.tar.gz
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir checkwget
-	cd ${source} &&\
-	wget http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz/download && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	wget -q http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz/download && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
 	patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
@@ -76,14 +83,16 @@ ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestag
 
 ${staging}/lib/libiconv.a: ${source}/libiconv-${iconvversion}.tar.gz | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/libiconv-${iconvversion}.tar.gz && \
+	echo "Extracting iconv..." && \
+	tar xf ${source}/libiconv-${iconvversion}.tar.gz && \
 	cd libiconv-${iconvversion} && \
 	./configure -prefix=${staging} --enable-static && \
 	${MAKE} && ${MAKE} install
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/expat-${expatversion}.tar.gz && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && \
 	cd expat-${expatversion} && \
 	./configure -prefix=${staging} --enable-static && \
 	${MAKE} && ${MAKE} install
@@ -97,10 +106,9 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/lib/libexpat.a ${staging}/lib/libi
 	${staging}/gdb-${version}/configure --target=$* --disable-nls --disable-werror \
 	--with-libiconv-prefix=${staging} \
 	--with-expat --with-libexpat-prefix=${staging} \
-	--with-python=${pydir} &&\
-	${MAKE} MAKEFLAGS+= -j1 &&\
-	strip gdb/gdb.exe && \
-	cp -T gdb/gdb.exe ${targetdir}/gdb-$*.exe
+	--with-python=${pydir} && \
+	${MAKE} MAKEFLAGS+= -j1 && \
+	strip -o ${targetdir}/gdb-$*.exe gdb/gdb.exe
 
 package: ${gdbtargets} ${broot}/python/python.exe
 	cp ${staging}/bin/libiconv* ${targetdir} && \
@@ -108,5 +116,6 @@ package: ${gdbtargets} ${broot}/python/python.exe
 	cp ${pydir}/python*.dll ${targetdir} && \
 	cp -r ${pydir}/lib ${targetdir} && \
 	mv ${targetdir} ${targetdir}-${arch} && \
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch} && \
+	echo "Packing..." && \
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch} && \
 	mv ${targetdir}-${arch} ${targetdir}
diff --git a/dist/gdb/Makefile.osx b/dist/gdb/Makefile.osx
index 737e7a6c80..9b0587fe9a 100644
--- a/dist/gdb/Makefile.osx
+++ b/dist/gdb/Makefile.osx
@@ -21,34 +21,44 @@ clean:
 	rm -rf  ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir
-	cd ${source}; curl -LOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	curl -LsOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
-	cd ${source}; curl -Of http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
+	cd ${source} && \
+	echo "Downloading python..." && \
+	curl -Osf http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
 	touch ${source}/Python-${pyversion}.tgz
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir
 	cd ${source} && \
-	curl -Of http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	curl -of gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	echo "Downloading gdb..." && \
+	curl -Osf http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	curl -osf gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-*.tar.bz2
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
-	cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	cd ${staging} && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=/ && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
-	unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
+	unset PYTHONHOME && \
+	cd ${staging} && \
+	echo "Extracting python..." && \
+	tar xf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
 	./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpython${pyversion}.a | maketargetdir
@@ -57,7 +67,8 @@ ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpyt
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
 	patch -p2 < ${broot}/patches/pythonhome-${version}.patch && \
@@ -70,8 +81,7 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	cd ${staging}/gdb-${version}-$* && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --target=$* --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	mv gdb/gdb ${targetdir}/gdb-$*
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
 	test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
@@ -80,10 +90,10 @@ ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${
 	cd ${staging}/gdb-${version}-${arch} && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	mv gdb/gdb ${targetdir}/gdb
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
 	mv ${targetdir} ${targetdir}-${arch}
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
+	echo "Packing..."
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch}
 	mv ${targetdir}-${arch} ${targetdir}
-- 
cgit v1.2.1