changelog shortlog graph tags branches files raw help

Mercurial > infra / changeset: emacs-mini

changeset 67: 28ed81f2d290
parent 66: cbd11dc24d4d
child 68: 4905e93756d7
author: ellis <ellis@rwest.io>
date: Wed, 03 Jan 2024 23:20:48 -0500
files: makefile scripts/build-emacs-mini.sh scripts/build-emacs.sh virt/build-ci-operator.sh
description: emacs-mini
     1.1--- a/makefile	Wed Jan 03 22:49:49 2024 -0500
     1.2+++ b/makefile	Wed Jan 03 23:20:48 2024 -0500
     1.3@@ -24,6 +24,8 @@
     1.4 # artifacts can deploy to dist/TARGET - need target triple first
     1.5 # init:sbcl rust emacs rocksdb comp virt;
     1.6 # dist/linux dist/rust dist/bundle
     1.7+quick:comp
     1.8+operator:core-install emacs-build-mini emacs-install
     1.9 all:dist/cdn dist/comp dist/lisp dist/rust dist/sbcl dist/rocksdb dist/emacs
    1.10 clean:;rm -rf $(B) $(D)
    1.11 $(B):;mkdir -pv $@/src
    1.12@@ -49,9 +51,12 @@
    1.13 $(EMACS_TARGET):scripts/get-emacs.sh $(B);
    1.14 	$<
    1.15 emacs:$(EMACS_TARGET)
    1.16-emacs-build:emacs scripts/build-emacs.sh;
    1.17+emacs-build:scripts/build-emacs.sh emcas;
    1.18 	cd $(EMACS_TARGET) && ./autogen.sh
    1.19-	scripts/build-emacs.sh $(EMACS_TARGET)
    1.20+	$< $(EMACS_TARGET)
    1.21+emacs-build-mini:scripts/build-emacs-mini.sh
    1.22+	cd $(EMACS_TARGET) && ./autogen.sh
    1.23+	$< $(EMACS_TARGET)
    1.24 emacs-install:emacs-build;
    1.25 	cd $(EMACS_TARGET) && make install
    1.26 
    1.27@@ -179,28 +184,32 @@
    1.28 	$< "$@/prelude.core" "(mapc #'ql:quickload \
    1.29 	(list :nlp :rdb :organ :packy :skel :obj :net :parse :pod :dat :log :packy :rt :syn :xdb :doc :vc :rt))"
    1.30 
    1.31-dist/lisp/bin:scripts/sbcl-make-bin.sh comp
    1.32+CORE_SRC=/usr/local/share/lisp/core
    1.33+dist/lisp/bin:scripts/sbcl-make-bin.sh
    1.34 	$< bin/skel
    1.35-	cp $(COMP_TARGET)/core/lisp/app/bin/skel $@
    1.36-	rm -f $(COMP_TARGET)/core/lisp/app/bin/skel.fasl
    1.37+	cp $(CORE_SRC)/core/lisp/app/bin/skel $@
    1.38+	rm -f $(CORE_SRC)/core/lisp/app/bin/skel.fasl
    1.39 	$< bin/organ
    1.40-	cp $(COMP_TARGET)/core/lisp/app/bin/organ $@
    1.41-	rm -f $(COMP_TARGET)/core/lisp/app/bin/organ.fasl
    1.42+	cp $(CORE_SRC)/core/lisp/app/bin/organ $@
    1.43+	rm -f $(CORE_SRC)/core/lisp/app/bin/organ.fasl
    1.44 	$< bin/homer
    1.45-	cp $(COMP_TARGET)/core/lisp/app/bin/homer $@
    1.46-	rm -f $(COMP_TARGET)/core/lisp/app/bin/homer.fasl
    1.47+	cp $(CORE_SRC)/core/lisp/app/bin/homer $@
    1.48+	rm -f $(CORE_SRC)/core/lisp/app/bin/homer.fasl
    1.49 	$< bin/packy
    1.50-	cp $(COMP_TARGET)/core/lisp/app/bin/packy $@
    1.51-	rm -f $(COMP_TARGET)/core/lisp/app/bin/packy.fasl
    1.52+	cp $(CORE_SRC)/core/lisp/app/bin/packy $@
    1.53+	rm -f $(CORE_SRC)/core/lisp/app/bin/packy.fasl
    1.54 	$< bin/rdb
    1.55-	cp $(COMP_TARGET)/core/lisp/app/bin/rdb $@
    1.56-	rm -f $(COMP_TARGET)/core/lisp/app/bin/rdb.fasl
    1.57+	cp $(CORE_SRC)/core/lisp/app/bin/rdb $@
    1.58+	rm -f $(CORE_SRC)/core/lisp/app/bin/rdb.fasl
    1.59+
    1.60+dist/lisp:dist/lisp/fasl dist/lisp/bin
    1.61+
    1.62+core-install:dist/lisp
    1.63+	install -m 755 $</bin/* /usr/local/bin/
    1.64+	install -m 755 $</fasl/* /usr/local/lib/sbcl/
    1.65 
    1.66 dist/comp:comp
    1.67 	mkdir -pv $@
    1.68 	cp -r $(COMP_TARGET)/{org,core,infra,demo,nas-t} $@
    1.69 clean-dist:;rm -rf $(D)
    1.70 clean-build:;rm -rf $(B)
    1.71-
    1.72-### Quickstart
    1.73-quick:comp
     2.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2+++ b/scripts/build-emacs-mini.sh	Wed Jan 03 23:20:48 2024 -0500
     2.3@@ -0,0 +1,13 @@
     2.4+#!/usr/bin/env bash
     2.5+CPUS=$(getconf _NPROCESSORS_ONLN)
     2.6+TARGETDIR=${1:-build/src/emacs}
     2.7+CONFIG=(--without-pop
     2.8+	--without-sound
     2.9+	--with-json
    2.10+	--enable-link-time-optimization
    2.11+	--with-modules)
    2.12+pushd $TARGETDIR
    2.13+./autogen.sh
    2.14+$TARGETDIR/configure ${CONFIG[@]} 
    2.15+NATIVE_FULL_AOT=1 make -j$CPUS
    2.16+popd
     3.1--- a/scripts/build-emacs.sh	Wed Jan 03 22:49:49 2024 -0500
     3.2+++ b/scripts/build-emacs.sh	Wed Jan 03 23:20:48 2024 -0500
     3.3@@ -8,7 +8,6 @@
     3.4 	--without-sound
     3.5 	--with-json
     3.6 	--enable-link-time-optimization
     3.7-	--with-native-compilation
     3.8 	--with-modules)
     3.9 pushd $TARGETDIR
    3.10 ./autogen.sh
     4.1--- a/virt/build-ci-operator.sh	Wed Jan 03 22:49:49 2024 -0500
     4.2+++ b/virt/build-ci-operator.sh	Wed Jan 03 23:20:48 2024 -0500
     4.3@@ -1,8 +1,10 @@
     4.4 #!/usr/bin/env bash
     4.5 id=$(buildah from ci-worker)
     4.6-buildah add $id etc/skel /etc
     4.7 buildah run $id adduser $USER -D
     4.8+buildah config --volume /mnt/y $id
     4.9+# save a fresh core
    4.10+buildah config --workingdir /infra $id
    4.11+buildah run --net host $id make operator
    4.12 buildah config --workingdir /home/$USER $id
    4.13-buildah config --volume /mnt/y $id
    4.14 buildah config --entrypoint '["/usr/local/bin/sbcl", "--core", "/usr/local/lib/sbcl/prelude.fasl"]' $id
    4.15 buildah commit $id ci-operator