X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/5338a63986a6bc4e486c1ca2e3260586b6ce62f7..baf0cb84bf02779e1fda3e34999fef5a5a8f3bab:/make-dist diff --git a/make-dist b/make-dist index 409edb521f..781a553905 100755 --- a/make-dist +++ b/make-dist @@ -197,8 +197,12 @@ if [ $check = yes ]; 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 @@ -209,8 +213,12 @@ 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= @@ -328,8 +336,8 @@ for subdir in lisp site-lisp \ 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/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 etc/images/custom 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/scalable \ etc/images/icons/hicolor/*/apps etc/images/icons/hicolor/*/mimetypes \ etc/images/low-color etc/images/mail \ @@ -342,13 +350,14 @@ for subdir in lisp site-lisp \ 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 @@ -389,23 +398,14 @@ echo "Making links to \`lisp' and its subdirectories" mkdir -p ../${tempdir}/lisp/$file ln $file/[a-zA-Z0-9]*.el ../${tempdir}/lisp/$file ln $file/[a-zA-Z0-9]*.elc ../${tempdir}/lisp/$file - for img in $file/[a-zA-Z]*.xpm $file/[a-zA-Z]*.xbm $file/[a-zA-Z]*.pbm; do - if [ -f $img ]; then - ln $img ../${tempdir}/lisp/$file + ## calc/README.priv, nxml/TODO + for f in $file/[a-zA-Z]*.xpm $file/[a-zA-Z]*.[xp]bm \ + $file/README $file/ChangeLog $file/ChangeLog.*[0-9] \ + $file/README.prev $file/TODO; do + if [ -f $f ]; then + ln $f ../${tempdir}/lisp/$file fi done - if [ -f $file/README ]; then - ln $file/README ../${tempdir}/lisp/$file - fi - - if [ -f $file/ChangeLog ]; then - ln $file/ChangeLog ../${tempdir}/lisp/$file - for f in $file/ChangeLog.*[0-9]; do - if [ -f $f ]; then - ln $f ../${tempdir}/lisp/$file - fi - done - fi done ) echo "Making links to \`leim' and its subdirectories" @@ -414,14 +414,14 @@ echo "Making links to \`leim' and its subdirectories" ln makefile.w32-in ../${tempdir}/leim ln ChangeLog README ../${tempdir}/leim - ln CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC + ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC - ln MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC + ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic ln Makefile.in ../${tempdir}/leim/Makefile.in ln leim-ext.el ../${tempdir}/leim/leim-ext.el - ## Lisp files that start with a capital are generated from TIT - ## dictionaries so we don't distribute them. + ## Lisp files that start with a capital (also 4Corner.el) are + ## generated from TIT dictionaries so we don't distribute them. ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail rm -f ../${tempdir}/leim/quail/quick-b5.* rm -f ../${tempdir}/leim/quail/quick-cns.* @@ -440,10 +440,9 @@ echo "Making links to \`src'" 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]*.opt ../${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 [a-zA-Z]*.opt; do + for file in [a-zA-Z]*.[hcs] [a-zA-Z]*.in; do if test -f ../${tempdir}/src/$file; then # test -f appears to succeed for a symlink if test -L ../${tempdir}/src/$file; then @@ -481,7 +480,7 @@ echo "Making links to \`lib-src'" (cd 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 b2m.pl grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src ln makefile.w32-in ../${tempdir}/lib-src ## If we ended up with a symlink, or if we did not get anything ## due to a cross-device symlink, copy the file. @@ -533,12 +532,12 @@ echo "Making links to \`nt/inc/netinet'" echo "Making links to \`nt/icons'" (cd nt/icons - ln [a-z]*.ico ../../${tempdir}/nt/icons + ln README [a-z]*.ico ../../${tempdir}/nt/icons ln [a-z]*.cur ../../${tempdir}/nt/icons) echo "Making links to \`msdos'" (cd msdos - ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos + ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos ln is_exec.c sigaction.c mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos cd ../${tempdir}/msdos rm -f =*) @@ -560,10 +559,6 @@ echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources/English.lpr (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) @@ -572,10 +567,6 @@ echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" (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 @@ -633,8 +624,9 @@ echo "Making links to \`etc/images'" 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 +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 echo "Making links to \`${dir}'" (cd ${dir} for f in *; do @@ -673,24 +665,23 @@ 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 .arch-inventory) + rm -f *~ \#*\# core .arch-inventory .gitignore) echo "Making links to \`doc/emacs'" (cd doc/emacs - ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/emacs + ln *.texi *.aux *.fns *.kys *.vrs ../../${tempdir}/doc/emacs ln makefile.w32-in ../../${tempdir}/doc/emacs - test -f README && ln README ../../${tempdir}/doc/emacs test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/emacs ln ChangeLog ../../${tempdir}/doc/emacs - cp texinfo.tex ../../${tempdir}/doc/emacs cd ../../${tempdir}/doc/emacs rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux) echo "Making links to \`doc/misc'" (cd doc/misc - ln *.texi *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/misc + ln *.texi *.aux *.fns *.kys *.vrs ../../${tempdir}/doc/misc ln makefile.w32-in ../../${tempdir}/doc/misc + ln gnus-news.el ../../${tempdir}/doc/misc test -f README && ln README ../../${tempdir}/doc/misc test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/misc ln ChangeLog ../../${tempdir}/doc/misc @@ -699,12 +690,13 @@ echo "Making links to \`doc/misc'" rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux) +## FIXME book-spine.texinfo unused? echo "Making links to \`doc/lispref'" (cd doc/lispref - ln `ls -1 *.texi` ../../${tempdir}/doc/lispref - ln *.aux *.cps *.fns *.kys *.vrs ../../${tempdir}/doc/lispref + ln *.texi *.aux *.fns *.kys *.vrs ../../${tempdir}/doc/lispref ln *.txt *.el spellfile tindex.pl ../../${tempdir}/doc/lispref ln makefile.w32-in ../../${tempdir}/doc/lispref + ln book-spine.texinfo two-volume.make ../../${tempdir}/doc/lispref test -f README && ln README ../../${tempdir}/doc/lispref test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispref ln ChangeLog ../../${tempdir}/doc/lispref @@ -714,9 +706,8 @@ echo "Making links to \`doc/lispref'" echo "Making links to \`doc/lispintro'" (cd doc/lispintro - ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../../${tempdir}/doc/lispintro + ln *.texi *.aux *.fns *.kys *.vrs *.eps ../../${tempdir}/doc/lispintro ln makefile.w32-in ../../${tempdir}/doc/lispintro - test -f texinfo.tex && ln texinfo.tex ../../${tempdir}/doc/lispintro test -f README && ln README ../../${tempdir}/doc/lispintro test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/lispintro ln ChangeLog ../../${tempdir}/doc/lispintro