| Prev | Chapter 5. Upgrading | Next |
|---|
OpenACS is distributed as a collection of files, available as one big tarball, via CVS, and via automatic download from within the APM. Upgrades work by first changing the file system (via any of the previous methods), and then using the APM to scan the file system, find upgrade scripts, and execute them. This section describes how to upgrade the file system. Starting with OpenACS 5.0, this section can generally be skipped because the OpenACS APM can directly download new files from the openacs.org repository.
If you are using CVS, you will unpack the OpenACS 4.6 tarball into a working directory and then import that directory into cvs. If you have changed files in the core packages, cvs will attempt to merge your changes. You may have to manually merge some conflicts. When that's finished, you can update your normal development checkout directory and the new files will appear. If you aren't using CVS, you can unpack the tarball on top of your existing tree, but any customizations you've made to the kernel or core packages will be erased.
Upgrading files without CVS. Unpack the tarball into a new directory and copy its contents on top of your working directory.
[root root]# su - service0 [service0 aolserver]$ cd /var/lib/aolserver [service0 web]$ tar xzf /tmp/openacs-4-6.tgz [service0 web]$ cp -r openacs-4-6/* openacs-4 [service0 openacs-upgrade]$ exit [root root]# su - service0 cd /var/lib/aolserver tar xzf /tmp/openacs-4-6.tgz cp -r openacs-4-6/* openacs-4 exit
Upgrading files with CVS
Unpack the new files into a working directory.
[root root]# su - service0
[service0 aolserver]$ cd /tmp
[service0 tmp]$ tar xzf openacs-4-6.tgz
[service0 tmp]$ cd openacs-4.6Import the new files into your cvs repository; where they match existing files, they will become the new version of the file.
[service0 openacs-4.6]$ cvs import -m "upgrade to OpenACS 4.6" openacs OpenACS openacs-4-6
Create a new directory as temporary working space to reconcile conflicts between the new files and your current work. The example uses the cvs keyword yesterday, making the assumption that you haven't checked in new code to your local tree in the last day.
[service0 openacs-4.6]$ cd /var/lib/aolserver
[service0 tmp]$ mkdir openacs-upgrade
[service0 tmp]$ cvs checkout -d openacs-upgrade -jOpenACS:yesterday -jOpenACS openacs > cvs.txt 2>&1
(CVS feedback here)
su - service0
cd /tmp
tar xzv openacs-4-6.tgz
cd openacs-4.6
cvs import -m "upgrade to OpenACS 4.6" openacs OpenACS openacs-4-6
cd /tmp
mkdir openacs-upgrade
cvs checkout -d openacs-upgrade -jOpenACS:yesterday -jOpenACS openacs > cvs.txt 2>&1The file /tmp/openacs-upgrade/cvs.txt contains the results of the upgrade. If you changed files that are part of the OpenACS tarball and those changes conflict with the 4.5-4.6 upgrade, you'll have to manually reconcile them. Use the emacs command M-x sort-lines and then, for each line that starts with a C, open that file and manually resolve the conflict by deleting the excess lines. When you're finished, or if there aren't any conflicts, save and exit.
Once you've fixed any conflicts, commit the new code to your local tree.
[service0 tmp]$ cd openacs-upgrade
[service0 openacs-upgrade]$ cvs commit -m "Upgraded to 4.6"
cd openacs-upgrade
cvs commit -m "Upgraded to 4.6"Update your working tree with the new files. The CVS flags ensure that new directories are created and pruned directories destroyed.
[service0 openacs-upgrade]$ cd /var/lib/aolserver/service0 [service0 service0]$ cvs up -Pd (CVS feedback) [service0 service0]$ exit [root root]# cd /var/lib/aolserver/service0 cvs up -Pd exit