diff --git a/HISTORY.rst b/HISTORY.rst
index 12ab8841690ad5afda578707ec7e77d887a90c59_SElTVE9SWS5yc3Q=..25719b8f503b25819ccb54df304257790c747840_SElTVE9SWS5yc3Q= 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,11 @@
History
=======
+2.0
+---
+
+Read module_list, module_list_test, addon_dirs and odoo_type from setup.cfg instead of directories
+
1.0
---
diff --git a/VERSION b/VERSION
index 12ab8841690ad5afda578707ec7e77d887a90c59_VkVSU0lPTg==..25719b8f503b25819ccb54df304257790c747840_VkVSU0lPTg== 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-1.2
+2.0
diff --git a/do_tests b/do_tests
index 12ab8841690ad5afda578707ec7e77d887a90c59_ZG9fdGVzdHM=..25719b8f503b25819ccb54df304257790c747840_ZG9fdGVzdHM= 100755
--- a/do_tests
+++ b/do_tests
@@ -13,5 +13,5 @@
#
# - access to pg database
#
-# Version 1.2
+# Version 2.0
here=$(dirname $0)
@@ -17,5 +17,5 @@
here=$(dirname $0)
-project_home=$here/..
-dbname=$(basename $(readlink -f $project_home))_test
+project_home=$(cd $here && cd .. && echo $PWD)
+dbname=$(basename $project_home)_test
# this is the same value as conf/dev/odoo.conf
dbowner=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/conf/dev/odoo.conf') ; print c.get('options', 'db_user')")
@@ -20,6 +20,6 @@
# this is the same value as conf/dev/odoo.conf
dbowner=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/conf/dev/odoo.conf') ; print c.get('options', 'db_user')")
-modules_to_install=$(paste -d, -s $project_home/module_list)
+modules_to_install=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list', '').split())")
# color stuff
autoload colors
diff --git a/docker_build b/docker_build
index 12ab8841690ad5afda578707ec7e77d887a90c59_ZG9ja2VyX2J1aWxk..25719b8f503b25819ccb54df304257790c747840_ZG9ja2VyX2J1aWxk 100755
--- a/docker_build
+++ b/docker_build
@@ -1,5 +1,5 @@
#!/bin/zsh
-# template version 1.2
+# template version 2.0
# TODO add a way to bypass the value, maybe with a key in the setup.cfg file
repository=dockerhub.xcg.io
diff --git a/run_tests b/run_tests
index 12ab8841690ad5afda578707ec7e77d887a90c59_cnVuX3Rlc3Rz..25719b8f503b25819ccb54df304257790c747840_cnVuX3Rlc3Rz 100755
--- a/run_tests
+++ b/run_tests
@@ -1,4 +1,11 @@
#!/bin/zsh
# vim: set shiftwidth=4 softtabstop=4:
-# Version 1.2
+#
+# This script is used to run tests on a database with demo data installed.
+#
+# Either provide the name of the database (first argument) or it will default to <project>_test
+# Version 2.0
+here=$(dirname $0)
+project_home=$(cd $here && cd .. && echo $PWD)
+tested_modules=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())")
dbname=$1
@@ -4,4 +11,3 @@
dbname=$1
-here=$(dirname $0)
if [[ -z "$dbname" ]];
then
@@ -6,4 +12,4 @@
if [[ -z "$dbname" ]];
then
- dbname=$(basename $(readlink -f $here/..))_test
+ dbname=$(basename $(readlink -f $project_home))_test
else
@@ -9,3 +15,3 @@
else
- shift
+ shift
fi
@@ -11,3 +17,3 @@
fi
-echo "Using database $dbname"
+echo "Using database $dbname for tests"
@@ -13,2 +19,9 @@
-$here/start -d $dbname --test-enable --log-level=debug --max-cron=0 --stop-after-init $*
+ODOO_TYPE=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print c.get('odoo_scripts', 'odoo_type', 'odoo8')"
+if [ "$ODOO_TYPE" = "odoo8" ];
+then
+ loglevel="--log-level=info"
+else
+ loglevel="--log-level=test"
+fi
+$here/start -u $tested_modules -d $dbname --test-enable $loglevel --max-cron=0 --stop-after-init $*
diff --git a/setup.cfg b/setup.cfg
index 12ab8841690ad5afda578707ec7e77d887a90c59_c2V0dXAuY2Zn..25719b8f503b25819ccb54df304257790c747840_c2V0dXAuY2Zn 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.2
+current_version = 2.0
parse = (?P<major>\d+)\.(?P<minor>\d+)
serialize =
{major}.{minor}
diff --git a/start b/start
index 12ab8841690ad5afda578707ec7e77d887a90c59_c3RhcnQ=..25719b8f503b25819ccb54df304257790c747840_c3RhcnQ= 100755
--- a/start
+++ b/start
@@ -5,8 +5,9 @@
#
# You can set ODOO_DATA_DIR and ODOO_DB_HOST if you want to avoid using the default value ($HOME/var/tmp and localhost)
#
-# Version 1.2
-here=$(readlink -f $(dirname $0)/..)
+# Version 2.0
+here=$(dirname $0)
+project_home=$(cd $here && cd .. && echo $PWD)
echo "Starting odoo for development"
python=python
# module_path will be .../<directory>/openerp/__init__.pyc
@@ -52,7 +53,7 @@
echo "Odoo version: $odoo_version"
# odoo7, odoo8 or bzr
-ODOO_TYPE=$(cat odoo_type)
+ODOO_TYPE=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print c.get('odoo_scripts', 'odoo_type', 'odoo8')"
args=$*
if [ "$ODOO_TYPE" = "odoo8" ];
@@ -84,5 +85,5 @@
else
if [ "$ODOO_TYPE" = "bzr" ];
then
- addons_path="--addons-path=$($python -B -c "print(','.join(['$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['$here/'+line for line in open('addon_dirs').read().splitlines()]))")"
+ addons_path="--addons-path=$($python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['${project_home}/'+line for line in c.get('odoo_scripts', 'odoo_type', 'addon_dirs').split()]))")"
else
@@ -88,5 +89,5 @@
else
- addons_path="--addons-path=$($python -B -c "print(','.join(['$odoo/addons']+['$here/'+line for line in open('addon_dirs').read().splitlines()]))")"
+ addons_path="--addons-path=$($python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo/addons']+['${project_home}/'+line for line in c.get('odoo_scripts', 'odoo_type', 'addon_dirs').split()]))")"
fi
fi
fi