#### files inside /usr. This will replace the default version of
#### emacs included with Mac OS X.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
#
# 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.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# Contributed by Steven Tamm (steventamm@mac.com).
with_config=yes
with_app=yes
with_x=no
-comp_diskimage=yes
+comp_diskimage=no
self_contained=no
app_symlink=no
full_dist=yes
+compressed_dist=no
build_in_place=no
keep_directory=no
with_app=no ;;
--without-full-dist | -without-full-dist | -no-full-dist | -no-full)
full_dist=no ;;
+ --compressed-dist)
+ compressed_dist=yes ;;
--self-contained | -self-contained | --with-self-contained-app | -sc)
self_contained=yes ;;
-app-symlink | --app-symlink | -symlink | --symlink | --asl)
if test "$display_usage" = "yes"; then
cat <<EOF
-\`make-package' generates a Mac OS X installer package from an Emacs
-distribution. By default, this first runs ./configure on the emacs
-directory. Then make install to create the emacs distribution.
-Then some mac-specific commands to generate the required information
+\`make-package' generates a Mac OS X installer package from an Emacs
+distribution. By default, this first runs ./configure on the emacs
+directory. Then make install to create the emacs distribution.
+Then some mac-specific commands to generate the required information
for the mac package. The installer will, by default, create a
Carbon application called Emacs in the ${appsdir} directory, with the
shared emacs files in /usr/local
--no-conf Do not run the configure script before running
make install.
--without-app Do not create the Emacs application bundle
- --with-x Setup the install to use X Windows for its
+ --with-x Setup the install to use X Windows for its
windowed display, instead of carbon. Implies
--without-app.
--without-full-dist Do not include all the .el files in the distribution.
This is discouraged except if disk space is critical.
+ --compressed-dist Compress .el and info files in the distribution.
--app-symlink Have the Emacs.app executable be a symlink
to the install in [prefix]/bin/emacs and have
the emacs executable link to emacs-${version}
--self-contained Create an Emacs.app that is self-contained;
- prefix will be ignored and all files installed
- inside the application
+ prefix will be ignored and all files installed
+ inside the application
--build-in-place Build the application in the source directory
- instead of a temporary directory.
+ instead of a temporary directory.
--build-dir=DIR Build the application in the specified directory
instead of a temporary directory. Mutually exclusive
with --build-in-place.
tempbuild="make-package.build.$$"
builddir="`pwd`/${tempbuild}"
removable_build_dir=${builddir}
+ mkdir -p ${builddir}
;;
[\\/]* | ?:[\\/]* ) #Absolutepath.
mkdir -p ${builddir}
installprefix=$tempparentfull/$appsdir/$emapp/Contents/Resources
fi
+
+make_options="prefix=${installprefix} $make_options"
+
+if test "$with_app" = "yes"; then
+ make_options="carbon_appdir=${tempparentfull}/Applications $make_options"
+fi
+
## Make bootstrap if .elc files are missing from distribution
if [ ! -f ${srcdir}/lisp/abbrev.elc ]; then
echo "Required .elc files missing; making bootstrap..."
- if ! (cd ${builddir}; make bootstrap prefix=$installprefix $make_options); then
+ if ! (cd ${builddir}; make bootstrap $make_options); then
echo "Make bootstrap failed... Aborting make-package."
exit 2
fi
fi
-if ! (cd ${builddir}; make install prefix=$installprefix $make_options); then
+if ! (cd ${builddir}; make install $make_options); then
echo "Make failed... Aborting make-package."
exit 1
fi
find $sharedir/lisp $sharedir/leim -name "*.elc" -print | sed 's|\(.*\)\.elc$|/bin/rm -f \1.el|' | /bin/sh -s
fi
+if test "$compressed_dist" == "yes" -a "$full_dist" == "yes"; then
+ echo "Compressing .el files"
+ sharedir=$installprefix/share/emacs/$version
+ find $sharedir/lisp $sharedir/leim -name "*.elc" -print | sed 's|\(.*\)\.elc$|/usr/bin/gzip -9 \1.el|' | /bin/sh -s
+ echo "Compressing info files"
+ find $installprefix/info -type f ! -name dir -print | sed 's|\(.*\)$|/usr/bin/gzip -9 \1|' | /bin/sh -s
+fi
+
if test "$with_app" == "yes"; then
echo "Creating Emacs.app application"
tempappdir=${tempparentfull}${appsdir}
tempemapp=${tempappdir}/${emapp}/Contents/MacOS/Emacs
- mkdir ${tempappdir}
-
- ## Copy Emacs application
- cp -r ${builddir}/mac/Emacs.app ${tempappdir}
## Delete any CVS files
find ${tempappdir} -name "CVS" -type d -exec rm -rf {} \;
fi
fi
+compver=powerpc-apple-darwin`uname -r`
+
if test "$self_contained" = "yes"; then
# Move shared files down to Resources directory
mv $installprefix/share/emacs/$version/* $installprefix
rm -rf $installprefix/share
# These directories might remain in Resources
mv $installprefix/bin $installprefix/../MacOS/bin
- mv $installprefix/libexec $installprefix/../MacOS/libexec
+ mv $installprefix/libexec/emacs/$version/$compver $installprefix/../MacOS/libexec
# Make the application binary a hard link
rm $installprefix/../MacOS/Emacs
ln $installprefix/../MacOS/bin/emacs $installprefix/../MacOS/Emacs
echo "Creating Package Info file"
-mkdir ${packagedir}
+mkdir -p ${packagedir}
mkdir ${packagedir}/Contents
mkdir ${packagedir}/Contents/Resources
mkdir ${packagedir}/Contents/Resources/English.lproj
-echo 'pmkrpkg1' > ${packagedir}/Contents/PkgInfo
+echo -n 'pmkrpkg1' > ${packagedir}/Contents/PkgInfo
+
+# Create ReadMe and License files
+cp ${srcdir}/COPYING ${packagedir}/Contents/Resources/License.txt
+cp ${srcdir}/mac/README ${packagedir}/Contents/Resources/ReadMe.txt
infofile=${packagedir}/Contents/Resources/English.lproj/Emacs.info
echo 'OverwritePermissions NO' >> ${infofile}
echo 'InstallFat NO' >> ${infofile}
-### Set the install directory to install files as root...
+### Set the install directory to install files as root...
### Not sure if this is a good diea
# echo "Setting owner to root"
# chown -Rh 0 ${tempparentfull}
cat ${sizesfile}
echo "Creating Disc Image"
-## Allocate an extra 5000 sectors (about 2.5 mg)
-## Note a sector appears to be 512k
-sectorsAlloced=`echo 2*${compressedSize}+5000|bc`
+## From hdiutil man page, a sector is 512k. Allocate an extra 5% for
+## directories and partition tables.
+sectorsAlloced=`echo 2.1*${compressedSize}|bc`
hdiutil create -ov ${builddir}/mac/EmacsRW -sectors ${sectorsAlloced}
## Need to format the disc image before mounting
mountLoc=`hdid -nomount ${builddir}/mac/EmacsRW.dmg | grep HFS | cut -f1`
if [ ! -d /Volumes/Emacs ]; then
echo "Could not create disc image. The Emacs installer package (Emacs.pkg)
-in this directory should be correct. Please use the Disc Copy program to
+in this directory should be correct. Please use the Disc Copy program to
create a disc image." >&2
exit 0
fi
echo "Cleaning up the staging directory"
rm -rf ${builddir}/mac/Emacs.pkg ${removable_build_dir}
+# arch-tag: 1b631d0d-9fde-4f71-80c0-33e0e5815515
### make-package ends here