X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=emacs;h=b2c97406a9c12f44c032806cbf2a5116fa70555a;hb=a92d67f31b2f8359baf97eabb0833e17c59ba92f;hp=5082b20e56dd75f4b71eb5543d93b2ba14dc3b5c;hpb=d94b08eaf07f80899b1a1949c8c03dd84f425379;p=buildscripts

diff --git a/emacs b/emacs
index 5082b20..b2c9740 100755
--- a/emacs
+++ b/emacs
@@ -16,86 +16,117 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
-set -x
+#set -x
 # arg = git commit to check out
-# -r = don't recompile from scratch
-# -u = update sources
 
-# stop if any the command fails
 update=false
 recompile=true
+export FORCE_RECOMPILE=true
+show_pkgs=false
 
 while [[ $1 == -* ]]; do
-    case $1 in
-        -r) recompile=false; shift ;;
-        -u) update=true; shift ;;
-        --) break ;;
-    esac
+  case $1 in
+    --no-r) recompile=false; unset FORCE_RECOMPILE; shift ;;
+    -u) update=true; shift ;;
+    -p) show_pkgs=true; shift ;;
+    --) break ;;
+  esac
 done
 
+e() { echo "$*"; "$@"; }
+
+# Og = optmize, but keep gdb working
 export CFLAGS="-Og -g3"
 
-logq pi texlive hunspell git
-case $(distro-name) in
-    fedora )
-        # before i learned the builddep command, i identified these
-        # dependencies. Not sure if the builddep took care of them all
-        # gtk3-devel libXpm-devel libjpeg-turbo-devel libtiff-devel giflib-devel ncurses-devel gnutls-devel libxml2-devel libotf-devel GConf2-devel gpm-devel librsvg2-devel ImageMagick-devel m17n-lib-devel libselinux-devel
-
-        logq s yum-builddep -y emacs
-        logq pi texlive-dvipng
-        ;;&
-    debian|ubuntu)
-        # oddly, on ubuntu 14.04 this installs postfix, but I dun care
-        # ubuntu 14.04 gave this error message
-        # Unable to satisfy the build-depends: Build-Depends: libpng-dev
-        # this is satisfied by dvipng. the build-dep is just wrong
-        # minor bug I'm not going to bother reporting
-        logq p -y build-dep emacs
-        # fyi libmagick is broken right now because it uses a fork which is waiting for emacs to support it
-        # not sure how many of these are satisfied by the prev command,
-        # but from the log, it looks like none of them
-        logq pi libacl1-dev libselinux-dev libm17n-dev libgtk-3-dev \
-             librsvg2-dev libgpm-dev libgconf2-dev libotf-dev libxml2-dev \
-             automake1.11 libgnutls28-dev libncurses-dev libxpm-dev libjpeg-dev \
-             libgif-dev libtiff-dev texinfo dvipng
-        ;;&
-    debian)
-        # included in dependencies on other distros, todo, check on ubuntu
-        logq pi suckless-tools
-        ;;
-esac
+for x in {35..24}; do
+  if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
+    echo $x
+    latest_emacs=emacs$x
+    break
+  fi
+done
 
+pkgs=(gawk attr autoconf-archive git install-info)
+##### warning, apt-rdepends seems to look at the newest version of the package,
+##### not the one that build-dep would install.
+if $show_pkgs; then
+  echo ${pkgs[*]}
+  for x in $latest_emacs maildir-utils; do
+    # todo, this gives fake provided packages like mailx, and then
+    # fai ignores them.
+    # https://askubuntu.com/questions/21379/how-do-i-find-the-build-dependencies-of-a-package
+    if ! type -p apt-rdepends &>/dev/null; then
+      sudo apt-get -y install --purge --auto-remove apt-rdepends
+    fi
+    apt-rdepends -p --build-depends --follow=DEPENDS $x/$(debian-codename)|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
+  done
+  exit 0
+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``debian-archive`
+dir=/a/opt/emacs-`distro-name`
+dir+=`debian-archive` ||: # we may not be on debian
 
 if [[ ! -e $dir ]]; then
-    cp -r /a/opt/emacs $dir
-    recompile=true
+  e cp -ar /a/opt/emacs $dir
+  recompile=true
 fi
-cd $dir
+e cd $dir
 
-if $recompile; then
+rev=$(cat ~/.local/emacs-build-git-revision 2>/dev/null) ||:
+head=$(git rev-parse HEAD)
+
+
+
+if $recompile || [[ $rev != "$head" ]]; then
+
+  case $(distro-name) in
+    fedora )
+      logq s yum-builddep -y emacs
+      logq pi texlive-dvipng
+      ;;&
+    debian|ubuntu|trisquel)
+      # todo: unknown for other distros, this will fail
+      logq p -y build-dep maildir-utils/$(debian-codename)
+      # oddly, on ubuntu 14.04 this installs postfix, but I dun care
+      # ubuntu 14.04 gave this error message
+      # Unable to satisfy the build-depends: Build-Depends: libpng-dev
+      # this is satisfied by dvipng. the build-dep is just wrong
+      # minor bug I'm not going to bother reporting.
+      #
+      # note, useful command to see build dep packagages:
+      # apt-rdepends --build-depends --follow=DEPENDS emacs25
+      logq p -y build-dep $latest_emacs
+      ;;&
+  esac
+
+
+
+  if $recompile; then
     # todo, consider when this should be uncommented
     #logq s make uninstall
     find ~/.emacs.d/ -name '*.elc' -delete
 
     # git version
     if [[ $1 ]]; then
-        i clean -xxxfd
+      e i clean -xxxfd
     elif $update; then
-        i fetch
-        i clean -xxxffd
-        i reset --hard origin/master
-        i clean -xxxffd
+      e i fetch
+      e i clean -xxxffd
+      e i reset --hard origin/master
+      e i clean -xxxffd
     fi
 
     # autogen is usually only for the first build, assume it works
-    logq ./autogen.sh
+    logq ./autogen.sh all
     # I tried changing O2 to O3, don't know if it made it faster or slower so I went back to 02.
     # Also, link-time-optimization based on ./INSTALL
 
@@ -107,27 +138,60 @@ if $recompile; then
     # on ubuntu 12.04, the above fails, says my c compiler won't work, so intead, just use defaults
     logq ./configure
     logq make -j `nproc` bootstrap
-fi
+  fi
 
-# temporarily for testing multiple versions
 
-logq sudo make install
+  # temporarily for testing multiple versions
+  logq make -j `nproc`
+  logq sudo make install
 
-# make emacs always work for root
-s lnf /usr/local/bin/emacs /usr/bin
+  # make emacs always work for root
+  s /a/exe/lnf /usr/local/bin/emacs /usr/bin
 
+  echo $head >~/.local/emacs-build-git-revision
+fi
 
+#git clone https://github.com/djcb/mu
+# note: master failed, i moved back to the commit before a bug https://github.com/djcb/mu/issues/1400
+# from its HACKING file
+
+cd /a/opt/mu
+
+rev=$(cat ~/.local/mu-build-git-revision 2>/dev/null) ||:
+head=$(git rev-parse HEAD)
+if $recompile || [[ $rev != "$head" ]]; then
+
+  if [[ $(distro-name) == trisquel ]]; then
+    # use the flidas branch, stuck behind because
+    # needs newer crypt libraries that are too troublesome.
+    cd /a/opt/muflidas
+  else
+    # newer version than build-dep installs for buster
+    sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+  fi
+  git clean -xfffd
+  ./autogen.sh
+  make
+  sudo make install
+  echo $head >~/.local/mu-build-git-revision
+  # note uninstall is implemented
+fi
 
-logq emacs --batch -l ~/.emacs.d/init.el -l ~/.emacs.d/compile-init-dir.el
+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.
+  logq emacs --batch -l ~/.emacs.d/compile-init-dir.el
+fi
 
-# not keeping up with the latest org-mode development
-#~/bin/buildscripts/org-mode
+# as of 01-2017, built-in org mode has a bug that
+# org-edit-src-exit does not get bound, so using latest
+#/a/bin/buildscripts/org-mode
 
-if $update; then
-    logq pi bzr
-    cd ~/.emacs.d/src/mediawiki-el
-    bzr pull
-fi
+# disabled as i haven't used it in a while
+# if $update; then
+#   logq pi bzr
+#   cd ~/.emacs.d/src/mediawiki-el
+#   bzr pull
+# fi
 
 
 # not keeping up with the latest gnus development.
@@ -140,3 +204,5 @@ fi
 # fi
 # logq ./configure
 # logq make
+
+my-update-info-dir