From 4b426f02920646ffac2f46a3759d87362e8799ea Mon Sep 17 00:00:00 2001 From: fpi Date: Wed, 8 Jul 2020 16:30:02 +0200 Subject: Add a basic Makefile --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a3a7693 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +.PHONY: merge tangle + +merge: + tangle/merge.sh + +tangle: + tangle/tangle.sh + +link: + tangle/link.sh -- cgit v1.2.3 From a965137b4b6fe572f4f5daee467000dd8404200c Mon Sep 17 00:00:00 2001 From: fpi Date: Wed, 15 Jul 2020 21:53:02 +0200 Subject: Add a script to pull from origin with rebase --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a3a7693..92b04f5 100644 --- a/Makefile +++ b/Makefile @@ -8,3 +8,9 @@ tangle: link: tangle/link.sh + +fetch: + git fetch + +pull: + tangle/pull.sh -- cgit v1.2.3 From 622e94a68126d7670a2dd40317e23730fccc153b Mon Sep 17 00:00:00 2001 From: fpi Date: Wed, 15 Jul 2020 22:41:26 +0200 Subject: Add make install target for fresh installations --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 92b04f5..033ac9a 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ -.PHONY: merge tangle +.PHONY: merge install link tangle fetch pull merge: tangle/merge.sh -tangle: +install: tangle link + +tangle: tangle/tangle.sh tangle/tangle.sh link: @@ -14,3 +16,6 @@ fetch: pull: tangle/pull.sh + +tangle/tangle.sh: README.org + emacs --batch --eval "(and (require 'org) (org-babel-tangle-file \"README.org\"))" -- cgit v1.2.3 From 4fcde17f96ada0c57ca42bb094f6ff5ae428f77e Mon Sep 17 00:00:00 2001 From: fpi Date: Thu, 16 Jul 2020 08:55:22 +0200 Subject: Add explicit make targets for readme tangles --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 033ac9a..8455a6a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ +dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh + .PHONY: merge install link tangle fetch pull -merge: +merge: tangle/merge.sh tangle/merge.sh install: tangle link @@ -8,14 +10,14 @@ install: tangle link tangle: tangle/tangle.sh tangle/tangle.sh -link: +link: tangle/link.sh tangle/link.sh fetch: git fetch -pull: +pull: tangle/pull.sh tangle/pull.sh -tangle/tangle.sh: README.org +$(addprefix tangle/,$(dst_readme)) &: README.org emacs --batch --eval "(and (require 'org) (org-babel-tangle-file \"README.org\"))" -- cgit v1.2.3 From da085e587776c84938ae38cd10003921b319ba06 Mon Sep 17 00:00:00 2001 From: fpi Date: Thu, 23 Jul 2020 07:59:54 +0200 Subject: Make tangling of readme silent --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8455a6a..f7412b5 100644 --- a/Makefile +++ b/Makefile @@ -19,5 +19,6 @@ fetch: pull: tangle/pull.sh tangle/pull.sh +.SILENT: $(addprefix tangle/,$(dst_readme)) $(addprefix tangle/,$(dst_readme)) &: README.org - emacs --batch --eval "(and (require 'org) (org-babel-tangle-file \"README.org\"))" + emacs --batch --eval "(and (require 'org) (org-babel-tangle-file \"README.org\"))" &> /dev/null -- cgit v1.2.3 From 71194e54cd50a20d6d1dbe7e883e5a07ec6150e2 Mon Sep 17 00:00:00 2001 From: fpi Date: Mon, 27 Jul 2020 10:11:25 +0200 Subject: Add experimental way to reduce amount of tangling Works by saving the git commit hash upon tangling. Currently this does not record if tangling fails for some reason. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f7412b5..d381bbf 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh -.PHONY: merge install link tangle fetch pull +.PHONY: merge install link tangle fetch pull clean merge: tangle/merge.sh tangle/merge.sh @@ -10,6 +10,9 @@ install: tangle link tangle: tangle/tangle.sh tangle/tangle.sh +clean: + rm hash/* + link: tangle/link.sh tangle/link.sh -- cgit v1.2.3 From cfeec023d5a401756773657cf3f86aacaca87c0b Mon Sep 17 00:00:00 2001 From: fpi Date: Sun, 23 Aug 2020 13:06:36 +0200 Subject: Add make target for dev+ branch --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d381bbf..db682d6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,16 @@ dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh -.PHONY: merge install link tangle fetch pull clean +.PHONY: merge dev install link tangle fetch pull clean merge: tangle/merge.sh tangle/merge.sh +dev: + git fetch + git rebase origin/dev+ dev+ + git rebase master dev+ + git push --force origin dev+ + install: tangle link tangle: tangle/tangle.sh -- cgit v1.2.3 From d511e2d575505d8513ce70c646108a4616951fa0 Mon Sep 17 00:00:00 2001 From: fpi Date: Mon, 21 Sep 2020 09:42:05 +0200 Subject: Add update target to combine pull and dev --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index db682d6..8f504ea 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh -.PHONY: merge dev install link tangle fetch pull clean +.PHONY: merge update dev install link tangle fetch pull clean merge: tangle/merge.sh tangle/merge.sh +update: pull dev + dev: git fetch git rebase origin/dev+ dev+ -- cgit v1.2.3 From b4cb3a93487181152160ba13b50ee12e353e2e43 Mon Sep 17 00:00:00 2001 From: fpi Date: Wed, 14 Oct 2020 10:27:02 +0200 Subject: Expand update target to also merge and rebase --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f504ea..7578e04 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ dst_readme := tangle.sh merge.sh pull.sh link.sh dots.sh -.PHONY: merge update dev install link tangle fetch pull clean +.PHONY: update merge dev install link tangle fetch pull clean + +update: pull merge dev + git rebase dev+ work+ merge: tangle/merge.sh tangle/merge.sh -update: pull dev - dev: git fetch git rebase origin/dev+ dev+ -- cgit v1.2.3 From bf7d0a09d6e0eaac029b43d976126164e786910b Mon Sep 17 00:00:00 2001 From: fpi Date: Sat, 19 Dec 2020 18:32:54 +0100 Subject: Add mkdir before tangling --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7578e04..51c279a 100644 --- a/Makefile +++ b/Makefile @@ -33,4 +33,5 @@ pull: tangle/pull.sh .SILENT: $(addprefix tangle/,$(dst_readme)) $(addprefix tangle/,$(dst_readme)) &: README.org + mkdir tangle emacs --batch --eval "(and (require 'org) (org-babel-tangle-file \"README.org\"))" &> /dev/null -- cgit v1.2.3 From a8072e98168d365de32753ab6388b2b6a8a0ec08 Mon Sep 17 00:00:00 2001 From: fpi Date: Mon, 4 Jan 2021 15:51:16 +0100 Subject: Only create tangle directory if it does not exist --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 51c279a..0eb9bc8 100644 --- a/Makefile +++ b/Makefile @@ -33,5 +33,5 @@ pull: tangle/pull.sh .SILENT: $(addprefix tangle/,$(dst_readme)) $(addprefix tangle/,$(dst_readme)) &: README.org - mkdir tangle + mkdir -p tangle emacs --batch --eval "(and (require 'org) (org-babel-tangle-file \"README.org\"))" &> /dev/null -- cgit v1.2.3