@@ -22,8 +25,7 @@ filesystem for you. If you are using the last method, you can skip this page. This page describes whether or not you need to be upgrading using this page or not: the section -called “Upgrading an OpenACS 5.0.0 or greater -installation” +called “Upgrading an OpenACS 5.0.0 or greater installation”
@@ -32,11 +34,10 @@
Upgrading files for a site which is not in a CVS -repository. Unpack the tarball into a new -directory and copy its contents on top of your working directory. -Or just 'install software', select remote repository, and -upgrade your files from there.
-[root root]#su - $OPENACS_SERVICE_NAME +repository.Unpack the tarball into a new directory +and copy its contents on top of your working directory. Or just +'install software', select remote repository, and upgrade +your files from there.[root root]#su - $OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME aolserver]$cd /var/lib/aolserver[$OPENACS_SERVICE_NAME web]$tar xzf /var/tmp/openacs-5-1.tar.gz@@ -57,20 +58,20 @@ version, without overriding your own local customizations.This diagram explains the basic idea. However, the labels are incorrect. Step 1(a) has been removed, and Step 1(b) should be labelled Step 1.
-Step 0: Set up a working CVS -checkout. To get your OpenACS code into your -local CVS repository, you will set up a working CVS checkout of -OpenACS. When you want to update your site, you'll update the -working CVS checkout, import those changes into your local CVS -checkout, create a temporary CVS checkout to merge your local -changes, fix any conflicts, commit your changes, and then update -your site. It sounds complicated, but it's not too bad, and it -is the best way to work around CVS's limitations.
This part describes how to set up your working CVS checkout. +Step 0: Set up a working CVS checkout. To +get your OpenACS code into your local CVS repository, you will set +up a working CVS checkout of OpenACS. When you want to update your +site, you'll update the working CVS checkout, import those +changes into your local CVS checkout, create a temporary CVS +checkout to merge your local changes, fix any conflicts, commit +your changes, and then update your site. It sounds complicated, but +it's not too bad, and it is the best way to work around +CVS's limitations.
This part describes how to set up your working CVS checkout. Once it is set up, you'll be able to update any packages using the existing working CVS checkout. We use one dedicated directory for each branch of OpenACS - if you are using OpenACS 5.1,x, you @@ -81,8 +82,7 @@ latest compatible version of each package. Each minor release of OpenACS since 5.0 has this tagging structure. For example, OpenACS 5.1.x has
openacs-5-1-compat.You will want to separately check out all the packages you are -using.
-[root root]#su - $OPENACS_SERVICE_NAME +using.[root root]#su - $OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME aolserver]$cd /var/lib/aolserver[$OPENACS_SERVICE_NAME aolserver]$cvs -d :pserver:anonymous\@cvs.openacs.org:/cvsroot checkout -r openacs-5-1-compat acs-core@@ -98,13 +98,11 @@ tree. You might want to start over, remove your working CVS checkout, and try again.- -
Step 1: Import new OpenACS -code.
+
Step 1: Import new OpenACS code.
-Update CVS. Update your local CVS -working checkout (unless you just set it up).
-[root root]#su - $OPENACS_SERVICE_NAME +Update CVS. Update your local CVS working +checkout (unless you just set it up).[root root]#su - $OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME aolserver]$cd /var/lib/aolserver/openacs-5-1@@ -113,9 +111,8 @@Update a single package via cvs working -checkout. You can add or upgrade a single -package at a time, if you already have a cvs working directory.
-[root root]#su - $OPENACS_SERVICE_NAME +checkout.You can add or upgrade a single package at +a time, if you already have a cvs working directory.[root root]#su - $OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME aolserver]$cd /var/lib/aolserver/packages/openacs-5-1@@ -127,21 +124,19 @@-Step 2: Merge New OpenACS code. Now -that you have a local copy of the new OpenACS code, you need to -import it into your local CVS repository and resolve any conflicts -that occur.
Import the new files into your cvs repository; where they match -existing files, they will become the new version of the file.
-[$OPENACS_SERVICE_NAME openacs-5-1]$cd /var/lib/aolserver/openacs-5-1 +Step 2: Merge New OpenACS code. Now that +you have a local copy of the new OpenACS code, you need to import +it into your local CVS repository and resolve any conflicts that +occur.Import the new files into your cvs repository; where they match +existing files, they will become the new version of the file.
[$OPENACS_SERVICE_NAME openacs-5-1]$cd /var/lib/aolserver/openacs-5-1[$OPENACS_SERVICE_NAME openacs-5-1]$cvs -d /var/lib/cvs import -m "upgrade to OpenACS 5.1" $OPENACS_SERVICE_NAME OpenACS openacs-5-1Tip
If adding or upgrading a single package, run the cvs import from within the base directory of that package, and adjust the cvs command accordingly. In this example, we are adding the -
myfirstpackagepackage.-[root root]#su - $OPENACS_SERVICE_NAME +myfirstpackagepackage.[root root]#su - $OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME aolserver]$cd /var/lib/aolserver/openacs-5-0/package/myfirstpackage@@ -152,13 +147,11 @@ uses the cvs keyword yesterday, making the assumption that you haven't checked in new code to your local tree in the last day. This section should be improved to use tags instead of the keyword -yesterday!-[$OPENACS_SERVICE_NAME openacs-5.1]$cd /var/lib/aolserver+yesterday![$OPENACS_SERVICE_NAME openacs-5.1]$cd /var/lib/aolserver[$OPENACS_SERVICE_NAME tmp]$rm -rf $OPENACS_SERVICE_NAME-upgrade[$OPENACS_SERVICE_NAME tmp]$mkdir $OPENACS_SERVICE_NAME-upgrade[$OPENACS_SERVICE_NAME tmp]$cvs checkout -d $OPENACS_SERVICE_NAME-upgrade -jOpenACS:yesterday -jOpenACS -kk $OPENACS_SERVICE_NAME > cvs.txt 2>&1-(CVS feedback here) -The file /var/tmp/openacs-upgrade/cvs.txt contains the results +(CVS feedback here)
The file /var/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, you'll have to manually reconcile them. Use the emacs command
M-x sort-lines(you may have to click @@ -167,34 +160,29 @@ 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.
-[$OPENACS_SERVICE_NAME tmp]$cd $OPENACS_SERVICE_NAME-upgrade+local tree.[$OPENACS_SERVICE_NAME tmp]$cd $OPENACS_SERVICE_NAME-upgrade[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME-upgrade]$cvs commit -m "Upgraded to 5.1"Step 3: Upgrade your local staging -site. Update your working tree with the new -files. The CVS flags ensure that new directories are created and -pruned directories destroyed.
-[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME-upgrade]$cd /var/lib/aolserver/$OPENACS_SERVICE_NAME +site.Update your working tree with the new files. +The CVS flags ensure that new directories are created and pruned +directories destroyed.[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME-upgrade]$+[root root]#cd /var/lib/aolserver/$OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$cvs up -Pd(CVS feedback) [$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$exit-[root root]# -Upgrading files for a site using -the OpenACS CVS repository (cvs.openacs.org)
cd /var/lib/aolserver/$OPENACS_SERVICE_NAME +the OpenACS CVS repository (cvs.openacs.org)+[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$
cd /var/lib/aolserver/$OPENACS_SERVICE_NAME[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$cvs up -Pd(CVS feedback) -[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$ -
