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

[Carlos Vásquez (ClearCorp)]

=== 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 @@
     echo ""
 }
 
+function mkrepo {
+    
+    REPO_DIR=$OPENERP_REPO_BASE/openerp-src/src/openerp
+    
+    if [ -d $REPO_DIR ]; then
+        echo "repository already exists, delete before running the script to recreate"
+        echo $REPO_DIR
+    else
+        echo "bzr init-repo $REPO_DIR"
+        bzr init-repo $REPO_DIR
+        
+        mkdir $REPO_DIR/trunk
+        
+        echo "bzr branch $OPENERP_REPO_BASE/openobject-server/main/trunk-ccorp $REPO_DIR/trunk/openobject-server"
+        bzr branch $OPENERP_REPO_BASE/openobject-server/main/trunk-ccorp $REPO_DIR/trunk/openobject-server
+        echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-server/trunk-ccorp" > $REPO_DIR/trunk/openobject-server/.bzr/branch/branch.conf
+        
+        echo "bzr branch $OPENERP_REPO_BASE/openerp-web/main/trunk-ccorp $REPO_DIR/trunk/openerp-web"
+        bzr branch $OPENERP_REPO_BASE/openerp-web/main/trunk-ccorp $REPO_DIR/trunk/openerp-web
+        echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/trunk/openerp-web/.bzr/branch/branch.conf
+        
+        echo "bzr branch $OPENERP_REPO_BASE/openobject-addons/main/trunk-ccorp $REPO_DIR/trunk/openobject-addons"
+        bzr branch $OPENERP_REPO_BASE/openobject-addons/main/trunk-ccorp $REPO_DIR/trunk/openobject-addons
+        echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-addons/trunk-ccorp" > $REPO_DIR/trunk/openobject-addons/.bzr/branch/branch.conf
+    fi
+}
+
 branch_project	openobject-server	5.0		5.0-ccorp	openobject-server
 branch_project	openobject-server	6.0		6.0-ccorp	openobject-server
 branch_project	openobject-server	6.1		6.1-ccorp	openobject-server
@@ -56,3 +83,5 @@
 branch_project	openobject-client-web	6.0		6.0-ccorp	openobject-client-web
 branch_project	openerp-web				6.1		6.1-ccorp	openerp-web
 branch_project	openerp-web				trunk	trunk-ccorp	openerp-web
+
+mkrepo

=== 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 @@
 echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-client-web/6.0-ccorp" > $REPO_DIR/6.0/openobject-client-web/.bzr/branch/branch.conf
 echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/6.1-ccorp" > $REPO_DIR/6.1/openerp-web/.bzr/branch/branch.conf
 echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/trunk/openerp-web/.bzr/branch/branch.conf
+
+
+echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-server/trunk-ccorp" > $REPO_DIR/openerp/trunk/openobject-server/.bzr/branch/branch.conf
+echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openerp-web/trunk-ccorp" > $REPO_DIR/openerp/trunk/openerp-web/.bzr/branch/branch.conf
+echo "parent_location = http://bazaar.launchpad.net/~clearcorp/openobject-addons/trunk-ccorp" > $REPO_DIR/openerp/trunk/openobject-addons/.bzr/branch/branch.conf

=== 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 @@
 	echo "COMPRESS $1/$2"
 	
 	cd $OPENERP_REPO_BASE/openerp-src/src
-	rm $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tgz
-	tar czf $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tgz $1/$2/
+	tar czf $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tmp.tgz $1/$2/
+	if [[ $? != 0 ]]; then
+	    echo "tar exited with error code $?, skipping the file"
+	else
+	    echo "tar OK, moving the file"
+	    mv $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tmp.tgz $OPENERP_REPO_BASE/openerp-src/bin/$1/$2.tgz
+	fi
+}
+
+function update_repo {
+	# $1: 
+	
+	REPO_DIR=$OPENERP_REPO_BASE/openerp-src/src
+	
+    echo ""
+    echo ""
+    echo "UPDATE $REPO_DIR/openerp"
+    echo "--------------------------------------------------------------"
+    echo ""
+    echo "Updating branch trunk/openobject-server"
+    cd $REPO_DIR/openerp/trunk/openobject-server
+    bzr pull
+    echo ""
+    echo "Updating branch trunk/openerp-web"
+    cd $REPO_DIR/openerp/trunk/openerp-web
+    bzr pull
+    echo ""
+    echo "Updating branch trunk/openobject-addons"
+    cd $REPO_DIR/openerp/trunk/openobject-addons
+    bzr pull
+}
+
+function compress_repo {
+	# $1: 
+	
+	REPO_DIR=$OPENERP_REPO_BASE/openerp-src/src
+	
+	echo ""
+	echo ""
+	echo "COMPRESS $REPO_DIR/openerp"
+	
+	cd $REPO_DIR
+	tar czf $OPENERP_REPO_BASE/openerp-src/bin/openerp.tmp.tgz openerp/.bzr
+	if [[ $? != 0 ]]; then
+	    echo "tar exited with error code $?, skipping the file"
+	else
+	    echo "tar OK, moving the file"
+	    mv $OPENERP_REPO_BASE/openerp-src/bin/openerp.tmp.tgz $OPENERP_REPO_BASE/openerp-src/bin/openerp.tgz
+	fi
 }
 
 update_project	openobject-server	5.0		5.0-ccorp	openobject-server
@@ -89,3 +136,6 @@
 compress_project	6.0		openobject-client-web
 compress_project	6.1		openerp-web
 compress_project	trunk	openerp-web
+
+update_repo
+compress_repo

=== 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 @@
     mkdir -p /srv/openerp/$branch/src >> $INSTALL_LOG_FILE
     cd /srv/openerp/$branch/src >> $INSTALL_LOG_FILE
     if [ -e $1 ]; then
+        log_echo "$branch/$1 exists, updating"
         cd $1 >> $INSTALL_LOG_FILE
+        log_echo "bzr pull"
         bzr pull >> $INSTALL_LOG_FILE
+    elif [[ $repo_downloaded =~ ^[Yy]$ ]] && [[ $1 =~ ^openobject-server|openerp-web|openobject-addons$ ]]; then
+        log_echo "bzr branch lp:~clearcorp/$2/$3 $1"
+        bzr branch lp:~clearcorp/$2/$3 $1 >> $INSTALL_LOG_FILE
     else
+        log_echo "Downloading $branch/$1 from code.clearcorp.co.cr"
         mkdir -p /usr/local/src/openerp/$branch >> $INSTALL_LOG_FILE
         cd /usr/local/src/openerp/$branch >> $INSTALL_LOG_FILE
         if [[ ! -f $1.tgz ]]; then
@@ -287,8 +293,31 @@
     log_echo ""
 }
 
+function download_repo {
+    # $1: sources branch
+    # $2: launchpad project
+    # $3: launchpad branch
+    # Download branch latest release.
+    log_echo "Downloading latest openerp repository..."
+    mkdir -p /usr/local/src/openerp >> $INSTALL_LOG_FILE
+    cd /usr/local/src/openerp >> $INSTALL_LOG_FILE
+    if [[ ! -f openerp.tgz ]]; then
+        wget http://code.clearcorp.co.cr/bzr/openerp/openerp-src/bin/openerp.tgz >> $INSTALL_LOG_FILE
+    fi
+    cd /srv >> $INSTALL_LOG_FILE
+    tar xzf /usr/local/src/openerp/openerp.tgz >> $INSTALL_LOG_FILE
+    repo_downloaded="y"
+    log_echo ""
+}
+
 function download_openerp {
-    bzr init-repo /srv/openerp
+    log_echo "Creating /srv/openerp repository"
+    if [ -d /srv/openerp ]; then
+        log_echo "/srv/openerp already exists"
+    else
+        download_repo
+    fi
+    
     if [[ $branch == "5.0" ]] || [[ $branch == "6.0" ]] || [[ $branch == "6.1" ]] || [[ $branch == "trunk" ]]; then
         download_openerp_branch openobject-server openobject-server $branch-ccorp
         if [[ $install_openerp_addons =~ ^[Yy]$ ]]; then