Permalink
Browse files

Further s/cvs/git/ tunings

  • Loading branch information...
1 parent 92582da commit a70540086d6c96240afd08b8e4ff8b86f34b5765 @docelic docelic committed Oct 7, 2009
Showing with 26 additions and 26 deletions.
  1. +6 −6 Makefile
  2. +9 −9 README
  3. +1 −1 bin/findtagopts
  4. +2 −2 bin/mkreport
  5. +6 −6 bin/refs-autogen
  6. +2 −2 bin/stattree
View
@@ -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/,,$<)
View
@@ -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).
View
@@ -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;
View
@@ -31,11 +31,11 @@ unless ( GetOptions (
"verbose|v!" => \$verbose,
)) { die "Error parsing options\n" }
-@ARGV == 1 or warn "No arguments, assuming sources/cvs-head\n";
+@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;
View
@@ -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 ) {
View
@@ -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};
}
}

0 comments on commit a705400

Please sign in to comment.