switch to 16.1 branch

This commit is contained in:
Ralf Becker 2016-06-27 16:06:26 +02:00
parent 62e1390e35
commit e545a43c5f

View File

@ -15,7 +15,7 @@ svn_untag = svn rm -m "remove tag" $(svn info|grep ^URL|cut -f 2 -d ' '|sed -E "
svn_branch = svn cp --parents -m "$2" $(svn info|grep ^URL|cut -f 2 -d ' ') $(svn info|grep ^URL|cut -f 2 -d ' '|sed -E "s:/(branches/[0-9.]+|trunk)/:/branches/$1/:"); svn switch ^/branches/$1/$(svn info|grep ^URL|cut -f 2 -d ' '|sed 's/^.*\///') . svn_branch = svn cp --parents -m "$2" $(svn info|grep ^URL|cut -f 2 -d ' ') $(svn info|grep ^URL|cut -f 2 -d ' '|sed -E "s:/(branches/[0-9.]+|trunk)/:/branches/$1/:"); svn switch ^/branches/$1/$(svn info|grep ^URL|cut -f 2 -d ' '|sed 's/^.*\///') .
[api/src/Db/ADOdb] [api/src/Db/ADOdb]
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ADOdb.git checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ADOdb.git
[api/src/Accounts/Ads] [api/src/Accounts/Ads]
checkout = svn checkout -q https://svn.code.sf.net/p/adldap/code/trunk/src Ads checkout = svn checkout -q https://svn.code.sf.net/p/adldap/code/trunk/src Ads
@ -42,73 +42,73 @@ order = 20
### ###
[activesync] [activesync]
# synchronise mobile phone via Z-Push and ActiveSync protocoll # synchronise mobile phone via Z-Push and ActiveSync protocoll
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/activesync.git checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/activesync.git
chain = true chain = true
[tracker] [tracker]
# tracking or helpdesk application # tracking or helpdesk application
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/tracker.git checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/tracker.git
[projectmanager] [projectmanager]
# projectmanagement and Ganttcharts # projectmanagement and Ganttcharts
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/projectmanager.git checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/projectmanager.git
#[bookmarks] #[bookmarks]
# record and share bookmarks # record and share bookmarks
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/bookmarks.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/bookmarks.git
#[news_admin] #[news_admin]
# publish and agregate RSS or ATOM feeds # publish and agregate RSS or ATOM feeds
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/news_admin.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/news_admin.git
#[registration] #[registration]
# allows (after configuration!) to selfregister accounts and recover lost passwords # allows (after configuration!) to selfregister accounts and recover lost passwords
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/registration.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/registration.git
### ###
### Older apps requiring to install phpgwapi and etemplate! ### Older apps requiring to install phpgwapi and etemplate!
### ###
#[phpgwapi] #[phpgwapi]
# old api used by non 16.1 apps # old api used by non 16.1 apps
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpgwapi.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpgwapi.git
#[jdots] #[jdots]
# alternative "Stylite" template set # alternative "Stylite" template set
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/jdots.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/jdots.git
#[etemplate] #[etemplate]
# old templating system superseeded by eTemplate2 in 16.1+ api # old templating system superseeded by eTemplate2 in 16.1+ api
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/etemplate.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/etemplate.git
#[phpbrain] #[phpbrain]
# knowledge base # knowledge base
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpbrain.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpbrain.git
#[wiki] #[wiki]
# wiki application # wiki application
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/wiki.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/wiki.git
#[sambaadmin] #[sambaadmin]
# keeps passwords in sync with Samba3 using same LDAP as EGroupware (for Samba4 use Active Directory) # keeps passwords in sync with Samba3 using same LDAP as EGroupware (for Samba4 use Active Directory)
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sambaadmin.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sambaadmin.git
#[sitemgr] #[sitemgr]
# content managment application # content managment application
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sitemgr.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/sitemgr.git
#[phpfreechat] #[phpfreechat]
# chat application # chat application
#checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpfreechat.git #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/phpfreechat.git
#chain = true #chain = true
### ###
### EPL apps not publicly available ### EPL apps not publicly available
### ###
#[stylite] #[stylite]
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/stylite #checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/branches/16.1/stylite
#[esyncpro] #[esyncpro]
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/esyncpro #checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/branches/16.1/esyncpro
#[archive] #[archive]
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/archive #checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/archive