Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml,v diff -u -r1.19 -r1.20 --- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml 5 May 2004 18:36:21 -0000 1.19 +++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml 7 May 2004 00:27:05 -0000 1.20 @@ -323,7 +323,7 @@ Upgrading the OpenACS files 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. - Many OpenACS site developers operate their own CVS repository to keep track of changes from the release OpenACS code. This part describes how to import the latest OpenACS version into your own 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. + Many OpenACS site developers operate their own CVS repository to keep track of changes from the release OpenACS code. This part describes how to import the latest OpenACS version into your own repository. If you are using CVS, you will unpack the OpenACS 5.1 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. @@ -332,14 +332,14 @@ [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 web]$ tar xzf /tmp/openacs-5-1.tar.gz +[service0 web]$ cp -r openacs-5-1/* 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 +tar xzf /tmp/openacs-5-1.tgz +cp -r openacs-5-1/* openacs-4 exit @@ -368,21 +368,28 @@ [root root]# su - service0 [service0 aolserver]$ cd /tmp -[service0 tmp]$ tar xzf openacs-4-6.tgz -[service0 tmp]$ cd openacs-4.6 +[service0 tmp]$ tar xzf openacs-5-1.tar.gz +[service0 tmp]$ cd openacs-5-1 (b): via cvs working checkout - Create a CVS checkout from OpenACS. The first time you do this, you will need to create the checkout directory. We use one dedicated directory for each branch of OpenACS - if you are using OpenACS 5.0,x, you only need an OpenACS 5.0 branch. The openacs-5-0-compat tag identifies the latest released version of OpenACS 5.0 (ie, 5.0.3 or 5.0.4) and the latest compatible version of each package, including .LRN. Each minor release of OpenACS since 5.0 has this tagging structure. (Ie., OpenACS 5.1.x has openacs-5-1-compat.) + Create a CVS checkout from OpenACS. The first time you do this, you will need to create the checkout directory. We use one dedicated directory for each branch of OpenACS - if you are using OpenACS 5.0,x, you only need an OpenACS 5.0 branch. The openacs-5-1-compat tag identifies the latest released version of OpenACS 5.1 (ie, 5.1.3 or 5.1.4) and the latest compatible version of each package, including .LRN. Each minor release of OpenACS since 5.0 has this tagging structure. (Ie., 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 - service0 [service0 aolserver]$ cd /var/lib/aolserver -[service0 aolserver]$ cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r openacs-5-0-compat openacs-4 -[service0 aolserver]$ mv openacs-4 openacs-5-0 +[service0 aolserver]$ cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r openacs-5-1-compat acs-core +[service0 aolserver]$ cd openacs-4/packages +[service0 aolserver]$ cvs -d :pserver:anonymous@openacs.org:/cvsroot checkout -r openacs-5-1-compat packagename packagename2... +[service0 aolserver]$ cd ../.. +[service0 aolserver]$ mv openacs-4 openacs-5-1 If this checkout already exists, you can simply update it instead of recreating it. [root root]# su - service0 -[service0 aolserver]$ cd /var/lib/aolserver/openacs-5-0 +[service0 aolserver]$ cd /var/lib/aolserver/openacs-5-1 [service0 aolserver]$ cvs up -Pd @@ -391,8 +398,8 @@ You can add or upgrade a single package at a time, if you already have a cvs working directory. [root root]# su - service0 -[service0 aolserver]$ cd /var/lib/aolserver/openacs-5-0 -[service0 openacs-5-0]$ cvs up -d myfirstpackage +[service0 aolserver]$ cd /var/lib/aolserver/openacs-5-1 +[service0 openacs-5-1]$ cvs up -d myfirstpackage In the next section, the import must be tailored to just this package. @@ -403,7 +410,11 @@ 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. - [service0 openacs-4.6]$ cvs -d /var/lib/cvs import -m "upgrade to OpenACS 4.6" openacs OpenACS openacs-4-6 + + [service0 openacs-5-1]$ cd /var/lib/aolserver/openacs-5-1 + [service0 openacs-5-1]$ cvs -d /var/lib/cvs import -m "upgrade to OpenACS 5.1" service0 OpenACS openacs-5-1 + + 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 myfirstpackage package. [root root]# su - service0 @@ -414,7 +425,7 @@ 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 service0-upgrade -[service0 tmp]$ cvs checkout -d openacs-upgrade -jOpenACS:yesterday -jOpenACS openacs > cvs.txt 2>&1 +[service0 tmp]$ cvs checkout -d openacs-upgrade -jOpenACS:yesterday -jOpenACS service0 > cvs.txt 2>&1 (CVS feedback here) The 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.