catchup with lots of updates

[buildscripts] / emacs

diff --git a/emacs b/emacs
index b9cc53b60824c2d67a1d73ee91a71690c173bdf4..f4444f8e1d8acc81f0e286c249c0dc81300f6b58 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -97,6 +97,7 @@ last_build=$dir/iank-emacs-build
 
 dirs=($dir $dir-nox)
 
+m cd /a/opt/emacs
 
 if [[ -e $dir ]]; then
   m cd $dir
@@ -104,12 +105,12 @@ if [[ -e $dir ]]; then
   head=$(git rev-parse HEAD)
   if ! $recompile && ! $bootstrap && [[ $rev == "$head" ]]; then
     echo "already compiled, exiting"
+    exit 0
   fi
   if [[ $rev != "$head" ]]; then
     bootstrap=true
   fi
 else
-  m cd /a/opt/emacs
   head=$(git rev-parse HEAD)
   bootstrap=true
 fi
@@ -211,7 +212,6 @@ if $recompile; then
     fi
     nox=true
   done
-  echo $head >$last_build
 else
   m cd ${dirs[0]}
   logq sudo make install
@@ -225,37 +225,6 @@ fi
 # from its HACKING file
 
 
-cd /a/opt/mu
-
-last_build=$PWD/iank-mu-build
-
-rev=$(cat $last_build 2>/dev/null) ||:
-head=$(git rev-parse HEAD)
-
-if [[ $(debian-codename) == flidas ]]; then
-  # use the flidas branch, stuck behind because
-  # needs newer crypt libraries that are too troublesome.
-  cd /a/opt/muflidas
-else
-  # libgmime-3.0-dev is a newer version than build-dep installs for buster
-  m sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev meson
-fi
-if $recompile || [[ $rev != "$head" ]]; then
-  m git clean -xfffd
-  m ./autogen.sh && make -j`nproc`
-  # note uninstall is implemented
-  m sudo make install
-  echo $head >$last_build
-else
-  # Workaround for some indecipherable build error
-  # that only happens after syncing the mu dir and not building from
-  # scratch. It seems there is some state somewhere, like ~/.local
-  # that doesn't get copied. Found the workaround by reading the Makefile,
-  # then doing a more verbose build with:
-  # ninja -C $PWD/build -v -d explain
-  sudo touch -d @$(($(stat -c%Y build/build.ninja) - 100)) /usr/local/bin/emacs
-  m sudo make install
-fi
 
 if $recompile; then
   # note, not totally sure its right to put this within recompile, but its taking up most of the time, so going for it.
@@ -286,3 +255,5 @@ fi
 # logq make
 
 my-update-info-dir
+
+echo $head >$last_build