From 21146336c1bcebd9b17673b1c67cb043a5cd0a29 Mon Sep 17 00:00:00 2001 From: JAremko Date: Wed, 9 Nov 2016 06:53:19 +0200 Subject: [PATCH] more reasonable file names --- layers/+distributions/spacemacs-docker/README.org | 6 +++--- .../dockerfiles/spacemacs-docker/Dockerfile | 2 +- .../usr/local/spacemacs/deps-installers/clojure/install.el | 2 +- .../usr/local/spacemacs/deps-installers/dash/install.el | 2 +- .../usr/local/spacemacs/deps-installers/fasd/install.el | 2 +- .../usr/local/spacemacs/deps-installers/go/install.el | 2 +- .../usr/local/spacemacs/deps-installers/gtags/install.el | 2 +- .../usr/local/spacemacs/deps-installers/html/install.el | 2 +- .../local/spacemacs/deps-installers/javascript/install.el | 2 +- .../usr/local/spacemacs/deps-installers/pandoc/install.el | 2 +- .../local/spacemacs/deps-installers/pdf-tools/install.el | 2 +- .../spacemacs/deps-installers/spell-checking/install.el | 2 +- .../spacemacs-docker/usr/local/spacemacs/lib/README.org | 4 ++-- .../spacemacs/lib/{dockerfile-dsl.el => build-helpers.el} | 2 +- .../spacemacs/lib/{deps-dsl.el => deps-install-helpers.el} | 4 ++-- 15 files changed, 19 insertions(+), 19 deletions(-) rename layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/{dockerfile-dsl.el => build-helpers.el} (99%) rename layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/{deps-dsl.el => deps-install-helpers.el} (97%) diff --git a/layers/+distributions/spacemacs-docker/README.org b/layers/+distributions/spacemacs-docker/README.org index 2bee4e465..1ecd6f8d4 100644 --- a/layers/+distributions/spacemacs-docker/README.org +++ b/layers/+distributions/spacemacs-docker/README.org @@ -196,9 +196,9 @@ currently unsupported layer or fix/extend existing one. See [[./dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/README.org][lib/README.org]]. Also you can improve libraries, docs. ** What's up with the Dockerfile formatting? Docker build logs are ugly anyway. At least we can keep Dockerfiles -as readable as possible. Also Emacs-Lisp DSL prints out executed -command and its output (if any) so we don't need to dig into usual -docker builder's wall of text. +as readable as possible. Also Emacs-Lisp build helpers prints out +executed command and its output (if any) so we don't need to dig +into usual docker builder's wall of text. ** Why not use Docker compose? It will make =spacemacs-docker= setup much less "beginner friendly". Currently user's .spacemacs file serves similar role. During the diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/Dockerfile b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/Dockerfile index c90e09310..6df16388a 100644 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/Dockerfile +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/Dockerfile @@ -31,7 +31,7 @@ RUN git clone "${GIT_REPO}" -b "${GIT_BRANCH}" "${UHOME}/.emacs.d" && \ dockerfiles/spacemacs-docker/usr/local/spacemacs" /usr/local/spacemacs && \ emacs -Q -batch -l /usr/local/spacemacs/lib/init.el > /dev/null 2>&1 -SHELL ["/usr/bin/emacs", "-l", "/usr/local/spacemacs/lib/dockerfile-dsl.el", \ +SHELL ["/usr/bin/emacs", "-l", "/usr/local/spacemacs/lib/build-helpers.el", \ "-Q", "-batch", "--eval"] # Build and test spacemacs (with all packages downloaded) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/clojure/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/clojure/install.el index bd49accea..8c1e46216 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/clojure/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/clojure/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (checkpoint (install default-jre-headless) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/dash/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/dash/install.el index 2828cca28..d2447030d 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/dash/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/dash/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (defconst docsets '( (clojure . ("http://newyork.kapeli.com/feeds/Clojure.tgz")) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/fasd/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/fasd/install.el index bad07553a..1a1fbadbc 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/fasd/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/fasd/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (with-build-dir (tfasd "/tmp/fasd/") (with-installed (make git) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/go/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/go/install.el index 1db18543e..402d11d34 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/go/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/go/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (checkpoint (let ((go-version "1.7")) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/gtags/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/gtags/install.el index 9db0f4d38..93ba57cf0 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/gtags/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/gtags/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (checkpoint (let ((global-version "6.5.5")) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/html/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/html/install.el index 8dce8ebc1..3eadece1d 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/html/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/html/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (checkpoint (with-installed (git curl) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/javascript/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/javascript/install.el index e2642a894..8b06e7df2 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/javascript/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/javascript/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (checkpoint (with-installed (curl) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pandoc/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pandoc/install.el index 1f0e66755..a69da24db 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pandoc/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pandoc/install.el @@ -10,6 +10,6 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (install pandoc) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pdf-tools/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pdf-tools/install.el index 31c00fe82..05c6b4560 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pdf-tools/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/pdf-tools/install.el @@ -10,7 +10,7 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (checkpoint (install libpng-dev libz-dev libpoppler-glib-dev diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/spell-checking/install.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/spell-checking/install.el index 2ec52c55e..e4fc37cfd 100755 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/spell-checking/install.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/deps-installers/spell-checking/install.el @@ -10,6 +10,6 @@ ;; ;;; License: GPLv3 -(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t) +(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t) (install ispell) diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/README.org b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/README.org index da7905692..5b282a60a 100644 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/README.org +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/README.org @@ -12,8 +12,8 @@ Dependency installation libraries for [[../../../../../../README.org][spacemacs- * library list 1. [[./init.el][init.el]] - Installs packages used in the libs -2. [[./dockerfile-dsl.el][dockerfile-dsl.el]] - Elisp Dockerfile DSL (also used in =deps-dsl.el=) -3. [[./deps-dsl.el][deps-dsl.el]] - layers dependencies installation helpers +2. [[./build-helpers.el][build-helpers.el]] - Elisp Dockerfile build helpers (also used in =deps-dsl.el=) +3. [[./deps-install-helpers.el][deps-install-helpers.el]] - layers dependencies installation helpers [[../deps-installers/README.org][Usage examples]] * Workflow diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/dockerfile-dsl.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/build-helpers.el similarity index 99% rename from layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/dockerfile-dsl.el rename to layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/build-helpers.el index 74623e50b..8f101fb6c 100644 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/dockerfile-dsl.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/build-helpers.el @@ -1,4 +1,4 @@ -;;; dockerfile-dsl.el --- Spacemacs layers dependencies installation DSL File +;;; build-helpers.el --- spacemacs-docker Dockerfile build helpers file ;; ;; Copyright (c) 2012-2016 Sylvain Benner & Contributors ;; diff --git a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/deps-dsl.el b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/deps-install-helpers.el similarity index 97% rename from layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/deps-dsl.el rename to layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/deps-install-helpers.el index 44d87ada0..f5d70ae9e 100644 --- a/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/deps-dsl.el +++ b/layers/+distributions/spacemacs-docker/dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/deps-install-helpers.el @@ -1,4 +1,4 @@ -;;; deps-dsl.el --- Spacemacs layers dependencies installation DSL File +;;; deps-install-helpers.el --- Spacemacs layers deps. install helpers File ;; ;; Copyright (c) 2012-2016 Sylvain Benner & Contributors ;; @@ -9,7 +9,7 @@ ;; ;;; License: GPLv3 -(load (expand-file-name "dockerfile-dsl.el" +(load (expand-file-name "build-helpers.el" (file-name-directory (or load-file-name (buffer-file-name)))) nil