Browse Source

Merge remote-tracking branch 'upstream/reduce-python-csharp-install-verbosity' into reduce-python-csharp-install-verbosity

Conflicts:
	toolset/setup/linux/languages/mono.sh
	toolset/setup/linux/languages/python2.sh
	toolset/setup/linux/languages/python3.sh
	toolset/setup/linux/prerequisites.sh
Hamilton Turner 10 years ago
parent
commit
9c56892aba

+ 5 - 4
toolset/setup/linux/languages/mono.sh

@@ -8,7 +8,7 @@ RETCODE=$(fw_exists ${IROOT}/mono.installed)
   sudo $IROOT/mono-3.6.0-install/bin/mozroots --import --sync;
   sudo $IROOT/mono-3.6.0-install/bin/mozroots --import --sync;
   return 0; }
   return 0; }
 
 
-sudo apt-get install -y build-essential \
+sudo apt-get install -qqy build-essential \
              autoconf \
              autoconf \
              automake \
              automake \
              libtool \
              libtool \
@@ -21,10 +21,11 @@ fw_untar mono-3.6.0.tar.bz2
 
 
 cd mono-3.6.0
 cd mono-3.6.0
 ./autogen.sh --prefix=${IROOT}/mono-3.6.0-install
 ./autogen.sh --prefix=${IROOT}/mono-3.6.0-install
-make -j4 EXTERNAL_MCS=${IROOT}/mono-3.6.0/mcs/class/lib/monolite/basic.exe
-make install
+echo -n "Installing Mono"
+make -j4 EXTERNAL_MCS=${IROOT}/mono-3.6.0/mcs/class/lib/monolite/basic.exe 2>&1 | tee $IROOT/mono-install.log | awk '{ if (NR%100 == 0) printf "."}'
+make install 2>&1 | tee -a $IROOT/mono-install.log | awk '{ if (NR%100 == 0) printf "."}'
 
 
 echo "Installing RootCAs from Mozilla..."; 
 echo "Installing RootCAs from Mozilla..."; 
 sudo ${IROOT}/mono-3.6.0-install/bin/mozroots --import --sync;
 sudo ${IROOT}/mono-3.6.0-install/bin/mozroots --import --sync;
 
 
-touch ${IROOT}/mono.installed
+touch $IROOT/mono.installed

+ 3 - 2
toolset/setup/linux/languages/python2.sh

@@ -7,8 +7,9 @@ fw_get http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz
 fw_untar Python-2.7.9.tgz
 fw_untar Python-2.7.9.tgz
 cd Python-2.7.9
 cd Python-2.7.9
 ./configure --prefix=${IROOT}/py2 --disable-shared --quiet
 ./configure --prefix=${IROOT}/py2 --disable-shared --quiet
-make -j4 --quiet
-make install --quiet
+make -j4 --quiet 2>&1 | tee $IROOT/python-install.log | awk '{ if (NR%100 == 0) printf "."}'
+make install --quiet 2>&1 | tee -a $IROOT/python-install.log | awk '{ if (NR%100 == 0) printf "."}'
+cd ..
 
 
 ${IROOT}/py2/bin/python -m ensurepip -U
 ${IROOT}/py2/bin/python -m ensurepip -U
 ${IROOT}/py2/bin/pip install -U setuptools pip
 ${IROOT}/py2/bin/pip install -U setuptools pip

+ 3 - 2
toolset/setup/linux/languages/python3.sh

@@ -7,8 +7,9 @@ fw_get http://www.python.org/ftp/python/3.4.2/Python-3.4.2.tar.xz
 fw_untar Python-3.4.2.tar.xz
 fw_untar Python-3.4.2.tar.xz
 cd Python-3.4.2
 cd Python-3.4.2
 ./configure --prefix=${IROOT}/py3 --disable-shared --quiet
 ./configure --prefix=${IROOT}/py3 --disable-shared --quiet
-make -j4 --quiet
-make install --quiet
+make -j4 --quiet 2>&1 | tee $IROOT/python3-install.log | awk '{ if (NR%100 == 0) printf "."}'
+make install --quiet 2>&1 | tee -a $IROOT/python3-install.log | awk '{ if (NR%100 == 0) printf "."}'
+cd ..
 
 
 ln -s ${IROOT}/py3/bin/python3.4m ${IROOT}/py3/bin/python3.4
 ln -s ${IROOT}/py3/bin/python3.4m ${IROOT}/py3/bin/python3.4
 ${IROOT}/py3/bin/python3 -m ensurepip -U
 ${IROOT}/py3/bin/python3 -m ensurepip -U

+ 2 - 2
toolset/setup/linux/prerequisites.sh

@@ -20,7 +20,7 @@ sudo apt-get -yq update
 sudo apt-get -yq upgrade -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
 sudo apt-get -yq upgrade -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
 
 
 # WARNING: DONT PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
 # WARNING: DONT PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
-sudo apt-get -yq install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+sudo apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
   cmake build-essential automake    `# Needed for building code` \
   cmake build-essential automake    `# Needed for building code` \
   curl wget unzip                   `# Common tools` \
   curl wget unzip                   `# Common tools` \
   software-properties-common        `# Needed for add-apt-repository` \
   software-properties-common        `# Needed for add-apt-repository` \
@@ -47,7 +47,7 @@ sudo apt-get -yq install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::
 # Install gcc-4.8
 # Install gcc-4.8
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo apt-get -yq update
 sudo apt-get -yq update
-sudo apt-get install -yq gcc-4.8 g++-4.8
+sudo apt-get install -qqy gcc-4.8 g++-4.8
 
 
 # Stop permanently overwriting people's files just for 
 # Stop permanently overwriting people's files just for 
 # trying out our software!
 # trying out our software!