[cvs] [Wiki] changed: Doc/Dev
Jan Schneider
jan at horde.org
Wed Aug 12 12:35:54 UTC 2009
jan Wed, 12 Aug 2009 08:35:54 -0400
Modified page: http://wiki.horde.org/Doc/Dev
New Revision: 1.64
Change log: Fix order, clearify a bit
@@ -56,24 +56,24 @@
* Update/pull most recent changes into the various repositories
* Use the horde-fw-symlinks.php script to link the various framework
libraries to your include directory.
<code>
-horde-fw-symlinks.php --src [Location of horde CVS HEAD]/framework
--dest [A PHP include directory]
horde-fw-symlinks.php --src [Location of horde-git]/framework --dest
[A PHP include directory]
horde-fw-symlinks.php --src [Location of horde-hatchery]/framework
--dest [A PHP include directory]
+horde-fw-symlinks.php --src [Location of horde CVS HEAD]/framework
--dest [A PHP include directory]
</code>
* Note that if your filesystem is NOT case sensitive (i.e. HFS+ on
the Mac) then you will need to have two separate include directories -
one for the CVS framework libraries and one for the Git framework
libraries. You will need to make sure to put the Git include directory
first in your include_path.
<code>
-horde-fw-symlinks.php --src [Location of horde CVS HEAD]/framework
--dest [A PHP include directory]
-horde-fw-symlinks.php --src [Location of horde-git]/framework --dest
[A second PHP include directory]
-horde-fw-symlinks.php --src [Location of horde-hatchery]/framework
--dest [A second PHP include directory]
+horde-fw-symlinks.php --src [Location of horde-git]/framework --dest
[A PHP include directory]
+horde-fw-symlinks.php --src [Location of horde-hatchery]/framework
--dest [A PHP include directory]
+horde-fw-symlinks.php --src [Location of horde CVS HEAD]/framework
--dest [A second PHP include directory]
</code>
-* For the actual Horde applications that have been moved to Git,
there are a few options. You could either copy the application
directory back and forth from your /horde directory, you could try to
use a joint CVS/Git source tree, or you can symlink the application
into your horde/ directory. Both methods have drawbacks. Issues with
the first are obvious - you need to pull, copy, code, copy, push
etc... The issue with second method is that you will either get lots
of warnings about files that aren't tracked, or you could try to
manage an ignore list for both CVS and Git.
+* For the actual Horde applications that have been moved to Git,
there are a few options. You could either copy the application
directory back and forth from your /horde directory, you could try to
use a joint CVS/Git source tree, or you can symlink the application
into your horde/ directory. All methods have drawbacks. Issues with
the first are obvious - you need to pull, copy, code, copy, push
etc... The issue with second method is that you will either get lots
of warnings about files that aren't tracked, or you could try to
manage an ignore list for both CVS and Git.
-* Using symlinks is the best solution. From the base horde install,
add a symlink to the Git application folder. Then you must create a
lib/base.local.php in this application and define HORDE_BASE in that
file like this:
+* Using symlinks is the best solution. From the base horde install,
add a symlink to the Git application folder. Then you must create a
lib/base.local.php in this application and define HORDE_BASE in that
file like this:
<code>
<?php
define('HORDE_BASE', '[Full filesystem path to horde]');
@@ -81,45 +81,46 @@
**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:
+
+Note that if this is the first time you've dealt with our framework
libraries, you will need to discover our PEAR server before proceeding
with the steps below:
+<code>
+pear channel-discover pear.horde.org
+</code>
<code>
export CVSROOT=:pserver:cvsread at anoncvs.horde.org:/repository
cvs login (password is 'horde')
-cvs checkout horde framework
+cvs checkout horde
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 -f framework/devtools/package.xml
cd horde
+cvs checkout framework
+pear install -f framework/devtools/package.xml
mkdir libs
-horde-fw-symlinks.php
horde-fw-symlinks.php --src ../horde-git/framework
horde-fw-symlinks.php --src ../horde-hatchery/framework
+horde-fw-symlinks.php
echo "<?php ini_set('include_path', dirname(__FILE__) . '/../libs' .
PATH_SEPARATOR . ini_get('include_path'));" > lib/core.local.php
</code>
-Note that if this is the first time you've dealt with our framework
libraries, you will need to discover our PEAR server before performing
the pear install above:
-<code>
-pear channel-discover pear.horde.org
-</code>
+Then continue with the installation steps in docs/INSTALL.
-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):
+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):
<code>
cvs update -dP
-cd horde-git && git pull --rebase && cd ..
-cd horde-hatchery && git pull --rebase && cd ..
+cd ../horde-git && git pull --rebase
+cd ../horde-hatchery && git pull --rebase
# Now we have to refresh the Framework library symlinks:
cd ../horde
rm -rf libs/*
-horde-fw-symlinks.php
horde-fw-symlinks.php --src ../horde-git/framework
horde-fw-symlinks.php --src ../horde-hatchery/framework
+horde-fw-symlinks.php
</code>
-
-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:** Make sure your 'jsfs' and 'jsuri' entries in
horde/config/registry.php are correct. They are actually no needed
anymore at all, unless you really know what you are doing.
Applications no longer come shipped with javascript source files in
js/src - they all live directly under js/ now.
More information about the cvs
mailing list