Mercurial > emacs
changeset 48626:bdbf27c68b39
2002-12-02 Andrew Choi <akochoi@shaw.ca>
* make-bin-dist, osx-install: Remove.
* INSTALL: Remove description of make-bin-dist and osx-install.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Mon, 02 Dec 2002 17:25:20 +0000 |
| parents | b696e2bae8da |
| children | c91408365d35 |
| files | mac/ChangeLog mac/INSTALL mac/make-bin-dist mac/osx-install |
| diffstat | 4 files changed, 6 insertions(+), 221 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/ChangeLog Mon Dec 02 17:13:46 2002 +0000 +++ b/mac/ChangeLog Mon Dec 02 17:25:20 2002 +0000 @@ -1,3 +1,9 @@ +2002-12-02 Andrew Choi <akochoi@shaw.ca> + + * make-bin-dist, osx-install: Remove. + + * INSTALL: Remove description of make-bin-dist and osx-install. + 2002-12-02 Steven Tamm <steventamm@mac.com> * make-package (installprefix): Switched copying of .el files
--- a/mac/INSTALL Mon Dec 02 17:13:46 2002 +0000 +++ b/mac/INSTALL Mon Dec 02 17:25:20 2002 +0000 @@ -79,13 +79,6 @@ :sc=\E7:rc=\E8:cs=\E[%i%d;%dr: ----- -To build a binary distribution of Emacs for Mac OS X, run the shell -script make-bin-dist in the `mac' directory. This will create a file -emacs-21.xx.yy-mac-bin.tar.gz. - -To install the binary distribution, untar the file and run the shell -script osx-install in its top-level directory. - To build the `info' files, you need to install the texinfo software. To install from source, obtain texinfo-4.2.tar.gz from ftp.gnu.org or
--- a/mac/make-bin-dist Mon Dec 02 17:13:46 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -#!/bin/sh - -#### make-bin-dist: create a binary Emacs distribution tar file for -#### Mac OS X. This basically runs a `configure' and `make install' -#### into a temporary directory and archives that directory. It also -#### places the Emacs application bundle and a installer script in the -#### tar file. The installer script is run to set up the XML file for -#### setting the environment variables used by Emacs when it is -#### started from the Finder. - -# Copyright (C) 2002 Free Software Foundation, Inc. -# -# This file is part of GNU Emacs. -# -# 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 2, 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -progname="$0" - -### Exit if a command fails. -#set -e - -### Print out each line we read, for debugging's sake. -set -v - -LANGUAGE=C -LC_ALL=C -LC_MESSAGES= -LANG= -export LANGUAGE LC_ALL LC_MESSAGES LANG - -## Don't restrict access to any files. -umask 0 - -### Make sure we're running in the right place. -if [ ! -f Emacs.app/Contents/PkgInfo ]; then - echo "${progname}: Can't find \`Emacs.app/Contents/PkgInfo'" >&2 - echo "${progname} must be run in the \`mac' directory of the Emacs" >&2 - echo "distribution tree. cd to that directory and try again." >&2 - exit 1 -fi - -### Check whether file ../lisp/version.el exists. -if [ ! -f ../lisp/version.el ]; then - echo "${progname}: Can't find \`../lisp/version.el'" >&2 - exit 1 -fi - -### Find out which version of Emacs this is. -shortversion=`grep 'defconst[ ]*emacs-version' ../lisp/version.el \ - | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` -version=`grep 'defconst[ ]*emacs-version' ../lisp/version.el \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` -if [ ! "${version}" ]; then - echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" >&2 - exit 1 -fi - -echo Version numbers are $version and $shortversion - -### Make sure we don't already have a directory emacs-${version}. - -emacsname="emacs-${version}${new_extension}" - -if [ -d ${emacsname} ] -then - echo Directory "${emacsname}" already exists >&2 - exit 1 -fi - -### Make sure the subdirectory is available. -tempparent="make-bin-dist.tmp.$$" -if [ -d ${tempparent} ]; then - echo "${progname}: staging directory \`${tempparent}' already exists. -Perhaps a previous invocation of \`${progname}' failed to clean up after -itself. Check that directories whose names are of the form -\`make-dist.tmp.NNNNN' don't contain any important information, remove -them, and try again." >&2 - exit 1 -fi - -tempparentfull="`pwd`/${tempparent}" - -echo Installing into directory ${tempparentfull} >&2 - -(cd ..; ./configure --prefix=${tempparentfull}; make install) - -### This trap ensures that the staging directory will be cleaned up even -### when the script is interrupted in mid-career. -trap "echo 'Interrupted...cleaning up the staging directory'; rm -rf ${tempparent}; exit 1" 1 2 15 - -cp -r Emacs.app ${tempparent} - -cp osx-install ${tempparent} - -echo "Creating tar file" - -mv ${tempparent} ${emacsname} - -tar cvf - ${emacsname} | gzip > ${emacsname}-mac-bin.tar.gz - -echo "Cleaning up the staging directory" -rm -rf ${emacsname} - -### make-bin-dist ends here
--- a/mac/osx-install Mon Dec 02 17:13:46 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -#!/bin/sh - -#### osx-install: create the file ~/.MacOSX/environment.plist with -#### appropriate paths for Emacs to access lisp and bin directories. -#### On Mac OS X, this file contains values for environment variables -#### seen by Aqua application launched in the Finder. This script -#### must be run at the top level of a Mac OS X binary distribution. - -# Copyright (C) 2002 Free Software Foundation, Inc. -# -# This file is part of GNU Emacs. -# -# 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 2, 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -progname="$0" - -### Exit if a command fails. -#set -e - -### Print out each line we read, for debugging's sake. -set -v - -LANGUAGE=C -LC_ALL=C -LC_MESSAGES= -LANG= -export LANGUAGE LC_ALL LC_MESSAGES LANG - -## Don't restrict access to any files. -umask 0 - -### Make sure we're running in the right place. -if [ ! -d Emacs.app -o ! -d libexec -o ! -d share ]; then - echo "${progname} must be run in the top directory of the Emacs" >&2 - echo "binary distribution tree for Mac OS. cd to that directory" >&2 - echo "and try again." >&2 - exit 1 -fi - -versionfile=`ls share/emacs/21.*/lisp/version.el` - -### Find out which version of Emacs this is. -shortversion=`grep 'defconst[ ]*emacs-version' ${versionfile} \ - | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` -version=`grep 'defconst[ ]*emacs-version' ${versionfile} \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` -if [ ! "${version}" ]; then - echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" >&2 - exit 1 -fi - -echo Version numbers are $version and $shortversion - -homedir=`ls -d ~` -initfile="${homedir}/.MacOSX/environment.plist" - -if [ -f ${initfile} ]; then - mv ${initfile} ${initfile}.old -fi - -if [ -d ${homedir}/.MacOSX ]; then - mkdir ${homedir}/.MacOSX -fi - -execpath=`ls -d libexec/emacs/21.*/powerpc-apple-*/` - -echo '<?xml version="1.0" encoding="UTF-8"?>' > ${initfile} -echo '<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">' >> ${initfile} -echo '<plist version="0.9">' >> ${initfile} -echo '<dict>' >> ${initfile} -echo ' <key>EMACSLOADPATH</key>' >> ${initfile} -echo " <string>`pwd`/share/emacs/${version}/lisp/</string>" >> ${initfile} -echo ' <key>EMACSPATH</key>' >> ${initfile} -echo " <string>`pwd`/${execpath}:`pwd`/bin/</string>" >> ${initfile} -echo ' <key>EMACSDATA</key>' >> ${initfile} -echo " <string>`pwd`/share/emacs/${version}/etc/</string>" >> ${initfile} -echo ' <key>EMACSDOC</key>' >> ${initfile} -echo " <string>`pwd`/share/emacs/${version}/etc/</string>" >> ${initfile} -echo ' <key>INFOPATH</key>' >> ${initfile} -echo " <string>`pwd`/info/</string>" >> ${initfile} -echo '</dict>' >> ${initfile} -echo '</plist>' >> ${initfile} - -### osx-install ends here