Anto has proposed merging
lp:~openerp-dev/openerp-tools/trunk-makefile_vars_imp-abo into lp:openerp-tools.
Requested reviews:
Antony Lesuisse (OpenERP) (al-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-tools/trunk-makefile_vars_imp-abo/+merge/142309
Use variables instead of hardcoded dir names.
Will be useful for further maintenance and any user that wish to change his
project's structure.
It already helped to fix an error introduced in revno 221 (forgot to rename
'oldweb').
--
https://code.launchpad.net/~openerp-dev/openerp-tools/trunk-makefile_vars_imp-abo/+merge/142309
Your team OpenERP R&D Team is subscribed to branch lp:openerp-tools.
=== modified file 'openerp-dev/Makefile'
--- openerp-dev/Makefile 2012-12-27 03:37:29 +0000
+++ openerp-dev/Makefile 2013-01-08 13:14:23 +0000
@@ -1,55 +1,68 @@
.PHONY: server web
+#--------------------------------------------------------------------
+# Config
+#--------------------------------------------------------------------
+# dir names
+ADDONS_DIR=addons
+GTK_DIR=client
+SERVER_DIR=server
+WEB_DIR=web
+OLD_WEB_DIR=client-web
+MISC_DIR=misc
+
+#--------------------------------------------------------------------
+# Misc
+#--------------------------------------------------------------------
help:
@# Display help
@grep -A1 '^[a-z0-9-]*:[^=]*$$' Makefile | grep -v ^--
autoupdate:
- # Autoupdate makefile
+ # autoupdate makefile
bzr cat -d lp:~openerp-dev/openerp-tools/trunk setup.sh | sh
#--------------------------------------------------------------------
# Versioning
#--------------------------------------------------------------------
init: init-v70
- # Init repository and download sources for latest stable and trunk
+ # init repository and download sources for latest stable and trunk
init-trunk:
- # Init repository
- [ -d web ] || bzr colo-fetch lp:~openerp/openerp-web/trunk web
- [ -d addons ] || bzr colo-fetch lp:~openerp/openobject-addons/trunk addons
- [ -d server ] || bzr colo-fetch lp:~openerp/openobject-server/trunk server
- [ -d client ] || bzr colo-fetch lp:~openerp/openobject-client-web/trunk client
- #for dir in addons client client-web server misc web; do [ -d $${dir} ] || bzr colo-init $${dir}; done
+ # init repository
+ [ -d ${ADDONS_DIR} ] || bzr colo-fetch lp:~openerp/openobject-addons/trunk ${ADDONS_DIR}
+ [ -d ${GTK_DIR} ] || bzr colo-fetch lp:~openerp/openobject-client-web/trunk ${GTK_DIR}
+ [ -d ${SERVER_DIR} ] || bzr colo-fetch lp:~openerp/openobject-server/trunk ${SERVER_DIR}
+ [ -d ${WEB_DIR} ] || bzr colo-fetch lp:~openerp/openerp-web/trunk ${WEB_DIR}
init-v60: init-trunk
- [ -d addons/.bzr/branches/6.0 ] || (cd addons && bzr branch lp:~openerp/openobject-addons/6.0 colo:6.0 && cd ..)
- [ -d client/.bzr/branches/6.0 ] || (cd client && bzr branch lp:~openerp/openobject-client/6.0 colo:6.0 && cd ..)
- [ -d client-web ] || bzr colo-fetch lp:~openerp/openobject-client-web/6.0 client-web
- [ -d server/.bzr/branches/6.0 ] || (cd server && bzr branch lp:~openerp/openobject-server/6.0 colo:6.0 && cd ..)
+ [ -d ${ADDONS_DIR}/.bzr/branches/6.0 ] || (cd ${ADDONS_DIR} && bzr branch lp:~openerp/openobject-addons/6.0 colo:6.0 && cd ..)
+ [ -d ${GTK_DIR}/.bzr/branches/6.0 ] || (cd ${GTK_DIR} && bzr branch lp:~openerp/openobject-client/6.0 colo:6.0 && cd ..)
+ [ -d ${SERVER_DIR}/.bzr/branches/6.0 ] || (cd ${SERVER_DIR} && bzr branch lp:~openerp/openobject-server/6.0 colo:6.0 && cd ..)
+ [ -d ${OLD_WEB_DIR} ] || bzr colo-fetch lp:~openerp/openobject-client-web/6.0 ${OLD_WEB_DIR}
init-v61: init-trunk
- [ -d addons/.bzr/branches/6.1 ] || (cd addons && bzr branch lp:~openerp/openobject-addons/6.1 colo:6.1 && cd ..)
- [ -d client/.bzr/branches/6.1 ] || (cd client && bzr branch lp:~openerp/openobject-client/6.1 colo:6.1 && cd ..)
- [ -d web/.bzr/branches/6.1 ] || (cd web && bzr branch lp:~openerp/openerp-web/6.1 colo:6.1 && cd ..)
- [ -d server/.bzr/branches/6.1 ] || (cd server && bzr branch lp:~openerp/openobject-server/6.1 colo:6.1 && cd ..)
+ [ -d ${ADDONS_DIR}/.bzr/branches/6.1 ] || (cd ${ADDONS_DIR} && bzr branch lp:~openerp/openobject-addons/6.1 colo:6.1 && cd ..)
+ [ -d ${GTK_DIR}/.bzr/branches/6.1 ] || (cd ${GTK_DIR} && bzr branch lp:~openerp/openobject-client/6.1 colo:6.1 && cd ..)
+ [ -d ${SERVER_DIR}/.bzr/branches/6.1 ] || (cd ${SERVER_DIR} && bzr branch lp:~openerp/openobject-server/6.1 colo:6.1 && cd ..)
+ [ -d ${WEB_DIR}/.bzr/branches/6.1 ] || (cd ${WEB_DIR} && bzr branch lp:~openerp/openerp-web/6.1 colo:6.1 && cd ..)
init-v70: init-trunk
- [ -d addons/.bzr/branches/7.0 ] || (cd addons && bzr branch lp:~openerp/openobject-addons/7.0 colo:7.0 && bzr switch colo:7.0 && cd ..)
- [ -d web/.bzr/branches/7.0 ] || (cd web && bzr branch lp:~openerp/openerp-web/7.0 colo:7.0 && bzr switch colo:7.0 && cd ..)
- [ -d server/.bzr/branches/7.0 ] || (cd server && bzr branch lp:~openerp/openobject-server/7.0 colo:7.0 && bzr switch colo:7.0 && cd ..)
+ [ -d ${ADDONS_DIR}/.bzr/branches/7.0 ] || (cd ${ADDONS_DIR} && bzr branch lp:~openerp/openobject-addons/7.0 colo:7.0 && bzr switch colo:7.0 && cd ..)
+ [ -d ${SERVER_DIR}/.bzr/branches/7.0 ] || (cd ${SERVER_DIR} && bzr branch lp:~openerp/openobject-server/7.0 colo:7.0 && bzr switch colo:7.0 && cd ..)
+ [ -d ${WEB_DIR}/.bzr/branches/7.0 ] || (cd ${WEB_DIR} && bzr branch lp:~openerp/openerp-web/7.0 colo:7.0 && bzr switch colo:7.0 && cd ..)
pull:
- # update all trunk branch
- for i in addons client oldweb web server; do [ -d $$i ] && (cd $$i && bzr pull && cd ..); done
+ # update all trunk branches
+ for i in ${ADDONS_DIR} ${GTK_DIR} ${SERVER_DIR} ${WEB_DIR} ${OLD_WEB_DIR}; do [ -d $$i ] && (cd $$i && bzr pull && cd ..); done
switch-to-trunk:
- for i in addons client oldweb web server; do [ -d $$i ] && (cd $$i && bzr switch origin/trunk && cd ..); done
+ for i in ${ADDONS_DIR} ${GTK_DIR} ${SERVER_DIR} ${WEB_DIR} ${OLD_WEB_DIR}; do [ -d $$i ] && (cd $$i && bzr switch origin/trunk && cd ..); done
switch-to-60:
- for i in addons client oldweb web server; do [ -d $$i ] && (cd $$i && bzr switch colo:6.0 && cd ..); done
+ for i in ${ADDONS_DIR} ${GTK_DIR} ${SERVER_DIR} ${WEB_DIR} ${OLD_WEB_DIR}; do [ -d $$i ] && (cd $$i && bzr switch colo:6.0 && cd ..); done
switch-to-61:
- for i in addons client oldweb web server; do [ -d $$i ] && (cd $$i && bzr switch colo:6.1 && cd ..); done
+ for i in ${ADDONS_DIR} ${GTK_DIR} ${SERVER_DIR} ${WEB_DIR} ${OLD_WEB_DIR}; do [ -d $$i ] && (cd $$i && bzr switch colo:6.1 && cd ..); done
branch-project-feature:
# create a branch to work on a feature on a given project
@@ -120,4 +133,3 @@
server-tail:
# less the server.log use F in less to enable follow mode
less server.log
-
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
