OERPTools

Merge lp:~cv.clearcorp/oerptools/faster-repo-build into lp:oerptools/trunk

  1. faster-repo-build
  2. Merge into trunk
Proposed by Carlos Vásquez (ClearCorp)
Status: Merged
Merged at revision: 299
Proposed branch: lp:~cv.clearcorp/oerptools/faster-repo-build
Merge into: lp:oerptools/trunk
Diff against target: 178 lines (+116/-3)
4 files modified
devel-scripts/openerp-src/openerp-src-make.sh (+29/-0)
devel-scripts/openerp-src/openerp-src-parent-locations.sh (+5/-0)
devel-scripts/openerp-src/openerp-src-update.sh (+52/-2)
openerp-scripts/openerp-lib.sh (+30/-1)
To merge this branch: bzr merge lp:~cv.clearcorp/oerptools/faster-repo-build
Reviewer Review Type Date Requested Status
Carlos Vásquez (ClearCorp) Pending
Review via email: mp+97550@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'devel-scripts/openerp-src/openerp-src-make.sh'
--- devel-scripts/openerp-src/openerp-src-make.sh 2012-03-02 18:30:42 +0000
+++ devel-scripts/openerp-src/openerp-src-make.sh 2012-03-15 00:52:21 +0000
@@ -33,6 +33,33 @@
33 echo ""33 echo ""
34}34}
3535
36function mkrepo {
37
38 REPO_DIR=$OPENERP_REPO_BASE/openerp-src/src/openerp
39
40 if [ -d $REPO_DIR ]; then
41 echo "repository already exists, delete before running the script to recreate"
42 echo $REPO_DIR
43 else
44 echo "bzr init-repo $REPO_DIR"
45 bzr init-repo $REPO_DIR
46
47 mkdir $REPO_DIR/trunk
48
49 echo "bzr branch $OPENERP_REPO_BASE/openobject-server/main/trunk-ccorp $REPO_DIR/trunk/openobject-server"
50 bzr branch $OPENERP_REPO_BASE/openobject-server/main/trunk-ccorp $REPO_DIR/trunk/openobject-server
51 echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-server/trunk-ccorp" > $REPO_DIR/trunk/openobject-server/.bzr/branch/branch.conf
52
53 echo "bzr branch $OPENERP_REPO_BASE/openerp-web/main/trunk-ccorp $REPO_DIR/trunk/openerp-web"
54 bzr branch $OPENERP_REPO_BASE/openerp-web/main/trunk-ccorp $REPO_DIR/trunk/openerp-web
55 echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/trunk/openerp-web/.bzr/branch/branch.conf
56
57 echo "bzr branch $OPENERP_REPO_BASE/openobject-addons/main/trunk-ccorp $REPO_DIR/trunk/openobject-addons"
58 bzr branch $OPENERP_REPO_BASE/openobject-addons/main/trunk-ccorp $REPO_DIR/trunk/openobject-addons
59 echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-addons/trunk-ccorp" > $REPO_DIR/trunk/openobject-addons/.bzr/branch/branch.conf
60 fi
61}
62
36branch_project openobject-server 5.0 5.0-ccorp openobject-server63branch_project openobject-server 5.0 5.0-ccorp openobject-server
37branch_project openobject-server 6.0 6.0-ccorp openobject-server64branch_project openobject-server 6.0 6.0-ccorp openobject-server
38branch_project openobject-server 6.1 6.1-ccorp openobject-server65branch_project openobject-server 6.1 6.1-ccorp openobject-server
@@ -56,3 +83,5 @@
56branch_project openobject-client-web 6.0 6.0-ccorp openobject-client-web83branch_project openobject-client-web 6.0 6.0-ccorp openobject-client-web
57branch_project openerp-web 6.1 6.1-ccorp openerp-web84branch_project openerp-web 6.1 6.1-ccorp openerp-web
58branch_project openerp-web trunk trunk-ccorp openerp-web85branch_project openerp-web trunk trunk-ccorp openerp-web
86
87mkrepo
5988
=== modified file 'devel-scripts/openerp-src/openerp-src-parent-locations.sh'
--- devel-scripts/openerp-src/openerp-src-parent-locations.sh 2012-03-02 18:30:42 +0000
+++ devel-scripts/openerp-src/openerp-src-parent-locations.sh 2012-03-15 00:52:21 +0000
@@ -31,3 +31,8 @@
31echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-client-web/6.0-ccorp" > $REPO_DIR/6.0/openobject-client-web/.bzr/branch/branch.conf31echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-client-web/6.0-ccorp" > $REPO_DIR/6.0/openobject-client-web/.bzr/branch/branch.conf
32echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/6.1-ccorp" > $REPO_DIR/6.1/openerp-web/.bzr/branch/branch.conf32echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/6.1-ccorp" > $REPO_DIR/6.1/openerp-web/.bzr/branch/branch.conf
33echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/trunk/openerp-web/.bzr/branch/branch.conf33echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/trunk/openerp-web/.bzr/branch/branch.conf
34
35
36echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-server/trunk-ccorp" > $REPO_DIR/openerp/trunk/openobject-server/.bzr/branch/branch.conf
37echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/openerp/trunk/openerp-web/.bzr/branch/branch.conf
38echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-addons/trunk-ccorp" > $REPO_DIR/openerp/trunk/openobject-addons/.bzr/branch/branch.conf
3439
=== modified file 'devel-scripts/openerp-src/openerp-src-update.sh'
--- devel-scripts/openerp-src/openerp-src-update.sh 2012-03-01 16:57:38 +0000
+++ devel-scripts/openerp-src/openerp-src-update.sh 2012-03-15 00:52:21 +0000
@@ -36,8 +36,55 @@
36 echo "COMPRESS $1/$2"36 echo "COMPRESS $1/$2"
37 37
38 cd $OPENERP_REPO_BASE/openerp-src/src38 cd $OPENERP_REPO_BASE/openerp-src/src
39 rm $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tgz39 tar czf $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tmp.tgz $1/$2/
40 tar czf $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tgz $1/$2/40 if [[ $? != 0 ]]; then
41 echo "tar exited with error code $?, skipping the file"
42 else
43 echo "tar OK, moving the file"
44 mv $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tmp.tgz $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tgz
45 fi
46}
47
48function update_repo {
49 # $1:
50
51 REPO_DIR=$OPENERP_REPO_BASE/openerp-src/src
52
53 echo ""
54 echo ""
55 echo "UPDATE $REPO_DIR/openerp"
56 echo "--------------------------------------------------------------"
57 echo ""
58 echo "Updating branch trunk/openobject-server"
59 cd $REPO_DIR/openerp/trunk/openobject-server
60 bzr pull
61 echo ""
62 echo "Updating branch trunk/openerp-web"
63 cd $REPO_DIR/openerp/trunk/openerp-web
64 bzr pull
65 echo ""
66 echo "Updating branch trunk/openobject-addons"
67 cd $REPO_DIR/openerp/trunk/openobject-addons
68 bzr pull
69}
70
71function compress_repo {
72 # $1:
73
74 REPO_DIR=$OPENERP_REPO_BASE/openerp-src/src
75
76 echo ""
77 echo ""
78 echo "COMPRESS $REPO_DIR/openerp"
79
80 cd $REPO_DIR
81 tar czf $OPENERP_REPO_BASE/openerp-src/bin/openerp.tmp.tgz openerp/.bzr
82 if [[ $? != 0 ]]; then
83 echo "tar exited with error code $?, skipping the file"
84 else
85 echo "tar OK, moving the file"
86 mv $OPENERP_REPO_BASE/openerp-src/bin/openerp.tmp.tgz $OPENERP_REPO_BASE/openerp-src/bin/openerp.tgz
87 fi
41}88}
4289
43update_project openobject-server 5.0 5.0-ccorp openobject-server90update_project openobject-server 5.0 5.0-ccorp openobject-server
@@ -89,3 +136,6 @@
89compress_project 6.0 openobject-client-web136compress_project 6.0 openobject-client-web
90compress_project 6.1 openerp-web137compress_project 6.1 openerp-web
91compress_project trunk openerp-web138compress_project trunk openerp-web
139
140update_repo
141compress_repo
92142
=== modified file 'openerp-scripts/openerp-lib.sh'
--- openerp-scripts/openerp-lib.sh 2012-03-04 04:51:22 +0000
+++ openerp-scripts/openerp-lib.sh 2012-03-15 00:52:21 +0000
@@ -251,9 +251,15 @@
251 mkdir -p /srv/openerp/$branch/src >> $INSTALL_LOG_FILE251 mkdir -p /srv/openerp/$branch/src >> $INSTALL_LOG_FILE
252 cd /srv/openerp/$branch/src >> $INSTALL_LOG_FILE252 cd /srv/openerp/$branch/src >> $INSTALL_LOG_FILE
253 if [ -e $1 ]; then253 if [ -e $1 ]; then
254 log_echo "$branch/$1 exists, updating"
254 cd $1 >> $INSTALL_LOG_FILE255 cd $1 >> $INSTALL_LOG_FILE
256 log_echo "bzr pull"
255 bzr pull >> $INSTALL_LOG_FILE257 bzr pull >> $INSTALL_LOG_FILE
258 elif [[ $repo_downloaded =~ ^[Yy]$ ]] && [[ $1 =~ ^openobject-server|openerp-web|openobject-addons$ ]]; then
259 log_echo "bzr branch lp:~clearcorp/$2/$3 $1"
260 bzr branch lp:~clearcorp/$2/$3 $1 >> $INSTALL_LOG_FILE
256 else261 else
262 log_echo "Downloading $branch/$1 from code.clearcorp.co.cr"
257 mkdir -p /usr/local/src/openerp/$branch >> $INSTALL_LOG_FILE263 mkdir -p /usr/local/src/openerp/$branch >> $INSTALL_LOG_FILE
258 cd /usr/local/src/openerp/$branch >> $INSTALL_LOG_FILE264 cd /usr/local/src/openerp/$branch >> $INSTALL_LOG_FILE
259 if [[ ! -f $1.tgz ]]; then265 if [[ ! -f $1.tgz ]]; then
@@ -287,8 +293,31 @@
287 log_echo ""293 log_echo ""
288}294}
289295
296function download_repo {
297 # $1: sources branch
298 # $2: launchpad project
299 # $3: launchpad branch
300 # Download branch latest release.
301 log_echo "Downloading latest openerp repository..."
302 mkdir -p /usr/local/src/openerp >> $INSTALL_LOG_FILE
303 cd /usr/local/src/openerp >> $INSTALL_LOG_FILE
304 if [[ ! -f openerp.tgz ]]; then
305 wget http://code.clearcorp.co.cr/bzr/openerp/openerp-src/bin/openerp.tgz >> $INSTALL_LOG_FILE
306 fi
307 cd /srv >> $INSTALL_LOG_FILE
308 tar xzf /usr/local/src/openerp/openerp.tgz >> $INSTALL_LOG_FILE
309 repo_downloaded="y"
310 log_echo ""
311}
312
290function download_openerp {313function download_openerp {
291 bzr init-repo /srv/openerp314 log_echo "Creating /srv/openerp repository"
315 if [ -d /srv/openerp ]; then
316 log_echo "/srv/openerp already exists"
317 else
318 download_repo
319 fi
320
292 if [[ $branch == "5.0" ]] || [[ $branch == "6.0" ]] || [[ $branch == "6.1" ]] || [[ $branch == "trunk" ]]; then321 if [[ $branch == "5.0" ]] || [[ $branch == "6.0" ]] || [[ $branch == "6.1" ]] || [[ $branch == "trunk" ]]; then
293 download_openerp_branch openobject-server openobject-server $branch-ccorp322 download_openerp_branch openobject-server openobject-server $branch-ccorp
294 if [[ $install_openerp_addons =~ ^[Yy]$ ]]; then323 if [[ $install_openerp_addons =~ ^[Yy]$ ]]; then

Subscribers

People subscribed via source and target branches