From 787e5014205ccc878e449c09aed208b180bbcbc2 Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Wed, 24 Sep 2008 20:18:27 -0600 Subject: [PATCH] Switch Linux nightly builds to Ubuntu and add pthread build. Remove the cron file for SuSE. Add cron file for Ubuntu. Remove LWP config file for SuSE. Add LWP and pthread config files for Ubuntu. --- .../conf/{suse.i386.config => ubuntu-lwp.i386.config} | 2 +- src/scripts/nightly/conf/ubuntu-pthread.i386.config | 10 ++++++++++ src/scripts/nightly/cron/cron.suse.i386 | 6 ------ src/scripts/nightly/cron/cron.ubuntu.i386 | 8 ++++++++ 4 files changed, 19 insertions(+), 7 deletions(-) rename src/scripts/nightly/conf/{suse.i386.config => ubuntu-lwp.i386.config} (83%) create mode 100644 src/scripts/nightly/conf/ubuntu-pthread.i386.config delete mode 100644 src/scripts/nightly/cron/cron.suse.i386 create mode 100755 src/scripts/nightly/cron/cron.ubuntu.i386 diff --git a/src/scripts/nightly/conf/suse.i386.config b/src/scripts/nightly/conf/ubuntu-lwp.i386.config similarity index 83% rename from src/scripts/nightly/conf/suse.i386.config rename to src/scripts/nightly/conf/ubuntu-lwp.i386.config index 67bad668..09fab2f0 100644 --- a/src/scripts/nightly/conf/suse.i386.config +++ b/src/scripts/nightly/conf/ubuntu-lwp.i386.config @@ -1,7 +1,7 @@ SCRIPTDIR=/home/empire BOXDIR=boxes LOGDIR=logs -INSTANCE=suse.i386 +INSTANCE=ubuntu-lwp.i386 EMPPORT=8889 NIGHTLY_SKIP_STEP= GITROOT=/home/empire/empserver.git diff --git a/src/scripts/nightly/conf/ubuntu-pthread.i386.config b/src/scripts/nightly/conf/ubuntu-pthread.i386.config new file mode 100644 index 00000000..f8cb5d19 --- /dev/null +++ b/src/scripts/nightly/conf/ubuntu-pthread.i386.config @@ -0,0 +1,10 @@ + +SCRIPTDIR=/home/empire +BOXDIR=boxes +LOGDIR=logs +INSTANCE=ubuntu-pthread.i386 +EMPPORT=8889 +NIGHTLY_SKIP_STEP= +GITROOT=/home/empire/empserver.git +export LANG=C +export CONFIGURE_OPTIONS="--with-pthread" diff --git a/src/scripts/nightly/cron/cron.suse.i386 b/src/scripts/nightly/cron/cron.suse.i386 deleted file mode 100644 index 7d8a793f..00000000 --- a/src/scripts/nightly/cron/cron.suse.i386 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd /home/empire/empserver.git -git pull 2>&1 >/dev/null -cd /home/empire -./nightlybuild.sh suse.i386.config -./report.sh suse.i386.config | mutt -s 'empserver suse.i386' empserver-devel@lists.sourceforge.net diff --git a/src/scripts/nightly/cron/cron.ubuntu.i386 b/src/scripts/nightly/cron/cron.ubuntu.i386 new file mode 100755 index 00000000..34bac62b --- /dev/null +++ b/src/scripts/nightly/cron/cron.ubuntu.i386 @@ -0,0 +1,8 @@ +#!/bin/sh +cd /home/empire/empserver.git +git pull 2>&1 >/dev/null +cd /home/empire +./nightlybuild.sh ubuntu-lwp.i386.config +./report.sh ubuntu-lwp.i386.config | mutt -s 'empserver ubuntu-lwp.i386' empserver-devel@lists.sourceforge.net +./nightlybuild.sh ubuntu-pthread.i386.config +./report.sh ubuntu-pthread.i386.config | mutt -s 'empserver ubuntu-pthread.i386' empserver-devel@lists.sourceforge.net