[interchange-docs] [SCM] Interchange XML documentation branch, master, updated. a70540086d6c96240afd08b8e4ff8b86f34b5765

Davor Ocelic docelic at rt.icdevgroup.org
Wed Oct 7 08:10:07 UTC 2009


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange XML documentation".

The branch, master has been updated
       via  a70540086d6c96240afd08b8e4ff8b86f34b5765 (commit)
      from  92582da016075cf118c6666e14e082b99ffd1ac0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a70540086d6c96240afd08b8e4ff8b86f34b5765
Author: Davor Ocelic <docelic at spinlocksolutions.com>
Date:   Wed Oct 7 10:09:54 2009 +0200

    Further s/cvs/git/ tunings

-----------------------------------------------------------------------

Summary of changes and diff:
 Makefile         |   12 ++++++------
 README           |   18 +++++++++---------
 bin/findtagopts  |    2 +-
 bin/mkreport     |    4 ++--
 bin/refs-autogen |   12 ++++++------
 bin/stattree     |    4 ++--
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 4525e26..e951c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 
 # Those two need to be adjusted with time
 export XMLDOCS_CUR_DEVEL = 5.7.0
-IC_VERSIONS = 4.6.0 4.8.0 5.0.0 5.2.0 5.4.0 5.6.0 cvs-head
+IC_VERSIONS = 4.6.0 4.8.0 5.0.0 5.2.0 5.4.0 5.6.0 git-head
 
 #############################################################
 # Base definitions
@@ -42,8 +42,8 @@ VPATH       = guides refs glossary whatsnew
 .PHONY: guides symbols glossary
 #.PHONY: olinkdbs-nc olinks-nc olinkdbs-c olinks-c
 .PHONY: clean clean-cache clean-refs distclean look-clean
-.PHONY: up-all cvs-sources srcs cvsrcs cvs cvss all-up cvsup
-.PHONY: up-% cvs-% %-up %-cvs
+.PHONY: up-all git-sources srcs gitrcs git gits all-up gitup
+.PHONY: up-% git-% %-up %-git
 .PHONY: cache caches
 .PHONY: refxmls
 .PHONY: $O
@@ -221,7 +221,7 @@ look-clean:
 	-mv $T $T.temporary 2>/dev/null
 commit:
 	make look-clean
-	cvs commit
+	git commit
 
 
 
@@ -232,11 +232,11 @@ sources:
 	mkdir -p $@
 sources/%: sources $T
 	bin/coup $(subst sources/,,$@)
-up-all cvs-sources srcs cvsrcs cvs cvss all-up cvsup: sources $T
+up-all git-sources srcs gitrcs git gits all-up gitup: sources $T
 	for p in $(IC_VERSIONS); do      \
 	  bin/coup -u $$p                \
 	; done
-up-% cvs-% %-up %-cvs: sources/% $T
+up-% git-% %-up %-git: sources/% $T
 	bin/coup -u $(subst sources/,,$<)
 
 
diff --git a/README b/README
index 249494c..85ec77b 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ INTRODUCTION
 The (new) Interchange XML documentation set is completely self-contained.
 To build the complete documentation set, just run:
 
-  make cvs
+  make git
   make
 
 Sometimes you want to build multiple versions of documentation at once
@@ -44,7 +44,7 @@ To build specific targets, see Makefile for target names. Few useful
 targets would include:
 
  -- Those that are not part of 'make' routine:
-  make cvs          (to create complete sources/ directory, or update existing)
+  make git          (to create complete sources/ directory, or update existing)
   make clean        (removes OUTPUT/)
   make distclean    (remove OUTPUT/ and tmp/)
   make look-clean   (clean + 'mv tmp tmp.temporary'. Useful to only make
@@ -73,7 +73,7 @@ must be available:
 
   - Perl
   - Shell commands: mkdir, cp, ln, find, tar, gzip, bzip2, make
-  - cvs
+  - git-core
   - docbook-xml
   - docbook-xsl
   - xsltproc
@@ -90,7 +90,7 @@ too - patches welcome).
 On Gentoo GNU/Linux systems, the prerequisite ebuild packages are as follows:
 
   - dev-lang/perl
-  - dev-util/cvs
+  - dev-util/git
   - app-arch/gzip
   - app-arch/bzip2
   - app-text/docbook-xml-dtd
@@ -165,7 +165,7 @@ DEVELOPMENT NOTES
                    the docset, but don't have the time to prepare it
                    yourself, just drop it in there and someone will pick
                    it up.
-   sources       - (not in CVS). run 'make cvs' to auto-create this 
+   sources       - (not in CVS). run 'make git' to auto-create this 
                    directory with all needed contents. 
    whatsnew      - A directory containing whatsnew.xml, continuously updated
                    what's new list. The items are added automatically; just
@@ -179,9 +179,9 @@ DEVELOPMENT NOTES
    The dotfiles found in cache/ can only be generated when the sources/
    directory is present as described above, and contains Interchange releases
    in directories named after release numbers (with the exception of
-   "cvs-head"). Run 'make cvs' to create that sources/ directory with
-   all the contents. Run 'make up-all' to invoke cvs update on all
-   versions (or 'make up-<ver>' for specific). ('make cvs' can also be used
+   "git-head"). Run 'make git' to create that sources/ directory with
+   all the contents. Run 'make up-all' to invoke git update on all
+   versions (or 'make up-<ver>' for specific). ('make git' can also be used
    to update repositories).
 
 
@@ -213,7 +213,7 @@ DEVELOPMENT NOTES
  The "CVS CO/UP" script:
    There's bin/coup tool that helps you manage sources/ directory.
    See the script or the Makefile for invocation examples.
-   ('make cvs' and 'make up-<ver|all>' invoke bin/coup).
+   ('make git' and 'make up-<ver|all>' invoke bin/coup).
 
 
 
diff --git a/bin/findtagopts b/bin/findtagopts
index 82b080e..2943658 100755
--- a/bin/findtagopts
+++ b/bin/findtagopts
@@ -37,7 +37,7 @@ unless ( GetOptions (
 
 @ARGV or die "Usage: $0 <tagname>\n";
 
-loaddb("$cachedir/cvs-head/.cache.bin");
+loaddb("$cachedir/git-head/.cache.bin");
 
 my $tagname = shift;
 
diff --git a/bin/mkreport b/bin/mkreport
index 8590721..b9f652f 100755
--- a/bin/mkreport
+++ b/bin/mkreport
@@ -31,11 +31,11 @@ unless ( GetOptions (
 	"verbose|v!" => \$verbose,
 )) { die "Error parsing options\n" }
 
- at ARGV == 1 or warn "No arguments, assuming sources/cvs-head\n";
+ at ARGV == 1 or warn "No arguments, assuming sources/git-head\n";
 
 
 my $path = shift;
-$path ||= "sources/cvs-head";
+$path ||= "sources/git-head";
 ( my $dumppath = $path ) =~ s#.+?/##;
 ( $i{ver} = $dumppath ) =~ s/\/$//;
 my $dumpdir = $dumppath;
diff --git a/bin/refs-autogen b/bin/refs-autogen
index 7d21063..3eaa28d 100755
--- a/bin/refs-autogen
+++ b/bin/refs-autogen
@@ -243,7 +243,7 @@ while ( $path = shift @paths) { # Now, for each IC version specified
 	# First derive IC series_ (in format X_Y) and series (in format X.Y) tags, 
 	# and cvs tag for non-cvs-head. (If we're in cvs-head, we don't make cvs tag
 	# since cvs-head has no special tag).
-	unless ( $i{ver} eq 'cvs-head' ) {
+	unless ( $i{ver} eq 'git-head' ) {
 		( $i{series_} = $i{ver} ) =~ s/\./_/; $i{series_} =~ s/\..*//;
 		( $i{series} = $i{series_} ) =~ s/_/./;
 		$i{cvstag} = "?only_with_tag=STABLE_$i{series_}-root";
@@ -598,7 +598,7 @@ ENDD
 
 	# If this is the last version we want (so, manual break), then stop here.
 	# This is for cases where you want to generate docs for say, 5.2.0 and not
-	# always cvs-head
+	# always git-head
 	last if $last_path and $last_path eq $path;
 }
 
@@ -801,10 +801,10 @@ while ( my($k,$v) = each %{ $autogenerated{$group} } ) {
 	# DONE
 	$ag{latest} = $hash{version};
 
-#	# Visually mark NEW (cvs-head) items .
+#	# Visually mark NEW (git-head) items .
 	if ( @{ $ag{'_available in'} } == 1 and
 			( ${$ag{'_available in'}}[0] eq $ENV{XMLDOCS_CUR_DEVEL} or
-			${$ag{'_available in'}}[0] eq 'cvs-head' )) {
+			${$ag{'_available in'}}[0] eq 'git-head' )) {
 		$ag{purpose} = <<ENDD;
 <inlinemediaobject>
 <imageobject>
@@ -1448,9 +1448,9 @@ sub compress_availability {
 	# cvs-head (so meaning the item is fully current), then visually 
 	# add "(cvs-head)" to the version number. Makes it easier to see
 	# the item is current.
-	$end and $end eq $ENV{XMLDOCS_CUR_DEVEL} and $end .= " (cvs-head)";
+	$end and $end eq $ENV{XMLDOCS_CUR_DEVEL} and $end .= " (git-head)";
 	$orig[$#orig] eq $ENV{XMLDOCS_CUR_DEVEL} and
-		$orig[$#orig] .= " (cvs-head)";
+		$orig[$#orig] .= " (git-head)";
 	
 	local $" = ", ";
 	if ( $cl > 1 ) {
diff --git a/bin/stattree b/bin/stattree
index ec585d6..132d9fe 100755
--- a/bin/stattree
+++ b/bin/stattree
@@ -168,7 +168,7 @@ sub wanted {
 	return if $file eq '.';
 
 	# Things we ignore
-	return if /(^|\/)(CVS|\.cvs|\.svn|\.autoload|\.gitignore)(\/.+[^\/])?$/;
+	return if /(^|\/)(CVS|\.cvs|\.svn|\.autoload|\.git(ignore)?)(\/.+[^\/])?$/;
 	
 	stat($file) or warn "Can't stat '$file' ? ($!)\n";
 
@@ -692,7 +692,7 @@ sub wanted {
 			# So if this is CVS Head that we can't retrieve version for,
 			# read XMLDOCS_CUR_DEVEL (variable exported by Makefile).
 			# Else, take that version == directory name.
-			$hash{version} = ( $i{ver} eq 'cvs-head' ) ? 
+			$hash{version} = ( $i{ver} eq 'git-head' ) ? 
 				$ENV{XMLDOCS_CUR_DEVEL} : $i{ver};
 		}
 	}


hooks/post-receive
-- 
Interchange XML documentation



More information about the docs mailing list