#### you should make sure that this script will include it.
# Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
#
done
### Make sure we're running in the right place.
-if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
- echo "${progname}: Can't find \`src/lisp.h' and \`lisp/version.el'." >&2
+if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then
+ echo "${progname}: Can't find \`src/lisp.h' and \`lisp/subr.el'." >&2
echo "${progname} must be run in the top directory of the Emacs" >&2
echo "distribution tree. cd to that directory and try again." >&2
exit 1
fi
### Find out which version of Emacs this is.
-shortversion=`grep 'defconst[ ]*emacs-version' lisp/version.el \
+shortversion=`grep 'char emacs_version' src/emacs.c \
| sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
-version=`grep 'defconst[ ]*emacs-version' lisp/version.el \
+version=`grep 'char emacs_version' src/emacs.c \
| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
if [ ! "${version}" ]; then
- echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" >&2
+ echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
exit 1
fi
then
### Check for .elc files with no corresponding .el file.
ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \
+ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
+ lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el
ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \
+ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
+ lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
leim/[a-z]*/[a-z]*.elc > /tmp/elc
bogosities="`comm -13 /tmp/el /tmp/elc`"
if [ "${bogosities}" != "" ]; then
### Check for .el files with no corresponding .elc file.
ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \
+ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
+ lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.el > /tmp/el
ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \
+ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
+ lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.elc | sed 's/\.elc$/.el/' > /tmp/elc
losers="`comm -23 /tmp/el /tmp/elc`"
bogosities=
(cd lisp;
files=`echo [!=]*.el | sed -e 's/ subdirs.el / /' -e 's/ default.el / /'`
for dir in [!=]*; do
- if [ -d $dir ] && [ $dir != term ] && [ $dir != CVS ] && [ $dir != RCS ]
+ if [ -d $dir ] && [ $dir != term ]
then
echo $dir
thisdir=`echo $dir/[!=]*.el | sed -e 's/ subdirs.el / /'`
etc/images/gud etc/images/icons etc/images/icons/hicolor \
etc/images/icons/hicolor/*x* etc/images/icons/hicolor/scalable \
etc/images/icons/hicolor/*/apps etc/images/icons/hicolor/*/mimetypes \
- etc/images/low-color etc/images/mail \
+ etc/images/low-color etc/images/mail etc/images/mpc \
etc/images/smilies etc/images/smilies/grayscale \
etc/images/smilies/medium etc/images/tree-widget \
etc/images/tree-widget/default etc/images/tree-widget/folder \
nextstep/Cocoa/Emacs.base/Contents \
nextstep/Cocoa/Emacs.base/Contents/Resources \
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj \
- nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib \
nextstep/Cocoa/Emacs.xcodeproj \
nextstep/GNUstep \
nextstep/GNUstep/Emacs.base \
- nextstep/GNUstep/Emacs.base/Resources \
- nextstep/GNUstep/Emacs.base/Resources/preferences.gorm
+ nextstep/GNUstep/Emacs.base/Resources
do
+ ## site-lisp for in-place installs (?).
+ [ "$subdir" = "site-lisp" ] || [ -d "$subdir" ] || \
+ echo "WARNING: $subdir not found, making anyway"
echo " ${tempdir}/${subdir}"
mkdir ${tempdir}/${subdir}
done
## Find all subdirs of lisp dir
for file in `find . -type d -print`; do
case $file in
- . | .. | */Old | */CVS | */RCS | */=*)
+ . | .. | */=*)
;;
*)
if [ -d $file ]; then
ln [a-zA-Z]*.h ../${tempdir}/src
ln [a-zA-Z]*.m ../${tempdir}/src
ln [a-zA-Z]*.in ../${tempdir}/src
+ ln [a-zA-Z]*.mk ../${tempdir}/src
## If we ended up with a symlink, or if we did not get anything
## due to a cross-device symlink, copy the file.
for file in [a-zA-Z]*.[hcs] [a-zA-Z]*.in; do
ln makefile.w32-in ../${tempdir}/src
ln .gdbinit .dbxinit ../${tempdir}/src
cd ../${tempdir}/src
- rm -f config.h epaths.h Makefile Makefile.c
+ rm -f config.h epaths.h Makefile
rm -f =* TAGS)
echo "Making links to \`src/bitmaps'"
echo "Making links to \`src/m'"
(cd src/m
- # We call files for miscellaneous input (to linker etc) .inp.
- ln README [a-zA-Z0-9]*.h *.inp ../../${tempdir}/src/m)
+ ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/m)
echo "Making links to \`src/s'"
(cd src/s
fi
done
cd ../${tempdir}/lib-src
- rm -f Makefile.c
rm -f getopt.h
rm -f =* TAGS)
echo "Making links to \`msdos'"
(cd msdos
ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos
- ln is_exec.c sigaction.c mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos
+ ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos
cd ../${tempdir}/msdos
rm -f =*)
(cd nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj
ln InfoPlist.strings ../../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj)
-echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib'"
-(cd nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib
- ln *.nib ../../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources/preferences.nib)
-
echo "Making links to \`nextstep/Cocoa/Emacs.xcodeproj'"
(cd nextstep/Cocoa/Emacs.xcodeproj
ln project.pbxproj ../../../${tempdir}/nextstep/Cocoa/Emacs.xcodeproj)
(cd nextstep/GNUstep/Emacs.base/Resources
ln Emacs.desktop Info-gnustep.plist README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources )
-echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources/preferences.gorm'"
-(cd nextstep/GNUstep/Emacs.base/Resources/preferences.gorm
- ln data.classes data.info objects.gorm ../../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources/preferences.gorm )
-
echo "Making links to \`oldXMenu'"
(cd oldXMenu
ln *.c *.h *.in ../${tempdir}/oldXMenu
### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
### tex litter.
(cd etc
- files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \
+ files=`ls -d * | grep -v '^e$' \
| grep -v '^charsets$' | grep -v '^gnus$' | grep -v '^images$' | grep -v '^nxml$' \
| grep -v '^refcards$' | grep -v '^tutorials$'| grep -v '^schema$'`
ln $files ../${tempdir}/etc
for dir in etc/charsets etc/e etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do
echo "Making links to \`${dir}'"
(cd ${dir}
- ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir}
+ ln `ls -d *` ../../${tempdir}/${dir}
cd ../../${tempdir}/${dir}
rm -f *~ \#*\# *,v =* core)
done
for dir in etc/images/custom etc/images/ezimage etc/images/gnus \
etc/images/gud etc/images/icons etc/images/low-color etc/images/mail \
- etc/images/smilies ; do
+ etc/images/mpc etc/images/smilies ; do
echo "Making links to \`${dir}'"
(cd ${dir}
for f in *; do
etc/images/smilies/grayscale etc/images/smilies/medium; do
echo "Making links to \`${dir}'"
(cd ${dir}
- ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../${tempdir}/${dir}
+ ln `ls -d *` ../../../../${tempdir}/${dir}
cd ../../../../${tempdir}/${dir}
rm -f *~ \#*\# *,v =* core)
done
etc/images/icons/hicolor/*/mimetypes; do
echo "Making links to \`${dir}'"
(cd ${dir}
- ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../../../${tempdir}/${dir}
+ ln `ls -d *` ../../../../../../${tempdir}/${dir}
cd ../../../../../../${tempdir}/${dir}
rm -f *~ \#*\# *,v =* core)
done
echo "Making links to \`info'"
# Don't distribute backups or autosaves.
(cd info
- ln `find . -type f -print | grep -v CVS | grep -v RCS | grep -v cvsignore` ../${tempdir}/info
+ ln `find . -type f -print` ../${tempdir}/info
#ln [a-zA-Z]* ../${tempdir}/info
cd ../${tempdir}/info
# Avoid an error when expanding the wildcards later.
ln emacs dummy~ ; ln emacs \#dummy\#
- rm -f *~ \#*\# core .arch-inventory)
+ rm -f *~ \#*\# core .arch-inventory .gitignore)
echo "Making links to \`doc/emacs'"
(cd doc/emacs
echo "Making links to \`doc/lispintro'"
(cd doc/lispintro
- ln *.texi *.aux *.fns *.kys *.vrs *.eps ../../${tempdir}/doc/lispintro
+ ln *.texi *.aux *.fns *.kys *.vrs *.eps *.pdf ../../${tempdir}/doc/lispintro
ln makefile.w32-in ../../${tempdir}/doc/lispintro
test -f README && ln README ../../${tempdir}/doc/lispintro
test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispintro