Skip to content
Snippets Groups Projects
Commit 25719b8f503b authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

Read module_list, module_list_test, addon_dirs and odoo_type from setup.cfg instead of directories

parent 12ab8841690a
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
History History
======= =======
2.0
---
Read module_list, module_list_test, addon_dirs and odoo_type from setup.cfg instead of directories
1.0 1.0
--- ---
......
1.2 2.0
...@@ -13,5 +13,5 @@ ...@@ -13,5 +13,5 @@
# #
# - access to pg database # - access to pg database
# #
# Version 1.2 # Version 2.0
here=$(dirname $0) here=$(dirname $0)
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
here=$(dirname $0) here=$(dirname $0)
project_home=$here/.. project_home=$(cd $here && cd .. && echo $PWD)
dbname=$(basename $(readlink -f $project_home))_test dbname=$(basename $project_home)_test
# this is the same value as conf/dev/odoo.conf # 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')") 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 @@ ...@@ -20,6 +20,6 @@
# this is the same value as conf/dev/odoo.conf # 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')") 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 # color stuff
autoload colors autoload colors
......
#!/bin/zsh #!/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 # TODO add a way to bypass the value, maybe with a key in the setup.cfg file
repository=dockerhub.xcg.io repository=dockerhub.xcg.io
......
#!/bin/zsh #!/bin/zsh
# vim: set shiftwidth=4 softtabstop=4: # 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 dbname=$1
...@@ -4,4 +11,3 @@ ...@@ -4,4 +11,3 @@
dbname=$1 dbname=$1
here=$(dirname $0)
if [[ -z "$dbname" ]]; if [[ -z "$dbname" ]];
then then
...@@ -6,4 +12,4 @@ ...@@ -6,4 +12,4 @@
if [[ -z "$dbname" ]]; if [[ -z "$dbname" ]];
then then
dbname=$(basename $(readlink -f $here/..))_test dbname=$(basename $(readlink -f $project_home))_test
else else
...@@ -9,3 +15,3 @@ ...@@ -9,3 +15,3 @@
else else
shift shift
fi fi
...@@ -11,3 +17,3 @@ ...@@ -11,3 +17,3 @@
fi fi
echo "Using database $dbname" echo "Using database $dbname for tests"
...@@ -13,2 +19,9 @@ ...@@ -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 $*
[bumpversion] [bumpversion]
current_version = 1.2 current_version = 2.0
parse = (?P<major>\d+)\.(?P<minor>\d+) parse = (?P<major>\d+)\.(?P<minor>\d+)
serialize = serialize =
{major}.{minor} {major}.{minor}
......
...@@ -5,8 +5,9 @@ ...@@ -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) # 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 # Version 2.0
here=$(readlink -f $(dirname $0)/..) here=$(dirname $0)
project_home=$(cd $here && cd .. && echo $PWD)
echo "Starting odoo for development" echo "Starting odoo for development"
python=python python=python
# module_path will be .../<directory>/openerp/__init__.pyc # module_path will be .../<directory>/openerp/__init__.pyc
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
echo "Odoo version: $odoo_version" echo "Odoo version: $odoo_version"
# odoo7, odoo8 or bzr # 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=$* args=$*
if [ "$ODOO_TYPE" = "odoo8" ]; if [ "$ODOO_TYPE" = "odoo8" ];
...@@ -84,5 +85,5 @@ ...@@ -84,5 +85,5 @@
else else
if [ "$ODOO_TYPE" = "bzr" ]; if [ "$ODOO_TYPE" = "bzr" ];
then 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 else
...@@ -88,5 +89,5 @@ ...@@ -88,5 +89,5 @@
else 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 fi
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment