From 2820653d0e8f00674fd986ad92a6e3ca4342ee37 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Tue, 6 Jan 2009 01:26:56 +0100 Subject: [PATCH] Rename aux 'directories' to 'auxiliar' for Windows compatibility Rename scripts/aux/ to scripts/auxiliar/ and python/aux/ to python/auxiliar/. --- Documentation/TRANSLATION | 6 +++--- Documentation/user/install.itely | 6 +++--- configure.in | 2 +- input/lsr/README | 2 +- make/generic-vars.make | 4 ++-- python/GNUmakefile | 2 +- python/{aux => auxiliar}/GNUmakefile | 0 python/{aux => auxiliar}/buildlib.py | 0 python/{aux => auxiliar}/manuals_definitions.py | 0 python/{aux => auxiliar}/mirrortree.py | 0 python/{aux => auxiliar}/postprocess_html.py | 0 scripts/GNUmakefile | 2 +- scripts/{aux => auxiliar}/GNUmakefile | 0 scripts/{aux => auxiliar}/build-coverage.sh | 8 ++++---- scripts/{aux => auxiliar}/build-profile.sh | 0 scripts/{aux => auxiliar}/check_texi_refs.py | 0 scripts/{aux => auxiliar}/check_translation.py | 0 scripts/{aux => auxiliar}/coverage.py | 0 scripts/{aux => auxiliar}/find-superfluous-includes.py | 0 scripts/{aux => auxiliar}/fixcc.py | 0 scripts/{aux => auxiliar}/makelsr.py | 0 scripts/{aux => auxiliar}/musicxml_generate_intervals.py | 0 scripts/{aux => auxiliar}/musicxml_generate_keys.py | 0 .../{aux => auxiliar}/musicxml_generate_timesignatures.py | 0 scripts/{aux => auxiliar}/pfx2ttf.fontforge | 0 scripts/{aux => auxiliar}/readlink.py | 0 scripts/{aux => auxiliar}/tely-gettext.py | 2 +- scripts/{aux => auxiliar}/texi-langutils.py | 0 scripts/{aux => auxiliar}/texi-skeleton-update.py | 0 scripts/{aux => auxiliar}/translations-status.py | 0 scripts/{aux => auxiliar}/update-snippets.py | 0 stepmake/stepmake/texinfo-rules.make | 2 +- 32 files changed, 18 insertions(+), 18 deletions(-) rename python/{aux => auxiliar}/GNUmakefile (100%) rename python/{aux => auxiliar}/buildlib.py (100%) rename python/{aux => auxiliar}/manuals_definitions.py (100%) rename python/{aux => auxiliar}/mirrortree.py (100%) rename python/{aux => auxiliar}/postprocess_html.py (100%) rename scripts/{aux => auxiliar}/GNUmakefile (100%) rename scripts/{aux => auxiliar}/build-coverage.sh (83%) rename scripts/{aux => auxiliar}/build-profile.sh (100%) rename scripts/{aux => auxiliar}/check_texi_refs.py (100%) rename scripts/{aux => auxiliar}/check_translation.py (100%) rename scripts/{aux => auxiliar}/coverage.py (100%) rename scripts/{aux => auxiliar}/find-superfluous-includes.py (100%) rename scripts/{aux => auxiliar}/fixcc.py (100%) rename scripts/{aux => auxiliar}/makelsr.py (100%) rename scripts/{aux => auxiliar}/musicxml_generate_intervals.py (100%) rename scripts/{aux => auxiliar}/musicxml_generate_keys.py (100%) rename scripts/{aux => auxiliar}/musicxml_generate_timesignatures.py (100%) rename scripts/{aux => auxiliar}/pfx2ttf.fontforge (100%) rename scripts/{aux => auxiliar}/readlink.py (100%) rename scripts/{aux => auxiliar}/tely-gettext.py (95%) rename scripts/{aux => auxiliar}/texi-langutils.py (100%) rename scripts/{aux => auxiliar}/texi-skeleton-update.py (100%) rename scripts/{aux => auxiliar}/translations-status.py (100%) rename scripts/{aux => auxiliar}/update-snippets.py (100%) diff --git a/Documentation/TRANSLATION b/Documentation/TRANSLATION index bdfa75cbaa..82798c5d45 100644 --- a/Documentation/TRANSLATION +++ b/Documentation/TRANSLATION @@ -672,7 +672,7 @@ TECHNICAL BACKGROUND A number of Python scripts handle a part of the documentation translation process. All scripts used to maintain the translations -are located in scripts/aux/: +are located in scripts/auxiliar/: * check_translation.py -- show diff to update a translation * texi-langutils.py -- quickly and dirtily parse Texinfo files to @@ -694,8 +694,8 @@ before calling texi2pdf * mass-link.py -- link or symlink files between English documentation and documentation in other languages -Python modules used by scripts in scripts/aux/ or scripts/build/ (but -not by installed Python scripts) are located in python/aux/: +Python modules used by scripts in scripts/auxiliar/ or scripts/build/ (but +not by installed Python scripts) are located in python/auxiliar/: * manuals_definitions.py -- define manual names and name of cross-reference Texinfo macros * buildlib.py -- common functions (read piped output diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely index 597aeb6900..d9e4d4396c 100644 --- a/Documentation/user/install.itely +++ b/Documentation/user/install.itely @@ -479,11 +479,11 @@ CVS; especially the following patch: For checking the coverage of the test suite, do the following @example -./scripts/aux/build-coverage.sh +./scripts/auxiliar/build-coverage.sh @emph{# uncovered files, least covered first} -./scripts/aux/coverage.py --summary out-cov/*.cc +./scripts/auxiliar/coverage.py --summary out-cov/*.cc @emph{# consecutive uncovered lines, longest first} -./scripts/aux/coverage.py --uncovered out-cov/*.cc +./scripts/auxiliar/coverage.py --uncovered out-cov/*.cc @end example diff --git a/configure.in b/configure.in index 3651171c46..0a1cfc241a 100644 --- a/configure.in +++ b/configure.in @@ -76,7 +76,7 @@ else NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:' | grep -v "\.ttf"` NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'` - NCSB_FILE=`$PYTHON "$srcdir/scripts/aux/readlink.py" $NCSB_FILE` + NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES" done else diff --git a/input/lsr/README b/input/lsr/README index 21bb3d6c2f..8c8683f216 100644 --- a/input/lsr/README +++ b/input/lsr/README @@ -3,7 +3,7 @@ http://lsr.dsi.unimi.it/ To update this directory, do at top of the source tree -scripts/aux/makelsr.py DIR +scripts/auxiliar/makelsr.py DIR where DIR is the directory unpacked from lsr-snippets-doc-DATE tarball available on http://lsr.dsi.unimi.it/download. diff --git a/make/generic-vars.make b/make/generic-vars.make index ffe17a38fc..44cb80ccaa 100644 --- a/make/generic-vars.make +++ b/make/generic-vars.make @@ -9,8 +9,8 @@ # buildscript-dir = $(top-build-dir)/scripts/build/$(outconfbase) -auxpython-dir = $(src-depth)/python/aux -auxscript-dir = $(src-depth)/scripts/aux +auxpython-dir = $(src-depth)/python/auxiliar +auxscript-dir = $(src-depth)/scripts/auxiliar script-dir = $(src-depth)/scripts input-dir = $(src-depth)/input diff --git a/python/GNUmakefile b/python/GNUmakefile index 5e706b1c50..14060aed61 100644 --- a/python/GNUmakefile +++ b/python/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=aux +SUBDIRS=auxiliar STEPMAKE_TEMPLATES=c python-module install-out po diff --git a/python/aux/GNUmakefile b/python/auxiliar/GNUmakefile similarity index 100% rename from python/aux/GNUmakefile rename to python/auxiliar/GNUmakefile diff --git a/python/aux/buildlib.py b/python/auxiliar/buildlib.py similarity index 100% rename from python/aux/buildlib.py rename to python/auxiliar/buildlib.py diff --git a/python/aux/manuals_definitions.py b/python/auxiliar/manuals_definitions.py similarity index 100% rename from python/aux/manuals_definitions.py rename to python/auxiliar/manuals_definitions.py diff --git a/python/aux/mirrortree.py b/python/auxiliar/mirrortree.py similarity index 100% rename from python/aux/mirrortree.py rename to python/auxiliar/mirrortree.py diff --git a/python/aux/postprocess_html.py b/python/auxiliar/postprocess_html.py similarity index 100% rename from python/aux/postprocess_html.py rename to python/auxiliar/postprocess_html.py diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index 1813590ff1..b3170cdbf9 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=aux build +SUBDIRS=auxiliar build SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly midi2ly lilypond-invoke-editor musicxml2ly lilysong lilymidi diff --git a/scripts/aux/GNUmakefile b/scripts/auxiliar/GNUmakefile similarity index 100% rename from scripts/aux/GNUmakefile rename to scripts/auxiliar/GNUmakefile diff --git a/scripts/aux/build-coverage.sh b/scripts/auxiliar/build-coverage.sh similarity index 83% rename from scripts/aux/build-coverage.sh rename to scripts/auxiliar/build-coverage.sh index 369b526e84..f61ff649dc 100755 --- a/scripts/aux/build-coverage.sh +++ b/scripts/auxiliar/build-coverage.sh @@ -49,10 +49,10 @@ do gcov -o $depth/lily/out-cov/ -p $a > $a.gcov-summary done -$depth/scripts/aux/coverage.py --uncovered *.cc > uncovered.txt -$depth/scripts/aux/coverage.py --hotspots *.cc > hotspots.txt -$depth/scripts/aux/coverage.py --summary *.cc > summary.txt -$depth/scripts/aux/coverage.py --uncovered *.scm > uncovered-scheme.txt +$depth/scripts/auxiliar/coverage.py --uncovered *.cc > uncovered.txt +$depth/scripts/auxiliar/coverage.py --hotspots *.cc > hotspots.txt +$depth/scripts/auxiliar/coverage.py --summary *.cc > summary.txt +$depth/scripts/auxiliar/coverage.py --uncovered *.scm > uncovered-scheme.txt head -20 summary.txt diff --git a/scripts/aux/build-profile.sh b/scripts/auxiliar/build-profile.sh similarity index 100% rename from scripts/aux/build-profile.sh rename to scripts/auxiliar/build-profile.sh diff --git a/scripts/aux/check_texi_refs.py b/scripts/auxiliar/check_texi_refs.py similarity index 100% rename from scripts/aux/check_texi_refs.py rename to scripts/auxiliar/check_texi_refs.py diff --git a/scripts/aux/check_translation.py b/scripts/auxiliar/check_translation.py similarity index 100% rename from scripts/aux/check_translation.py rename to scripts/auxiliar/check_translation.py diff --git a/scripts/aux/coverage.py b/scripts/auxiliar/coverage.py similarity index 100% rename from scripts/aux/coverage.py rename to scripts/auxiliar/coverage.py diff --git a/scripts/aux/find-superfluous-includes.py b/scripts/auxiliar/find-superfluous-includes.py similarity index 100% rename from scripts/aux/find-superfluous-includes.py rename to scripts/auxiliar/find-superfluous-includes.py diff --git a/scripts/aux/fixcc.py b/scripts/auxiliar/fixcc.py similarity index 100% rename from scripts/aux/fixcc.py rename to scripts/auxiliar/fixcc.py diff --git a/scripts/aux/makelsr.py b/scripts/auxiliar/makelsr.py similarity index 100% rename from scripts/aux/makelsr.py rename to scripts/auxiliar/makelsr.py diff --git a/scripts/aux/musicxml_generate_intervals.py b/scripts/auxiliar/musicxml_generate_intervals.py similarity index 100% rename from scripts/aux/musicxml_generate_intervals.py rename to scripts/auxiliar/musicxml_generate_intervals.py diff --git a/scripts/aux/musicxml_generate_keys.py b/scripts/auxiliar/musicxml_generate_keys.py similarity index 100% rename from scripts/aux/musicxml_generate_keys.py rename to scripts/auxiliar/musicxml_generate_keys.py diff --git a/scripts/aux/musicxml_generate_timesignatures.py b/scripts/auxiliar/musicxml_generate_timesignatures.py similarity index 100% rename from scripts/aux/musicxml_generate_timesignatures.py rename to scripts/auxiliar/musicxml_generate_timesignatures.py diff --git a/scripts/aux/pfx2ttf.fontforge b/scripts/auxiliar/pfx2ttf.fontforge similarity index 100% rename from scripts/aux/pfx2ttf.fontforge rename to scripts/auxiliar/pfx2ttf.fontforge diff --git a/scripts/aux/readlink.py b/scripts/auxiliar/readlink.py similarity index 100% rename from scripts/aux/readlink.py rename to scripts/auxiliar/readlink.py diff --git a/scripts/aux/tely-gettext.py b/scripts/auxiliar/tely-gettext.py similarity index 95% rename from scripts/aux/tely-gettext.py rename to scripts/auxiliar/tely-gettext.py index 12f80aa8dc..341816a7db 100755 --- a/scripts/aux/tely-gettext.py +++ b/scripts/auxiliar/tely-gettext.py @@ -17,7 +17,7 @@ if len (sys.argv) > 3: buildscript_dir, localedir, lang = sys.argv[1:4] else: print """USAGE: tely-gettext.py PYTHON-DIR LOCALEDIR LANG FILES - For example scripts/aux/tely-gettext.py python/out Documentation/po/out-www de Documentation/de/user/*.tely""" + For example scripts/auxiliar/tely-gettext.py python/out Documentation/po/out-www de Documentation/de/user/*.tely""" sys.exit (1) sys.path.append (buildscript_dir) diff --git a/scripts/aux/texi-langutils.py b/scripts/auxiliar/texi-langutils.py similarity index 100% rename from scripts/aux/texi-langutils.py rename to scripts/auxiliar/texi-langutils.py diff --git a/scripts/aux/texi-skeleton-update.py b/scripts/auxiliar/texi-skeleton-update.py similarity index 100% rename from scripts/aux/texi-skeleton-update.py rename to scripts/auxiliar/texi-skeleton-update.py diff --git a/scripts/aux/translations-status.py b/scripts/auxiliar/translations-status.py similarity index 100% rename from scripts/aux/translations-status.py rename to scripts/auxiliar/translations-status.py diff --git a/scripts/aux/update-snippets.py b/scripts/auxiliar/update-snippets.py similarity index 100% rename from scripts/aux/update-snippets.py rename to scripts/auxiliar/update-snippets.py diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 27924f71e1..05627f18da 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -6,7 +6,7 @@ # $(outdir)/$(INFO_IMAGES_DIR)/*.png symlinks are only needed to view # out-www/*.info with Emacs -- HTML docs no longer need these # symlinks, see replace_symlinks_urls in -# python/aux/postprocess_html.py. +# python/auxiliar/postprocess_html.py. # make dereferences symlinks, and $(INFO_IMAGES_DIR) is a symlink # to $(outdir), so we can't use directly $(INFO_IMAGES_DIR) as a -- 2.39.2