diff options
| -rw-r--r-- | scripts/auto-build/auto-build-common | 72 | ||||
| -rwxr-xr-x | scripts/auto-build/pd-extended-auto-builder.sh | 120 |
2 files changed, 96 insertions, 96 deletions
diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index 74ee0cea..ab4aca3c 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -9,9 +9,9 @@ RSYNC_SERVER=blinky.at.or.at # use the hostname from /etc/hostname in case we are a chroot build enviroment if [ -e /etc/hostname ]; then - HOSTNAME=`cat /etc/hostname` + HOSTNAME=`cat /etc/hostname` else - HOSTNAME=$(hostname | sed 's|\([a-zA-Z0-9-]\)\..*|\1|' | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|') + HOSTNAME=$(hostname | sed 's|\([a-zA-Z0-9-]\)\..*|\1|' | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|') fi ## the following creates a spam-bot that sends emails to an address that has not asked for it @@ -30,24 +30,24 @@ fi ## the autobuilder if [ -e ${HOME}/auto-build-common.local ]; then - . ${HOME}/auto-build-common.local - running_on_server=yes + . ${HOME}/auto-build-common.local + running_on_server=yes else - running_on_server=no - echo "Could not find local configuration in \"${HOME}/auto-build-common.local\"" - echo "Skipping... (see ${HOME}/auto-build-common for instructions)" - echo + running_on_server=no + echo "Could not find local configuration in \"${HOME}/auto-build-common.local\"" + echo "Skipping... (see ${HOME}/auto-build-common for instructions)" + echo fi # cygwin/Mingw don't have 'mail', but do have 'email' which is close enough. # To get around the troubles with mail servers, we'll contact the SMTP server # of the mailing lists directly (mail.iem.at). if [ -x /usr/bin/mail ]; then - MAIL_COMMAND=/usr/bin/mail + MAIL_COMMAND=/usr/bin/mail elif [ -x /bin/mail ]; then - MAIL_COMMAND=/bin/mail + MAIL_COMMAND=/bin/mail else - MAIL_COMMAND="email --smtp-server mail.iem.at" + MAIL_COMMAND="email --smtp-server mail.iem.at" fi @@ -55,31 +55,31 @@ fi # print out ip addresses for debugging print_ip_address() { - echo -n "hostname: " - hostname - echo "---------------------------" - if [ -x /sbin/ifconfig ]; then - /sbin/ifconfig - else - ipconfig - fi + echo -n "hostname: " + hostname + echo "---------------------------" + if [ -x /sbin/ifconfig ]; then + /sbin/ifconfig + else + ipconfig + fi } rsync_distro() { # let rsync handle the cleanup with --delete - DISTRO=$(basename $1) - echo "rsyncing $DISTRO to ${1}:" - RSYNC_COMMAND="rsync -a --delete-before rsync://${RSYNC_SERVER}/distros/${DISTRO}/ ${1}/" - case $SYSTEM in - mingw*) - /c/cygwin/bin/sh -c "$RSYNC_COMMAND" - ;; - *) - $RSYNC_COMMAND - ;; - esac + DISTRO=$(basename $1) + echo "rsyncing $DISTRO to ${1}:" + RSYNC_COMMAND="rsync -a --delete-before rsync://${RSYNC_SERVER}/distros/${DISTRO}/ ${1}/" + case $SYSTEM in + mingw*) + /c/cygwin/bin/sh -c "$RSYNC_COMMAND" + ;; + *) + $RSYNC_COMMAND + ;; + esac } # Mac OS X's included git or svn might be really old, so try Fink first @@ -146,13 +146,13 @@ clean_and_update_folder() get_pd_version() { PD_MAJOR_VERSION=$(grep PD_MAJOR_VERSION $1/pd/src/m_pd.h | \ - sed 's|^.define *PD_MAJOR_VERSION *\([0-9]*\).*|\1|' ) + sed 's|^.define *PD_MAJOR_VERSION *\([0-9]*\).*|\1|' ) PD_MINOR_VERSION=$(grep PD_MINOR_VERSION $1/pd/src/m_pd.h | \ - sed 's|^.define *PD_MINOR_VERSION *\([0-9]*\).*|\1|' ) + sed 's|^.define *PD_MINOR_VERSION *\([0-9]*\).*|\1|' ) PD_BUGFIX_VERSION=$(grep PD_BUGFIX_VERSION $1/pd/src/m_pd.h | \ - sed 's|^.define *PD_BUGFIX_VERSION *\([0-9]*\).*|\1|' ) + sed 's|^.define *PD_BUGFIX_VERSION *\([0-9]*\).*|\1|' ) PD_TEST_VERSION=$(grep PD_TEST_VERSION $1/pd/src/m_pd.h | \ - sed 's|^.define *PD_TEST_VERSION *"\(.*\)".*|\1|' | \ + sed 's|^.define *PD_TEST_VERSION *"\(.*\)".*|\1|' | \ sed 's|extended-||') if [ -z $PD_TEST_VERSION ]; then echo $PD_MAJOR_VERSION.$PD_MINOR_VERSION.$PD_BUGFIX_VERSION @@ -181,6 +181,6 @@ set_debian_changelog_version() { version=$1 rootdir=$2 - sed -i "s|^pd-extended (.*)|pd-extended ($version-1)|" \ - $rootdir/debian/changelog + sed -i "s|^pd-extended (.*)|pd-extended ($version-1)|" \ + $rootdir/debian/changelog } diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh index 45138f75..f21cb9f4 100755 --- a/scripts/auto-build/pd-extended-auto-builder.sh +++ b/scripts/auto-build/pd-extended-auto-builder.sh @@ -12,26 +12,26 @@ SCRIPT=$(echo $0| sed 's|.*/\(.*\)|\1|g') BUILD_DIR=. case $SYSTEM in - linux) - BUILD_DIR=linux_make - echo "Configuring to use $BUILD_DIR on GNU/Linux" - ;; - darwin) - BUILD_DIR=darwin_app - echo "Configuring to use $BUILD_DIR on Darwin/Mac OS X" - ;; - mingw*) - BUILD_DIR=win32_inno - echo "Configuring to use $BUILD_DIR on MinGW/Windows" - ;; - cygwin*) - BUILD_DIR=win32_inno - echo "Configuring to use $BUILD_DIR on Cygwin/Windows" - ;; - *) - echo "ERROR: Platform $SYSTEM not supported!" - exit - ;; + linux) + BUILD_DIR=linux_make + echo "Configuring to use $BUILD_DIR on GNU/Linux" + ;; + darwin) + BUILD_DIR=darwin_app + echo "Configuring to use $BUILD_DIR on Darwin/Mac OS X" + ;; + mingw*) + BUILD_DIR=win32_inno + echo "Configuring to use $BUILD_DIR on MinGW/Windows" + ;; + cygwin*) + BUILD_DIR=win32_inno + echo "Configuring to use $BUILD_DIR on Cygwin/Windows" + ;; + *) + echo "ERROR: Platform $SYSTEM not supported!" + exit + ;; esac @@ -94,52 +94,52 @@ upload_build () platform_folder=$1 build_folder=$2 archive_format=$3 - - archive=$(ls -1 ${auto_build_root_dir}/packages/${platform_folder}/${build_folder}/Pd*.${archive_format} | tail -1) + + archive=$(ls -1 ${auto_build_root_dir}/packages/${platform_folder}/${build_folder}/Pd*.${archive_format} | tail -1) echo "upload specs $1 $2 $3" echo "Uploading $archive" - upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|") - if [ -e ${archive} ]; then - case $SYSTEM in - mingw*) - /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ - md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ - /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5" && \ - echo "successfully uploaded: ${upload_filename}" && \ - echo SUCCESS - ;; - *) - rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ - md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ - rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ - echo "successfully uploaded: ${upload_filename}" && \ - echo SUCCESS - ;; - esac - fi + upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|") + if [ -e ${archive} ]; then + case $SYSTEM in + mingw*) + /c/cygwin/bin/sh -c \ + "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ + md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ + /c/cygwin/bin/sh -c \ + "rsync --archive --no-links --copy-links ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5" && \ + echo "successfully uploaded: ${upload_filename}" && \ + echo SUCCESS + ;; + *) + rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ + md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ + rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ + echo "successfully uploaded: ${upload_filename}" && \ + echo SUCCESS + ;; + esac + fi } case $SYSTEM in - linux) - if [ -x /usr/bin/dpkg-deb ]; then - upload_build linux_make . deb - else - upload_build linux_make build tar.bz2 - fi - ;; - darwin) - upload_build darwin_app . dmg - ;; - mingw*) - upload_build win32_inno Output exe - upload_build win32_inno zip zip - ;; - cygwin*) - upload_build win32_inno Output exe - ;; + linux) + if [ -x /usr/bin/dpkg-deb ]; then + upload_build linux_make . deb + else + upload_build linux_make build tar.bz2 + fi + ;; + darwin) + upload_build darwin_app . dmg + ;; + mingw*) + upload_build win32_inno Output exe + upload_build win32_inno zip zip + ;; + cygwin*) + upload_build win32_inno Output exe + ;; esac |