X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/910fb17168d6aa88999ed56ca3e7cba3397f0085..5ea7adcc85bde756df818f7f6da70ba28f16548b:/mac/make-package

diff --git a/mac/make-package b/mac/make-package
index e4c228ee97..dc058588f1 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -40,14 +40,26 @@
 # Contributed by Steven Tamm (steventamm@mac.com).
 
 progname="$0"
-## Default location to place it is /usr/local
 
+srcdir="`pwd`/.."
+builddir=..
+
+## 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=yes
+self_contained=no
+app_symlink=no
+full_dist=yes
+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 +74,46 @@ do
        ac_prev=prefix ;;
     -p=* | -prefix=* | --p=* | --prefix=*)
        prefix=`expr "x$1" : 'x[^=]*=\(.*\)'` ;;
-    -no-configure | -no-conf | --no-configure | --no-conf)
+    -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 ;;
+    --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 <<EOF
-\`make-package' generates a Mac OS X 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.
+\`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
 
 Usage: $0 [OPTION]
 
@@ -85,8 +123,20 @@ Options:
                           of the emacs related file.  By default /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 
-                          windowed display, instead of carbon.
+                          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.
+      --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 
+  -C,option               Pass option to configure
+  -M,option               Pass option to make
 EOF
   exit 0
 fi
@@ -95,7 +145,7 @@ fi
 #set -e
 
 ### Print out each line we read, for debugging's sake.
-set -v
+#set -v
 
 LANGUAGE=C
 LC_ALL=C
@@ -114,8 +164,8 @@ itself.  Move or delete Emacs.pkg and try again." >&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,22 +217,80 @@ eject that disc image and try again." >&2
 fi
 
 tempparentfull="`pwd`/${tempparent}"
+tempparentdist=${tempparentfull}/dist
 
 echo Installing into directory ${tempparentfull} >&2
 
-if test "$with_config" = yes; then
-    (cd ..; ./configure ${config_options} --prefix=${prefix};)
+# Run configure in the new tempparent directory
+if test "$with_config" = "yes"; then
+    (cd ..; ./configure ${config_options} --prefix=${prefix})
 fi
 
-(cd ..; make install prefix=${tempparentfull}${prefix})
+installprefix=${tempparentfull}${prefix}
+if test "$self_contained" = "yes"; then
+    # If selfcontained, the local directory is Resources directory
+    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
 
-mkdir ${tempparentfull}/Applications
+## Make bootstrap if .elc files are missing from distribution
+if [ ! -f ../lisp/abbrev.elc ]; then
+   echo "Required .elc files missing; making bootstrap..."
+   if ! (cd ${builddir}; make bootstrap prefix=$installprefix $make_options); then
+      echo "Make bootstrap failed...  Aborting make-package."
+      exit 2
+   fi
+fi
 
-cp -r Emacs.app ${tempparentfull}/Applications
+if ! (cd ${builddir}; make install prefix=$installprefix $make_options); then
+   echo "Make failed... Aborting make-package."
+   exit 1
+fi
+
+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 "$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 -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
+
+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
+    # 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"
 
@@ -207,10 +315,15 @@ 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
+echo "Compressing pax file"
+gzip Emacs.pkg/Contents/Resources/Emacs.pax
 
 echo "Creating bom file"
 mkbom ${tempparentfull} Emacs.pkg/Contents/Resources/Emacs.bom
@@ -218,8 +331,8 @@ mkbom ${tempparentfull} Emacs.pkg/Contents/Resources/Emacs.bom
 echo "Generating sizes file"
 sizesfile=Emacs.pkg/Contents/Resources/Emacs.sizes
 
-numFiles=`du -a ${tmpparent} | wc -l`
-installedSize=`du -s ${tmpparent} | cut -f1`
+numFiles=`du -a ${tempparent} | wc -l`
+installedSize=`du -s ${tempparent} | cut -f1`
 compressedSize=`du -s Emacs.pkg | cut -f1`
 
 echo "NumFiles ${numFiles}" > ${sizesfile}
@@ -241,12 +354,14 @@ hdiutil eject ${mountLoc}
 echo "Copying Package to Disc Image"
 hdid EmacsRW.dmg
 
-rm -rf ${emacsname}
+if test "$keep_directory" = "no"; then
+    rm -rf ${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
 
@@ -256,8 +371,11 @@ cp -R Emacs.pkg /Volumes/Emacs
 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
+if test "$comp_diskimage" = "yes"; then
+    hdiutil convert EmacsRW.dmg -format UDZO -imagekey zlib-level=2 -o EmacsInstaller.dmg
+else
+    hdiutil convert EmacsRW.dmg -format UDRO -o EmacsInstaller.dmg
+fi
 rm EmacsRW.dmg
 
 echo "Cleaning up the staging directory"