emacs fixes

[buildscripts] / emacs

diff --git a/emacs b/emacs
index 6b5ec5c8eef9ea75c5767c890e147586ed2ec131..5300c3cbf32c1e0bc143a43685c68f3777585577 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -19,18 +19,21 @@ if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 # arg = git commit to check out
 
 update=false
-recompile=true
-export FORCE_RECOMPILE=true
+bootstrap=false
+recompile=false
 show_pkgs=false
 
 while [[ $1 == -* ]]; do
   case $1 in
-    --no-r) recompile=false; unset FORCE_RECOMPILE; shift ;;
-    -u) update=true; shift ;;
-    -p) show_pkgs=true; shift ;;
+    -b) bootstrap=true; recompile=true ;;
+    -r) recompile=true ;;
+    --no-r) recompile=false ;;
+    -u) update=true ;;
+    -p) show_pkgs=true ;;
     --) break ;;
     *) echo "$0: error: bad arg: $1" >&2; exit 1 ;;
   esac
+  shift
 done
 
 
@@ -39,9 +42,9 @@ export CFLAGS="-Og -g3"
 
 export DEBIAN_FRONTEND=noninteractive
 pupdate
-for x in {35..24}; do
+for x in {35..25} ""; do
   if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
-    echo $x
+    echo latest_emacs=$x
     latest_emacs=emacs$x
     break
   fi
@@ -67,31 +70,44 @@ fi
 
 #building emacs, INSTALL.BZR
 
-# gawk and attr were no longer automatically installed in stretch,
-# looking back, i assume i got some error.
-# autoconf-archive due to come error
-pi ${pkgs[@]}
 
 #git repo
 dir=/a/opt/emacs-$(distro-name)$(distro-num)
+last_build=$dir/iank-emacs-build
 
 # e/e because autofs failing to mount will make it so
 # you cant ls whatever directory it is in, so we
 # need an extra directory
 dirs=($dir $dir-nox/.iank/e/e)
 
-if [[ ! -e $dir ]]; then
-  m cp -ar /a/opt/emacs $dir
-  recompile=true
+if [[ -e $dir ]]; then
+  m cd $dir
+  rev=$(cat $last_build 2>/dev/null) ||:
+  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
 
+if $bootstrap; then
+  m rsync --delete -ra /a/opt/emacs/ $dir
+  recompile=true
+fi
 
-m cd $dir
-
-rev=$(cat ~/.local/emacs-build-git-revision 2>/dev/null) ||:
-head=$(git rev-parse HEAD)
+# gawk and attr were no longer automatically installed in stretch,
+# looking back, i assume i got some error.
+# autoconf-archive due to come error
+pi ${pkgs[@]}
 
-if $recompile || [[ $rev != "$head" ]]; then
+if $recompile; then
   case $(distro-name) in
     fedora )
       logq s yum-builddep -y emacs
@@ -115,10 +131,8 @@ fi
 
 nox=false
 for d in ${dirs[@]}; do
-  if [[ -d $d ]]; then
-    m cd $d
-  fi
   if $nox; then
+    # todo: this doesnt account for
     m mkdir -p ${d%/*}
     m rsync --delete -ra $dir/ $d
     mp=$HOME/.iank/e/e
@@ -129,8 +143,10 @@ for d in ${dirs[@]}; do
     m sudo mount -o bind $d $mp
     m sudo chown $USER:$USER $mp
     m cd $mp
+  else
+    m cd $d
   fi
-  if $recompile; then
+  if $recompile || [[ ! -e configure ]]; then
     # todo, consider when this should be uncommented
     #logq s make uninstall
     m find ~/.emacs.d/ -name '*.elc' -delete
@@ -175,11 +191,11 @@ for d in ${dirs[@]}; do
     logq sudo make install
     # make emacs always work for root
     sudo /a/exe/lnf /usr/local/bin/emacs /usr/bin
-
-    echo $head >~/.local/emacs-build-git-revision
   fi
   nox=true
 done
+echo $head >$last_build
+
 
 #git clone https://github.com/djcb/mu
 # note: master failed on t8, i moved back to the commit before a bug
@@ -189,7 +205,9 @@ done
 
 cd /a/opt/mu
 
-rev=$(cat ~/.local/mu-build-git-revision 2>/dev/null) ||:
+last_build=$PWD/iank-mu-build
+
+rev=$(cat $last_build 2>/dev/null) ||:
 head=$(git rev-parse HEAD)
 if $recompile || [[ $rev != "$head" ]]; then