Version Control - Specific to Our Site

Companion Documents

• CVS Conventions and Policy.
• CVS for UNIX configuration files.

Where is the repository?

mysite.com:/home/cvsroot/

The relevent CVS projects in the repository are:

• mysite - The www.mysite.com ACS web server (which we check out into /web/mysite/).
• acs-util - Misc. ACS-related scripts used on the unix box.
• aol3 - AOLserver binary distribution.
• aol3-src - AOLserver source distribution, source of any 3rd party AOLserver modules, etc.
• unix - Unix config stuff, e.g. parts of /etc.
• oracle8 - Oracle config files, rooted at $ORACLE_BASE.
• acs-util - Misc. ACS-related scripts used on the unix box.
• perl-src - Source of downloaded Perl modules (e.g., DBD::ODBC).
• tcl-src - Source of downloaded Tcl modules (e.g., TclODBC).

Record all Vendor Branches here:

All code from external sources shall be imported onto a vendor branch.

Note that vendor branches are per CVS project, just like everything else in CVS. But please be sure to use the same vendor branch numbers and names across all our CVS projects above. (If for some reason you don't or can't, change the list of vendor branches below to be per-cvs-project.)

• 1.1.1 - ArsDigita - ACS, AOLserver, etc.
• 1.1.7 - scottg - Scott Goodwin's nsopenssl AOLserver SSL module
• 1.1.9 - Asher - Jerry Asher's odbc2 AOLserver ODBC driver
• 1.1.11 - AOLserver - source from www.aolserver.com, rather than ArsDigita (e.g., nsodbc).
• 1.1.13 - symbolstone - Perl DBI modules from dbi.symbolstone.org. (E.g., DBD::ODBC, DBD::Oracle.)
  (Should probably have made this the "CPAN" rather than "symbolstone" branch.)
• 1.1.17 - SourceForge - TclODBC, Oratcl, Tcl
• 1.1.19 - Tom-Poindexter - Odbcisql
• 1.1.21 - Shasha - C code to generate data for the FinTime benchmark.
• 1.1.23 - Cleverly - Michael Cleverly's nstcl package.
• 1.1.25 - Oracle - Oracle Corporation - Oracle 8.1.7 databse config files and the like.
• 1.1.27 - Sun - Sun Corp. - Solaris config files in /etc and the like.
• 1.1.29 - Fogel - Karl Fogel - cvs2cl.pl
• 1.1.33 - OpenACS - Currently (2001/12/07) just the AOLserver Postgres driver (CVS)

What CVS "Method" Are We Using?

TODO:

On the website

On the S code

On our site Emacs code

What else?

Tag Naming Conventions

When naming tags please try to follow our conventions as much as possible, to make things clearer for everyone. Record additions or modifications to the conventions here.

Adding a PDF Report - an example

You created the PDF somewhere else, and now you want to check it into CVS on the Dev site. Since you created the file somewhere else, you may have had to fool with the unix file ownership and permissions with chown and chmod - we want it writeable by the group web. This should now be taken care of by the sticky bits on the directory. It's also a good idea to use the -kb flag when you do cvs add, to make sure CVS treats it as a binary file. So, e.g.:

$ cd /web/mysite-dev/packages/mypackage/www/reports
$ cp somewhere/foo.pdf foo.pdf
$ chmod ug+rw foo.pdf
$ ls -lst foo.pdf
$ cvs add -kb foo.pdf
$ cvs commit foo.pdf

For a commit comment, try and use something descriptive yet reasonably succinct. If you have to choose, accutate and descriptive is better than succinct. (E.g., "new study" probably isn't very good choic.)

Now, let's push the newly commited PDF out to the Production site:

$ cd /web/mysite/packages/mypackage/www/reports/
$ cvs -nq update
$ cvs update -kb foo.pdf

Note that in order to have your PDF reports indexed by Site-Wide Search, you need to tell the Static Pages package to re-scan and sync the file-system with the database. See our ACS tools document for more info.