changeset 608:ee1dd2a6fd7e

Updated documentation
author Sebastien Decugis <sdecugis@nict.go.jp>
date Fri, 26 Nov 2010 11:04:29 +0900
parents d6b6bda9c6d1
children 2d15fd8ef5ba
files contrib/nightly_tests/README contrib/nightly_tests/prereqs contrib/nightly_tests/prereqs.freebsd contrib/nightly_tests/prereqs.ubuntu
diffstat 4 files changed, 14 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/nightly_tests/README	Thu Nov 25 16:55:27 2010 +0900
+++ b/contrib/nightly_tests/README	Fri Nov 26 11:04:29 2010 +0900
@@ -13,13 +13,14 @@
 -- note: the build slave should have cmake version 2.8 at least so that ctest will update the source tree properly.
 
 1) Install all dependencies for freeDiameter as follow: 
-  a) Debian / Ubuntu: See the "prereqs" file
-	$ sudo aptitude install `wget http://www.freediameter.net/hg/freeDiameter/raw-file/tip/contrib/nightly_tests/prereqs -O - | grep -v -e "^#"`
+  a) Debian / Ubuntu: See the "prereqs.ubuntu" file
+	$ sudo aptitude install `wget http://www.freediameter.net/hg/freeDiameter/raw-file/tip/contrib/nightly_tests/prereqs.ubuntu -O - | grep -v -e "^#"`
 	
-  b) FreeBSD:
+  b) FreeBSD: See the "prereqs.freebsd" file
       - install base system and ports
       - install freediameter dependencies as follow:
-      # pkg_add -r -v wget bash cmake mercurial flex bison gnutls postgresql84-client postgresql84-server mysql50-client
+      # pkg_add -r -v wget
+      # pkg_add -r -v `wget http://www.freediameter.net/hg/freeDiameter/raw-file/tip/contrib/nightly_tests/prereqs.freebsd -O - | grep -v -e "^#"`
 
 2) Create the "test" database for app_acct test (we assume the tests are run as user "test" here)
       - check INSTALL.FreeBSD file for specific PostgreSQL pre-install instructions.
@@ -61,9 +62,9 @@
 5) Create a file local.cmake defining the name of the build slave in this directory also.
 	$ echo "SET(CTEST_SITE \""`hostname`"\")" > local.cmake
 	
-   For FreeBSD:
+   For FreeBSD, in addition do:
    	$ echo "set(CTEST_BUILD_OPTIONS \"\${CTEST_BUILD_OPTIONS} -DFLEX_EXECUTABLE:FILEPATH=/usr/local/bin/flex\")" >> local.cmake
-
+	
 6) Run the runscript.sh script once to check it works properly (freeBSD might require: ln -s /usr/local/bin/bash /bin/bash)
 
 7) Set up a crontab to run the script
--- a/contrib/nightly_tests/prereqs	Thu Nov 25 16:55:27 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# Packages (Ubuntu names)
-cmake mercurial make gcc flex bison binutils libsctp-dev libgnutls-dev valgrind wget libpq-dev postgresql libmysqlclient-dev
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/nightly_tests/prereqs.freebsd	Fri Nov 26 11:04:29 2010 +0900
@@ -0,0 +1,4 @@
+# 1: install base system and ports
+# 2: install wget with command: pkg_add -r -v wget
+# Finally, install the other packages from this file
+bash cmake mercurial flex bison gnutls postgresql84-client postgresql84-server mysql50-client libxml2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/nightly_tests/prereqs.ubuntu	Fri Nov 26 11:04:29 2010 +0900
@@ -0,0 +1,3 @@
+# Packages (Ubuntu names)
+cmake mercurial make gcc flex bison binutils libsctp-dev libgnutls-dev valgrind wget libpq-dev postgresql libmysqlclient-dev libxml2-dev libxml2
+
"Welcome to our mercurial repository"