← Back to team overview

clearcorp team mailing list archive

lp:~cv.clearcorp/openerp-ccorp-scripts/lp-939827-dev-dir-structure into lp:openerp-ccorp-scripts/stable

 

Carlos Vásquez (CLEARCORP) has proposed merging lp:~cv.clearcorp/openerp-ccorp-scripts/lp-939827-dev-dir-structure into lp:openerp-ccorp-scripts/stable.

Requested reviews:
  Carlos Vásquez (CLEARCORP) (cv.clearcorp)
Related bugs:
  Bug #939827 in OpenERP CLEARCORP Scripts: "Development dir structure creation"
  https://bugs.launchpad.net/openerp-ccorp-scripts/+bug/939827

For more details, see:
https://code.launchpad.net/~cv.clearcorp/openerp-ccorp-scripts/lp-939827-dev-dir-structure/+merge/94484
-- 
https://code.launchpad.net/~cv.clearcorp/openerp-ccorp-scripts/lp-939827-dev-dir-structure/+merge/94484
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-scripts/stable.
=== added symlink 'bin-links/ccorp-openerp-repository-make'
=== target is u'../devel-scripts/repository/openerp-repository-make.sh'
=== added symlink 'bin-links/ccorp-openerp-repository-update'
=== target is u'../devel-scripts/repository/openerp-repository-update.sh'
=== added symlink 'bin-links/ccorp-openerp-src-make'
=== target is u'../devel-scripts/openerp-src/openerp-src-make.sh'
=== added symlink 'bin-links/ccorp-openerp-src-parent-locations'
=== target is u'../devel-scripts/openerp-src/openerp-src-parent-locations.sh'
=== added symlink 'bin-links/ccorp-openerp-src-update'
=== target is u'../devel-scripts/openerp-src/openerp-src-update.sh'
=== added directory 'devel-scripts'
=== added directory 'devel-scripts/openerp-src'
=== added file 'devel-scripts/openerp-src/openerp-src-make.sh'
--- devel-scripts/openerp-src/openerp-src-make.sh	1970-01-01 00:00:00 +0000
+++ devel-scripts/openerp-src/openerp-src-make.sh	2012-02-24 00:57:19 +0000
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+if [[ $OPENERP_REPO_BASE == "" ]]; then
+    OPENERP_REPO_BASE="~/Development/openerp"
+fi
+
+function branch_project {
+	# $1: Project name
+	# $2: Version
+	# $3: Original branch
+	# $4: Destination branch
+    echo ""
+    echo ""
+	echo "BRANCH $1 ($4) v$2"
+    echo "--------------------------------------------------------------"
+    echo ""
+	
+	ORI_DIR=$OPENERP_REPO_BASE/$1/main/$3
+	DES_DIR=$OPENERP_REPO_BASE/openerp-src/src/$2/$4
+    
+    echo "Checking branch"
+    if [ -d $DES_DIR ]; then
+        echo "branch already exists, delete before running the script to recreate"
+        echo $ORI_DIR
+    else
+        echo "bzr branch --no-tree $ORI_DIR $DES_DIR"
+        bzr branch --no-tree $ORI_DIR $DES_DIR
+        
+        echo "parent_location = lp:~clearcorp/$1/$3" > $DES_DIR/.bzr/branch/branch.conf
+    fi
+    echo ""
+}
+
+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
+branch_project	openobject-server	trunk	trunk-ccorp	openobject-server
+
+branch_project	openobject-addons	5.0		5.0-ccorp	openobject-addons
+branch_project	openobject-addons	6.0		6.0-ccorp	openobject-addons
+branch_project	openobject-addons	6.1 	6.1-ccorp	openobject-addons
+branch_project	openobject-addons	trunk	trunk-ccorp	openobject-addons
+
+branch_project	openobject-addons	5.0		extra-5.0-ccorp		openobject-addons-extra
+branch_project	openobject-addons	6.0		extra-6.0-ccorp		openobject-addons-extra
+branch_project	openobject-addons	trunk	extra-trunk-ccorp	openobject-addons-extra
+
+branch_project	openobject-client	5.0		5.0-ccorp	openobject-client
+branch_project	openobject-client	6.0		6.0-ccorp	openobject-client
+branch_project	openobject-client	6.1		6.1-ccorp	openobject-client
+branch_project	openobject-client	trunk	trunk-ccorp	openobject-client
+
+branch_project	openobject-client-web	5.0		5.0-ccorp	openobject-client-web
+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

=== added file 'devel-scripts/openerp-src/openerp-src-parent-locations.sh'
--- devel-scripts/openerp-src/openerp-src-parent-locations.sh	1970-01-01 00:00:00 +0000
+++ devel-scripts/openerp-src/openerp-src-parent-locations.sh	2012-02-24 00:57:19 +0000
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [[ $OPENERP_REPO_BASE == "" ]]; then
+    OPENERP_REPO_BASE="~/Development/openerp"
+fi
+
+echo "parent_location = lp:~clearcorp/openobject-server/5.0-ccorp" > $BASE_DIR/5.0/openobject-server/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-server/6.0-ccorp" > $BASE_DIR/6.0/openobject-server/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-server/6.1-ccorp" > $BASE_DIR/6.1/openobject-server/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-server/trunk-ccorp" > $BASE_DIR/trunk/openobject-server/.bzr/branch/branch.conf
+
+echo "parent_location = lp:~clearcorp/openobject-addons/5.0-ccorp" > $BASE_DIR/5.0/openobject-addons/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-addons/6.0-ccorp" > $BASE_DIR/6.0/openobject-addons/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-addons/6.1-ccorp" > $BASE_DIR/6.1/openobject-addons/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-addons/trunk-ccorp" > $BASE_DIR/trunk/openobject-addons/.bzr/branch/branch.conf
+
+echo "parent_location = lp:~clearcorp/openobject-addons/extra-5.0-ccorp" > $BASE_DIR/5.0/openobject-addons-extra/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-addons/extra-6.0-ccorp" > $BASE_DIR/6.0/openobject-addons-extra/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-addons/extra-trunk-ccorp" > $BASE_DIR/trunk/openobject-addons-extra/.bzr/branch/branch.conf
+
+echo "parent_location = lp:~clearcorp/openobject-client/5.0-ccorp" > $BASE_DIR/5.0/openobject-client/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-client/6.0-ccorp" > $BASE_DIR/6.0/openobject-client/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-client/6.1-ccorp" > $BASE_DIR/6.1/openobject-client/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-client/trunk-ccorp" > $BASE_DIR/trunk/openobject-client/.bzr/branch/branch.conf
+
+echo "parent_location = lp:~clearcorp/openobject-client-web/5.0-ccorp" > $BASE_DIR/5.0/openobject-client-web/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openobject-client-web/6.0-ccorp" > $BASE_DIR/6.0/openobject-client-web/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openerp-web/6.1-ccorp" > $BASE_DIR/6.1/openerp-web/.bzr/branch/branch.conf
+echo "parent_location = lp:~clearcorp/openerp-web/trunk-ccorp" > $BASE_DIR/trunk/openerp-web/.bzr/branch/branch.conf

=== added file 'devel-scripts/openerp-src/openerp-src-update.sh'
--- devel-scripts/openerp-src/openerp-src-update.sh	1970-01-01 00:00:00 +0000
+++ devel-scripts/openerp-src/openerp-src-update.sh	2012-02-24 00:57:19 +0000
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+if [[ $OPENERP_REPO_BASE == "" ]]; then
+    OPENERP_REPO_BASE="~/Development/openerp"
+fi
+
+function update_project {
+	# $1: Project name
+	# $2: Version
+	# $3: Original branch
+	# $4: Destination branch
+    echo ""
+    echo ""
+	echo "UPDATE $1 ($4) v$2"
+    echo "--------------------------------------------------------------"
+    echo ""
+	
+	ORI_DIR=$BASE_DIR/$1/main/$3
+	DES_DIR=$BASE_DIR/openerp-src/src/$2/$4
+	
+    echo "Updating branch $2/$4"
+    echo "cd $DES_DIR"
+	cd $DES_DIR
+    echo "bzr pull $ORI_DIR"
+	bzr pull $ORI_DIR
+    echo ""
+}
+
+function compress_project {
+	# $1: Version
+	# $2: Destination branch
+	echo ""
+	echo ""
+	echo "COMPRESS $1/$2"
+	
+	cd $BASE_DIR/openerp-src/src
+	rm $BASE_DIR/openerp-src/bin/$1/$2.tgz
+	tar czf $BASE_DIR/openerp-src/bin/$1/$2.tgz $1/$2/
+}
+
+update_project	openobject-server	5.0		5.0-ccorp	openobject-server
+update_project	openobject-server	6.0		6.0-ccorp	openobject-server
+update_project	openobject-server	6.1		6.1-ccorp	openobject-server
+update_project	openobject-server	trunk	trunk-ccorp	openobject-server
+
+update_project	openobject-addons	5.0		5.0-ccorp	openobject-addons
+update_project	openobject-addons	6.0		6.0-ccorp	openobject-addons
+update_project	openobject-addons	6.1		6.1-ccorp	openobject-addons
+update_project	openobject-addons	trunk	trunk-ccorp	openobject-addons
+
+update_project	openobject-addons	5.0		extra-5.0-ccorp		openobject-addons-extra
+update_project	openobject-addons	6.0		extra-6.0-ccorp		openobject-addons-extra
+#update_project	openobject-addons	6.1		extra-6.1-ccorp		openobject-addons-extra
+update_project	openobject-addons	trunk	extra-trunk-ccorp	openobject-addons-extra
+
+update_project	openobject-client	5.0		5.0-ccorp	openobject-client
+update_project	openobject-client	6.0		6.0-ccorp	openobject-client
+update_project	openobject-client	6.1		6.1-ccorp	openobject-client
+update_project	openobject-client	trunk	trunk-ccorp	openobject-client
+
+update_project	openobject-client-web	5.0		5.0-ccorp	openobject-client-web
+update_project	openobject-client-web	6.0		6.0-ccorp	openobject-client-web
+update_project	openerp-web				6.1		6.1-ccorp	openerp-web
+update_project	openerp-web				trunk	trunk-ccorp	openerp-web
+
+compress_project	5.0		openobject-server
+compress_project	6.0		openobject-server
+compress_project	6.1		openobject-server
+compress_project	trunk	openobject-server
+
+compress_project	5.0		openobject-addons
+compress_project	6.0		openobject-addons
+compress_project	6.1		openobject-addons
+compress_project	trunk	openobject-addons
+
+compress_project	5.0		openobject-addons-extra
+compress_project	6.0		openobject-addons-extra
+#compress_project	6.1		openobject-addons-extra
+compress_project	trunk	openobject-addons-extra
+
+compress_project	5.0		openobject-client
+compress_project	6.0		openobject-client
+compress_project	6.1		openobject-client
+compress_project	trunk	openobject-client
+
+compress_project	5.0		openobject-client-web
+compress_project	6.0		openobject-client-web
+compress_project	6.1		openerp-web
+compress_project	trunk	openerp-web

=== added directory 'devel-scripts/repository'
=== added file 'devel-scripts/repository/openerp-repository-make.sh'
--- devel-scripts/repository/openerp-repository-make.sh	1970-01-01 00:00:00 +0000
+++ devel-scripts/repository/openerp-repository-make.sh	2012-02-24 00:57:19 +0000
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+if [[ $OPENERP_REPO_BASE == "" ]]; then
+    OPENERP_REPO_BASE="~/Development/openerp"
+fi
+
+function branch_project {
+    # $1: Project name
+    # $2,3,4,...: Original branches
+    echo ""
+    echo ""
+    echo "Project: $1"
+    echo "--------------------------------------------------------------"
+    echo ""
+    
+    REPO_DIR=$OPENERP_REPO_BASE/$1
+    
+    echo "Create repository $REPO_DIR"
+    if [ -d $REPO_DIR ]; then
+        echo "repository already exists, delete before running the script to recreate"
+        echo "$REPO_DIR"
+    else
+        echo "bzr init-repo --no-tree $REPO_DIR"
+        bzr init-repo --no-tree $REPO_DIR
+    fi
+    echo ""
+    
+    echo "Subdirectories creation"
+    if [ -d $REPO_DIR/main ]; then
+        echo "main already exists, delete before running the script to recreate"
+        echo "$REPO_DIR/main"
+    else
+        echo "mkdir $REPO_DIR/main"
+        mkdir $REPO_DIR/main
+    fi
+    if [ -d $REPO_DIR/features ]; then
+        echo "features already exists, delete before running the script to recreate"
+        echo "$REPO_DIR/features"
+    else
+        echo "mkdir $REPO_DIR/features"
+        mkdir $REPO_DIR/features
+    fi
+    echo ""
+    
+    echo "Main branches creation"
+    echo ""
+    args=("$@")
+    start=1
+    let "stop=$#-1"
+    for i in `seq $start $stop`; do
+        branch=${args[$i]}
+        LP_OERP="lp:$1/$branch"
+        LP_CCORP="lp:~clearcorp/$1/${branch}-ccorp"
+        echo "Branch creation: $1/$branch"
+        
+        echo "Branch $LP_OERP"
+        echo "bzr branch $LP_OERP $REPO_DIR/main/$branch"
+        bzr branch $LP_OERP $REPO_DIR/main/$branch
+        echo "Branch $LP_CCORP"
+        echo "bzr branch $LP_CCORP $REPO_DIR/main/${branch}-ccorp"
+        bzr branch $LP_CCORP $REPO_DIR/main/${branch}-ccorp
+
+        echo "Updating parent locations"
+        echo "parent_location = $LP_OERP" > $REPO_DIR/main/$branch/.bzr/branch/branch.conf
+        echo "parent_location = $LP_OERP" > $REPO_DIR/main/${branch}-ccorp/.bzr/branch/branch.conf
+        echo "push_location = $LP_CCORP" >> $REPO_DIR/main/${branch}-ccorp/.bzr/branch/branch.conf
+        
+        echo ""
+    done
+    
+    echo ""
+    echo ""
+}
+
+branch_project  openobject-server       5.0 6.0 6.1 trunk
+branch_project  openobject-addons       5.0 6.0 6.1 trunk extra-5.0 extra-6.0 extra-trunk
+branch_project  openobject-client       5.0 6.0 6.1 trunk
+branch_project  openobject-client-web   5.0 6.0 trunk
+branch_project  openerp-web             6.1 trunk
+branch_project  openobject-doc          5.0 6.0 6.1

=== added file 'devel-scripts/repository/openerp-repository-update.sh'
--- devel-scripts/repository/openerp-repository-update.sh	1970-01-01 00:00:00 +0000
+++ devel-scripts/repository/openerp-repository-update.sh	2012-02-24 00:57:19 +0000
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+if [[ $OPENERP_REPO_BASE == "" ]]; then
+    OPENERP_REPO_BASE="~/Development/openerp"
+fi
+
+#WARNING: do not activate push unless you know exactly what you are doing.
+if [ $OPENERP_REPO_PUSH -ne 1 ]; then
+    OPENERP_REPO_PUSH=0
+fi
+
+function bzr_pull {
+    echo ""
+	cd $1
+	echo "+++ bzr pull $1"
+    echo "$(pwd)/$1"
+	bzr pull
+	cd ..
+}
+
+function bzr_push {
+    if [ $OPENERP_REPO_PUSH ]; then
+        echo ""
+        cd $1
+        echo "+++ bzr pull $1"
+        echo "$(pwd)/$1"
+        bzr pull
+        echo "+++ bzr push $1"
+        echo "$(pwd)/$1"
+        bzr push
+        cd ..
+    fi
+}
+
+function update_oerp_project {
+    # $1: Project name
+    # $2,3,4,...: Original branches
+    echo ""
+    echo ""
+    echo "Project: $1"
+    echo "--------------------------------------------------------------"
+    echo ""
+    
+    REPO_DIR=$OPENERP_REPO_BASE/$1
+    
+    echo "Check repository $REPO_DIR"
+    if [ ! -d $REPO_DIR ]; then
+        echo "repository doesn't exists, skipping"
+        echo "$REPO_DIR"
+        return 1
+    fi
+    echo ""
+    
+    echo "Main branches update"
+    echo ""
+    args=("$@")
+    start=1
+    let "stop=$#-1"
+    for i in `seq $start $stop`; do
+        branch=${args[$i]}
+        
+        echo "Check branch $REPO_DIR/main/$branch"
+        if [ ! -d $REPO_DIR/main/$branch ]; then
+            echo "branch doesn't exists, skipping"
+            echo "$REPO_DIR/main/$branch"
+            echo ""
+        else
+            echo "Branch pull: $REPO_DIR/main/$branch"
+            
+            echo "cd $REPO_DIR/main/$branch"
+            cd $REPO_DIR/main/$branch
+            echo "bzr pull"
+            bzr pull
+            echo ""
+        fi
+        
+        echo "Check branch $REPO_DIR/main/${branch}-ccorp"
+        if [ ! -d $REPO_DIR/main/${branch}-ccorp ]; then
+            echo "branch doesn't exists, skipping"
+            echo "$REPO_DIR/main/${branch}-ccorp"
+            echo ""
+        else
+            echo "Branch pull: $REPO_DIR/main/${branch}-ccorp"
+            
+            echo "cd $REPO_DIR/main/${branch}-ccorp"
+            cd $REPO_DIR/main/${branch}-ccorp
+            echo "bzr pull"
+            bzr pull
+            echo ""
+            
+            if [ $OPENERP_REPO_PUSH ]; then
+                echo "Branch push: $REPO_DIR/main/${branch}-ccorp"
+                
+                echo "cd $REPO_DIR/main/${branch}-ccorp"
+                cd $REPO_DIR/main/${branch}-ccorp
+                echo "bzr push"
+                bzr push
+                echo ""
+            fi
+        fi
+            
+        echo ""
+    done
+    
+    echo ""
+    echo ""
+}
+
+update_oerp_project openobject-server       5.0 6.0 6.1 trunk
+update_oerp_project openobject-addons       5.0 6.0 6.1 trunk extra-5.0 extra-6.0 extra-trunk
+update_oerp_project openobject-client       5.0 6.0 6.1 trunk
+update_oerp_project openobject-client-web   5.0 6.0 trunk
+update_oerp_project openerp-web             6.1 trunk
+update_oerp_project openobject-doc          5.0 6.0 6.1


Follow ups