X-Git-Url: https://iankelling.org/git/?p=buildscripts;a=blobdiff_plain;f=emacs;h=b2c97406a9c12f44c032806cbf2a5116fa70555a;hp=e99db9951b1ce86a4d36e1247d059b1051aa7ea6;hb=HEAD;hpb=4482a7d6ec82e87d6ddf345193be12326c91a5bc

diff --git a/emacs b/emacs
index e99db99..5fe4e2f 100755
--- a/emacs
+++ b/emacs
@@ -1,5 +1,12 @@
-#!/bin/bash -l
-# Copyright (C) 2016 Ian Kelling
+#!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,98 +20,183 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 #set -x
 # arg = git commit to check out
 
 update=false
-recompile=true
+bootstrap=false
+recompile=false
 show_pkgs=false
+dryrun=false
 
 while [[ $1 == -* ]]; do
-    case $1 in
-        --no-r) recompile=false; shift ;;
-        -u) update=true; shift ;;
-        -p) show_pkgs=true; shift ;;
-        --) break ;;
-    esac
+  case $1 in
+    -b) bootstrap=true; recompile=true ;;
+    -n) dryrun=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
 
-e() { echo "$*"; "$@"; }
 
 # Og = optmize, but keep gdb working
 export CFLAGS="-Og -g3"
 
-pkgs=(gawk attr autoconf-archive)
+export DEBIAN_FRONTEND=noninteractive
+pupdate
+
+# some distros, the package name is like emacs25, some its just emacs
+ver=$(apt-cache showsrc emacs | sed -rn 's/^Version: 1:([0-9]+).*/\1/p' | sort -n | tail -n1) ||:
+for x in {35..25} ""; do
+  if [[ $ver ]] && (( ver >= x )); then
+    echo latest_emacs=emacs
+    latest_emacs=emacs
+    break
+  fi
+  if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
+    echo latest_emacs=$x
+    latest_emacs=emacs$x
+    break
+  fi
+done
+
+# ccache is a missing build dep for mu
+pkgs=(gawk attr autoconf-archive git install-info ccache)
+##### 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 emacs25 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
-      apt-rdepends --build-depends --follow=DEPENDS $x|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
-    done
-    exit 0
+  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[@]}
 
-
-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
-        # 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 emacs25
-        ;;&
-esac
-
-
-
-#building emacs, INSTALL.BZR
-
 #git repo
-dir=/a/opt/emacs-`distro-name`
-dir+=`debian-archive` ||: # we may not be on debian
+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. i dunno why this was like this instead of just $dir-nox.
+#dirs=($dir $dir-nox/.iank/e/e)
+
+dirs=($dir $dir-nox)
+
+m cd /a/opt/emacs
+
+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"
+    installed_info=$(file $(readlink -f $(type -P emacs)))
+    build_info=$(file $dir/src/emacs)
+    if [[ $installed_info == "$build_info" ]]; then
+      echo "already installed exiting"
+      # this isn't perfect, because install could partially fail or the
+      # command after it could
+      exit 0
+    fi
+  fi
+  if [[ $rev != "$head" ]]; then
+    bootstrap=true
+  fi
+else
+  head=$(git rev-parse HEAD)
+  bootstrap=true
+fi
+
+if $dryrun; then
+  echo recompile=$recompile bootstrap=$bootstrap update=$update
+  exit 0
+fi
 
-if [[ ! -e $dir ]]; then
-    e cp -ar /a/opt/emacs $dir
-    recompile=true
+if $bootstrap; then
+  m rsync --delete -ra /a/opt/emacs/ $dir
+  recompile=true
 fi
-e cd $dir
+
+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
+    # 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
+
+  nox=false
+  for d in ${dirs[@]}; do
+    if $nox; then
+      # Commented stuff in this block had something to do with ssh / autofs, im not really using nox right now,
+      # so unless I figure out why it was this way, ignore this.
+      # m mkdir -p ${d%/*}
+      m rsync --delete -ra $dir/ $d
+      #
+      # mp=$HOME/.iank/e/e
+      # if mountpoint $mp &>/dev/null; then
+      #   m sudo umount $mp
+      # fi
+      # m mkdir -p $mp
+      # m sudo mount -o bind $d $mp
+      # m sudo chown $USER:$USER $mp
+      # m cd $mp
+
+      #  instead of $mp above
+      m cd $d
+    else
+      m cd $d
+    fi
     # todo, consider when this should be uncommented
     #logq s make uninstall
-    find ~/.emacs.d/ -name '*.elc' -delete
+    m find ~/.emacs.d/ -name '*.elc' -delete
 
     # git version
     if [[ $1 ]]; then
-        e i clean -xxxfd
+      m i clean -xxxfd
     elif $update; then
-        e i fetch
-        e i clean -xxxffd
-        e i reset --hard origin/master
-        e i clean -xxxffd
+      m i fetch
+      m i clean -xxxffd
+      m i reset --hard origin/master
+      m i clean -xxxffd
     fi
-
     # autogen is usually only for the first build, assume it works
     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.
@@ -116,40 +208,54 @@ if $recompile; then
     export CFLAGS='-g3 -Og'
     #CFLAGS='-std=gnu99 -g3 -O2' logq ./configure --enable-link-time-optimization
     # on ubuntu 12.04, the above fails, says my c compiler won't work, so intead, just use defaults
-    logq ./configure
+    if $nox; then
+      # mix of flags from arch and debians build flags
+      # note, youd think we could just run make again, but the
+      # build system isnt smart enough, we have to recompile
+      # from scratch.
+      logq ./configure --without-x --without-sound --without-gsettings --without-gconf
+      ln -s ~/.emacs.d .
+    else
+      logq ./configure
+    fi
     logq make -j `nproc` bootstrap
+    logq make -j `nproc`
+    if ! $nox; then
+      logq sudo make install
+      # make emacs always work for root
+      sudo /a/exe/lnf /usr/local/bin/emacs /usr/bin
+    fi
+    nox=true
+  done
+else
+  m cd ${dirs[0]}
+  logq sudo make install
+  # make emacs always work for root
+  m sudo /a/exe/lnf /usr/local/bin/emacs /usr/bin
 fi
 
-# 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
-
-
 #git clone https://github.com/djcb/mu
+# note: master failed on t8, i moved back to the commit before a bug
+# https://github.com/djcb/mu/issues/1400
 # from its HACKING file
-cd /a/opt/mu
-./autogen.sh
-make
-s make install
-# note uninstall is implemented
+
+
 
 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/init.el -l ~/.emacs.d/compile-init-dir.el
+  # 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
 
 # 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
+#/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.
@@ -162,3 +268,7 @@ fi
 # fi
 # logq ./configure
 # logq make
+
+my-update-info-dir
+
+echo $head >$last_build