Remove use of `svn`.

diff --git a/building.md b/building.md
index 4ec85c388cbe48025cb3edaceb3e0bb49907893e..dd94467e42cf8d7d35a904e882ffa632768c4749 100644 (file)
--- a/building.md
+++ b/building.md
@@ -50,7 +50,7 @@ lock file, and continues.
 13. Build the XSL files using this command. This Makefile must also build the -ns version as well, because no other commands in the script do so.
 
     ```
-    make distrib -C xsl XSLT="$DOCBOOK_SVN/buildtools/xslt -$ENGINE" \
+    make distrib -C xsl XSLT="$repo_dir/buildtools/xslt -$ENGINE" \
       PDF_MAKER=$PDF_MAKER
     ```
 14. echo some descriptive text to a file named header.txt.
@@ -58,7 +58,7 @@ lock file, and continues.
 
     ```
     make zip-ns -C xsl ZIPVER=$RELEASEVERSION TMP=$TMP \
-      XSLT="$DOCBOOK_SVN/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER
+      XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER
     ```
     where `$RELEASEVERSION` is the value from the -v command line option.
 16. Generate a list of changes to a LatestChanges file using this command:

diff --git a/buildtools/Makefile.incl b/buildtools/Makefile.incl
index aac253cebdcbde0cf854758a31e658abe5833e84..6ba3311ae06ba00087e8b4375708044f8797c39e 100644 (file)
--- a/buildtools/Makefile.incl
+++ b/buildtools/Makefile.incl
@@ -1,10 +1,10 @@
 # this file is a -*- makefile -*- snippet
 # use it to configure DocBook Project builds
 
-CVSTOOLSROOT=$(DOCBOOK_SVN)/buildtools
-XSLROOT=$(DOCBOOK_SVN)/xsl
-DSSSLROOT=$(DOCBOOK_SVN)/dsssl
-WEBSITEROOT=$(DOCBOOK_SVN)/website
+CVSTOOLSROOT=$(repo_dir)/buildtools
+XSLROOT=$(repo_dir)/xsl
+DSSSLROOT=$(repo_dir)/dsssl
+WEBSITEROOT=$(repo_dir)/website
 CVS2LOG=$(CVSTOOLSROOT)/cvs2log
 FLATTEN=$(CVSTOOLSROOT)/flatten
 MERGELOGS=$(CVSTOOLSROOT)/mergechangelogs
@@ -23,5 +23,5 @@ XSLT=$(CVSTOOLSROOT)/xslt -$(XSLTENGINE)
 XSLTOPT=
 XSLTPROC=
 RUNTRANG=$(CVSTOOLSROOT)/runtrang
-CLDR_DIR=$(DOCBOOK_SVN)/contrib/cldr
-XMLFORMAT_DIR=$(DOCBOOK_SVN)/contrib/tools/xmlformat/xmlformat-1.03
+CLDR_DIR=$(repo_dir)/contrib/cldr
+XMLFORMAT_DIR=$(repo_dir)/contrib/tools/xmlformat/xmlformat-1.03

diff --git a/buildtools/paramchk b/buildtools/paramchk
index caa8a8bb9d82c63c97936c697fa005c225473f0a..d9a1bca63f590c7d98329597e0cb81d040d8b547 100755 (executable)
--- a/buildtools/paramchk
+++ b/buildtools/paramchk
@@ -14,8 +14,8 @@ my $file = shift @ARGV || die $usage;
 my $dir = ".";
 $dir = $1 if $file =~ /^(.*)\/[^\/]+$/;
 
-if ($ENV{DOCBOOK_SVN}) {
-  $dir = "$ENV{DOCBOOK_SVN}/xsl/params";
+if ($ENV{repo_dir}) {
+  $dir = "$ENV{repo_dir}/xsl/params";
 }
 
 my $entfile = $file;

diff --git a/contrib/samples/refentry/clisp/Makefile b/contrib/samples/refentry/clisp/Makefile
index 3b8ef85d7539b8d62b38e7c697ae3aa212a662ad..1885844628c0a7d10b4dbeb8abf520cbf68b90bc 100644 (file)
--- a/contrib/samples/refentry/clisp/Makefile
+++ b/contrib/samples/refentry/clisp/Makefile
@@ -3,7 +3,7 @@ all: clisp/doc
 clisp:
        cvs -z3 -d:pserver:anonymous@clisp.cvs.sourceforge.net:/cvsroot/clisp co -P clisp
 clisp/doc: clisp
-       $(MAKE) -C clisp/doc STYLESHEETS_PATH=$(DOCBOOK_SVN)/xsl/
+       $(MAKE) -C clisp/doc STYLESHEETS_PATH=$(repo_dir)/xsl/
 clean:
        $(MAKE) -C clisp/doc clean
 realclean:

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 2292d9778cf23fdb5b6316df9b2be706c61b674b..b152f0959d5f101996dde3c94f02bcaca0f02e51 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -61,7 +61,7 @@ NEWS.xml: ChangeLog.xml
        param.file="$(XSL_PARAMS)"
 
        mv NEWS.xml NEWS-4.xml
-       $(XSLT) NEWS-4.xml $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl $@
+       $(XSLT) NEWS-4.xml $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl $@
        rm NEWS-4.xml
 
 NEWS.html: NEWS.xml
@@ -251,7 +251,7 @@ announce: $(ANNOUNCE_CHANGES) .announcement-text
        $(RELEASE_ANNOUNCE) "$(DISTRO_TITLE)" "$(RELVER)" .announcement-text $< "$(ANNOUNCE_RECIPIENTS)"
 
 tag:
-ifeq (,$(shell svn status))
+ifeq (,$(shell git status --porcelain))
 ifneq (,$(shell svn info $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO) 2>/dev/null))
          $(SVN) $(SVN_OPTS) delete -m "deleting the $(DISTRO) $(ZIPVER) tag" \
            $(REPOSITORY_ROOT)/tags/$(TAG)/$(DISTRO)

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 17e543f2a23f18d56641fe9f87e27fd9abe191c6..3982ebaa0baeccb2596d0c98214936a1f0c3b003 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -8,23 +8,23 @@
 
 # $Id$
 
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
-RELEASE_ANNOUNCE=$(DOCBOOK_SVN)/releasetools/release-announce
+RELEASE_ANNOUNCE=$(repo_dir)/releasetools/release-announce
 ANNOUNCE_RECIPIENTS=docbook-apps@lists.oasis-open.org
 ANNOUNCE_CHANGES=RELEASE-NOTES-PARTIAL.txt
-FRESHMEAT_SUBMIT=$(DOCBOOK_SVN)/releasetools/freshmeat-submit
+FRESHMEAT_SUBMIT=$(repo_dir)/releasetools/freshmeat-submit
 
-CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example
-INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh
+CATALOGMANAGER=$(repo_dir)/releasetools/.CatalogManager.properties.example
+INSTALL_SH=$(repo_dir)/releasetools/install.sh
 ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
 MAKECATALOG=../releasetools/make-catalog.xsl
 else
-MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl
+MAKECATALOG=$(repo_dir)/releasetools/make-catalog.xsl
 endif
 else
-MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl
+MAKECATALOG=$(repo_dir)/releasetools/make-catalog.xsl
 endif
 
 ifneq ($(shell uname -s | grep -i cygwin),)
@@ -32,12 +32,12 @@ ifeq ($(XSLTENGINE),saxon)
 DOCBUILD_STYLESHEETS=../../xsl/tools/xsl/build
 RELEASEDOC_STYLESHEETS=../xsl/tools/xsl/build
 else
-DOCBUILD_STYLESHEETS=$(DOCBOOK_SVN)/xsl/tools/xsl/build
-RELEASEDOC_STYLESHEETS=$(DOCBOOK_SVN)/xsl/tools/xsl/build
+DOCBUILD_STYLESHEETS=$(repo_dir)/xsl/tools/xsl/build
+RELEASEDOC_STYLESHEETS=$(repo_dir)/xsl/tools/xsl/build
 endif
 else
-DOCBUILD_STYLESHEETS=$(DOCBOOK_SVN)/xsl/tools/xsl/build
-RELEASEDOC_STYLESHEETS=$(DOCBOOK_SVN)/xsl/tools/xsl/build
+DOCBUILD_STYLESHEETS=$(repo_dir)/xsl/tools/xsl/build
+RELEASEDOC_STYLESHEETS=$(repo_dir)/xsl/tools/xsl/build
 endif
 
 PARAMPROF=$(VPATH)/.param.profiled
@@ -85,12 +85,12 @@ DBX_STYLE=$(RELEASEDOC_STYLESHEETS)/dblatex-release-notes.xsl
 # MARKUP_XSL is a modified version of Jeni Tennison's "Markup Utility"
 ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
-MARKUP_XSL=$(DOCBOOK_SVN)/releasetools/modified-markup.xsl
+MARKUP_XSL=$(repo_dir)/releasetools/modified-markup.xsl
 else
 MARKUP_XSL=../releasetools/modified-markup.xsl
 endif
 else
-MARKUP_XSL=$(DOCBOOK_SVN)/releasetools/modified-markup.xsl
+MARKUP_XSL=$(repo_dir)/releasetools/modified-markup.xsl
 endif
 
 # stylesheet used in taking XML output from "svn log" and using it
@@ -99,10 +99,10 @@ ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
 SVNLOG2DOCBOOK=../releasetools/svnlog2docbook.xsl
 else
-SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl
+SVNLOG2DOCBOOK=$(repo_dir)/releasetools/svnlog2docbook.xsl
 endif
 else
-SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl
+SVNLOG2DOCBOOK=$(repo_dir)/releasetools/svnlog2docbook.xsl
 endif
 
 SVN_INFO_FILE=.svninfo.xml
@@ -246,10 +246,10 @@ ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
 EVALXPATH=../releasetools/eval-xpath.xsl
 else
-EVALXPATH=$(DOCBOOK_SVN)/releasetools/eval-xpath.xsl
+EVALXPATH=$(repo_dir)/releasetools/eval-xpath.xsl
 endif
 else
-EVALXPATH=$(DOCBOOK_SVN)/releasetools/eval-xpath.xsl
+EVALXPATH=$(repo_dir)/releasetools/eval-xpath.xsl
 endif
 
 XMLLINT=xmllint

diff --git a/releasetools/docbook-build b/releasetools/docbook-build
index 138c325d74c0501c54e9101fabe701981628509c..968f665f3a497d72a0bce2cc9a0f6fc61ae20170 100755 (executable)
--- a/releasetools/docbook-build
+++ b/releasetools/docbook-build
@@ -21,17 +21,18 @@ EOF
   exit 1
 fi
 
-# fail if no DOCBOOK_SVN set
-if [ -z "$DOCBOOK_SVN" ]; then
+export repo_dir=`dirname $(cd $(dirname $0); pwd)`
+# fail if no repo_dir set
+if [ -z "$repo_dir" ]; then
   cat <<- EOF
-`basename $0`: error: DOCBOOK_SVN not set. Stopping.
+`basename $0`: error: repo_dir not set. Stopping.
 
-Before invoking `basename $0`, you must set the DOCBOOK_SVN
+Before invoking `basename $0`, you must set the repo_dir
 environment variable in the environment from which the script
-runs. The value of DOCBOOK_SVN should be the absolute path to the
+runs. The value of repo_dir should be the absolute path to the
 base of a DocBook Project Subversion working directory that
 contains the various DocBook Project modules; that is, such that
-the modules can be found in \$DOCBOOK_SVN/xsl, etc.
+the modules can be found in \$repo_dir/xsl, etc.
 EOF
   exit 1
 fi
@@ -78,7 +79,7 @@ Options:
      Specifies the location of the base directory containing the
      SVN working directories for modules from the DocBook project
      (directory containing 'xsl', 'dsssl', 'slides', etc. subdirs)
-     Default: value of the DOCBOOK_SVN environment variable, if
+     Default: value of the repo_dir environment variable, if
      set; otherwise, the directory from which the script is run.
 
   -d DOMAIN
@@ -182,6 +183,9 @@ fi
 cd $BUILDDIR
 
 DISTROS="$@"
+if [ -z "$DISTROS" ]; then
+  DISTROS=xsl
+fi
 
 if [ -z "$DISTROS" ]; then
   echo
@@ -191,8 +195,8 @@ if [ -z "$DISTROS" ]; then
   printf "$opts_admon"
   exit 1;
 else
-  svn cleanup
-  REVISION=$(svn update > /dev/null 2>&1 && svn info | grep "^Revision:" | sed -r 's/^Revision: (.+)$/\1/')
+  # We may want to use `git describe` here, once we use real tags...
+  REVISION=$(git rev-parse HEAD)
   for DISTRO in $DISTROS; do
     printf "Running svn update in gentext and $DISTRO working directories...\n" 1>&2
     if test "$SVNCHECK" = "yes"; then
@@ -246,7 +250,7 @@ else
     #fi
     #rm -f $DISTRO/LatestTag
     rm -f $DISTRO/VERSION
-    svn update $DISTRO/VERSION 1>/dev/null 2>&1
+    git checkout $DISTRO/VERSION
 
     printf "." 1>&2
 
@@ -292,9 +296,9 @@ else
     echo
 
     if test "$SVNCHECK" = "yes"; then
-      make distrib -C $DISTRO XSLT="$DOCBOOK_SVN/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER
+      make distrib -C $DISTRO XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER
     else
-      make release -C $DISTRO XSLT="$DOCBOOK_SVN/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER
+      make release -C $DISTRO XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER
     fi
 
     cat <<- EOF > HEADER.txt
@@ -307,7 +311,7 @@ These snapshots are intended for testing purposes only and otherwise come with
 no guarantees. Any of them may in fact be broken at any given time.
 EOF
 
-    make $ZIPTARG -C $DISTRO ZIPVER=$RELEASEVERSION TMP=$TMP XSLT="$DOCBOOK_SVN/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER || exit 1
+    make $ZIPTARG -C $DISTRO ZIPVER=$RELEASEVERSION TMP=$TMP XSLT="$repo_dir/buildtools/xslt -$ENGINE" PDF_MAKER=$PDF_MAKER || exit 1
 
     cat <<- EOF > $TMP/line.tmp
 
@@ -316,7 +320,7 @@ Latest Changes:
 --------------------------------------------------------------------------------
 
 EOF
-    svn cleanup && svn update && svn log --verbose --limit 200 > LatestChanges
+    git log -n 200 > LatestChanges
 
     cat HEADER.txt $TMP/line.tmp LatestChanges > README.txt
     rm $TMP/line.tmp
@@ -366,7 +370,7 @@ To: docbook-snapshots@lists.sourceforge.net
 EOF
 
     # Run build-check and determine if it exits without any errors
-    if $DOCBOOK_SVN/buildtools/build-check $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp
+    if $repo_dir/buildtools/build-check $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp
     then
       # build-check completed successfully, so prepare the
       # buildbot message accordingly
@@ -375,7 +379,7 @@ EOF
       echo "$DISTRO snapshot $REVISION appears to have been built successfully" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       # append the commit message for this revision
-      /usr/bin/svn log -r$REVISION >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
+      git show --quiet $REVISION >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo "For further details about the code changes in this revision, see:" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo "http://docbook.svn.sf.net/docbook/?rev=$REVISION&view=rev" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
@@ -390,10 +394,10 @@ EOF
       echo "The $DISTRO snapshot build appears to be broken at r$REVISION or before." >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       # run buildcheck again and copy the output to the beginning
       # of the buildbot message
-      $DOCBOOK_SVN/buildtools/build-check $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
+      $repo_dir/buildtools/build-check $LOGDIR/docbook-$DISTRO-$RELEASEVERSION.log.tmp >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       # append the commit message for this revision
-      /usr/bin/svn log -r$REVISION >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
+      git show --quiet $REVISION >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo "For further details about the code changes in this revision, see:" >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt
       echo >> $TMP/docbook-$DISTRO-$RELEASEVERSION-message.txt

diff --git a/releasetools/xslnons.mk b/releasetools/xslnons.mk
index 0a3cc97b709fc27de8b1853aef5ac9fb9ecb67c5..fdc317c1967852ca35af0ed2d9bc296589b2d62b 100755 (executable)
--- a/releasetools/xslnons.mk
+++ b/releasetools/xslnons.mk
@@ -22,7 +22,7 @@ zip-nons: zip
        $(RM)  $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER).zip
        (cd $(TMP) && \
          unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
-         $(DOCBOOK_SVN)/releasetools/xslnons-build \
+         $(repo_dir)/releasetools/xslnons-build \
          docbook-$(DISTRO)-$(ZIPVER) \
          docbook-$(DISTRO)-nons-$(ZIPVER)); 
 
@@ -30,11 +30,11 @@ zip-nons: zip
 # Run xslt on xsl/webhelp/docsrc/readme.xml
        $(XSLT) \
        $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/readme.xml \
-       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl \
+       $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \
        $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER)/webhelp/docsrc/readme.xml 
        $(XSLT) \
        $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml \
-       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl \
+       $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \
        $(TMP)/docbook-$(DISTRO)-nons-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml 
 
 # Turn off validation in webhelp:
@@ -127,6 +127,6 @@ install-nons: install upload-to-project-webspace-nons
 
 announce-nons: announce
        $(RELEASE_ANNOUNCE) "XSL-NS Stylesheets" "$(RELVER)" \
-         $(DOCBOOK_SVN)/releasetools/xslnsfiles/announcement-text \
+         $(repo_dir)/releasetools/xslnsfiles/announcement-text \
          $(ANNOUNCE_CHANGES) \
         "$(ANNOUNCE_RECIPIENTS)"

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index 55d2f75c8efa88ada700c9683f94641cde82eda2..bb61d007725a918b4f1b034db9257a65071e8d0c 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -22,7 +22,7 @@ zip-ns: zip
        $(RM)  $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).zip
        (cd $(TMP) && \
          unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
-         $(DOCBOOK_SVN)/releasetools/xslns-build \
+         $(repo_dir)/releasetools/xslns-build \
          docbook-$(DISTRO)-$(ZIPVER) \
          docbook-$(DISTRO)-ns-$(ZIPVER)); 
 
@@ -30,11 +30,11 @@ zip-ns: zip
 # Run xslt on xsl/webhelp/docsrc/readme.xml
        $(XSLT) \
        $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/readme.xml \
-       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl \
+       $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \
        $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/readme.xml 
        $(XSLT) \
        $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml \
-       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl \
+       $(repo_dir)/docbook/relaxng/tools/db4-upgrade.xsl \
        $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/xinclude-test.xml 
 
 # Turn off validation in webhelp:
@@ -127,6 +127,6 @@ install-ns: install upload-to-project-webspace-ns
 
 announce-ns: announce
        $(RELEASE_ANNOUNCE) "XSL-NS Stylesheets" "$(RELVER)" \
-         $(DOCBOOK_SVN)/releasetools/xslnsfiles/announcement-text \
+         $(repo_dir)/releasetools/xslnsfiles/announcement-text \
          $(ANNOUNCE_CHANGES) \
         "$(ANNOUNCE_RECIPIENTS)"

diff --git a/xsl/Makefile b/xsl/Makefile
index 1abf308b5dcc5a8e9fac196327a5fa3f19eac8df..8909e9e978e5ba9d6dc66a8129d528d5bdc1ae6e 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -1,7 +1,7 @@
 : Makefile 9654 2012-10-28 22:54:32Z stefan $
 
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
-include $(DOCBOOK_SVN)/releasetools/Variables.mk
+include $(repo_dir)/buildtools/Makefile.incl
+include $(repo_dir)/releasetools/Variables.mk
 
 # The -E0 switch on xjparse gets passed on to the XML Commons
 # resolver and causes all error message from the resolver to be
@@ -114,5 +114,5 @@ docsrc-clean:
        $(MAKE) -C docsrc release-clean
 
 include Makefile.tests
-include $(DOCBOOK_SVN)/releasetools/Targets.mk
-include $(DOCBOOK_SVN)/releasetools/xslns.mk
+include $(repo_dir)/releasetools/Targets.mk
+include $(repo_dir)/releasetools/xslns.mk

diff --git a/xsl/Makefile.incl b/xsl/Makefile.incl
index 83c89be91c4267565e99d8090f4eee0ece69376c..a9fd472f395a2585f8bbfd59f3869e6181ccc346 100644 (file)
--- a/xsl/Makefile.incl
+++ b/xsl/Makefile.incl
@@ -37,12 +37,12 @@ $(PARAMBASE).xml: $(PARAMXMLID)
 
 $(PARAMXMLID): $(PARAMSTRIP)
 ifneq ($(XSLTENGINE),saxon)
-       $(XSLT) $< $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@
+       $(XSLT) $< $(repo_dir)/releasetools/w2docbook.xsl $@
 else
 ifneq ($(shell uname -s | grep -i cygwin),)
        $(XSLT) $< $(NESTLEVEL)../../releasetools/w2docbook.xsl $@.tmp
 else
-       $(XSLT) $< $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@.tmp
+       $(XSLT) $< $(repo_dir)/releasetools/w2docbook.xsl $@.tmp
 endif
        $(XSLT) $@.tmp $(ADDNEWLINE) $@
        $(RM) $@.tmp
@@ -54,10 +54,10 @@ ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
        $(NESTLEVEL)../../buildtools/paramchk -m Makefile.param $<
 else
-       $(DOCBOOK_SVN)/buildtools/paramchk -m Makefile.param $<
+       $(repo_dir)/buildtools/paramchk -m Makefile.param $<
 endif
 else
-       $(DOCBOOK_SVN)/buildtools/paramchk -m Makefile.param $<
+       $(repo_dir)/buildtools/paramchk -m Makefile.param $<
 endif
 endif
        $(XSLT) $< $(NESTLEVEL)../profiling/profile.xsl $(PARAMPROF) profile.condition=$(PROFILECONDITION)
@@ -69,10 +69,10 @@ ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
        $(XSLT) $< $(NESTLEVEL)../../releasetools/xtangle.xsl $@
 else
-       $(XSLT) $< $(DOCBOOK_SVN)/releasetools/xtangle.xsl $@
+       $(XSLT) $< $(repo_dir)/releasetools/xtangle.xsl $@
 endif
 else
-       $(XSLT) $< $(DOCBOOK_SVN)/releasetools/xtangle.xsl $@
+       $(XSLT) $< $(repo_dir)/releasetools/xtangle.xsl $@
 endif
 
 
@@ -89,10 +89,10 @@ ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
        $(NESTLEVEL)../../buildtools/paramchk -m $@ param.xweb
 else
-       $(DOCBOOK_SVN)/buildtools/paramchk -m $@ param.xweb
+       $(repo_dir)/buildtools/paramchk -m $@ param.xweb
 endif
 else
-       $(DOCBOOK_SVN)/buildtools/paramchk -m $@ param.xweb
+       $(repo_dir)/buildtools/paramchk -m $@ param.xweb
 endif
        $(MAKE)
 

diff --git a/xsl/README.BUILD b/xsl/README.BUILD
index e48c951a156101372ec99ebda36be74a7ef971b4..7b7971e5ede52b0f44fe9d4b89fc2c1ed61d6322 100644 (file)
--- a/xsl/README.BUILD
+++ b/xsl/README.BUILD
@@ -106,7 +106,7 @@ contributions welcome...
    following in it:
 
      # directory that is base directory for all your DocBook modules
-     export DOCBOOK_SVN=/opt/sandbox/docbook/trunk
+     export repo_dir=/opt/sandbox/docbook/trunk
      # directory containing all your jar files
      export JARDIR=/usr/share/java
      export CLASSPATH=$CLASSPATH:$JARDIR/xml-commons-resolver-1.1.jar
@@ -224,11 +224,11 @@ and all other Parts following it).
 
      rm -f DOCBOOK-BUILD.LOG && \
      . ~/docbk.sh && \
-     $DOCBOOK_SVN/buildtools/build-clean && \
+     $repo_dir/buildtools/build-clean && \
      make all 2>&1 \
        XSLTENGINE=xsltproc \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG
 
    The preceding will cause the following:
 
@@ -258,7 +258,7 @@ and all other Parts following it).
      make check 2>&1 \
        XSLTENGINE=xsltproc \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG
 
    After running with "xsltproc", you should run it again with
    "saxon":
@@ -267,7 +267,7 @@ and all other Parts following it).
      make check 2>&1 \
        XSLTENGINE=saxon \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG
 
 4. Fix any obvious problems.
    If build-check and/or "make check" report any problems, fix
@@ -345,18 +345,18 @@ the stylesheets -- then you can ignore this "Part 2" section; the
 
      rm -f DOCBOOK-BUILD.LOG && \
      . ~/docbk.sh && \
-     $DOCBOOK_SVN/buildtools/build-clean && \
+     $repo_dir/buildtools/build-clean && \
      make all 2>&1 \
        XSLTENGINE=xsltproc \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/releasetools/catalog-install && \
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG && \
+     $repo_dir/releasetools/catalog-install && \
      make distrib 2>&1 \
        XSLTENGINE=xsltproc \
        PDF_MAKER=dblatex \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/releasetools/catalog-install uninstall && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG
+     $repo_dir/releasetools/catalog-install uninstall && \
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG
 
    The above first runs a "make all" build, and if that succeeds
    without any errors, then runs a "make distrib" build.
@@ -461,18 +461,18 @@ you're not a project member, you can safely ignore this part.
 
      rm -f DOCBOOK-BUILD.LOG && \
      . ~/docbk.sh && \
-     $DOCBOOK_SVN/buildtools/build-clean && \
+     $repo_dir/buildtools/build-clean && \
      make all 2>&1 \
        XSLTENGINE=xsltproc \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/releasetools/catalog-install && \
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG && \
+     $repo_dir/releasetools/catalog-install && \
      make release 2>&1 \
        XSLTENGINE=xsltproc \
        PDF_MAKER=dblatex \
        | tee DOCBOOK-BUILD.LOG && \
-     $DOCBOOK_SVN/releasetools/catalog-install uninstall && \
-     $DOCBOOK_SVN/buildtools/build-check DOCBOOK-BUILD.LOG; \
+     $repo_dir/releasetools/catalog-install uninstall && \
+     $repo_dir/buildtools/build-check DOCBOOK-BUILD.LOG; \
      rm -f DOCBOOK-BUILD.LOG
 
    In addition to the normal error-checking that build-check

diff --git a/xsl/RELEASE-NOTES.xml b/xsl/RELEASE-NOTES.xml
index 341fb7f0f4a8ba0096c35f4a1f29ae25666cdff7..153e18dd6418f0d21e7131cd7e983020ed8d22a3 100644 (file)
--- a/xsl/RELEASE-NOTES.xml
+++ b/xsl/RELEASE-NOTES.xml
@@ -4770,7 +4770,7 @@ HTML build.</phrase></screen>
             <filename>extensions</filename> code
             since the 1.73.2 release.</para>
 <itemizedlist>
-<listitem> <para><literal>Keith Fahlgren: Makefile</literal></para><screen><phrase role="commit-message">Use DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER</phrase></screen> </listitem>
+<listitem> <para><literal>Keith Fahlgren: Makefile</literal></para><screen><phrase role="commit-message">Use repo_dir variable everywhere, please; build with PDF_MAKER</phrase></screen> </listitem>
 <listitem>
 <para><literal>Michael(tm) Smith: Makefile</literal></para><screen><phrase role="commit-message">moved extensions build targets from master xsl/Makefile to
 xsl/extensions/Makefile</phrase></screen>

diff --git a/xsl/common/Makefile b/xsl/common/Makefile
index 0e6affd57249f31c92684e553adbf2ad821faada..c4d798b512e25a37d42828e899c9477ce5b5aecd 100644 (file)
--- a/xsl/common/Makefile
+++ b/xsl/common/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 SOURCES=af.xml am.xml ar.xml as.xml ast.xml az.xml bg.xml bn.xml bn_in.xml bs.xml \
        ca.xml cs.xml cy.xml da.xml de.xml el.xml en.xml eo.xml es.xml et.xml eu.xml \
@@ -9,87 +9,87 @@ SOURCES=af.xml am.xml ar.xml as.xml ast.xml az.xml bg.xml bn.xml bn_in.xml bs.xm
        ta.xml te.xml th.xml tl.xml tr.xml uk.xml ur.xml vi.xml xh.xml zh.xml zh_cn.xml \
        zh_tw.xml
 
-GENSTYLE=$(DOCBOOK_SVN)/gentext/xsl/xsl.xsl $(DOCBOOK_SVN)/gentext/locale/en.xml
+GENSTYLE=$(repo_dir)/gentext/xsl/xsl.xsl $(repo_dir)/gentext/locale/en.xml
 
 all: $(SOURCES)
 
-af.xml: $(DOCBOOK_SVN)/gentext/locale/af.xml $(GENSTYLE)
-am.xml: $(DOCBOOK_SVN)/gentext/locale/am.xml $(GENSTYLE)
-ar.xml: $(DOCBOOK_SVN)/gentext/locale/ar.xml $(GENSTYLE)
-as.xml: $(DOCBOOK_SVN)/gentext/locale/as.xml $(GENSTYLE)
-ast.xml: $(DOCBOOK_SVN)/gentext/locale/ast.xml $(GENSTYLE)
-az.xml: $(DOCBOOK_SVN)/gentext/locale/az.xml $(GENSTYLE)
-bg.xml: $(DOCBOOK_SVN)/gentext/locale/bg.xml $(GENSTYLE)
-bn.xml: $(DOCBOOK_SVN)/gentext/locale/bn.xml $(GENSTYLE)
-bn_in.xml: $(DOCBOOK_SVN)/gentext/locale/bn_in.xml $(GENSTYLE)
-bs.xml: $(DOCBOOK_SVN)/gentext/locale/bs.xml $(GENSTYLE)
-ca.xml: $(DOCBOOK_SVN)/gentext/locale/ca.xml $(GENSTYLE)
-cs.xml: $(DOCBOOK_SVN)/gentext/locale/cs.xml $(GENSTYLE)
-cy.xml: $(DOCBOOK_SVN)/gentext/locale/cy.xml $(GENSTYLE)
-da.xml: $(DOCBOOK_SVN)/gentext/locale/da.xml $(GENSTYLE)
-de.xml: $(DOCBOOK_SVN)/gentext/locale/de.xml $(GENSTYLE)
-el.xml: $(DOCBOOK_SVN)/gentext/locale/el.xml $(GENSTYLE)
-en.xml: $(DOCBOOK_SVN)/gentext/locale/en.xml $(GENSTYLE)
-eo.xml: $(DOCBOOK_SVN)/gentext/locale/eo.xml $(GENSTYLE)
-es.xml: $(DOCBOOK_SVN)/gentext/locale/es.xml $(GENSTYLE)
-et.xml: $(DOCBOOK_SVN)/gentext/locale/et.xml $(GENSTYLE)
-eu.xml: $(DOCBOOK_SVN)/gentext/locale/eu.xml $(GENSTYLE)
-fa.xml: $(DOCBOOK_SVN)/gentext/locale/fa.xml $(GENSTYLE)
-fi.xml: $(DOCBOOK_SVN)/gentext/locale/fi.xml $(GENSTYLE)
-fr.xml: $(DOCBOOK_SVN)/gentext/locale/fr.xml $(GENSTYLE)
-ga.xml: $(DOCBOOK_SVN)/gentext/locale/ga.xml $(GENSTYLE)
-gl.xml: $(DOCBOOK_SVN)/gentext/locale/gl.xml $(GENSTYLE)
-gu.xml: $(DOCBOOK_SVN)/gentext/locale/gu.xml $(GENSTYLE)
-he.xml: $(DOCBOOK_SVN)/gentext/locale/he.xml $(GENSTYLE)
-hi.xml: $(DOCBOOK_SVN)/gentext/locale/hi.xml $(GENSTYLE)
-hr.xml: $(DOCBOOK_SVN)/gentext/locale/hr.xml $(GENSTYLE)
-hu.xml: $(DOCBOOK_SVN)/gentext/locale/hu.xml $(GENSTYLE)
-id.xml: $(DOCBOOK_SVN)/gentext/locale/id.xml $(GENSTYLE)
-is.xml: $(DOCBOOK_SVN)/gentext/locale/is.xml $(GENSTYLE)
-it.xml: $(DOCBOOK_SVN)/gentext/locale/it.xml $(GENSTYLE)
-ja.xml: $(DOCBOOK_SVN)/gentext/locale/ja.xml $(GENSTYLE)
-ka.xml: $(DOCBOOK_SVN)/gentext/locale/ka.xml $(GENSTYLE)
-kn.xml: $(DOCBOOK_SVN)/gentext/locale/kn.xml $(GENSTYLE)
-ko.xml: $(DOCBOOK_SVN)/gentext/locale/ko.xml $(GENSTYLE)
-ky.xml: $(DOCBOOK_SVN)/gentext/locale/ky.xml $(GENSTYLE)
-la.xml: $(DOCBOOK_SVN)/gentext/locale/la.xml $(GENSTYLE)
-lt.xml: $(DOCBOOK_SVN)/gentext/locale/lt.xml $(GENSTYLE)
-lv.xml: $(DOCBOOK_SVN)/gentext/locale/lv.xml $(GENSTYLE)
-ml.xml: $(DOCBOOK_SVN)/gentext/locale/ml.xml $(GENSTYLE)
-mn.xml: $(DOCBOOK_SVN)/gentext/locale/mn.xml $(GENSTYLE)
-mr.xml: $(DOCBOOK_SVN)/gentext/locale/mr.xml $(GENSTYLE)
-nb.xml: $(DOCBOOK_SVN)/gentext/locale/nb.xml $(GENSTYLE)
-nds.xml: $(DOCBOOK_SVN)/gentext/locale/nds.xml $(GENSTYLE)
-nl.xml: $(DOCBOOK_SVN)/gentext/locale/nl.xml $(GENSTYLE)
-nn.xml: $(DOCBOOK_SVN)/gentext/locale/nn.xml $(GENSTYLE)
-or.xml: $(DOCBOOK_SVN)/gentext/locale/or.xml $(GENSTYLE)
-pa.xml: $(DOCBOOK_SVN)/gentext/locale/pa.xml $(GENSTYLE)
-pl.xml: $(DOCBOOK_SVN)/gentext/locale/pl.xml $(GENSTYLE)
-pt.xml: $(DOCBOOK_SVN)/gentext/locale/pt.xml $(GENSTYLE)
-pt_br.xml: $(DOCBOOK_SVN)/gentext/locale/pt_br.xml $(GENSTYLE)
-ro.xml: $(DOCBOOK_SVN)/gentext/locale/ro.xml $(GENSTYLE)
-ru.xml: $(DOCBOOK_SVN)/gentext/locale/ru.xml $(GENSTYLE)
-sk.xml: $(DOCBOOK_SVN)/gentext/locale/sk.xml $(GENSTYLE)
-sl.xml: $(DOCBOOK_SVN)/gentext/locale/sl.xml $(GENSTYLE)
-sq.xml: $(DOCBOOK_SVN)/gentext/locale/sq.xml $(GENSTYLE)
-sr.xml: $(DOCBOOK_SVN)/gentext/locale/sr.xml $(GENSTYLE)
-sr_Latn.xml: $(DOCBOOK_SVN)/gentext/locale/sr_Latn.xml $(GENSTYLE)
-sv.xml: $(DOCBOOK_SVN)/gentext/locale/sv.xml $(GENSTYLE)
-ta.xml: $(DOCBOOK_SVN)/gentext/locale/ta.xml $(GENSTYLE)
-te.xml: $(DOCBOOK_SVN)/gentext/locale/te.xml $(GENSTYLE)
-th.xml: $(DOCBOOK_SVN)/gentext/locale/th.xml $(GENSTYLE)
-tl.xml: $(DOCBOOK_SVN)/gentext/locale/tl.xml $(GENSTYLE)
-tr.xml: $(DOCBOOK_SVN)/gentext/locale/tr.xml $(GENSTYLE)
-uk.xml: $(DOCBOOK_SVN)/gentext/locale/uk.xml $(GENSTYLE)
-ur.xml: $(DOCBOOK_SVN)/gentext/locale/ur.xml $(GENSTYLE)
-vi.xml: $(DOCBOOK_SVN)/gentext/locale/vi.xml $(GENSTYLE)
-xh.xml: $(DOCBOOK_SVN)/gentext/locale/xh.xml $(GENSTYLE)
-zh.xml: $(DOCBOOK_SVN)/gentext/locale/zh.xml $(GENSTYLE)
-zh_cn.xml: $(DOCBOOK_SVN)/gentext/locale/zh_cn.xml $(GENSTYLE)
-zh_tw.xml: $(DOCBOOK_SVN)/gentext/locale/zh_tw.xml $(GENSTYLE)
+af.xml: $(repo_dir)/gentext/locale/af.xml $(GENSTYLE)
+am.xml: $(repo_dir)/gentext/locale/am.xml $(GENSTYLE)
+ar.xml: $(repo_dir)/gentext/locale/ar.xml $(GENSTYLE)
+as.xml: $(repo_dir)/gentext/locale/as.xml $(GENSTYLE)
+ast.xml: $(repo_dir)/gentext/locale/ast.xml $(GENSTYLE)
+az.xml: $(repo_dir)/gentext/locale/az.xml $(GENSTYLE)
+bg.xml: $(repo_dir)/gentext/locale/bg.xml $(GENSTYLE)
+bn.xml: $(repo_dir)/gentext/locale/bn.xml $(GENSTYLE)
+bn_in.xml: $(repo_dir)/gentext/locale/bn_in.xml $(GENSTYLE)
+bs.xml: $(repo_dir)/gentext/locale/bs.xml $(GENSTYLE)
+ca.xml: $(repo_dir)/gentext/locale/ca.xml $(GENSTYLE)
+cs.xml: $(repo_dir)/gentext/locale/cs.xml $(GENSTYLE)
+cy.xml: $(repo_dir)/gentext/locale/cy.xml $(GENSTYLE)
+da.xml: $(repo_dir)/gentext/locale/da.xml $(GENSTYLE)
+de.xml: $(repo_dir)/gentext/locale/de.xml $(GENSTYLE)
+el.xml: $(repo_dir)/gentext/locale/el.xml $(GENSTYLE)
+en.xml: $(repo_dir)/gentext/locale/en.xml $(GENSTYLE)
+eo.xml: $(repo_dir)/gentext/locale/eo.xml $(GENSTYLE)
+es.xml: $(repo_dir)/gentext/locale/es.xml $(GENSTYLE)
+et.xml: $(repo_dir)/gentext/locale/et.xml $(GENSTYLE)
+eu.xml: $(repo_dir)/gentext/locale/eu.xml $(GENSTYLE)
+fa.xml: $(repo_dir)/gentext/locale/fa.xml $(GENSTYLE)
+fi.xml: $(repo_dir)/gentext/locale/fi.xml $(GENSTYLE)
+fr.xml: $(repo_dir)/gentext/locale/fr.xml $(GENSTYLE)
+ga.xml: $(repo_dir)/gentext/locale/ga.xml $(GENSTYLE)
+gl.xml: $(repo_dir)/gentext/locale/gl.xml $(GENSTYLE)
+gu.xml: $(repo_dir)/gentext/locale/gu.xml $(GENSTYLE)
+he.xml: $(repo_dir)/gentext/locale/he.xml $(GENSTYLE)
+hi.xml: $(repo_dir)/gentext/locale/hi.xml $(GENSTYLE)
+hr.xml: $(repo_dir)/gentext/locale/hr.xml $(GENSTYLE)
+hu.xml: $(repo_dir)/gentext/locale/hu.xml $(GENSTYLE)
+id.xml: $(repo_dir)/gentext/locale/id.xml $(GENSTYLE)
+is.xml: $(repo_dir)/gentext/locale/is.xml $(GENSTYLE)
+it.xml: $(repo_dir)/gentext/locale/it.xml $(GENSTYLE)
+ja.xml: $(repo_dir)/gentext/locale/ja.xml $(GENSTYLE)
+ka.xml: $(repo_dir)/gentext/locale/ka.xml $(GENSTYLE)
+kn.xml: $(repo_dir)/gentext/locale/kn.xml $(GENSTYLE)
+ko.xml: $(repo_dir)/gentext/locale/ko.xml $(GENSTYLE)
+ky.xml: $(repo_dir)/gentext/locale/ky.xml $(GENSTYLE)
+la.xml: $(repo_dir)/gentext/locale/la.xml $(GENSTYLE)
+lt.xml: $(repo_dir)/gentext/locale/lt.xml $(GENSTYLE)
+lv.xml: $(repo_dir)/gentext/locale/lv.xml $(GENSTYLE)
+ml.xml: $(repo_dir)/gentext/locale/ml.xml $(GENSTYLE)
+mn.xml: $(repo_dir)/gentext/locale/mn.xml $(GENSTYLE)
+mr.xml: $(repo_dir)/gentext/locale/mr.xml $(GENSTYLE)
+nb.xml: $(repo_dir)/gentext/locale/nb.xml $(GENSTYLE)
+nds.xml: $(repo_dir)/gentext/locale/nds.xml $(GENSTYLE)
+nl.xml: $(repo_dir)/gentext/locale/nl.xml $(GENSTYLE)
+nn.xml: $(repo_dir)/gentext/locale/nn.xml $(GENSTYLE)
+or.xml: $(repo_dir)/gentext/locale/or.xml $(GENSTYLE)
+pa.xml: $(repo_dir)/gentext/locale/pa.xml $(GENSTYLE)
+pl.xml: $(repo_dir)/gentext/locale/pl.xml $(GENSTYLE)
+pt.xml: $(repo_dir)/gentext/locale/pt.xml $(GENSTYLE)
+pt_br.xml: $(repo_dir)/gentext/locale/pt_br.xml $(GENSTYLE)
+ro.xml: $(repo_dir)/gentext/locale/ro.xml $(GENSTYLE)
+ru.xml: $(repo_dir)/gentext/locale/ru.xml $(GENSTYLE)
+sk.xml: $(repo_dir)/gentext/locale/sk.xml $(GENSTYLE)
+sl.xml: $(repo_dir)/gentext/locale/sl.xml $(GENSTYLE)
+sq.xml: $(repo_dir)/gentext/locale/sq.xml $(GENSTYLE)
+sr.xml: $(repo_dir)/gentext/locale/sr.xml $(GENSTYLE)
+sr_Latn.xml: $(repo_dir)/gentext/locale/sr_Latn.xml $(GENSTYLE)
+sv.xml: $(repo_dir)/gentext/locale/sv.xml $(GENSTYLE)
+ta.xml: $(repo_dir)/gentext/locale/ta.xml $(GENSTYLE)
+te.xml: $(repo_dir)/gentext/locale/te.xml $(GENSTYLE)
+th.xml: $(repo_dir)/gentext/locale/th.xml $(GENSTYLE)
+tl.xml: $(repo_dir)/gentext/locale/tl.xml $(GENSTYLE)
+tr.xml: $(repo_dir)/gentext/locale/tr.xml $(GENSTYLE)
+uk.xml: $(repo_dir)/gentext/locale/uk.xml $(GENSTYLE)
+ur.xml: $(repo_dir)/gentext/locale/ur.xml $(GENSTYLE)
+vi.xml: $(repo_dir)/gentext/locale/vi.xml $(GENSTYLE)
+xh.xml: $(repo_dir)/gentext/locale/xh.xml $(GENSTYLE)
+zh.xml: $(repo_dir)/gentext/locale/zh.xml $(GENSTYLE)
+zh_cn.xml: $(repo_dir)/gentext/locale/zh_cn.xml $(GENSTYLE)
+zh_tw.xml: $(repo_dir)/gentext/locale/zh_tw.xml $(GENSTYLE)
 
 %.xml:
-       $(XSLT) $(DOCBOOK_SVN)/gentext/locale/en.xml $(DOCBOOK_SVN)/gentext/xsl/xsl.xsl $@ locale.file=$@
+       $(XSLT) $(repo_dir)/gentext/locale/en.xml $(repo_dir)/gentext/xsl/xsl.xsl $@ locale.file=$@
 
 clean:
        $(RM) $(SOURCES)

diff --git a/xsl/doc/Makefile b/xsl/doc/Makefile
index 76421b0f4e8a34a3b45daedcf5d1b4c244fa0c87..9280df6648603a0f59961138092e4f0944ce7563 100644 (file)
--- a/xsl/doc/Makefile
+++ b/xsl/doc/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/releasetools/Variables.mk
+include $(repo_dir)/releasetools/Variables.mk
 
 XJPARSEFLAGS= -E 0 -w
 FO_BUILDER=saxon
@@ -40,7 +40,7 @@ DIRS=common fo html lib manpages pi refentry roundtrip slides template utility w
 # otherwise, xsltproc reports duplicate ID errors...
 %.included: %
        $(XINCLUDE) $< > $@.tmp
-       $(DOCBOOK_SVN)/buildtools/saxon $@.tmp $(XMLID_TO_ID) > $@
+       $(repo_dir)/buildtools/saxon $@.tmp $(XMLID_TO_ID) > $@
        $(RM) $@.tmp
 
 # build reference.pdf.gz except for snapshot and "-pre" releases
@@ -65,7 +65,7 @@ reference.css: ../docsrc/reference.css
        for dir in $(DIRS); do cp -p $< $$dir; done
 
 reference.fo: ../docsrc/reference.xml.included $(REFERENCEFOXSL) fo/page.png $(DOC_SOURCE_XML_FILES)
-       $(DOCBOOK_SVN)/buildtools/xslt -$(FO_BUILDER) $< $(REFERENCEFOXSL) > $@
+       $(repo_dir)/buildtools/xslt -$(FO_BUILDER) $< $(REFERENCEFOXSL) > $@
 
 reference.pdf: reference.fo
 ifeq ($(PDF_MAKER),dblatex)

diff --git a/xsl/docsrc/Makefile b/xsl/docsrc/Makefile
index 512d68cb2ed96ddbf5c1af4ac9c2edcad812e561..0c4af81626a4981b752b716dc559860dc89f6837 100644 (file)
--- a/xsl/docsrc/Makefile
+++ b/xsl/docsrc/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/releasetools/Variables.mk
+include $(repo_dir)/releasetools/Variables.mk
 
 XJPARSEFLAGS= -E 0 -w
 
@@ -13,10 +13,10 @@ ifneq ($(shell uname -s | grep -i cygwin),)
 ifeq ($(XSLTENGINE),saxon)
 DOCBOOK_RNG=../../releasetools/docbook.rng
 else
-DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
+DOCBOOK_RNG=$(repo_dir)/releasetools/docbook.rng
 endif
 else
-DOCBOOK_RNG=$(DOCBOOK_SVN)/releasetools/docbook.rng
+DOCBOOK_RNG=$(repo_dir)/releasetools/docbook.rng
 endif
 PARAM_XSL_FILES=$(foreach format,$(PARAM_DIRS),../$(format)/param.xsl)
 PI_XSL_FILES=$(foreach format,$(PI_DIRS),../$(format)/pi.xsl)

diff --git a/xsl/eclipse/Makefile b/xsl/eclipse/Makefile
index cd0233e9cc5104aba52c09b270ea3a49216aca1b..a737880bc16b96d473bdd17cbe00c7030e2270cd 100644 (file)
--- a/xsl/eclipse/Makefile
+++ b/xsl/eclipse/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 all: profile-eclipse.xsl
 
 profile-eclipse.xsl: eclipse.xsl ../profiling/xsl2profile.xsl

diff --git a/xsl/epub/bin/spec/README b/xsl/epub/bin/spec/README
index 033e132352c82de92c46d9759eb018ad52e3868e..ffbefeed1614da2061aa29677b894f3d4412781e 100644 (file)
--- a/xsl/epub/bin/spec/README
+++ b/xsl/epub/bin/spec/README
@@ -43,7 +43,7 @@ Environment
 
 Before running the test suite you must check out (all of) 
 https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/ and set the
-environment variable DOCBOOK_SVN to the location of the checkout.
+environment variable repo_dir to the location of the checkout.
 
 
 Running tests

diff --git a/xsl/epub/bin/spec/epub_regressions_spec.rb b/xsl/epub/bin/spec/epub_regressions_spec.rb
index 85ecd7c525c778c4d10ae7e8647bcb035b6d8e0d..b4938a38505a53f3015ef4091d2071e94263755b 100755 (executable)
--- a/xsl/epub/bin/spec/epub_regressions_spec.rb
+++ b/xsl/epub/bin/spec/epub_regressions_spec.rb
@@ -21,7 +21,7 @@ $DEBUG = false
 describe DocBook::Epub do
   before(:all) do
     @filedir = File.expand_path(File.join(File.dirname(__FILE__), 'files'))
-    @testdocsdir = File.expand_path(File.join(ENV['DOCBOOK_SVN'], 'testdocs', 'tests'))
+    @testdocsdir = File.expand_path(File.join(ENV['repo_dir'], 'testdocs', 'tests'))
     @tmpdir = File.join(Dir::tmpdir(), "epubregressions"); Dir.mkdir(@tmpdir) rescue Errno::EEXIST
   end
 

diff --git a/xsl/epub/bin/spec/epub_small_smoketest.rb b/xsl/epub/bin/spec/epub_small_smoketest.rb
index 6834792a50d7948ee3a765b7b83ab7267bc9e106..59f6af506da4a45f90ca2d039445246d266bab22 100755 (executable)
--- a/xsl/epub/bin/spec/epub_small_smoketest.rb
+++ b/xsl/epub/bin/spec/epub_small_smoketest.rb
@@ -16,7 +16,7 @@ require 'docbook'
 
 $DEBUG = false
 
-TESTDOCSDIR = File.expand_path(File.join(ENV['DOCBOOK_SVN'], 'testdocs', 'tests'))
+TESTDOCSDIR = File.expand_path(File.join(ENV['repo_dir'], 'testdocs', 'tests'))
 NUMBER_TO_TEST = 15
 
 describe DocBook::Epub do

diff --git a/xsl/epub/bin/spec/epub_smoketest_spec.rb b/xsl/epub/bin/spec/epub_smoketest_spec.rb
index 9d81469a33c6ef4d9942bfa81b4c87b3388fcf01..9e560f7bd5bc16935d84d01770fdd51123687761 100755 (executable)
--- a/xsl/epub/bin/spec/epub_smoketest_spec.rb
+++ b/xsl/epub/bin/spec/epub_smoketest_spec.rb
@@ -17,7 +17,7 @@ require 'docbook'
 
 $DEBUG = false
 
-TESTDOCSDIR = File.expand_path(File.join(ENV['DOCBOOK_SVN'], 'testdocs', 'tests'))
+TESTDOCSDIR = File.expand_path(File.join(ENV['repo_dir'], 'testdocs', 'tests'))
 
 describe DocBook::Epub do
 

diff --git a/xsl/epub/bin/spec/epub_spec.rb b/xsl/epub/bin/spec/epub_spec.rb
index 7dac5faeccecf1bfa137a42e5aee396057bba3ed..af3829bfa034a77b79cbcb63566c108a0b159e2a 100755 (executable)
--- a/xsl/epub/bin/spec/epub_spec.rb
+++ b/xsl/epub/bin/spec/epub_spec.rb
@@ -20,7 +20,7 @@ $DEBUG = false
 describe DocBook::Epub do
   before(:all) do
     @filedir = File.expand_path(File.join(File.dirname(__FILE__), 'files'))
-    @testdocsdir = File.expand_path(File.join(ENV['DOCBOOK_SVN'], 'testdocs', 'tests'))
+    @testdocsdir = File.expand_path(File.join(ENV['repo_dir'], 'testdocs', 'tests'))
     exampledir = File.expand_path(File.join(File.dirname(__FILE__), 'examples'))
     @valid_epub = File.join(exampledir, "AMasqueOfDays.epub")
     @tmpdir = File.join(Dir::tmpdir(), "epubspec"); Dir.mkdir(@tmpdir) rescue Errno::EEXIST

diff --git a/xsl/epub3/Makefile b/xsl/epub3/Makefile
index 05b4fa235f40cb4deb17b34979783d24dfadb646..e7a9ce7988da3d81cc97c12508207b238ce255f0 100644 (file)
--- a/xsl/epub3/Makefile
+++ b/xsl/epub3/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl\r
+include $(repo_dir)/buildtools/Makefile.incl\r
 \r
 TARGETNS=http://www.w3.org/1999/xhtml\r
 \r

diff --git a/xsl/extensions/Makefile b/xsl/extensions/Makefile
index c65d4bb0926255c45b7fd1abe8cf231190b0994b..2bafdd83683ee30efa731a5de89dea8a612cde93 100644 (file)
--- a/xsl/extensions/Makefile
+++ b/xsl/extensions/Makefile
@@ -2,33 +2,33 @@
 
 all: saxon65.jar xalan27.jar webhelpindexer.jar xslt.py docbook.py README.LIBXSLT
 
-saxon65.jar: $(DOCBOOK_SVN)/xsl-saxon/saxon65.jar
+saxon65.jar: $(repo_dir)/xsl-saxon/saxon65.jar
        cp -p $^ $@
 
-xalan27.jar: $(DOCBOOK_SVN)/xsl-xalan/xalan27.jar
+xalan27.jar: $(repo_dir)/xsl-xalan/xalan27.jar
        cp -p $^ $@
 
-webhelpindexer.jar: $(DOCBOOK_SVN)/xsl-webhelpindexer/webhelpindexer.jar
+webhelpindexer.jar: $(repo_dir)/xsl-webhelpindexer/webhelpindexer.jar
        cp -p $^ $@
-       cp -p $(DOCBOOK_SVN)/xsl-webhelpindexer/lib/*.jar .
-       cp -p $(DOCBOOK_SVN)/xsl-webhelpindexer/*.txt .
+       cp -p $(repo_dir)/xsl-webhelpindexer/lib/*.jar .
+       cp -p $(repo_dir)/xsl-webhelpindexer/*.txt .
 
-$(DOCBOOK_SVN)/xsl-saxon/saxon65.jar: $(wildcard $(DOCBOOK_SVN)/xsl-saxon/src/com/nwalsh/saxon/*.java) 
+$(repo_dir)/xsl-saxon/saxon65.jar: $(wildcard $(repo_dir)/xsl-saxon/src/com/nwalsh/saxon/*.java) 
        $(MAKE) -C $(dir $@)
 
-$(DOCBOOK_SVN)/xsl-xalan/xalan27.jar: $(wildcard $(DOCBOOK_SVN)/xsl-xalan/src/com/nwalsh/xalan/*.java) 
+$(repo_dir)/xsl-xalan/xalan27.jar: $(wildcard $(repo_dir)/xsl-xalan/src/com/nwalsh/xalan/*.java) 
        $(MAKE) -C $(dir $@)
 
-$(DOCBOOK_SVN)/xsl-webhelpindexer/webhelpindexer.jar: $(wildcard $(DOCBOOK_SVN)/xsl-webhelpindexer/src/com/nexwave/*/*.java) 
+$(repo_dir)/xsl-webhelpindexer/webhelpindexer.jar: $(wildcard $(repo_dir)/xsl-webhelpindexer/src/com/nexwave/*/*.java) 
        $(MAKE) -C $(dir $@)
 
-xslt.py: $(DOCBOOK_SVN)/xsl-libxslt/python/xslt.py
+xslt.py: $(repo_dir)/xsl-libxslt/python/xslt.py
        cp -p $^ $@
 
-docbook.py: $(DOCBOOK_SVN)/xsl-libxslt/python/docbook.py
+docbook.py: $(repo_dir)/xsl-libxslt/python/docbook.py
        cp -p $^ $@
 
-README.LIBXSLT: $(DOCBOOK_SVN)/xsl-libxslt/python/README.LIBXSLT
+README.LIBXSLT: $(repo_dir)/xsl-libxslt/python/README.LIBXSLT
        cp -p $^ $@
 
 clean:

diff --git a/xsl/fo/Makefile b/xsl/fo/Makefile
index 90e93330730ce43c6a9151a7ced991b1c14f4743..685936f3767f5ce08d88e49c3f35e036753cc8fa 100644 (file)
--- a/xsl/fo/Makefile
+++ b/xsl/fo/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl profile-docbook.xsl

diff --git a/xsl/html/Makefile b/xsl/html/Makefile
index 7c3f025b43c1c88c7fe7978c3577b01155236fe9..d62dc894c9482a8069924a0d7167b187b2c3cf86 100644 (file)
--- a/xsl/html/Makefile
+++ b/xsl/html/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl profile-docbook.xsl profile-chunk-code.xsl
@@ -14,10 +14,10 @@ ifeq ($(XSLTENGINE),saxon)
 profile-chunk-code.xsl: chunk-code.xsl ../profiling/xsl2profile.xsl
        $(XSLT) $< ../profiling/xsl2profile.xsl $@
 else
-profile-chunk-code.xsl: chunk-code.xsl $(DOCBOOK_SVN)/xsl/profiling/xsl2profile.xsl
-       $(XSLT) $< $(DOCBOOK_SVN)/xsl/profiling/xsl2profile.xsl $@
+profile-chunk-code.xsl: chunk-code.xsl $(repo_dir)/xsl/profiling/xsl2profile.xsl
+       $(XSLT) $< $(repo_dir)/xsl/profiling/xsl2profile.xsl $@
 endif
 else
-profile-chunk-code.xsl: chunk-code.xsl $(DOCBOOK_SVN)/xsl/profiling/xsl2profile.xsl
-       $(XSLT) $< $(DOCBOOK_SVN)/xsl/profiling/xsl2profile.xsl $@
+profile-chunk-code.xsl: chunk-code.xsl $(repo_dir)/xsl/profiling/xsl2profile.xsl
+       $(XSLT) $< $(repo_dir)/xsl/profiling/xsl2profile.xsl $@
 endif

diff --git a/xsl/htmlhelp/Makefile b/xsl/htmlhelp/Makefile
index ddf55a96d28dd73377a28bcc5ca87dcd84bbef80..37a94dd3aae074338a7a3b8834d80b3872654de5 100644 (file)
--- a/xsl/htmlhelp/Makefile
+++ b/xsl/htmlhelp/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 all: profile-htmlhelp-common.xsl
 
 profile-htmlhelp-common.xsl: htmlhelp-common.xsl ../profiling/xsl2profile.xsl

diff --git a/xsl/javahelp/Makefile b/xsl/javahelp/Makefile
index 14675b21c3464e894610851ed4c0228d134f6c64..e876b527441a041ed53a1802bdc4eb0819162f27 100644 (file)
--- a/xsl/javahelp/Makefile
+++ b/xsl/javahelp/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 all: profile-javahelp.xsl
 
 profile-javahelp.xsl: javahelp.xsl ../profiling/xsl2profile.xsl

diff --git a/xsl/lib/Makefile b/xsl/lib/Makefile
index 749dac67caa29c773b563cee4816cd9a9545954c..282bb18c7f098c51650d706beae6ebf1128d2405 100644 (file)
--- a/xsl/lib/Makefile
+++ b/xsl/lib/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 PARAMBASE=lib
 XSLFILES=lib.xsl

diff --git a/xsl/manpages/Makefile b/xsl/manpages/Makefile
index 6b045d74a6f7ebbb1054e9d1704e0c2f14e0b4ae..00d23ca00eafdb86ecec2dd43779703ba1f2c6c6 100644 (file)
--- a/xsl/manpages/Makefile
+++ b/xsl/manpages/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl profile-docbook.xsl html-synop.xsl

diff --git a/xsl/roundtrip/Makefile b/xsl/roundtrip/Makefile
index 1a921af64983e8e4cb542760eee2b4813a15b68e..7e3c9717a7a0d13685a7e47f2efcce49409f05ac 100644 (file)
--- a/xsl/roundtrip/Makefile
+++ b/xsl/roundtrip/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl

diff --git a/xsl/tests/Makefile b/xsl/tests/Makefile
index 36f5b590821e4b277f8816b617837f584b14523f..d6f1da09373767fa14b6e61ca8d107920df5371d 100644 (file)
--- a/xsl/tests/Makefile
+++ b/xsl/tests/Makefile
@@ -2,10 +2,10 @@
 
 all: refentry.007.xml refentry.007.ns.xml
 
-refentry.007.xml: $(DOCBOOK_SVN)/releasetools/refentry.007.xml 
+refentry.007.xml: $(repo_dir)/releasetools/refentry.007.xml 
        cp $< $@
 
-refentry.007.ns.xml: $(DOCBOOK_SVN)/releasetools/refentry.007.ns.xml 
+refentry.007.ns.xml: $(repo_dir)/releasetools/refentry.007.ns.xml 
        cp $< $@
 
 clean:

diff --git a/xsl/website/Makefile b/xsl/website/Makefile
index c5b2d7c67c50f198c69111bb5be8ed12adc80180..1681e358a91309f96c53913992225a0b6d938ce7 100644 (file)
--- a/xsl/website/Makefile
+++ b/xsl/website/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 PARAMBASE=param
 XSLFILES=param.xsl

diff --git a/xsl/xhtml-1_1/Makefile b/xsl/xhtml-1_1/Makefile
index d58df10292639b62aab2564dc46a6e16ab9d6323..0e30596558ccc7e516aec2538195786575de9675 100644 (file)
--- a/xsl/xhtml-1_1/Makefile
+++ b/xsl/xhtml-1_1/Makefile
@@ -1,7 +1,7 @@
 PARAMBASE=param
 ALLTARGETS=param.xml
 
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 all: xsl-files profile-docbook.xsl profile-chunk.xsl profile-onechunk.xsl
 

diff --git a/xsl/xhtml/Makefile b/xsl/xhtml/Makefile
index 702390ec98dc763c8729b5b1a51b9a67cb66e8ec..389879ffde860695afa9403fab3ef8f12b069a4a 100644 (file)
--- a/xsl/xhtml/Makefile
+++ b/xsl/xhtml/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 TARGETNS=http://www.w3.org/1999/xhtml
 

diff --git a/xsl/xhtml5/Makefile b/xsl/xhtml5/Makefile
index e973fecbbc3b5c0a882cd73e6fb895b7a4d72de2..464a8a97c7d81c66a73797f7ff985532c8fc1615 100644 (file)
--- a/xsl/xhtml5/Makefile
+++ b/xsl/xhtml5/Makefile
@@ -1,4 +1,4 @@
-include $(DOCBOOK_SVN)/buildtools/Makefile.incl
+include $(repo_dir)/buildtools/Makefile.incl
 
 TARGETNS=http://www.w3.org/1999/xhtml