X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7b1019e2781472c793d0bf74e2b9ee17894270b8..fdcab4274673a2a7f15a5c9fa0a25e48585773fb:/make-dist diff --git a/make-dist b/make-dist index 866b4351e9..02c2c46940 100755 --- a/make-dist +++ b/make-dist @@ -7,7 +7,7 @@ #### you should make sure that this script will include it. # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is part of GNU Emacs. # @@ -141,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;; @@ -305,7 +305,7 @@ mkdir ${tempdir} echo "Making links to top-level files" ln INSTALL README BUGS move-if-change ${tempdir} ln ChangeLog Makefile.in configure configure.in ${tempdir} -ln config.bat make-dist update-subdirs vpath.sed ${tempdir} +ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir} ### Copy these files; they're cross-filesystem symlinks. cp mkinstalldirs ${tempdir} cp config.sub ${tempdir} @@ -337,10 +337,17 @@ for subdir in lisp site-lisp \ 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/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 + doc/misc doc/man doc/lispref doc/lispintro m4 msdos \ + 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 +358,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 +438,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 +479,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 @@ -510,7 +510,7 @@ echo "Making links to \`m4'" echo "Making links to \`nt'" (cd nt - ln emacs.manifest emacs.rc config.nt [a-z]*.c ../${tempdir}/nt + ln emacs.manifest emacs.rc emacsclient.rc config.nt [a-z]*.c ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt ln [a-z]*.bat [a-z]*.h ../${tempdir}/nt ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) @@ -536,26 +536,6 @@ echo "Making links to \`nt/icons'" ln [a-z]*.ico ../../${tempdir}/nt/icons ln [a-z]*.cur ../../${tempdir}/nt/icons) -echo "Making links to \`mac'" -(cd mac - ln ChangeLog INSTALL README make-package ../${tempdir}/mac) - -echo "Making links to \`mac/src'" -(cd mac/src - ln [a-z]*.c *.r ../../${tempdir}/mac/src) - -echo "Making links to \`mac/Emacs.app/Contents'" -(cd mac/Emacs.app/Contents - ln Info.plist PkgInfo ../../../${tempdir}/mac/Emacs.app/Contents) - -echo "Making links to \`mac/Emacs.app/Contents/Resources'" -(cd mac/Emacs.app/Contents/Resources - ln Emacs.icns ../../../../${tempdir}/mac/Emacs.app/Contents/Resources) - -echo "Making links to \`mac/Emacs.app/Contents/Resources/English.lproj'" -(cd mac/Emacs.app/Contents/Resources/English.lproj - ln InfoPlist.strings ../../../../../${tempdir}/mac/Emacs.app/Contents/Resources/English.lproj) - echo "Making links to \`msdos'" (cd msdos ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos @@ -563,11 +543,42 @@ 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 - ln README ChangeLog ../${tempdir}/oldXMenu - ln compile.com descrip.mms ../${tempdir}/oldXMenu) + ln README ChangeLog ../${tempdir}/oldXMenu) echo "Making links to \`lwlib'" (cd lwlib @@ -613,19 +624,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 \ @@ -654,7 +672,7 @@ echo "Making links to \`info'" cd ../${tempdir}/info # Avoid an error when expanding the wildcards later. ln emacs dummy~ ; ln emacs \#dummy\# - rm -f *~ \#*\# core) + rm -f *~ \#*\# core .arch-inventory) echo "Making links to \`doc/emacs'" (cd doc/emacs @@ -707,18 +725,13 @@ echo "Making links to \`doc/lispintro'" echo "Making links to \`doc/man'" (cd doc/man - ln *.1 ../../${tempdir}/doc/man) - -echo "Making links to \`vms'" -(cd vms - test -f README && ln README ../${tempdir}/vms - cd ../${tempdir}/vms - rm -f *~) + ln *.1 ../../${tempdir}/doc/man + ln ChangeLog ../../${tempdir}/doc/man) ### It would be nice if they could all be symlinks to top-level copy, but ### you're not supposed to have any symlinks in distribution tar files. echo "Making sure copying notices are all copies of \`COPYING'" -for subdir in . etc info leim lib-src lisp lwlib mac msdos nt src; do +for subdir in . etc info leim lib-src lisp lwlib msdos nt src; do rm -f ${tempdir}/${subdir}/COPYING cp COPYING ${tempdir}/${subdir} done