From: Han-Wen Nienhuys Date: Fri, 16 Feb 2007 15:48:15 +0000 (+0100) Subject: junk cruft X-Git-Tag: release/2.11.19-1~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ba813f72087815c20fba43788c647214bba130b;p=lilypond.git junk cruft --- diff --git a/buildscripts/analyse-cxx-log.py b/buildscripts/analyse-cxx-log.py deleted file mode 100644 index 48748a032f..0000000000 --- a/buildscripts/analyse-cxx-log.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/python -import sys -import os -import re -import string - -if len (sys.argv) < 5: - print 'args: LOGFILE CLASS FUNC NEW_FUNC' - -func = sys.argv[3] -new_func = sys.argv[4] -klazz = sys.argv[2] -log_ls = open (sys.argv[1]).readlines () -regex = re.compile ("([^:]+):([0-9]+): error: .class ([_a-zA-Z]+). has no member named .%s." % func) - -files = {} - -for l in log_ls: - m = regex.search (l) - if not m: - continue - print l - - file = m.group (1) - line_no = string.atoi (m.group (2)) - klass = m.group (3) - - if klass <> klazz: - continue - - if not files.has_key (file): - files[file] = open (file).read ().split ('\n') - - line_no -= 1 - files[file][line_no] = re.sub (func, new_func, files[file][line_no]) - - -for (f,ls) in files.items(): - print 'writing ', f - os.rename (f, f + '~') - open (f, 'w').write ('\n'.join (ls)) - diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh deleted file mode 100644 index 577956dcd5..0000000000 --- a/buildscripts/guile-gnome.sh +++ /dev/null @@ -1,245 +0,0 @@ -#!@BASH@ - -# guile-gnome.sh -- download, compile, install g-wrap, guile-gnome, -# pango - -# LilyPond has an experimental gnome canvas output backend -- hackers -# only. This depends on rather new versions of guile-gnome, g-wrap -# and pango. - -set -ex - -# Where user built stuff will be installed -OPT=$HOME/usr/pkg -# When using GUILE CVS, make a slib/require like so -cat > /dev/null < CVS/Root - echo "." > CVS/Repository - cvs -z3 checkout -P pango - else - $WGET ftp://ftp.gtk.org/pub/gtk/v2.6/pango-$PANGOVERSION.tar.gz - tar -xzf $download/pango-$PANGOVERSION.tar.gz - ln -s pango-$PANGOVERSION pango - fi - cd pango - rm -rf $OPT/pango - if [ ! -f configure ]; then - ./autogen.sh --help - fi - ./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc - make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" all install - cd ../.. -fi - -## 3. Currently (2004-9-15) GUILE CVS works somewhat -## But there's a guile/g-wrap problem with integer parameters -## PATH=/usr/bin:$PATH - -if [ -d $OPT/libffi/ ]; then - export LDFLAGS=-L$OPT/libffi/lib - export CPPFLAGS=-I$OPT/libffi/include -fi - -## 4. get g-wrap 2.0 -if ! pkg-config --atleast-version=$GWRAPVERSION g-wrap-2.0-guile; then - if [ -n "$BLOEDIGE_RAND" ]; then - tla register-archive a.rottmann@gmx.at--2004-main \ - http://people.debian.org/~rotty/arch/a.rottmann@gmx.at/2004-main || true - - ## tla get a.rottmann@gmx.at--2004-main/g-wrap--tng g-wrap - ## tla get a.rottmann@gmx.at--2004-main/g-wrap--mainline--1.9.0 g-wrap - tla get a.rottmann@gmx.at--2004-main/g-wrap--dev--0 g-wrap - ## ughr: - mkdir -p g-wrap/libffi - else - $WGET http://savannah.nongnu.org/download/g-wrap/g-wrap-$GWRAPVERSION.tar.gz - tar xzf $download/g-wrap-$GWRAPVERSION.tar.gz - ln -s g-wrap-$GWRAPVERSION g-wrap - fi - cd g-wrap - - rm -rf $OPT/g-wrap - if [ ! -f configure ]; then - sh autogen.sh --noconfigure - fi - mkdir =build - cd =build - ../configure --prefix=$OPT/g-wrap --enable-maintainer-mode - make install - cd ../.. - PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH - LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH - GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH:$SLIB_PATH -fi - -## 4a. get g-lib 0.1.2 -if ! guile -c "(use-modules (srfi srfi-35))"; then - if [ -n "$BLOEDIGE_RAND" ]; then - : - else - $WGET http://download.gna.org/guile-lib/guile-lib-$GLVERSION.tar.gz - tar xzf $download/guile-lib-$GLVERSION.tar.gz - ln -s guile-lib-$GLVERSION guile-lib - fi - cd guile-lib - - rm -rf $OPT/guile-lib - if [ ! -f src/configure ]; then - sh autogen.sh --noconfigure - fi - mkdir =build - cd =build - ../src/configure --prefix=$OPT/guile-lib #--enable-maintainer-mode - if true; then - make - cp ./guile-lib/doc/guile-library.info doc - install -d $OPT/guile-lib/share/info - fi - make install - cd ../.. - GUILE_LOAD_PATH=$OPT/guile-lib/share/guile:$GUILE_LOAD_PATH -fi - -# not a good idea -## cp srfi-34.scm from CVS head ? --hwn -#(cd $OPT/g-wrap/share/guile/site -# mv srfi-34.scm srfi-34.scm-g-wrap -# cp $OPT/guile/share/guile-1.7/srfi/srfi-34.scm .) - -## 5. get guile-gnome -if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then - if [ -n "$BLOEDIGE_RAND" ]; then - - if false; then # rotty - tla register-archive guile-gnome-devel@gnu.org--2004 \ - http://people.debian.org/~rotty/arch/guile-gnome-devel@gnu.org/2004/ || true - tla get guile-gnome-devel@gnu.org--2004/dists--dev guile-gnome - cd guile-gnome - tla build-config -r configs/gnu.org/dev - cd src - - # 5a. get extra modules (gnome canvas) - for i in $EXTRA; do - tla get guile-gnome-devel@gnu.org--2004/$i--dev $i - done - else # andy - tla register-archive wingo@pobox.com--2004-main \ - http://ambient.2y.net/wingo/arch/wingo@pobox.com--2004-main || true - - tla get wingo@pobox.com--2004-main/guile-gnome-dists--release guile-gnome - cd guile-gnome - tla build-config -r configs/gnu.org/guile-gnome-platform-$GGVERSION - cd src - EXTRA="pkg atk defs glib gstreamer gtk gtksourceview libgda libglade libgnome libgnomeui pango libgnomecanvas" - EXTRA= - - # 5a. get extra modules (gnome canvas) - for i in $EXTRA; do - tla get wingo@pobox.com--2004-main/guile-gnome-$i--release $i - done - - cd libgnomecanvas - cd .. - fi - - if [ ! -f configure ]; then - sh autogen.sh --noconfigure - fi - cd .. - srcdir="../src" - else - #$WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz - $WGET ftp://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-$GGVERSION.tar.gz - tar xzf $download/guile-gnome-platform-$GGVERSION.tar.gz - ln -s guile-gnome-platform-$GGVERSION guile-gnome - cd guile-gnome - srcdir="../" - fi - - rm -rf $OPT/guile-gnome - mkdir =build - cd =build - -# Using libtool < 1.6.0 together with gcc-3.4 may trigger this problem: -# -# If a tag has not been given, and we're using a compiler which is -# not one of the ones with which libtool was built, attempt to -# infer the compiler from the first word of the command line passed -# to libtool. -# - if [ -z "$GCC34" ]; then - # Use libtool-1.5.6, gcc-3.{2,3} without -O2, - CFLAGS='-O -g' $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode - else - # or use gcc-3.4 with libtool-1.6.0 - CC=$GCC34 $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode - fi - make all install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site - PKG_CONFIG_PATH=$OPT/guile-gnome/lib/pkgconfig:$PKG_CONFIG_PATH - LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH - GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH -fi - -cat < pats - - - -When done, move this to Coding Standads doco. - - -Mandatory suffixes: - _ : _ member var - - -Optional suffixes: - _b : bool - _p : as in lispy pair_p ()? - _x : x-coor - _y : y-coor - - _byte : - _char : - _count : counter - _drul : Drul_array - _global : global var - _grob : Grob - _mom : moment - _req : Request - _scm : SCM - _str : C string - _str0 : C string - _string : C++ string - -Prefixes: - get_ : - gh_ : Do not use: part of deprecated Guile api - ly_ : - scm_ : - - -The Grand Ontgaaring (some may remain): - - _str -> _string - _ch -> _str0 - _ch_C -> _str0 - _sz -> _str0 - - _ch -> _char - - _C : junk - _c : junk - _f : junk - _i : junk - _l : junk - _p : junk, except for lispy is_foo_p () - _arr : junk - _array : junk - - - - -Voor alle suffixen waar het funcienamen betreft, als ik zeg maar wat, -multiplicity_i (), wordt naam dan zoveel mogelijk: get_mulitiplity (). -Als je dat niet doet, krijg je naam clashes met variabelen. - - - - -''' - -import re -import sys - -files = sys.argv[1:] - -for f in files: - print f - s = open (f).read () - - # shield stuff - s = re.sub (r'equal_p', r'equal_pX', s) - s = re.sub (r'less_p', r'less_pX', s) - s = re.sub (r'pair_p', r'pair_pX', s) - s = re.sub (r'smob_p', r'smob_pX', s) - s = re.sub (r'list_p(\W)', r'list_pX\1', s) - - s = re.sub (r'(gh_\w*_(p|str)) *\(', r'\1X (', s) - s = re.sub (r'(ly_\w*_(p|str)) *\(', r'\1X (', s) - s = re.sub (r'(scm_\w*_(p|str)) *\(', r'\1X (', s) - - s = re.sub (r'to_c(\W)', r'to_cX\1', s) - s = re.sub (r'P_C', r'P_XC', s) - - s = re.sub (r'(\W)get_music(\W)', r'\1Yget_pending_events\2', s) - - s = re.sub (r'2_i(\W)', r'2int\1', s) - s = re.sub (r'2_u(\W)', r'2unsigned\1', s) - s = re.sub (r'2_f(\W)', r'2double\1', s) - - s = re.sub (r'(\w+)_str *\(', r'\1_string (', s) - - - # member vars or multipart names - s = re.sub (r'(\w+)_(c|f|i|l|p)_(\W)', r'\1_\3', s) - s = re.sub (r'(\w+)_(c|f|i|l|p)_arr(_|\W)', r'\1_array\3', s) - s = re.sub (r'(\w+)_arr_', r'\1_array_', s) - s = re.sub (r'(\w+)_str_', r'\1_string_', s) - s = re.sub (r'(\w+)_sz', r'\1_str0', s) - - # functions - s = re.sub (r'(\W)ch_C *\(', r'\1Yto_str0 (', s) - s = re.sub (r'(\W)byte_C *\(', r'\1Yto_bytes (', s) - s = re.sub (r'(\W)byte_l *\(', r'\1Yget_bytes (', s) - s = re.sub (r'(\W)value_i *\(', r'\1Yto_int (', s) - s = re.sub (r'(\W)value_f *\(', r'\1Yto_double (', s) - s = re.sub (r'find_i *\(', r'Yfind_index (', s) - s = re.sub (r'compare_i *\)', r'compare)', s) - - - s = re.sub (r'(\w+)_(c|f|i|l|p) *\(', r'Yget_\1 (', s) - - s = re.sub (r'(\w+)_arr *\(', r'\1_array (', s) - s = re.sub (r'(\w+)_ch *\(', r'\1_str0 (', s) - s = re.sub (r'(\w+)_str *\(', r'\1_string (', s) - - s = re.sub (r'(\W)str *\(', r'\1string (', s) - s = re.sub (r'(\W)arr *\(', r'\1array (', s) - - s = re.sub (r'(\w+)_ch_C *\(', r'\1_str0 (', s) - s = re.sub (r'(\w+)_ch *\(', r'\1_str0 (', s) - - # more member vars or multipart names - s = re.sub (r'(\w+)_ch_C', r'\1_str0', s) - s = re.sub (r'(\w+)_ch_', r'\1_char_', s) - s = re.sub (r'(\W)ch_C(\W)', r'\1str0\2', s) - - # plain vars -- can't do, as we have - # Real foo_f, int foo_i, SCM foo constructs - # s = re.sub (r'(\w+)_(c|f|i|l|p)(\W)', r'\1_\3', s) - - - # but these will go - s = re.sub (r'(\W)arr_(l|p)(\W)', r'\1array\3', s) - s = re.sub (r'new_(l|p)', r'new_pX', s) - s = re.sub (r'(\w+)_(l|p)(\W)', r'\1\3', s) - - s = re.sub (r'(\w+)_arr(\W)', r'\1_array\2', s) - s = re.sub (r'(\w+)_str(\W)', r'\1_string\2', s) - - s = re.sub (r'(\w+)_ch_C(\W)', r'\1_str0\2', s) - s = re.sub (r'(\w+)_ch(\W)', r'\1_char\2', s) - - s = re.sub (r'(\w+)_C(\W)', r'\1\2', s) - - # fixups - s = re.sub (r'Yfind', 'find', s) - s = re.sub (r'Yget_argument_to', 'get_argument_index', s) - s = re.sub (r'Yget_compare', 'compare', s) - s = re.sub (r'Yget_cons', 'cons', s) - s = re.sub (r'Yget_create', 'create', s) - s = re.sub (r'Yget_find', 'find', s) - s = re.sub (r'Yget_hex', 'hex', s) - s = re.sub (r'Yget_index', 'index', s) - s = re.sub (r'Yget_length', 'length', s) - s = re.sub (r'Yget_remove', 'remove', s) - s = re.sub (r'Yget_report', 'report', s) - s = re.sub (r'Yget_size', 'size', s) - s = re.sub (r'Yget_get', 'get', s) - s = re.sub (r'Yget', 'get', s) - s = re.sub (r'Yto', 'to', s) - - - s = re.sub (r'(bin2dec|bin2hex|dec2bin|hex2bin)_string', r'\1', s) - s = re.sub (r'i2hex_string', 'int2hex', s) - s = re.sub (r'u2hex_string', 'unsigned2hex', s) - s = re.sub (r'i2dec_string', 'int2dec', s) - - # Would this work? - s = re.sub (r'split_array', 'split', s) - s = re.sub (r'custos_array', 'custodes', s) - s = re.sub (r'primitives_array', 'primitives', s) - s = re.sub (r'span_array', 'spanners', s) - s = re.sub (r'(Pointer|Link|Drul|get|heap|_of|remove)_array', - r'\1_Xarray', s) - s = re.sub (r'([a-rt-zA-RT-Z])_array', r'\1s', s) - s = re.sub (r'([sS])_array', r'\1es', s) - s = re.sub (r'_Xarray', '_array', s) - - # shields down - s = re.sub (r'_pX', r'_p', s) - s = re.sub (r'_cX', r'_c', s) - s = re.sub (r'_strX', r'_str', s) - s = re.sub (r'P_XC', 'P_C', s) - s = re.sub (r'Xget_music', 'get_music', s) - - h = open (f + '.ontgaar', 'w') - h.write (s) - h.close () - diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh index 8246d09fe3..4421a619d7 100644 --- a/flower/include/flower-proto.hh +++ b/flower/include/flower-proto.hh @@ -30,11 +30,6 @@ class File_name; class File_path; struct Getopt_long; -struct Text_stream; -struct Data_file; -struct Text_db; -struct Scalar; - typedef unsigned char U8; typedef short I16; typedef unsigned short U16; @@ -43,11 +38,6 @@ typedef int I32; typedef long long I64; -struct Duration; -struct Duration_iterator; -struct Source_file; -struct Binary_source_file; -struct Sources; struct File_storage; struct Mapped_file_storage; struct Simple_file_storage;