X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/68e7476278a3dc4bd13dab63cc23bc0e671e5525..c788afcec7700f168c482ed3d934bd31c324e448:/make-dist diff --git a/make-dist b/make-dist index 6d91e7cf56..19d7ddc79b 100755 --- a/make-dist +++ b/make-dist @@ -8,23 +8,22 @@ # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007, 2008 Free Software Foundation, Inc. -# + # This file is part of GNU Emacs. # -# GNU Emacs is free software; you can redistribute it and/or modify +# GNU Emacs 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. -# +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + # GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# along with GNU Emacs. If not, see . + progname="$0" @@ -142,7 +141,7 @@ then /*) ;; *) if [ ! -f "$EMACS" ]; then - echo "$0: You must specify the EMACS environment variable " \ + echo "$0: You must set the EMACS environment variable " \ "to an absolute file name." 2>&1 exit 1 fi;; @@ -328,19 +327,30 @@ for subdir in lisp site-lisp \ leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - etc etc/e etc/gnus etc/nxml \ + etc etc/charsets etc/e etc/gnus etc/nxml \ etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ etc/images/icons etc/images/icons/hicolor \ - etc/images/icons/hicolor/*x* etc/images/icons/hicolor/*x*/apps \ + 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/smilies etc/images/smilies/grayscale \ etc/images/smilies/medium etc/images/tree-widget \ etc/images/tree-widget/default etc/images/tree-widget/folder \ etc/refcards etc/schema etc/tutorials info doc doc/emacs \ doc/misc doc/man doc/lispref doc/lispintro m4 msdos vms mac \ - mac/inc mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ + mac/src mac/Emacs.app mac/Emacs.app/Contents \ mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ - mac/Emacs.app/Contents/Resources/English.lproj + mac/Emacs.app/Contents/Resources/English.lproj \ + nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ + 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 do echo " ${tempdir}/${subdir}" mkdir ${tempdir}/${subdir} @@ -351,13 +361,6 @@ echo "Making links to \`lisp' and its subdirectories" (cd lisp ln [a-zA-Z]*.el ../${tempdir}/lisp ln [a-zA-Z]*.elc ../${tempdir}/lisp - ln [a-zA-Z]*.dat ../${tempdir}/lisp - for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do - # If there are no images, the shell won't expand the pattern. - if [ -f $img ]; then - ln $img ../${tempdir}/lisp - fi - done ## simula.el doesn't keep abbreviations in simula.defns any more. ## ln [a-zA-Z]*.defns ../${tempdir}/lisp ln ChangeLog ChangeLog.*[0-9] ../${tempdir}/lisp @@ -438,7 +441,7 @@ echo "Making links to \`src'" echo " (It is ok if ln fails in some cases.)" ln [a-zA-Z]*.c ../${tempdir}/src ln [a-zA-Z]*.h ../${tempdir}/src - ln [a-zA-Z]*.s ../${tempdir}/src + ln [a-zA-Z]*.m ../${tempdir}/src ln [a-zA-Z]*.in ../${tempdir}/src ln [a-zA-Z]*.opt ../${tempdir}/src ## If we ended up with a symlink, or if we did not get anything @@ -479,7 +482,7 @@ echo "Making links to \`src/s'" echo "Making links to \`lib-src'" (cd lib-src - ln [a-zA-Z]*.[chy] ../${tempdir}/lib-src + ln [a-zA-Z]*.[chmy] ../${tempdir}/lib-src ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src ln makefile.w32-in ../${tempdir}/lib-src @@ -538,15 +541,7 @@ echo "Making links to \`nt/icons'" echo "Making links to \`mac'" (cd mac - ln ChangeLog INSTALL README make-package *.xml *.MPW ../${tempdir}/mac) - -echo "Making links to \`mac/inc'" -(cd mac/inc - ln [a-z]*.h ../../${tempdir}/mac/inc) - -echo "Making links to \`mac/inc/sys'" -(cd mac/inc/sys - ln [a-z]*.h ../../../${tempdir}/mac/inc/sys) + ln ChangeLog INSTALL README make-package ../${tempdir}/mac) echo "Making links to \`mac/src'" (cd mac/src @@ -571,6 +566,38 @@ echo "Making links to \`msdos'" cd ../${tempdir}/msdos rm -f =*) +echo "Making links to \`nextstep'" +(cd nextstep + ln AUTHORS ChangeLog FOR-RELEASE README.txt compile ../${tempdir}/nextstep) + +echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents'" +(cd nextstep/Cocoa/Emacs.base/Contents + ln Info.plist PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents) + +echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources'" +(cd nextstep/Cocoa/Emacs.base/Contents/Resources + ln Credits.html Emacs.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources) + +echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj'" +(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) + +echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" +(cd nextstep/GNUstep/Emacs.base/Resources + ln Emacs.desktop Info-gnustep.plist 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 @@ -587,7 +614,7 @@ echo "Making links to \`etc'" ### tex litter. (cd etc files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ - | grep -v '^gnus$' | grep -v '^images$' | grep -v '^nxml$' \ + | 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 ## If we ended up with a symlink, or if we did not get anything @@ -611,7 +638,7 @@ echo "Making links to \`etc'" rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) -for dir in etc/e etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do +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} @@ -621,19 +648,26 @@ done echo "Making links to \`etc/images'" (cd etc/images - for img in README [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do - if [ -f $img ]; then - ln $img ../../${tempdir}/etc/images - fi + for f in *; do + [ -f "$f" ] || continue + case $f in + (*~|\#*\#|*,v|=*|core) continue ;; + esac + ln $f ../../${tempdir}/etc/images done) for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \ etc/images/low-color etc/images/mail etc/images/smilies ; do echo "Making links to \`${dir}'" (cd ${dir} - ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir} - cd ../../../${tempdir}/${dir} - rm -f *~ \#*\# *,v =* core) + for f in *; do + [ -f "$f" ] || continue + case $f in + (*~|\#*\#|*,v|=*|core) continue ;; + esac + ln $f ../../../${tempdir}/${dir} + done + ) done for dir in etc/images/tree-widget/default etc/images/tree-widget/folder \ @@ -645,7 +679,8 @@ for dir in etc/images/tree-widget/default etc/images/tree-widget/folder \ rm -f *~ \#*\# *,v =* core) done -for dir in etc/images/icons/hicolor/*x*/apps ; do +for dir in etc/images/icons/hicolor/*/apps \ + etc/images/icons/hicolor/*/mimetypes; do echo "Making links to \`${dir}'" (cd ${dir} ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../../../${tempdir}/${dir}