From baadeebab18d1c6a7afbf111427ed05146018ef8 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sun, 18 Sep 2005 18:47:20 +0200 Subject: [PATCH] More CVS -> GIT conversions Update INSTALL to both 'cover' GIT checkouts and requirements for the new build system. Hacking info no more advices to add CVS Id lines. --- INSTALL | 38 ++++++++++++++++++-------------------- doc/hacking.txt | 4 +--- doc/installation.txt | 2 +- src/README | 2 +- src/intl/gettext/TODO | 2 +- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/INSTALL b/INSTALL index 778a6fa3..01a59eb0 100644 --- a/INSTALL +++ b/INSTALL @@ -11,30 +11,28 @@ ECMAScript (that's JavaScript) support. ########## - In order to check out the latest tree from CVS: + In order to check out the latest tree from GIT (using Cogito): -$ export CVSROOT=check_file_SITES_for_value_of_this -$ cvs login -(empty password) -$ cvs -z3 co elinks -$ cd elinks -... + $ cg clone check_file_SITES_for_value_of_this + $ cd elinks - To update your existing tree to the latest CVS version, do: + To update your existing tree to the latest GIT version, do: -$ cvs -z3 update -dP + $ cg update - If you downloaded a nightly snapshot, it already contains CVS/ directories -etc. Thus, you should be able to update your tree with the above command as if -you had previously done a full cvs checkout. + If you downloaded a nightly snapshot, and want to check out the latest tree +from GIT in it, use the command: - Note that if you obtained the sources directly from CVS, you NEED to run -./autogen.sh! (It should be enough to do it once, automake should be smart -enough to rerun itself when needed - however, if you have build problems, try -running this first.) Also, you obviously need automake and autoconf installed -on your system (note that autoconf-2.13 a automake-1.4p5 are supported, newer -ones may cause problems thanks to the auto* developers who don't know how to -maintain backwards compatibility). Otherwise, you have to use the nightly CVS + $ cg clone -s check_file_SITES_for_value_of_this + + Note that if you obtained the sources directly from GIT, you NEED to run + +./autogen.sh! (It should be enough to do it once - however, if you have build + +problems, try running this first.) Also, you obviously need GNU make and +autoconf installed on your system (note that autoconf-2.13 is supported, newer +ones may cause problems thanks to the autoconf developers who don't know how to +maintain backwards compatibility). Otherwise, you have to use the nightly GIT snapshot - you don't need to do this there. @@ -44,7 +42,7 @@ snapshot - you don't need to do this there. may contain patches that are of use to you. If you're interested in any of them, try to apply them by doing (for each one): -$ patch -p0 < contrib/that-patch + $ patch -p0 < contrib/that-patch They may not apply, since I don't update patches in contrib/ regularly - if you want, feel free to go ahead and update the patch for the current tree and diff --git a/doc/hacking.txt b/doc/hacking.txt index c40c7790..b9c2af25 100644 --- a/doc/hacking.txt +++ b/doc/hacking.txt @@ -500,11 +500,9 @@ Use assert() and assertm() where applicable. It will prevent hidden bugs. If you see code in ELinks that doesn't follow these rules, fix it or tell us about it. -All the .c files MUST start by a short one-line description and a CVS Id tag -on the next line: +All the .c files MUST start by a short one-line description: /* */ - /* $Id: hacking.txt,v 1.36 2005/05/24 18:21:45 jonas Exp $ */ All the .h files MUST start by a CVS Id tag and then anti-reinclusion ifdef. The macro is diff --git a/doc/installation.txt b/doc/installation.txt index f38ca716..a3d09ce9 100644 --- a/doc/installation.txt +++ b/doc/installation.txt @@ -20,7 +20,7 @@ Requirements ~~~~~~~~~~~~ To succesfully install ELinks all that is required is GNU make and a C -compiler. If you want to install directly from CVS it is also required that +compiler. If you want to install directly from GIT it is also required that automake and autoconf is installed on your system. Recommended Libraries and Programs diff --git a/src/README b/src/README index 34723ec9..91165558 100644 --- a/src/README +++ b/src/README @@ -26,7 +26,7 @@ descriptors). dialogs/ is special too. It in fact means to say "global and unique BFU instances belonging to the ELinks core"/ but that's a rather long and boring name, besides the nightmares associated with maintaining files and directories -containing spaces in CVS. The "global and unique BFU instances" part can be +containing spaces in GIT. The "global and unique BFU instances" part can be represented by exmode, menus and leds (were they there). The "ELinks core" part can be represented by options, document and downloads. The reason those aren't in their respective directories (while bookmarks or formhist have their diff --git a/src/intl/gettext/TODO b/src/intl/gettext/TODO index 3c4838da..a9ac336b 100644 --- a/src/intl/gettext/TODO +++ b/src/intl/gettext/TODO @@ -1,4 +1,4 @@ -* Remove plural.c from CVS. +* Remove plural.c from GIT. * Use our own charset routines instead of iconv.