[elpa] externals/hyperbole 7f37701e2c 3/4: Local straight (#363)

[ELPA Syncer]

branch: externals/hyperbole
commit 7f37701e2c8af08725179172776a417e295d6b7c
Author: Mats Lidell <mats.lidell@lidells.se>
Commit: GitHub <noreply@github.com>

    Local straight (#363)
---
 Makefile                              | 12 ++++++++----
 hargs.el                              |  3 ++-
 install-test/MANIFEST                 |  1 +
 install-test/elpa-devel/.emacs        |  1 +
 install-test/elpa/.emacs              |  1 +
 install-test/local-install-test.sh    |  6 ++++++
 install-test/local/.emacs             | 31 +++++++++++++++++++++++++++++++
 install-test/tarball/install-local.sh |  3 ++-
 8 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 85b1cded50..2d38f4fc45 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     24-Jun-23 at 00:31:35 by Mats Lidell
+# Last-Mod:      9-Jul-23 at 20:35:56 by Mats Lidell
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -319,7 +319,6 @@ load-hyperbole:
 #          -f batch-native-compile $(EL_KOTL) $(EL_COMPILE)
 eln: src
        $(EMACS_BATCH) \
-          $(LOAD_EL) \
          -f batch-native-compile $(EL_KOTL) $(EL_COMPILE)
 
 # Byte compile files but apply a filter for either including or
@@ -507,13 +506,18 @@ test-all-output:
 
 # Hyperbole install tests - Verify that hyperbole can be installed
 # using different sources. See folder "install-test"
-.PHONY: install-elpa install-elpa-devel install-tarball install-straight 
install-all
-install-all: install-elpa install-elpa-devel install-tarball install-straight
+.PHONY: install-elpa install-elpa-devel install-tarball install-straight 
install-all install-local
+install-all: install-elpa install-elpa-devel install-tarball install-straight 
install-local
 
 install-elpa install-elpa-devel install-tarball install-straight:
        @echo "Install Hyperbole using $@"
        (cd ./install-test/ && ./local-install-test.sh $(subst install-,,$@))
 
+install-local:
+       @echo "Install Hyperbole using $@"
+       (cd ./install-test/ && \
+       ./local-install-test.sh $(subst install-,,$@) $(shell pwd) $(shell git 
rev-parse --abbrev-ref HEAD 2>/dev/null))
+
 package-lint:
        $(EMACS_BATCH) \
        --eval "(setq package-lint-main-file \"hyperbole.el\")" \
diff --git a/hargs.el b/hargs.el
index fecdbb0a62..bf582b5033 100644
--- a/hargs.el
+++ b/hargs.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    31-Oct-91 at 23:17:35
-;; Last-Mod:     10-Jul-23 at 18:26:29 by Mats Lidell
+;; Last-Mod:     11-Jul-23 at 10:36:27 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -33,6 +33,7 @@
 (require 'hypb)
 (require 'set)
 (require 'info)
+(require 'hmouse-drv)
 
 ;;; ************************************************************************
 ;;; Public variables
diff --git a/install-test/MANIFEST b/install-test/MANIFEST
index 4013b6ef6a..9f06c3ffcc 100644
--- a/install-test/MANIFEST
+++ b/install-test/MANIFEST
@@ -5,3 +5,4 @@ local-install-test.sh        - Run one or more test 
installations
 straight/.emacs              - Straight git package personal configuration
 tarball/.emacs               - Manual tarball personal configuration
 tarball/install-local.sh     - Manual tarball download and build script
+local/.emacs                 - Straight git package from local repo and branch
diff --git a/install-test/elpa-devel/.emacs b/install-test/elpa-devel/.emacs
index f27fb10ee7..1828da633f 100644
--- a/install-test/elpa-devel/.emacs
+++ b/install-test/elpa-devel/.emacs
@@ -3,6 +3,7 @@
 (when (< emacs-major-version 27)
   (error "Hyperbole requires Emacs 27 or above; you are running version %d" 
emacs-major-version))
 (require 'package)
+(setq package-native-compile t)
 (add-to-list 'package-archives '("gnu-devel" . "https://elpa.gnu.org/devel/";))
 (unless (package-installed-p 'hyperbole)
   (package-refresh-contents)
diff --git a/install-test/elpa/.emacs b/install-test/elpa/.emacs
index a367d0ba5a..0c94637a28 100644
--- a/install-test/elpa/.emacs
+++ b/install-test/elpa/.emacs
@@ -3,6 +3,7 @@
 (when (< emacs-major-version 27)
   (error "Hyperbole requires Emacs 27 or above; you are running version %d" 
emacs-major-version))
 (require 'package)
+(setq package-native-compile t)
 (unless (package-installed-p 'hyperbole)
   (package-refresh-contents)
   (package-install 'hyperbole))
diff --git a/install-test/local-install-test.sh 
b/install-test/local-install-test.sh
index 3f05cb3920..a94a5fddcc 100755
--- a/install-test/local-install-test.sh
+++ b/install-test/local-install-test.sh
@@ -16,6 +16,12 @@ export HOME=$app/$install_method
 
 cd $app/$install_method
 
+if [ -n "$2" ]
+then
+  export LOCAL_HYPB_REPO=$2
+  export LOCAL_HYPB_BRANCH=$3
+fi
+
 ## Initial install with ert tests
 emacs --batch -l $app/$install_method/.emacs \
       --eval '(load (expand-file-name "test/hy-test-dependencies.el" 
hyperb:dir))' \
diff --git a/install-test/local/.emacs b/install-test/local/.emacs
new file mode 100644
index 0000000000..5c1090b398
--- /dev/null
+++ b/install-test/local/.emacs
@@ -0,0 +1,31 @@
+;; Use this in your Emacs init file to install Straight
+(progn
+  (when (< emacs-major-version 27)
+    (error "Hyperbole requires Emacs 27 or above; you are running version %d" 
emacs-major-version))
+  (defvar bootstrap-version)
+  (setq package-enable-at-startup nil)
+  (let ((bootstrap-file
+         (expand-file-name "straight/repos/straight.el/bootstrap.el" 
user-emacs-directory))
+        (bootstrap-version 5))
+    (unless (file-exists-p bootstrap-file)
+      (with-current-buffer
+          (url-retrieve-synchronously
+           
"https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el";
+           'silent 'inhibit-cookies)
+        (goto-char (point-max))
+        (eval-print-last-sexp)))
+    (load bootstrap-file nil 'nomessage)))
+
+(setq package-native-compile t)
+
+(straight-use-package
+ (list
+  'hyperbole
+  :host nil
+  :repo (getenv "LOCAL_HYPB_REPO")
+  :branch (getenv "LOCAL_HYPB_BRANCH")
+  :config '(hyperbole-mode 1)))
+
+(hyperbole-mode 1)
+
+(message "%s" "Hyperbole successfully installed and activated")
diff --git a/install-test/tarball/install-local.sh 
b/install-test/tarball/install-local.sh
index a828718254..9defde2b8e 100755
--- a/install-test/tarball/install-local.sh
+++ b/install-test/tarball/install-local.sh
@@ -3,4 +3,5 @@ tar -xf hyperbole.tar
 rm hyperbole.tar
 ln -s hyperbole* hyperbole
 cd hyperbole
-make bin
+make bin eln
+