JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emacs-packages: Remove jdee from old emacs package infrastructure

Browse Source
This commit is contained in:
adisbladis 2019-08-18 17:02:40 +01:00
parent 438131a1a4
commit 0e7598677c
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
5 changed files with 0 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
View File

@ -1,12 +0,0 @@
Make sure `build.properties' is honored.
--- jde/build.xml
+++ jde/build.xml
@@ -14,6 +14,7 @@
<property name="project.version" value="2.4.0"/>
<property name="config.dir" location="./config"/>
+ <property file="build.properties"/>
<!-- everything depends on this initialization target -->
<target name="init">

18
pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
View File

@ -1,18 +0,0 @@
JDE insists on seeing CEDET's source tree layout, with various
sub-directories (`common', `eieio', etc.). However, the installed CEDET
is flat, with everything under ${cedet}/share/emacs/site-lisp.
--- jde/config/build.el (revision 90)
+++ jde/config/build.el (working copy)
@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI
(jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}")
"@{src.lisp.dir}"
"@{cedet.dir}"
- '("common"
- "eieio"
- "semantic"
- "semantic/bovine"
- "speedbar"
- )
+ '(".")
"@{build.lisp.autoload.libname}")

99
pkgs/applications/editors/emacs-modes/jdee/default.nix
View File

@ -1,99 +0,0 @@
{ fetchsvn, stdenv, emacs, cedet, ant }:
let
revision = "137";
in
stdenv.mkDerivation rec {
name = "jdee-svn${revision}";
# Last release is too old, so use SVN.
# See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment .
src = fetchsvn {
url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee";
rev = revision;
sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz";
};
patchFlags = "-p1 --ignore-whitespace";
patches = [
./build-properties.patch
./cedet-paths.patch ./elib-avltree.patch
./java-directory.patch
];
configurePhase = ''
mkdir -p "dist"
cat > build.properties <<EOF
dist.lisp.dir = dist/share/emacs/site-lisp
dist.java.lib.dir = dist/share/java
dist.jar.jde.file = dist/share/java/jde.jar
dist.java.src.dir = dist/src/${name}/java
dist.doc.dir dist/doc/${name}
prefix.dir = $out
cedet.dir = ${cedet}/share/emacs/site-lisp
elib.dir = /nowhere
build.bin.emacs = ${emacs}/bin/emacs
EOF
# Substitute variables, à la Autoconf.
for i in "lisp/"*.el
do
sed -i "$i" -e "s|@out@|$out|g ;
s|@javadir@|$out/share/java|g ;
s|@datadir@|$out/share/${name}|g"
done
'';
buildPhase = "ant dist";
installPhase = ''
ant install
mkdir -p "$out/share/${name}"
cp -rv java/bsh-commands "$out/share/${name}"
# Move everything that's not a JAR to $datadir. This includes
# `sun_checks.xml', license files, etc.
cd "$out/share/java"
for i in *
do
if echo $i | grep -qv '\.jar''$'
then
mv -v "$i" "$out/share/${name}"
fi
done
'';
buildInputs = [ emacs ant ];
propagatedBuildInputs = [ cedet ];
propagatedUserEnvPkgs = propagatedBuildInputs; # FIXME: Not honored
meta = {
description = "JDEE, a Java development environment for Emacs";
longDescription = ''
The JDEE is a software package that interfaces Emacs to
command-line Java development tools (for example, JavaSoft's
JDK). JDEE features include:
* JDEE menu with compile, run, debug, build, browse, project,
and help commands
* syntax coloring
* auto indentation
* compile error to source links
* source-level debugging
* source code browsing
* make file support
* automatic code generation
* Java source interpreter (Pat Neimeyer's BeanShell)
'';
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
broken = true;
};
}

105
pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch
View File

@ -1,105 +0,0 @@
JDEE refers to the `avltree' module from GNU Elib, but GNU Elib
no longer exists (see http://www.gnu.org/software/elib/). This
patch updates the module names to what's current in Emacs.
--- jde/config/build.el
+++ jde/config/build.el
@@ -33,11 +33,10 @@ compile.
CEDET-DIR is the cedet lisp code base directory (see PATHS).
PATHS are sub directories under CEDET-DIR we use to compile."
- (dolist (path (list dir lisp-src-dir elib-dir cedet-dir))
+ (dolist (path (list dir lisp-src-dir cedet-dir))
(if (not (file-directory-p path))
(error "Doesn't exist or not a directory: %s" path)))
(let ((autoload-buf (jde-make-autoloads dir autoload-libname)))
- (add-to-list 'load-path elib-dir t)
(dolist (path paths)
(add-to-list 'load-path (expand-file-name path cedet-dir) t))
(add-to-list 'load-path lisp-src-dir t)
--- jde/lisp/jde-parse.el (revision 90)
+++ jde/lisp/jde-parse.el (working copy)
@@ -24,7 +24,7 @@
(require 'semantic-sb)
(require 'semantic-ctxt)
-(require 'avltree)
+(require 'avl-tree)
(require 'thingatpt)
(require 'eieio)
(require 'jde-imenu) ; All the imenu stuff is here now!
@@ -869,7 +869,8 @@ in a method; otherwise, nil."
(defclass jde-avl-tree ()
((tree :initarg tree
- :type list
+ ;; FIXME: Emacs 23 `avl-tree' objects are not lists.
+ ;;:type list
:documentation
"The tree")
(compare-fcn :initarg compare-fcn
@@ -887,51 +887,51 @@ in a method; otherwise, nil."
(assert (typep (oref this compare-fcn) 'function))
- (oset this tree (avltree-create (oref this compare-fcn))))
+ (oset this tree (avl-tree-create (oref this compare-fcn))))
(defmethod jde-avl-tree-add ((this jde-avl-tree) item)
"Inserts ITEM in this tree."
- (avltree-enter (oref this tree) item))
+ (avl-tree-enter (oref this tree) item))
(defmethod jde-avl-tree-delete ((this jde-avl-tree) item)
"Deletes ITEM from THIS tree."
- (avltree-delete (oref this tree) item))
+ (avl-tree-delete (oref this tree) item))
(defmethod jde-avl-tree-is-empty ((this jde-avl-tree))
"Return t if THIS tree is empty, otherwise return nil."
- (avltree-empty (oref this tree)))
+ (avl-tree-empty (oref this tree)))
(defmethod jde-avl-tree-find ((this jde-avl-tree) item)
"Return the element in THIS tree that matches item."
- (avltree-member (oref this tree) item))
+ (avl-tree-member (oref this tree) item))
(defmethod jde-avl-tree-map ((this jde-avl-tree) map-function)
"Applies MAP-FUNCTION to all elements of THIS tree."
- (avltree-map map-function (oref this tree)))
+ (avl-tree-map map-function (oref this tree)))
(defmethod jde-avl-tree-first ((this jde-avl-tree))
"Return the first item in THIS tree."
- (avltree-first (oref this tree)))
+ (avl-tree-first (oref this tree)))
(defmethod jde-avl-tree-last ((this jde-avl-tree))
"Return the last item in THIS tree."
- (avltree-last (oref this tree)))
+ (avl-tree-last (oref this tree)))
(defmethod jde-avl-tree-copy ((this jde-avl-tree))
"Return a copy of THIS tree."
- (avltree-copy (oref this tree)))
+ (avl-tree-copy (oref this tree)))
(defmethod jde-avl-tree-flatten ((this jde-avl-tree))
"Return a sorted list containing all elements of THIS tree."
- (avltree-flatten (oref this tree)))
+ (avl-tree-flatten (oref this tree)))
(defmethod jde-avl-tree-size ((this jde-avl-tree))
"Return the number of elements in THIS tree."
- (avltree-size (oref this tree)))
+ (avl-tree-size (oref this tree)))
(defmethod jde-avl-tree-clear ((this jde-avl-tree))
"Delete all elements of THIS tree."
- (avltree-clear (oref this tree)))
+ (avl-tree-clear (oref this tree)))
(defclass jde-parse-method-map (jde-avl-tree)
()

82
pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
View File

@ -1,82 +0,0 @@
Tell the elisp code about the right Java directory.
--- jde/lisp/jde.el (revision 90)
+++ jde/lisp/jde.el (working copy)
@@ -2448,17 +2448,14 @@ environment variable."
(defmethod initialize-instance ((this jde-bsh) &rest fields)
"Constructor for the JDEE BeanShell instance."
(call-next-method)
- (let* ((jde-java-directory
- (concat
- (jde-find-jde-data-directory)
- "java/")))
-
- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
+ (let ((jde-java-directory "@out@/share/java"))
+
+ (oset this bsh-cmd-dir "@datadir@/bsh-commands")
+ (oset this checkstyle-jar (expand-file-name "checkstyle-all.jar" jde-java-directory))
+ (oset this regexp-jar (expand-file-name "jakarta-regexp.jar" jde-java-directory))
(oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
- (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
- (oset this jar (expand-file-name "lib/bsh.jar" jde-java-directory))
+ (oset this jde-jar (expand-file-name "jde.jar" jde-java-directory))
+ (oset this jar (expand-file-name "bsh.jar" jde-java-directory))
(oset-default 'jde-bsh the-bsh this)))
(defmethod bsh-create-buffer ((this jde-bsh))
--- jde/lisp/jde-checkstyle.el (revision 90)
+++ jde/lisp/jde-checkstyle.el (working copy)
@@ -316,10 +316,7 @@ string describing how the compilation fi
(vm-path (oref (jde-run-get-vm) :path))
(source-file
(concat (file-name-nondirectory buffer-file-name)))
- (jde-java-directory
- (concat
- (jde-find-jde-data-directory)
- "java/"))
+ (jde-java-directory "@out@/share/java")
(args (append
(unless jde-checkstyle-expanded-properties-file
(jde-checkstyle-get-property-args this))
@@ -328,12 +325,12 @@ string describing how the compilation fi
(if jde-checkstyle-classpath
(jde-build-classpath jde-checkstyle-classpath)
(jde-normalize-path
- (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
+ (expand-file-name "checkstyle-all.jar" jde-java-directory))))
(list jde-checkstyle-class)
(list "-c"
(if jde-checkstyle-style
(jde-normalize-path jde-checkstyle-style)
- (concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
+ "@datadir@/sun_checks.xml"))
(if jde-checkstyle-expanded-properties-file
(list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
(if jde-checkstyle-module-package-names-file
--- jde/lisp/jde-dbs.el (revision 90)
+++ jde/lisp/jde-dbs.el (working copy)
@@ -899,9 +899,7 @@ for the breakpoint."
(jde-normalize-path 'jde-run-working-directory)
source-directory))
(vm (oref (jde-run-get-vm) :path))
- (jde-java-directory
- (expand-file-name "java"
- (jde-find-jde-data-directory)))
+ (jde-java-directory "@out@/share/java")
(vm-args
(let (args)
(setq args
@@ -912,7 +910,7 @@ for the breakpoint."
(jde-build-classpath
(list
(expand-file-name
- (if jde-bug-debug "classes" "lib/jde.jar")
+ (if jde-bug-debug "classes" "jde.jar")
jde-java-directory)
(if (jde-bug-vm-includes-jpda-p)
(jde-get-tools-jar)