Skip to content

Commit

Permalink
Merge pull request #57 from nlamirault/develop
Browse files Browse the repository at this point in the history
Release 1.4.0
  • Loading branch information
nlamirault committed Mar 7, 2016
2 parents feb2847 + d32d2b1 commit f5a329b
Show file tree
Hide file tree
Showing 45 changed files with 1,219 additions and 668 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Emacs
*~

# Emacslisp
.cask
elpa
.projectile
*.elc
test/sandbox/

doc/scame.html
doc/scame.pdf
doc/scame.epub
5 changes: 3 additions & 2 deletions Cask
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

(source "gnu" "http://elpa.gnu.org/packages/")
(source "melpa" "http://melpa.milkbox.net/packages/")
;; (source "melpa" "https://stable.melpa.org/packages/")
(source "melpa" "https://melpa.org/packages/")
(source "gnu" "https://elpa.gnu.org/packages/")

;; Development
(development
Expand Down
14 changes: 14 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Scame ChangeLog

## Version 1.4.0

- Setup Arduino development
- Update documentation
- Remove *rustfmt* package (now in *rust-mode*)
- Add *spaceline* for modeline
- Improve UI using *mode-icons*
- Update OCmaml configuration and dependencies
- ``FIX`` CircleCI configuration
- Update Gnus configuration for GMail
- Add *hydra* for golang and python
- ``FIX`` Haskell configuration
- ``FIX`` projectile completion backends

## Version 1.3.0 (10/14/2015)

- Setup CircleCI continuous integration
Expand Down
24 changes: 9 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2014, 2015 Nicolas Lamirault <nicolas.lamirault@gmail.com>
# Copyright (C) 2014-2016 Nicolas Lamirault <nicolas.lamirault@gmail.com>

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -41,23 +41,17 @@ OK_COLOR=\033[32;01m
ERROR_COLOR=\033[31;01m
WARN_COLOR=\033[33;01m

all: help
MAKE_COLOR=\033[33;01m%-20s\033[0m

.DEFAULT_GOAL := help

.PHONY: help
help:
@echo -e "$(OK_COLOR)==== $(APP) [$(VERSION)] ====$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- clean$(NO_COLOR) : clean Scame installation$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- install$(NO_COLOR) : Install Scame dependencies$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- test$(NO_COLOR) : launch unit tests$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- deps$(NO_COLOR) : check dependencies$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- release$(NO_COLOR) : make a new release$(NO_COLOR)"

@echo -e "$(WARN_COLOR)- reset$(NO_COLOR) : remote Scame dependencies for development$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- docker-build$(NO_COLOR) : build the Docker image$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- docker-clean$(NO_COLOR) : remove the Docker image$(NO_COLOR)"
@echo -e "$(WARN_COLOR)- docker-run$(NO_COLOR) : launch Emacs using Scame docker image$(NO_COLOR)"
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(MAKE_COLOR) : %s\n", $$1, $$2}'

.PHONY: clean
clean:
clean: ## clean Scame installation
@$(CASK) clean-elc
@rm -fr dist $(ARCHIVE).gz test/sandboxorg-clock-save.el test/sandbox

Expand All @@ -77,14 +71,14 @@ deps:
@$(CASK) --path src outdated

.PHONY: install
install: clean
install: clean ## Install Scame dependencies
$(CASK) exec $(EMACS) -Q --batch -L . -L test \
--eval "(progn (require 'test-helper) (install-scame))"
$(CASK) exec $(EMACS) -Q --batch -L . -L test -L test/sandbox/scame \
--eval "(progn (require 'test-helper) (cleanup-load-path) (setup-scame-test) (require 'scame))"

.PHONY: test
test: elpa
test: elpa ## Launch unit tests
@echo -e "$(OK_COLOR)[$(APP)] Launch unit tests$(NO_COLOR)"
@$(CASK) exec ert-runner -L test/sandbox

Expand Down
Loading

0 comments on commit f5a329b

Please sign in to comment.