X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bfde2673662f0af592d6de0ed2b3f0809e0fd70c..0a1bb12333835d0ca88a002ca714315952b27065:/mac/make-package diff --git a/mac/make-package b/mac/make-package index d3eae56a07..85c6646c5d 100755 --- a/mac/make-package +++ b/mac/make-package @@ -18,7 +18,7 @@ #### 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 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -34,20 +34,34 @@ # # 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" -## Default location to place it is /usr/local +srcdir="`pwd`/.." +builddir=${srcdir} + +## Default location to place it is /usr/local prefix=/usr/local +appsdir=/Applications +emapp=Emacs.app with_config=yes +with_app=yes +with_x=no +comp_diskimage=no +self_contained=no +app_symlink=no +full_dist=yes +compressed_dist=no +build_in_place=no +keep_directory=no ac_prev= display_usage=false; -config_options=--without-x +config_options=; while test $# != 0 do if test -n "$ac_prev"; then @@ -62,20 +76,56 @@ do 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-x | --without-x) + with_x=no ;; -with-x | --with-x) - config_options= ;; + with_x=yes + 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) + app_symlink=yes ;; + --keep-dir) + keep_directory=yes ;; + -C,* | -c,*) + config_options="$config_options `expr "x$1" : 'x[^,]*,\(.*\)'`" ;; + -M,* | -m,*) + make_options="$make_options `expr "x$1" : 'x[^,]*,\(.*\)'`" ;; + *) + display_usage=yes ;; esac shift done +if test "$with_x" = "no"; then + config_options="--without-x $config_options" +fi + if test "$display_usage" = "yes"; then cat <&2 exit 1 fi -if [ ! -f Emacs.app/Contents/PkgInfo ]; then - echo "${progname}: Can't find \`Emacs.app/Contents/PkgInfo'" >&2 +if test $with_app == "yes" && [ ! -f ${emapp}/Contents/PkgInfo ]; then + echo "${progname}: Can't find \`${emapp}/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 @@ -167,46 +235,130 @@ eject that disc image and try again." >&2 fi 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 -if test "$with_config" = yes; then - (cd ..; ./configure ${config_options} --prefix=${prefix};) +### 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 ${builddir}; ${srcdir}/configure ${config_options} --prefix=${prefix}) +fi + +installprefix=${tempparentfull}${prefix} +if test "$self_contained" = "yes"; then + # If selfcontained, the local directory is Resources directory + 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 ../lisp/abbrev.elc ]; then +if [ ! -f ${srcdir}/lisp/abbrev.elc ]; then echo "Required .elc files missing; making bootstrap..." - if ! (cd ..; make bootstrap prefix=${tempparentfull}${prefix}); then + if ! (cd ${builddir}; make bootstrap $make_options); then echo "Make bootstrap failed... Aborting make-package." exit 2 fi fi -if ! (cd ..; make install prefix=${tempparentfull}${prefix}); then +if ! (cd ${builddir}; make install $make_options); then echo "Make failed... Aborting make-package." exit 1 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 +if test "$full_dist" == "no"; then + echo "Removing unneeded .el files" + sharedir=$installprefix/share/emacs/$version + 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 -mkdir ${tempparentfull}/Applications +if test "$with_app" == "yes"; then + echo "Creating Emacs.app application" + tempappdir=${tempparentfull}${appsdir} + tempemapp=${tempappdir}/${emapp}/Contents/MacOS/Emacs + ## Delete any CVS files + find ${tempappdir} -name "CVS" -type d -exec rm -rf {} \; + + ## Have application be a symlink to ${prefix}/bin/emacs + if test "$app_symlink" == "yes"; then + echo "Creating application symlink" + rm ${tempemapp} + ln -s ${prefix}/bin/${emacsname} ${tempemapp} + fi +fi -cp -r Emacs.app ${tempparentfull}/Applications +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/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 +fi + + +# Remove unnecessary .el files +#if test "$full_dist" = no; then +#fi 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 -infofile=Emacs.pkg/Contents/Resources/English.lproj/Emacs.info +# Create ReadMe and License files +cp ${srcdir}/COPYING ${packagedir}/Contents/Resources/License.txt +cp ${srcdir}/mac/README ${packagedir}/Contents/Resources/ReadMe.txt -echo 'Title Emacs' > ${infofile} +infofile=${packagedir}/Contents/Resources/English.lproj/Emacs.info + +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} @@ -219,60 +371,71 @@ echo 'UseUserMask NO' >> ${infofile} echo 'OverwritePermissions NO' >> ${infofile} echo 'InstallFat NO' >> ${infofile} +### 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 ..) -#echo "Compressing pax file" -#gzip Emacs.pkg/Contents/Resources/Emacs.pax +(cd ${tempparentfull}; pax -w -f ${packagedir}/Contents/Resources/Emacs.pax .) +echo "Compressing pax file" +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 -rm -rf ${emacsname} +if test "$keep_directory" = "no"; then + rm -rf ${tempparentfull} +else + mv ${tempparentfull} ${emacsname} +fi if [ ! -d /Volumes/Emacs ]; then - echo "Could not create disc image. The Emacs installer package in this -directory should be correct. Please use the Disc Copy program to create -a disc image." >&2 + 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 +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 convert EmacsRW.dmg -format UDRO -o EmacsInstaller.dmg -gzip EmacsInstaller.dmg -rm EmacsRW.dmg +hdiutil resize ${builddir}/mac/EmacsRW.dmg -sectors min +if test "$comp_diskimage" = "yes"; then + hdiutil convert ${builddir}/mac/EmacsRW.dmg -format UDZO -imagekey zlib-level=2 -o ${srcdir}/mac/EmacsInstaller.dmg +else + hdiutil convert ${builddir}/mac/EmacsRW.dmg -format UDRO -o ${srcdir}/mac/EmacsInstaller.dmg +fi +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