Q: Are we going to keep the existing development model where we have a "master" server (i.e. cvs.horde.org) where we will build the releases? For our workflow, that seems to make the most sense - since we don't have a "master" user that checks all commits before integrating.
A: Yes. We'll figure this out as we work on Horde 4, to some extent, but my expectation is that we will all push commits to dev.horde.org:/horde/git/horde (or horde-hatchery, etc.), and we'll use branches to do local dev or to coordinate non-mainline work.
Q: How do I combine the CVS and Git trees so I can test/develop current Horde 4 code?
A: Some of this is still being worked out, and these instruction might change as development moves forward, but the current suggestion is:
horde-fw-symlinks.php --src /var/www/html/horde/framework --dest /var/www/pear horde-fw-symlinks.php --src /usr/local/githorde/framework --dest /var/www/pear horde-fw-symlinks.php --src /usr/local/horde-hatchery/framework --dest /var/www/pear
horde-fw-symlinks.php --src /var/www/html/horde/framework --dest /var/www/pear horde-fw-symlinks.php --src /usr/local/githorde/framework --dest /var/www/gitpear horde-fw-symlinks.php --src /usr/local/horde-hatchery/framework --dest /var/www/gitpear
Q: How do I start from scratch with a git/cvs head install
A:
These steps only work on case sensitive file systems, see above:
cvs -d:pserver:cvs.horde.org:/repository checkout horde framework git clone --depth 1 git://dev.horde.org/horde/git/horde horde-git git clone --depth 1 git://dev.horde.org/horde/git/horde-hatchery pear install framework/devtools/package.xml cd horde mkdir libs horde-fw-symlinks.php horde-fw-symlinks.php --src ../horde-git/framework horde-fw-symlinks.php --src ../horde-hatchery/framework echo "<?php ini_set('include_path', dirname(__FILE__) . '/../libs' . PATH_SEPARATOR . ini_get('include_path'));" > lib/core.local.php
After some time has passed you will want to update your working copy from the Horde servers. These commands will do that. The commands are to be executed from the base of the Horde installation (the directory created by the CVS checkout):
cvs update -dP cd horde-git && git pull --rebase && cd .. cd horde-hatchery && git pull --rebase && cd .. # Now we have to refresh the Framework library symlinks: horde-fw-symlinks.php horde-fw-symlinks.php --src ../horde-git/framework horde-fw-symlinks.php --src ../horde-hatchery/framework
Then continue with the installation steps in docs/INSTALL.
Q: Why does the sidebar not collapse/Why can't I switch tabs on the config screen/Why do certain links not work?
A: To minimize commits and SCM growth we are no longer providing minimized JavaScript files in the js/ directory. Instead you will need to use the source JavaScript files directly. To do this you will need to add a line for each installed application that provides a JavaScript file. Start with the following lines and expand as necessary, added to the bottom of config/registry.php:
$this->applications['horde']['jsuri'] = $this->applications['horde']['webroot'] . '/js/src'; $this->applications['imp']['jsuri'] = $this->applications['horde']['webroot'] . '/js/src'; $this->applications['kronolith']['jsuri'] = $this->applications['horde']['webroot'] . '/js/src'; $this->applications['chora']['jsuri'] = $this->applications['horde']['webroot'] . '/js/src';