diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-02-04 22:34:23 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-02-04 22:38:10 +0200 |
commit | 67a97c12e855298a2d5e46eb994d7415237c2e78 (patch) | |
tree | c1e1f63236547164718cc175781218e241774d2b | |
parent | 73e4a3f9dfc693a3b25e7f7d903fd885a71850f4 (diff) | |
download | idest-67a97c12e855298a2d5e46eb994d7415237c2e78.tar.gz idest-67a97c12e855298a2d5e46eb994d7415237c2e78.tar.bz2 |
Add gnulib framework
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | Makefile.am | 32 | ||||
-rw-r--r-- | NEWS | 34 | ||||
-rw-r--r-- | README | 0 | ||||
-rw-r--r-- | README-hacking | 71 | ||||
-rw-r--r-- | THANKS | 0 | ||||
-rwxr-xr-x | bootstrap | 631 | ||||
-rw-r--r-- | bootstrap.conf | 69 | ||||
-rw-r--r-- | configure.ac | 34 | ||||
-rw-r--r-- | gnulib.modules | 8 | ||||
-rw-r--r-- | main.c | 263 | ||||
-rw-r--r-- | src/cmdline.opt | 72 | ||||
-rw-r--r-- | src/getopt.m4 | 522 | ||||
-rw-r--r-- | src/id3ed.h (renamed from id3ed.h) | 6 | ||||
-rw-r--r-- | src/id3v1.c (renamed from id3v1.c) | 0 | ||||
-rw-r--r-- | src/id3v1.h (renamed from id3v1.h) | 0 | ||||
-rw-r--r-- | src/main.c | 160 |
18 files changed, 1640 insertions, 278 deletions
@@ -0,0 +1 @@ +Sergey Poznyakoff gray@gnu.org.ua diff --git a/Makefile b/Makefile deleted file mode 100644 index 4354868..0000000 --- a/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -SRC=main.c id3v1.c -OBJ=$(SRC:.c=.o) -HDR=id3ed.h id3v1.h - -DBG=-ggdb -CFLAGS=-ggdb - -id3ed: $(OBJ) - cc -oid3ed $(LDFLAGS) $(DBG) $(OBJ) $(LIBS) - -main.o: main.c $(HDR) -id3v1.o: id3v1.c id3v1.h - -clean: - rm -f $(OBJ)
\ No newline at end of file diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..ab92d1f --- /dev/null +++ b/Makefile.am @@ -0,0 +1,32 @@ +ACLOCAL_AMFLAGS = -I m4 +SUBDIRS=gnu src + +.PHONY: make-ChangeLog +make-ChangeLog: + if test -d .git; then \ + $(top_srcdir)/build-aux/gitlog-to-changelog | \ + sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t; \ + echo "" >> $(distdir)/cl-t; \ + echo "Local Variables:" >> $(distdir)/cl-t; \ + echo "mode: change-log" >> $(distdir)/cl-t; \ + echo "version-control: never" >> $(distdir)/cl-t; \ + echo "buffer-read-only: t" >> $(distdir)/cl-t; \ + echo "End:" >> $(distdir)/cl-t; \ + rm -f $(distdir)/ChangeLog; \ + mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + fi + +dist-hook: make-ChangeLog + +.PHONY: ChangeLog +ChangeLog: + if test -d .git; then \ + $(top_srcdir)/build-aux/gitlog-to-changelog | \ + sed '/<unknown>$$/d' | fmt -s > ChangeLog; \ + echo "" >> ChangeLog; \ + echo "Local Variables:" >> ChangeLog; \ + echo "mode: change-log" >> ChangeLog; \ + echo "version-control: never" >> ChangeLog; \ + echo "buffer-read-only: t" >> ChangeLog; \ + echo "End:" >> ChangeLog; \ + fi @@ -0,0 +1,34 @@ +ID3ed -- history of user-visible changes. 2009-02-04 +Copyright (C) 2009 Sergey Poznyakoff +See the end of file for copying conditions. + +Please send bug reports to <gray@gnu.org.ua> + + +Version 0.1 (Git) + + +========================================================================= +Copyright information: + +Copyright (C) 2009 Sergey Poznyakoff + + Permission is granted to anyone to make or distribute verbatim copies + of this document as received, in any medium, provided that the + copyright notice and this permission notice are preserved, + thus giving the recipient permission to redistribute in turn. + + Permission is granted to distribute modified versions + of this document, or of portions of it, + under the above conditions, provided also that they + carry prominent notices stating who last changed them. + +Local variables: +mode: outline +paragraph-separate: "[ ]*$" +eval: (add-hook 'write-file-hooks 'time-stamp) +time-stamp-start: "changes. " +time-stamp-format: "%:y-%02m-%02d" +time-stamp-end: "\n" +end: + diff --git a/README-hacking b/README-hacking new file mode 100644 index 0000000..cff5eec --- /dev/null +++ b/README-hacking @@ -0,0 +1,71 @@ +These notes intend to help people working on the Git version of Id3ed. +See end of file for copying conditions. + +* Requirements + +If you have taken the sources from Git you will need the following +packages to build Id3ed. I don't make any extra effort to accommodate +older versions of these packages, so please make sure that you have the +latest stable version. + +- Automake <http://www.gnu.org/software/automake/> +- Autoconf <http://www.gnu.org/software/autoconf/> +- Gnulib <http://www.gnu.org/software/gnulib/> +- Texinfo <http://www.gnu.org/software/texinfo/> + +* Bootstrapping + +Obviously, if you are reading these notes, you did manage to check out +the project from Git. The next step is to get other files needed to build, +which are extracted from other source packages: + +1. Change to the source tree directory + + cd id3ed + +2. Run + + ./bootstrap + +Once done, proceed as described in the file README (section +INSTALLATION). + +Normally you will have to run bootstrap only once. However, if you +intend to hack on ID3ed, you might need to run it again later. In +this case, you will probably want to save some time and bandwidth by +avoiding downloading the same files again. If so, create in the project's +root directory a file named `.bootstrap' with the following +contents: + + --gnulib-srcdir=$HOME/gnulib + +Replace `$HOME/gnulib' with the actual directory where the Gnulib +sources reside. + +For more information about `bootstrap', run `bootstrap --help'. + + +* Copyright information + +Copyright (C) 2009 Sergey Poznyakoff + + Permission is granted to anyone to make or distribute verbatim copies + of this document as received, in any medium, provided that the + copyright notice and this permission notice are preserved, + thus giving the recipient permission to redistribute in turn. + + Permission is granted to distribute modified versions + of this document, or of portions of it, + under the above conditions, provided also that they + carry prominent notices stating who last changed them. + + +Local Variables: +mode: outline +paragraph-separate: "[ ]*$" +version-control: never +End: + + + + diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..c6076b1 --- /dev/null +++ b/bootstrap @@ -0,0 +1,631 @@ +#! /bin/sh + +# Bootstrap this package from checked-out sources. + +# Copyright (C) 2003-2008 Free Software Foundation, Inc. + +# Dico is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# Dico is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with Dico. If not, see <http://www.gnu.org/licenses/>. + +# Written by Paul Eggert. + +nl=' +' + +# Ensure file names are sorted consistently across platforms. +LC_ALL=C +export LC_ALL + +local_gl_dir=gl + +# Temporary directory names. +bt='._bootmp' +bt_regex=`echo "$bt"| sed 's/\./[.]/g'` +bt2=${bt}2 + +usage() { + echo >&2 "\ +Usage: $0 [OPTION]... +Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth downloading + them again. + --copy Copy files instead of creating symbolic links. + --force Attempt to bootstrap even if the sources seem + not to have been checked out. + --skip-po Do not download po files. + +If the file bootstrap.conf exists in the current working directory, its +contents are read as shell variables to configure the bootstrap. + +Running without arguments will suffice in most cases. +" +} + +# Configuration. + +# Name of the Makefile.am +gnulib_mk=gnulib.mk + +# List of gnulib modules needed. +gnulib_modules= + +# Any gnulib files needed that are not in modules. +gnulib_files= + +# The command to download all .po files for a specified domain into +# a specified directory. Fill in the first %s is the domain name, and +# the second with the destination directory. Use rsync's -L and -r +# options because the latest/%s directory and the .po files within are +# all symlinks. +po_download_command_format=\ +"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'" + +extract_package_name=' + /^AC_INIT(/{ + /.*,.*,.*, */{ + s/// + s/[][]//g + s/)$// + p + q + } + s/AC_INIT(\[*// + s/]*,.*// + s/^GNU // + y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + s/[^A-Za-z0-9_]/-/g + p + } +' +package=`sed -n "$extract_package_name" configure.ac` || exit +gnulib_name=lib$package + +build_aux=build-aux +source_base=lib +m4_base=m4 +doc_base=doc +tests_base=tests + +# Extra files from gnulib, which override files from other sources. +gnulib_extra_files=" + $build_aux/install-sh + $build_aux/missing + $build_aux/mdate-sh + $build_aux/texinfo.tex + $build_aux/depcomp + $build_aux/config.guess + $build_aux/config.sub + doc/INSTALL +" + +# Additional gnulib-tool options to use. Use "\newline" to break lines. +gnulib_tool_option_extras= + +# Other locale categories that need message catalogs. +EXTRA_LOCALE_CATEGORIES= + +# Additional xgettext options to use. Use "\\\newline" to break lines. +XGETTEXT_OPTIONS='\\\ + --flag=_:1:pass-c-format\\\ + --flag=N_:1:pass-c-format\\\ + --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ +' + +# Package bug report address for gettext files +MSGID_BUGS_ADDRESS=bug-$package@gnu.org + +# Files we don't want to import. +excluded_files= + +# File that should exist in the top directory of a checked out hierarchy, +# but not in a distribution tarball. +checkout_only_file=README-hacking + +# Whether to use copies instead of symlinks. +copy=false + +# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want +# those files to be generated in directories like lib/, m4/, and po/. +# Or set it to 'auto' to make this script select which to use based +# on which version control system (if any) is used in the source directory. +vc_ignore=auto + +# Override the default configuration, if necessary. +test -r bootstrap.conf && . ./bootstrap.conf + +if test "$vc_ignore" = auto; then + vc_ignore= + test -d .git && vc_ignore=.gitignore + test -d CVS && vc_ignore="$vc_ignore .cvsignore" +fi + +# Translate configuration into internal form. + +# Parse options. + +for option +do + case $option in + --help) + usage + exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; + --skip-po) + SKIP_PO=t;; + --force) + checkout_only_file=;; + --copy) + copy=true;; + *) + echo >&2 "$0: $option: unknown option" + exit 1;; + esac +done + +if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then + echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 + exit 1 +fi + +# If $STR is not already on a line by itself in $FILE, insert it, +# sorting the new contents of the file and replacing $FILE with the result. +insert_sorted_if_absent() { + file=$1 + str=$2 + test -f $file || touch $file + echo "$str" | sort -u - $file | cmp -s - $file \ + || echo "$str" | sort -u - $file -o $file \ + || exit 1 +} + +# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. +found_aux_dir=no +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ + >/dev/null && found_aux_dir=yes +grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ + >/dev/null && found_aux_dir=yes +if test $found_aux_dir = no; then + echo "$0: expected line not found in configure.ac. Add the following:" >&2 + echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2 + exit 1 +fi + +# If $build_aux doesn't exist, create it now, otherwise some bits +# below will malfunction. If creating it, also mark it as ignored. +if test ! -d $build_aux; then + mkdir $build_aux + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + insert_sorted_if_absent $dot_ig $build_aux + done +fi + +echo "$0: Bootstrapping from checked-out $package sources..." + +cleanup_gnulib() { + status=$? + rm -fr gnulib + exit $status +} + +# Get gnulib files. + +case ${GNULIB_SRCDIR--} in +-) + if [ ! -d gnulib ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + git clone --depth 2 git://git.sv.gnu.org/gnulib || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=gnulib +esac + +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit + +# Get translations. + +download_po_files() { + subdir=$1 + domain=$2 + echo "$0: getting translations into $subdir for $domain..." + cmd=`printf "$po_download_command_format" "$domain" "$subdir"` + eval "$cmd" +} + +# Download .po files to $po_dir/.reference and copy only the new +# or modified ones into $po_dir. Also update $po_dir/LINGUAS. +update_po_files() { + # Directory containing primary .po files. + # Overwrite them only when we're sure a .po file is new. + po_dir=$1 + domain=$2 + + # Download *.po files into this dir. + # Usually contains *.s1 checksum files. + ref_po_dir="$po_dir/.reference" + + test -d $ref_po_dir || mkdir $ref_po_dir || return + download_po_files $ref_po_dir $domain \ + && ls "$ref_po_dir"/*.po 2>/dev/null | + sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" + + langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'` + test "$langs" = '*' && langs=x + for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do + case $po in x) continue;; esac + new_po="$ref_po_dir/$po.po" + cksum_file="$ref_po_dir/$po.s1" + if ! test -f "$cksum_file" || + ! test -f "$po_dir/$po.po" || + ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then + echo "updated $po_dir/$po.po..." + cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file" + fi + done +} + +case $SKIP_PO in +'') + if test -d po; then + update_po_files po $package || exit + fi + + if test -d runtime-po; then + update_po_files runtime-po $package-runtime || exit + fi;; +esac + +symlink_to_dir() +{ + src=$1/$2 + dst=${3-$2} + + test -f "$src" && { + + # If the destination directory doesn't exist, create it. + # This is required at least for "lib/uniwidth/cjk.h". + dst_dir=`dirname "$dst"` + if ! test -d "$dst_dir"; then + mkdir -p "$dst_dir" + + # If we've just created a directory like lib/uniwidth, + # tell version control system(s) it's ignorable. + # FIXME: for now, this does only one level + parent=`dirname "$dst_dir"` + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$parent/$dot_ig + insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'` + done + fi + + if $copy; then + { + test ! -h "$dst" || { + echo "$0: rm -f $dst" && + rm -f "$dst" + } + } && + test -f "$dst" && + cmp -s "$src" "$dst" || { + echo "$0: cp -fp $src $dst" && + cp -fp "$src" "$dst" + } + else + test -h "$dst" && + src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && + dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && + test "$src_i" = "$dst_i" || { + dot_dots= + case $src in + /*) ;; + *) + case /$dst/ in + *//* | */../* | */./* | /*/*/*/*/*/) + echo >&2 "$0: invalid symlink calculation: $src -> $dst" + exit 1;; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; + esac;; + esac + + echo "$0: ln -fs $dot_dots$src $dst" && + ln -fs "$dot_dots$src" "$dst" + } + fi + } +} + +cp_mark_as_generated() +{ + cp_src=$1 + cp_dst=$2 + + if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then + symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst" + elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then + symlink_to_dir $local_gl_dir "$cp_dst" + else + case $cp_dst in + *.[ch]) c1='/* '; c2=' */';; + *.texi) c1='@c '; c2= ;; + *.m4|*/Make*|Make*) c1='# ' ; c2= ;; + *) c1= ; c2= ;; + esac + + # If the destination directory doesn't exist, create it. + # This is required at least for "lib/uniwidth/cjk.h". + dst_dir=`dirname "$cp_dst"` + test -d "$dst_dir" || mkdir -p "$dst_dir" + + if test -z "$c1"; then + cmp -s "$cp_src" "$cp_dst" || { + echo "$0: cp -f $cp_src $cp_dst" && + rm -f "$cp_dst" && + sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst" + } + else + # Copy the file first to get proper permissions if it + # doesn't already exist. Then overwrite the copy. + cp "$cp_src" "$cp_dst-t" && + ( + echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && + echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && + sed "s!$bt_regex/!!g" "$cp_src" + ) > $cp_dst-t && + if cmp -s "$cp_dst-t" "$cp_dst"; then + rm -f "$cp_dst-t" + else + echo "$0: cp $cp_src $cp_dst # with edits" && + mv -f "$cp_dst-t" "$cp_dst" + fi + fi + fi +} + +version_controlled_file() { + dir=$1 + file=$2 + found=no + if test -d CVS; then + grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | + grep '^/[^/]*/[0-9]' > /dev/null && found=yes + elif test -d .git; then + git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes + elif test -d .svn; then + svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes + else + echo "$0: no version control for $dir/$file?" >&2 + fi + test $found = yes +} + +slurp() { + for dir in . `(cd $1 && find * -type d -print)`; do + copied= + sep= + for file in `ls -a $1/$dir`; do + case $file in + .|..) continue;; + .*) continue;; # FIXME: should all file names starting with "." be ignored? + esac + test -d $1/$dir/$file && continue + for excluded_file in $excluded_files; do + test "$dir/$file" = "$excluded_file" && continue 2 + done + if test $file = Makefile.am; then + copied=$copied${sep}$gnulib_mk; sep=$nl + remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g" + sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || { + echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." && + rm -f $dir/$gnulib_mk && + sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk + } + elif { test "${2+set}" = set && test -r $2/$dir/$file; } || + version_controlled_file $dir $file; then + echo "$0: $dir/$file overrides $1/$dir/$file" + else + copied=$copied$sep$file; sep=$nl + if test $file = gettext.m4; then + echo "$0: patching m4/gettext.m4 to remove need for intl/* ..." + rm -f $dir/$file + sed ' + /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\ + AC_DEFUN([AM_INTL_SUBDIR], [ + /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\ + AC_DEFUN([gt_INTL_SUBDIR_CORE], []) + $a\ + AC_DEFUN([gl_LOCK_EARLY], []) + ' $1/$dir/$file >$dir/$file + else + cp_mark_as_generated $1/$dir/$file $dir/$file + fi + fi || exit + done + + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$dir/$dot_ig + if test -n "$copied"; then + insert_sorted_if_absent $ig "$copied" + # If an ignored file name ends with .in.h, then also add + # the name with just ".h". Many gnulib headers are generated, + # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc. + # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed + f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'` + insert_sorted_if_absent $ig "$f" + + # For files like sys_stat.in.h and sys_time.in.h, record as + # ignorable the directory we might eventually create: sys/. + f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'` + insert_sorted_if_absent $ig "$f" + fi + done + done +} + + +# Create boot temporary directories to import from gnulib and gettext. +rm -fr $bt $bt2 && +mkdir $bt $bt2 || exit + +# Import from gnulib. + +gnulib_tool_options="\ + --import\ + --no-changelog\ + --aux-dir $bt/$build_aux\ + --doc-base $bt/$doc_base\ + --lib $gnulib_name\ + --m4-base $bt/$m4_base/\ + --source-base $bt/$source_base/\ + --tests-base $bt/$tests_base\ + --local-dir $local_gl_dir\ + $gnulib_tool_option_extras\ +" +echo "$0: $gnulib_tool $gnulib_tool_options --import ..." +$gnulib_tool $gnulib_tool_options --import $gnulib_modules && +slurp $bt || exit + +for file in $gnulib_files; do + symlink_to_dir "$GNULIB_SRCDIR" $file || exit +done + + +# Import from gettext. +with_gettext=yes +grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ + with_gettext=no + +if test $with_gettext = yes; then + echo "$0: (cd $bt2; autopoint) ..." + cp configure.ac $bt2 && + (cd $bt2 && autopoint && rm configure.ac) && + slurp $bt2 $bt || exit + + rm -fr $bt $bt2 || exit +fi + +# Coreutils is unusual in that it generates some of its test-related +# Makefile.am files. That must be done before invoking automake. +mam_template=tests/Makefile.am.in +if test -f $mam_template; then + PERL=perl + for tool in cut head join pr sort tac tail test tr uniq wc; do + m=tests/$tool/Makefile.am + t=${m}t + rm -f $m $t + sed -n '1,/^##test-files-begin/p' $mam_template > $t + echo "x = $tool" >> $t + srcdir=tests/$tool + $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t + sed -n '/^##test-files-end/,$p' $mam_template >> $t + chmod -w $t + mv $t $m + done +fi + +# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some +# gnulib-populated directories. Such .m4 files would cause aclocal to fail. +# The following requires GNU find 4.2.3 or newer. Considering the usual +# portability constraints of this script, that may seem a very demanding +# requirement, but it should be ok. Ignore any failure, which is fine, +# since this is only a convenience to help developers avoid the relatively +# unusual case in which a symlinked-to .m4 file is git-removed from gnulib +# between successive runs of this script. +find "$m4_base" "$source_base" \ + -depth \( -name '*.m4' -o -name '*.[ch]' \) \ + -type l -xtype l -delete > /dev/null 2>&1 + +# Reconfigure, getting other files. + +aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am` +for command in \ + libtool \ + "aclocal --force $aclocal_flags" \ + 'autoconf --force' \ + 'autoheader --force' \ + 'automake --add-missing --copy --force-missing'; +do + if test "$command" = libtool; then + grep '^[ ]*LT_INIT\>' configure.ac >/dev/null || + continue + command='libtoolize -c -f' + grep '^[ ]*LT_WITH_LTDL' configure.ac > /dev/null && + command="$command --ltdl" + fi + echo "$0: $command ..." + $command || exit +done + +# FIXME: A kludge to avoid unnecessary data in the distribution. +test -d libltdl/config && rm -rf libltdl/config +test -d libltdl/m4 && rm -rf libltdl/m4 + +# Get some extra files from gnulib, overriding existing files. +for file in $gnulib_extra_files; do + case $file in + */INSTALL) dst=INSTALL;; + build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;; + *) dst=$file;; + esac + symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit +done + +if test $with_gettext = yes; then + # Create gettext configuration. + echo "$0: Creating po/Makevars from po/Makevars.template ..." + rm -f po/Makevars + sed ' + /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} + } + ' po/Makevars.template >po/Makevars + + if test -d runtime-po; then + # Similarly for runtime-po/Makevars, but not quite the same. + rm -f runtime-po/Makevars + sed ' + /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ + /^subdir *=.*/s/=.*/= runtime-po/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} + } + ' <po/Makevars.template >runtime-po/Makevars + + # Copy identical files from po to runtime-po. + (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + fi +fi + +echo "$0: done. Now you can run './configure'." diff --git a/bootstrap.conf b/bootstrap.conf new file mode 100644 index 0000000..0767b22 --- /dev/null +++ b/bootstrap.conf @@ -0,0 +1,69 @@ +# Bootstrap configuration for ID3ed. -*- shell-script -*- +# Copyright (C) 2009 Sergey Poznyakoff +# +# ID3ed is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# ID3ed is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ID3ed. If not, see <http://www.gnu.org/licenses/>. + +source_base=gnu +gnulib_name=libgnu +gnulib_mk=Makefile.am + +if [ -n "$MODAVOID" ]; then + gnulib_tool_option_extras="`echo $MODAVOID | sed 's/\([^ ][^ ]*\)/--avoid &/g'`" +fi + +# gnulib modules used by this package. +gnulib_modules=`grep '^[^#]' gnulib.modules` + +## I18N +NLS_MARKERS="\ + asprintf:2\ + vasprintf:2\ + error:3\ + error_at_line:5" + +# Additional xgettext options to use. Use "\\\newline" to break lines. +if [ -n "$NLS_MARKERS" ]; then + XGETTEXT_OPTIONS="$XGETTEXT_OPTIONS "`echo $NLS_MARKERS | tr ' ' '\n' | sed 's/.*/ --flag=&:c-format\\\\\\\\\\\\/'`" +" +fi + +# Bug address +extract_bug_address=' + /^AC-INIT-BUG-ADDRESS/{ + s/[][]//g + s/.*=//p + } +' + +COPYRIGHT_HOLDER="Sergey Poznyakoff" +MSGID_BUGS_ADDRESS=`echo 'changequote([,])' | m4 -D'AC_INIT=AC-INIT-BUG-ADDRESS=$3' - configure.ac | sed -n "$extract_bug_address"` +if test -z "$MSGID_BUGS_ADDRESS"; then + MSGID_BUGS_ADDRESS="bug-${package}@gnu.org.ua" +fi + +# Read local configuration file +if [ -r .bootstrap ]; then + echo "$0: Reading configuration file .bootstrap" + eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*" +fi + +test -d $source_base || mkdir $source_base + +SKIP_PO=t + +cat > ChangeLog <<EOT +This file is a placeholder. It will be replaced with the actual ChangeLog +by make dist. Run make ChangeLog if you wish to create it earlier. +EOT + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..3b35567 --- /dev/null +++ b/configure.ac @@ -0,0 +1,34 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.61) +AC_INIT(id3ed, 0.1, [gray@gnu.org.ua]) +AC_CONFIG_SRCDIR([src/id3ed.h]) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_AUX_DIR([build-aux]) +AM_INIT_AUTOMAKE([1.9 gnits tar-ustar std-options]) + +# Checks for programs. +AC_PROG_CC +gl_EARLY + +# Checks for libraries. + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([stdlib.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T + +# Checks for library functions. +AC_FUNC_MEMCMP +AC_CHECK_FUNCS([memset strcasecmp strerror strncasecmp]) + +gl_INIT + +AC_CONFIG_FILES([Makefile + gnu/Makefile + src/Makefile]) +AC_OUTPUT diff --git a/gnulib.modules b/gnulib.modules new file mode 100644 index 0000000..3013198 --- /dev/null +++ b/gnulib.modules @@ -0,0 +1,8 @@ +# List of gnulib modules needed for id3ed. +# A module name per line. Empty lines and comments are ignored. + +error +getopt +gitlog-to-changelog +progname +xalloc @@ -1,263 +0,0 @@ -#include "id3ed.h" - -char *progname; - -void -copy_string(const char *name, char *ptr, size_t size, const char *arg) -{ - size_t len = strlen(arg); - if (len > size) { - fprintf(stderr, "%s: %s truncated\n", progname, name); - len = size; - } - memcpy(ptr, arg, len); -} - - -void -verify_mp3(FILE *fp, const char *name) -{ - char str[3]; - unsigned short sig = 0; - int c = 0; - - if (fread(str, sizeof(str), 1, fp) != 1) { - fprintf(stderr, "%s: error reading %s: %s\n", progname, - name, strerror(errno)); - exit(1); - } - if (memcmp(str, "ID3", 3) == 0) { - fprintf(stderr, "%s: %s: warning: ID3 header found\n", - progname, name); - return; - } - sig = ((unsigned char)str[0]) << 8 | ((unsigned char)str[1]); - - switch (sig & 0xFFFE) { - case 0xFFFA: /* MPEG ADTS, layer III, v1 */ - case 0xFFF2: /* MPEG ADTS, layer III, v2 */ - case 0xFFFE: /* MPEG ADTS, layer III, v2.5 */ - break; - - default: - fprintf(stderr, "%s: %s: not an mp3 file\n", progname, - name); - exit(1); - } -} - -void -read_id3(FILE *fp, const char *name, struct id3_block *blk) -{ - if (fseek(fp, -sizeof(blk[0]), SEEK_END)) { - fprintf(stderr, "%s: %s: seek error: %s\n", - progname, name, strerror(errno)); - exit(1); - } - if (fread(blk, sizeof(blk[0]), 1, fp) != 1) { - fprintf(stderr, "%s: %s: read error: %s\n", - progname, name, strerror(errno)); - exit(1); - } -} - -#define ID3_MERGE_FIELD( |