[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d301048 154/271: Update compilation again.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master d301048 154/271: Update compilation again. |
Date: |
Thu, 05 Feb 2015 18:30:43 +0000 |
branch: master
commit d301048f2aa7419beb59af65f6fbea377f0d8145
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Update compilation again.
---
Makefile | 12 ++++++++----
benchmark/context-coloring-benchmark.el | 7 +------
benchmark/fixtures/.dir-locals.el | 1 +
test/context-coloring-test.el | 1 -
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 1e5e6d5..3b3e7d6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ all: clean install compile test
bench: benchel benchjs
benchel:
- emacs -Q -L . \
+ emacs -Q \
+ -L . \
+ -L lib/js2-mode \
-l context-coloring \
-l benchmark/context-coloring-benchmark \
-f context-coloring-benchmark-run
@@ -12,9 +14,9 @@ benchjs:
node_modules/.bin/matcha
compile:
- emacs -Q \
+ emacs -Q -batch \
-L lib/js2-mode \
- -batch -f batch-byte-compile *.el
+ -f batch-byte-compile *.el
clean:
rm -f *.log benchmark/*.log *.elc
@@ -25,7 +27,9 @@ install:
test: testel testjs
testel:
- emacs -Q -batch -L . \
+ emacs -Q -batch \
+ -L . \
+ -L lib/js2-mode \
-l ert \
-l context-coloring \
-l test/context-coloring-test.el \
diff --git a/benchmark/context-coloring-benchmark.el
b/benchmark/context-coloring-benchmark.el
index 1da2b8c..be03229 100644
--- a/benchmark/context-coloring-benchmark.el
+++ b/benchmark/context-coloring-benchmark.el
@@ -41,8 +41,6 @@
(context-coloring-benchmark-js-mode-teardown))
(defun context-coloring-benchmark-js2-mode-setup ()
- (add-to-list 'load-path (context-coloring-benchmark-resolve-path
- "../lib/js2-mode"))
(require 'js2-mode)
(setq js2-mode-show-parse-errors nil)
(setq js2-mode-show-strict-warnings nil)
@@ -55,10 +53,7 @@
(setq auto-mode-alist (delete '("\\.js\\'" . js2-mode)
auto-mode-alist))
(setq js2-mode-show-strict-warnings t)
- (setq js2-mode-show-parse-errors t)
- (setq load-path (delete (context-coloring-benchmark-resolve-path
- "../test/fixtures/js2-mode")
- load-path)))
+ (setq js2-mode-show-parse-errors t))
(defun context-coloring-benchmark-js2-mode-run ()
(context-coloring-benchmark-js2-mode-setup)
diff --git a/benchmark/fixtures/.dir-locals.el
b/benchmark/fixtures/.dir-locals.el
new file mode 100644
index 0000000..f3d5e97
--- /dev/null
+++ b/benchmark/fixtures/.dir-locals.el
@@ -0,0 +1 @@
+((nil . ((buffer-read-only . t))))
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 633aec4..e1ae2e3 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -24,7 +24,6 @@ FIXTURE."
FIXTURE."
`(context-coloring-test-with-fixture
,fixture
- (add-to-list 'load-path (context-coloring-test-resolve-path
"../lib/js2-mode"))
(require 'js2-mode)
(setq js2-mode-show-parse-errors nil)
(setq js2-mode-show-strict-warnings nil)
- [elpa] master 9f87a03 148/271: Actually colorize complex files., (continued)
- [elpa] master 9f87a03 148/271: Actually colorize complex files., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 76122df 144/271: Write js2 scopifier., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 5fcd757 146/271: Refactor to use more resilient dispatch strategy., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 8982c75 127/271: Merge branch 'feature/tests' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master e06fbe9 158/271: Add comment support for js2-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master a2b6a5a 112/271: Use defvar-local., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 6c8175e 153/271: Update compilation., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 4f57f0c 163/271: Improve global test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master dc8e99c 130/271: Function name., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 2bb4d12 124/271: More cleanup., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d301048 154/271: Update compilation again.,
Jackson Ray Hamilton <=
- [elpa] master 1d9cf42 164/271: Refactor tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master a0ccc5c 162/271: Improve and pass catch test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master c8fa33f 170/271: Improve async benchmarking., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 7954efc 110/271: Rename instances of depth to level., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 338716d 161/271: Refactor., Jackson Ray Hamilton, 2015/02/05
- [elpa] master fc81cf9 157/271: Don't use timers for js2-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master b4c220a 159/271: Always remove hooks., Jackson Ray Hamilton, 2015/02/05
- [elpa] master e040ca0 181/271: Just use stable emacs., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 9e7ee77 155/271: Add catch test. Don't uncolorize., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 665a54a 167/271: Add more js-mode tests., Jackson Ray Hamilton, 2015/02/05