diff --git a/tests/sandboxed_emacs/.emacs.d/el-get/.gitignore b/tests/sandboxed_emacs/.emacs.d/el-get/.gitignore deleted file mode 100644 index 3d8412c0..00000000 --- a/tests/sandboxed_emacs/.emacs.d/el-get/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.loaddefs.el -.loaddefs.elc -.status.el -el-get -c-xrefactory diff --git a/tests/sandboxed_emacs/.emacs.d/el-get/.loaddefs.el b/tests/sandboxed_emacs/.emacs.d/el-get/.loaddefs.el deleted file mode 100644 index 5f91207f..00000000 --- a/tests/sandboxed_emacs/.emacs.d/el-get/.loaddefs.el +++ /dev/null @@ -1,55 +0,0 @@ -;;; .loaddefs.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- -;; Generated by the `loaddefs-generate' function. - -;; This file is part of GNU Emacs. - -;;; Code: - - -;;;### (autoloads nil "c-xrefactory/editors/emacs/c-xref" "c-xrefactory/editors/emacs/c-xref.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from c-xrefactory/editors/emacs/c-xref.el - -(register-definition-prefixes "c-xrefactory/editors/emacs/c-xref" '("c-xref-" "cut-long-refactoring-undo-list" "get-corresponding-undo" "undo-changes-until")) - -;;;*** - -;;;### (autoloads nil "c-xrefactory/editors/emacs/c-xrefactory" "c-xrefactory/editors/emacs/c-xrefactory.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from c-xrefactory/editors/emacs/c-xrefactory.el - -(register-definition-prefixes "c-xrefactory/editors/emacs/c-xrefactory" '("c-xref-")) - -;;;*** - -;;;### (autoloads nil "c-xrefactory/editors/emacs/c-xrefdoc" "c-xrefactory/editors/emacs/c-xrefdoc.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from c-xrefactory/editors/emacs/c-xrefdoc.el - -(register-definition-prefixes "c-xrefactory/editors/emacs/c-xrefdoc" '("c-xref-refactoring-documentation")) - -;;;*** - -;;;### (autoloads nil "c-xrefactory/editors/emacs/c-xrefprotocol" -;;;;;; "c-xrefactory/editors/emacs/c-xrefprotocol.el" (0 0 0 0)) -;;; Generated autoloads from c-xrefactory/editors/emacs/c-xrefprotocol.el - -(register-definition-prefixes "c-xrefactory/editors/emacs/c-xrefprotocol" '("c-xref_")) - -;;;*** - -;;;### (autoloads nil nil ("c-xrefactory/editors/emacs/compileCxrefactory.el") -;;;;;; (0 0 0 0)) - -;;;*** - -;;; End of scraped data - -;; Local Variables: -;; version-control: never -;; no-update-autoloads: t -;; no-native-compile: t -;; coding: utf-8-emacs-unix -;; End: - -;;; .loaddefs.el ends here diff --git a/tests/sandboxed_emacs/.emacs.d/el-get/.status.el b/tests/sandboxed_emacs/.emacs.d/el-get/.status.el deleted file mode 100644 index 1890b53c..00000000 --- a/tests/sandboxed_emacs/.emacs.d/el-get/.status.el +++ /dev/null @@ -1,31 +0,0 @@ -((c-xrefactory status "installed" recipe - (:name c-xrefactory :description "c-xrefactory - a refactoring browser for C and Java." :type github :branch "stable" :website "https://github.com/thoni56/c-xrefactory" :pkgname "thoni56/c-xrefactory" :load-path "editors/emacs" :build - (("make")) - :load "editors/emacs/c-xrefactory.el" :post-init - (progn - (add-to-list 'exec-path - (concat default-directory "src")) - (el-get-envpath-prepend "PATH" - (concat default-directory "src"))))) - (el-get status "installed" recipe - (:name el-get :website "https://github.com/dimitri/el-get#readme" :description "Manage the external elisp bits and pieces you depend upon." :type github :branch "master" :pkgname "dimitri/el-get" :info "." :compile - ("el-get.*\\.el$" "methods/") - :features el-get :post-init - (when - (memq 'el-get - (bound-and-true-p package-activated-list)) - (message "Deleting melpa bootstrap el-get") - (unless package--initialized - (package-initialize t)) - (when - (package-installed-p 'el-get) - (let - ((feats - (delete-dups - (el-get-package-features - (el-get-elpa-package-directory 'el-get))))) - (el-get-elpa-delete-package 'el-get) - (dolist - (feat feats) - (unload-feature feat t)))) - (require 'el-get))))) diff --git a/tests/sandboxed_emacs/.emacs.d/init.el b/tests/sandboxed_emacs/.emacs.d/init.el index 9474c7f7..fa99d1ee 100644 --- a/tests/sandboxed_emacs/.emacs.d/init.el +++ b/tests/sandboxed_emacs/.emacs.d/init.el @@ -7,7 +7,7 @@ (require 'package) (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t) -(add-to-list 'load-path "~/.emacs.d/c-xrefactory/editors/emacs") +(add-to-list 'load-path "~/c-xrefactory/editors/emacs") (load "c-xrefactory.el") (custom-set-variables diff --git a/tests/sandboxed_emacs/.emacs.d/override-el-get-update.el b/tests/sandboxed_emacs/.emacs.d/override-el-get-update.el deleted file mode 100644 index 6c9badee..00000000 --- a/tests/sandboxed_emacs/.emacs.d/override-el-get-update.el +++ /dev/null @@ -1,4 +0,0 @@ -;; Override el-gets update functions -(defun el-get-update () (message "You cannot update el-get packages in this sandboxed environment")) -(defun el-get-update-all () (message "You cannot update el-get packages in this sandboxed environment")) -(defun el-get-update-packages-of-type () (message "You cannot update el-get packages in this sandboxed environment")) diff --git a/tests/sandboxed_emacs/Makefile b/tests/sandboxed_emacs/Makefile index 80e7e30d..581cb766 100644 --- a/tests/sandboxed_emacs/Makefile +++ b/tests/sandboxed_emacs/Makefile @@ -14,13 +14,13 @@ all: pure EMACS_COMMAND = emacs -l $(PWD)/.emacs.d/init.el --eval '(setq c-xref-exec-directory "$(PWD)/bin/")' --eval '(setq c-xref-debug-mode t)' --eval '(setq c-xref-debug-preserve-tmp-files t)' # Run a pure sandboxed Emacs which should use the latest elisp and c-xref -pure: .emacs.d/c-xrefactory/src .emacs.d/c-xrefactory/editors - make -C .emacs.d/c-xrefactory/src - cp .emacs.d/c-xrefactory/src/c-xref $(CURDIR)/bin/ - -rm -r .emacs.d/c-xrefactory/editors/emacs/*.elc +pure: c-xrefactory + make -C c-xrefactory/src c-xref + cp c-xrefactory/src/c-xref $(CURDIR)/bin/ + -rm -r c-xrefactory/editors/emacs/*.elc @$(ENV) $(EMACS_COMMAND) -debug: .emacs.d/c-xrefactory +debug: c-xrefactory @$(ENV) $(EMACS_COMMAND) @@ -42,14 +42,8 @@ pipe-spy: pipe-spy.c Makefile $(CC) -o pipe-spy -g -Wall -DTARGET=\"$(TARGET_PATH)\" pipe-spy.c cp pipe-spy bin/c-xref -.emacs.d/c-xrefactory/editors : .emacs.d/c-xrefactory - ln -s $(CURDIR)/../../editors .emacs.d/c-xrefactory/editors +c-xrefactory : + ln -s $(CURDIR)/../.. c-xrefactory -.emacs.d/c-xrefactory/src : .emacs.d/c-xrefactory - ln -s $(CURDIR)/../../src .emacs.d/c-xrefactory/src - -.emacs.d/c-xrefactory: - ln -s $(CURDIR)/../../src .emacs.d/c-xrefactory/src - -clean: - -rm $(LOGFILE)* /tmp/c-xref*.log +curdir: + echo $(CURDIR)