From 61f47cf91db0687908c7e6e1da8a29b033a0d0d6 Mon Sep 17 00:00:00 2001 From: "Carl X. Su" Date: Mon, 18 Nov 2013 14:15:09 +0800 Subject: [PATCH 1/4] Add missing dependency on Debian --- install-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-all.sh b/install-all.sh index 0e8eb195..607c3221 100755 --- a/install-all.sh +++ b/install-all.sh @@ -10,7 +10,7 @@ debian_prepare() echo echo Profanity installer... installing dependencies echo - sudo apt-get -y install git autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev + sudo apt-get -y install git automake autoconf libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev } From 0a1e8d9c1ecf7f1b4985dfda90708cd0d8c1b094 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 7 Oct 2013 16:53:47 +0100 Subject: [PATCH 2/4] Fixed Cygwin install for 32/64bit changes --- install-all.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/install-all.sh b/install-all.sh index 607c3221..cd0ed542 100755 --- a/install-all.sh +++ b/install-all.sh @@ -36,7 +36,12 @@ cygwin_prepare() chmod +x apt-cyg mv apt-cyg /usr/local/bin/ - apt-cyg install make gcc automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncurses-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + if [ -n "$CYG_MIRROR" ]; then + apt-cyg -m $CYG_MIRROR install make automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + else + apt-cyg install make automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + fi + ln -s /usr/bin/gcc-3.exe /usr/bin/gcc.exe export LIBRARY_PATH=/usr/local/lib/ @@ -109,6 +114,13 @@ cleanup() echo } +while getopts m: opt +do + case "$opt" in + m) CYG_MIRROR=$OPTARG;; + esac +done + OS=`uname -s` DIST=unknown From 59c9e23bfa53d70ca20a6b83e840c8340bb6495d Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 20 Nov 2013 23:06:26 +0000 Subject: [PATCH 3/4] Added git, gcc-core, m4 to cygwin dependencies in install-all.sh --- install-all.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install-all.sh b/install-all.sh index cd0ed542..2425ef5d 100755 --- a/install-all.sh +++ b/install-all.sh @@ -37,9 +37,10 @@ cygwin_prepare() mv apt-cyg /usr/local/bin/ if [ -n "$CYG_MIRROR" ]; then - apt-cyg -m $CYG_MIRROR install make automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + apt-cyg -m $CYG_MIRROR install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel else - apt-cyg install make automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + apt-cyg install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel + fi ln -s /usr/bin/gcc-3.exe /usr/bin/gcc.exe From bdb8ea3f089da782bde114447062c10f76f82716 Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 20 Nov 2013 23:10:45 +0000 Subject: [PATCH 4/4] Call ./bootstrap.sh if development build in install-all.sh --- install-all.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install-all.sh b/install-all.sh index 2425ef5d..42deaf1a 100755 --- a/install-all.sh +++ b/install-all.sh @@ -1,5 +1,7 @@ #!/bin/sh +STATUS=development + debian_prepare() { echo @@ -68,6 +70,9 @@ install_profanity() echo echo Profanity installer... installing Profanity echo + if [ "${STATUS}" = "development" ]; then + ./bootstrap.sh + fi ./configure make sudo make install @@ -94,6 +99,9 @@ cyg_install_profanity() echo echo Profanity installer... installing Profanity echo + if [ "${STATUS}" = "development" ]; then + ./bootstrap.sh + fi ./configure make make install