#### 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).
progname="$0"
srcdir="`pwd`/.."
-builddir=..
+builddir=${srcdir}
## Default location to place it is /usr/local
prefix=/usr/local
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
ac_prev=
ac_prev=prefix ;;
-p=* | -prefix=* | --p=* | --prefix=*)
prefix=`expr "x$1" : 'x[^=]*=\(.*\)'` ;;
+ --build-in-place | --build-in-place )
+ build_in_place=yes ;;
+ --build-dir | -build-dir | --builddir | -build-dir)
+ build_in_place=no
+ ac_prev=builddir;;
+ --build-dir=* | -build-dir=* | -builddir=* | --builddir=*)
+ build_in_place=no
+ builddir=`expr "x$1" : 'x[^=]*=\(.*\)'`;;
-no-configure | -no-conf | --no-configure | --no-conf | --without-config)
with_config=no ;;
-no-app | --no-app | -without-app | --without-app)
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.
+ --build-dir=DIR Build the application in the specified directory
+ instead of a temporary directory. Mutually exclusive
+ with --build-in-place.
-C,option Pass option to configure
-M,option Pass option to make
EOF
tempparentfull="`pwd`/${tempparent}"
tempparentdist=${tempparentfull}/dist
+if test "$build_in_place" = "no"; then
+ case ${builddir} in
+ ${srcdir})
+ tempbuild="make-package.build.$$"
+ builddir="`pwd`/${tempbuild}"
+ removable_build_dir=${builddir}
+ mkdir -p ${builddir}
+ ;;
+ [\\/]* | ?:[\\/]* ) #Absolutepath.
+ mkdir -p ${builddir}
+ ;;
+ *)
+ mkdir -p ${builddir}
+ builddir=`cd $builddir && pwd`
+ ;;
+ esac
+fi
+# Location of install package
+packagedir=${builddir}/mac/Emacs.pkg
+
+echo Building in directory ${builddir}
echo Installing into directory ${tempparentfull} >&2
+### 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} ${removable_build_dir} ${packagedir}; exit 1" 1 2 15
+
# Run configure in the new tempparent directory
if test "$with_config" = "yes"; then
- (cd ..; ./configure ${config_options} --prefix=${prefix})
+ (cd ${builddir}; ${srcdir}/configure ${config_options} --prefix=${prefix})
fi
installprefix=${tempparentfull}${prefix}
installprefix=$tempparentfull/$appsdir/$emapp/Contents/Resources
fi
-### 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}; rm -rf Emacs.pkg; exit 1" 1 2 15
+
+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 ../lisp/abbrev.elc ]; then
+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 Emacs.app ${tempappdir}
## Delete any CVS files
- find ${tempappdir} -name "CVS" -type d -execdir rm -rf {} \;
+ find ${tempappdir} -name "CVS" -type d -exec rm -rf {} \;
## Have application be a symlink to ${prefix}/bin/emacs
if test "$app_symlink" == "yes"; then
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 Emacs.pkg
-mkdir Emacs.pkg/Contents
-mkdir Emacs.pkg/Contents/Resources
-mkdir Emacs.pkg/Contents/Resources/English.lproj
-echo 'pmkrpkg1' > Emacs.pkg/Contents/PkgInfo
+mkdir -p ${packagedir}
+mkdir ${packagedir}/Contents
+mkdir ${packagedir}/Contents/Resources
+mkdir ${packagedir}/Contents/Resources/English.lproj
+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=Emacs.pkg/Contents/Resources/English.lproj/Emacs.info
+infofile=${packagedir}/Contents/Resources/English.lproj/Emacs.info
-echo 'Title Emacs' > ${infofile}
+echo 'Title GNU Emacs' > ${infofile}
echo "Version ${version}" >> ${infofile}
echo "Description Install GNU Emacs ${version} as a command-line app and a Mac OS Application" >> ${infofile}
echo 'DefaultLocation /' >> ${infofile}
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}
echo "Creating pax file"
-(cd ${tempparentfull}; pax -w -f ../Emacs.pkg/Contents/Resources/Emacs.pax .; cd ..)
+(cd ${tempparentfull}; pax -w -f ${packagedir}/Contents/Resources/Emacs.pax .)
echo "Compressing pax file"
-gzip Emacs.pkg/Contents/Resources/Emacs.pax
+gzip ${packagedir}/Contents/Resources/Emacs.pax
echo "Creating bom file"
-mkbom ${tempparentfull} Emacs.pkg/Contents/Resources/Emacs.bom
+mkbom ${tempparentfull} ${packagedir}/Contents/Resources/Emacs.bom
echo "Generating sizes file"
-sizesfile=Emacs.pkg/Contents/Resources/Emacs.sizes
+sizesfile=${packagedir}/Contents/Resources/Emacs.sizes
-numFiles=`du -a ${tmpparent} | wc -l`
-installedSize=`du -s ${tmpparent} | cut -f1`
-compressedSize=`du -s Emacs.pkg | cut -f1`
+numFiles=`du -a ${tempparent} | wc -l`
+installedSize=`du -s ${tempparent} | cut -f1`
+compressedSize=`du -s ${packagedir} | cut -f1`
echo "NumFiles ${numFiles}" > ${sizesfile}
echo "InstalledSize ${installedSize}" >> ${sizesfile}
echo "CompressedSize ${compressedSize}" >> ${sizesfile}
cat ${sizesfile}
-mv ${tempparentfull} ${emacsname}
-
echo "Creating Disc Image"
-## Allocate an extra 5000 sectors (about 2.5 mg)
-## Note a sector appears to be ~500k
-sectorsAlloced=`echo 2*${compressedSize}+5000|bc`
-hdiutil create -ov EmacsRW -sectors ${sectorsAlloced}
+## 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 EmacsRW.dmg | grep HFS | cut -f1`
+mountLoc=`hdid -nomount ${builddir}/mac/EmacsRW.dmg | grep HFS | cut -f1`
/sbin/newfs_hfs -v Emacs ${mountLoc}
hdiutil eject ${mountLoc}
echo "Copying Package to Disc Image"
-hdid EmacsRW.dmg
+hdid ${builddir}/mac/EmacsRW.dmg
if test "$keep_directory" = "no"; then
- rm -rf ${emacsname}
+ rm -rf ${tempparentfull}
+else
+ mv ${tempparentfull} ${emacsname}
fi
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
-cp -R Emacs.pkg /Volumes/Emacs
+cp -R ${packagedir} /Volumes/Emacs
## Converting Disk Image to read-only
echo 'Converting Disc Image to read-only'
hdiutil eject ${mountLoc}
-hdiutil resize EmacsRW.dmg -sectors min
+hdiutil resize ${builddir}/mac/EmacsRW.dmg -sectors min
if test "$comp_diskimage" = "yes"; then
- hdiutil convert EmacsRW.dmg -format UDZO -imagekey zlib-level=2 -o EmacsInstaller.dmg
+ hdiutil convert ${builddir}/mac/EmacsRW.dmg -format UDZO -imagekey zlib-level=2 -o ${srcdir}/mac/EmacsInstaller.dmg
else
- hdiutil convert EmacsRW.dmg -format UDRO -o EmacsInstaller.dmg
+ hdiutil convert ${builddir}/mac/EmacsRW.dmg -format UDRO -o ${srcdir}/mac/EmacsInstaller.dmg
fi
-rm EmacsRW.dmg
+rm ${builddir}/mac/EmacsRW.dmg
echo "Cleaning up the staging directory"
-rm -rf Emacs.pkg
+rm -rf ${builddir}/mac/Emacs.pkg ${removable_build_dir}
+# arch-tag: 1b631d0d-9fde-4f71-80c0-33e0e5815515
### make-package ends here