1 |
ulm 10/02/02 17:55:13 |
2 |
|
3 |
Modified: 70jde-gentoo.el |
4 |
Added: jde-2.4.0.1-classpath-gentoo.patch |
5 |
70jde-gentoo-2.3.5.1.el |
6 |
jde-2.4.0.1-fix-paths-gentoo.patch |
7 |
Removed: 70jde-gentoo-2.3.6_pre20081208.el |
8 |
Log: |
9 |
Version bump. Add prefix keywords, change EAPI to 3. |
10 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
11 |
|
12 |
Revision Changes Path |
13 |
1.6 app-emacs/jde/files/70jde-gentoo.el |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/70jde-gentoo.el?rev=1.6&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/70jde-gentoo.el?rev=1.6&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/70jde-gentoo.el?r1=1.5&r2=1.6 |
18 |
|
19 |
Index: 70jde-gentoo.el |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/app-emacs/jde/files/70jde-gentoo.el,v |
22 |
retrieving revision 1.5 |
23 |
retrieving revision 1.6 |
24 |
diff -u -r1.5 -r1.6 |
25 |
--- 70jde-gentoo.el 1 May 2008 19:16:44 -0000 1.5 |
26 |
+++ 70jde-gentoo.el 2 Feb 2010 17:55:12 -0000 1.6 |
27 |
@@ -1,5 +1,9 @@ |
28 |
- |
29 |
-;;; jde site-lisp configuration |
30 |
- |
31 |
-(add-to-list 'load-path "@SITELISP@/lisp") |
32 |
+(add-to-list 'load-path "@SITELISP@") |
33 |
(require 'jde-autoload) |
34 |
+ |
35 |
+(setq jde-java-directory "/usr/share/jde") |
36 |
+(setq jde-bsh-jar-file "@BSH_JAR@") |
37 |
+(setq jde-checkstyle-jar-file "@CHECKSTYLE_JAR@") |
38 |
+(setq jde-checkstyle-style "/usr/share/checkstyle/checks/sun_checks.xml") |
39 |
+(setq jde-html-directory "/usr/share/doc/@PF@/html") |
40 |
+(setq bsh-html-directory "/usr/share/doc/@PF@/html") |
41 |
|
42 |
|
43 |
|
44 |
1.1 app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: jde-2.4.0.1-classpath-gentoo.patch |
50 |
=================================================================== |
51 |
Initialise classpath for beanshell and checkstyle using java-config. |
52 |
Gentoo specific patch. |
53 |
|
54 |
--- jde-orig/lisp/beanshell.el |
55 |
+++ jde/lisp/beanshell.el |
56 |
@@ -809,6 +809,14 @@ |
57 |
"BeanShell intended to be used independently of any other |
58 |
Emacs package.") |
59 |
|
60 |
+(defun bsh-get-gentoo-classpath () |
61 |
+ (or bsh-classpath |
62 |
+ (with-temp-buffer |
63 |
+ (call-process "java-config" nil t nil "-d" "-p" "bsh") |
64 |
+ (skip-chars-backward "\n") |
65 |
+ (setq bsh-classpath |
66 |
+ (split-string (buffer-substring (point-min) (point)) ":+"))))) |
67 |
+ |
68 |
(defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields) |
69 |
"Constructor for the standard bsh BeanShell instance." |
70 |
(call-next-method) |
71 |
@@ -845,7 +853,7 @@ |
72 |
bsh-vm) |
73 |
(executable-find (if (eq system-type 'windows-nt) "javaw" "java")))) |
74 |
|
75 |
- (oset this cp bsh-classpath) |
76 |
+ (oset this cp (bsh-get-gentoo-classpath)) |
77 |
|
78 |
(oset this startup-dir bsh-startup-directory)) |
79 |
|
80 |
--- jde-orig/lisp/jde-bsh.el |
81 |
+++ jde/lisp/jde-bsh.el |
82 |
@@ -187,7 +187,7 @@ |
83 |
(jde-get-tools-jar) |
84 |
(if ant-home (expand-file-name "lib" ant-home))) |
85 |
(jde-pi-get-bsh-classpath) |
86 |
- bsh-classpath |
87 |
+ (bsh-get-gentoo-classpath) |
88 |
(jde-expand-classpath (jde-get-global-classpath))))))) |
89 |
|
90 |
;; Create the BeanShell wrapper object. |
91 |
--- jde-orig/lisp/jde-checkstyle.el |
92 |
+++ jde/lisp/jde-checkstyle.el |
93 |
@@ -305,6 +305,14 @@ |
94 |
(format "-D%s=%s" (car prop) (cdr prop))) |
95 |
jde-checkstyle-expanded-properties)) |
96 |
|
97 |
+(defun jde-checkstyle-get-gentoo-classpath () |
98 |
+ (or jde-checkstyle-classpath |
99 |
+ (with-temp-buffer |
100 |
+ (call-process "java-config" nil t nil "-d" "-p" "checkstyle") |
101 |
+ (skip-chars-backward "\n") |
102 |
+ (setq jde-checkstyle-classpath |
103 |
+ (split-string (buffer-substring (point-min) (point)) ":+"))))) |
104 |
+ |
105 |
(defmethod jde-checkstyle-exec ((this jde-checkstyle-checker)) |
106 |
|
107 |
(jde-checkstyle-create-checker-buffer this) |
108 |
@@ -327,9 +335,8 @@ |
109 |
(jde-checkstyle-get-property-args this)) |
110 |
(oref this :interactive-args) |
111 |
(list "-classpath" |
112 |
- (if jde-checkstyle-classpath |
113 |
- (jde-build-classpath jde-checkstyle-classpath) |
114 |
- (jde-normalize-path jde-checkstyle-jar-file))) |
115 |
+ (jde-build-classpath |
116 |
+ (jde-checkstyle-get-gentoo-classpath))) |
117 |
(list jde-checkstyle-class) |
118 |
(list "-c" |
119 |
(if jde-checkstyle-style |
120 |
|
121 |
|
122 |
|
123 |
1.1 app-emacs/jde/files/70jde-gentoo-2.3.5.1.el |
124 |
|
125 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/70jde-gentoo-2.3.5.1.el?rev=1.1&view=markup |
126 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/70jde-gentoo-2.3.5.1.el?rev=1.1&content-type=text/plain |
127 |
|
128 |
Index: 70jde-gentoo-2.3.5.1.el |
129 |
=================================================================== |
130 |
(add-to-list 'load-path "@SITELISP@/lisp") |
131 |
(require 'jde-autoload) |
132 |
|
133 |
|
134 |
|
135 |
1.1 app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch |
136 |
|
137 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch?rev=1.1&view=markup |
138 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch?rev=1.1&content-type=text/plain |
139 |
|
140 |
Index: jde-2.4.0.1-fix-paths-gentoo.patch |
141 |
=================================================================== |
142 |
Make paths of directories and jar files configurable. |
143 |
|
144 |
Part of this patch was taken from Debian and heavily modified, see: |
145 |
http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0005-Set-the-location-of-needed-files-for-beanshell.el-an.patch |
146 |
|
147 |
--- jde-orig/lisp/beanshell.el |
148 |
+++ jde/lisp/beanshell.el |
149 |
@@ -891,14 +891,21 @@ |
150 |
|
151 |
(add-to-list 'auto-mode-alist '("\\.bsh\\'" . bsh-script-mode)) |
152 |
|
153 |
+(defcustom bsh-html-directory |
154 |
+ (let ((jde-dir (jde-find-jde-doc-directory))) |
155 |
+ (if jde-dir |
156 |
+ (expand-file-name "doc/html/bsh-ug" jde-dir))) |
157 |
+ "Directory of the beanshell HTML documentation." |
158 |
+ :group 'bsh |
159 |
+ :type 'directory) |
160 |
+ |
161 |
;;;###autoload |
162 |
(defun bsh-script-help () |
163 |
"Display BeanShell User's Guide." |
164 |
(interactive) |
165 |
- (let* ((jde-dir (jde-find-jde-doc-directory)) |
166 |
- (bsh-help |
167 |
- (if jde-dir |
168 |
- (expand-file-name "doc/html/bsh-ug/bsh-ug.html" jde-dir)))) |
169 |
+ (let ((bsh-help |
170 |
+ (if bsh-html-directory |
171 |
+ (expand-file-name "bsh-ug.html" bsh-html-directory)))) |
172 |
(if (and |
173 |
bsh-help |
174 |
(file-exists-p bsh-help)) |
175 |
--- jde-orig/lisp/jde-bsh.el |
176 |
+++ jde/lisp/jde-bsh.el |
177 |
@@ -91,22 +91,59 @@ |
178 |
"The single instance of the JDEE's BeanShell.")) |
179 |
"Class of JDEE BeanShells. There is only one per Emacs session.") |
180 |
|
181 |
+(defcustom jde-java-directory |
182 |
+ (expand-file-name "java" (jde-find-jde-data-directory)) |
183 |
+ "Top-level directory of JDE Java files." |
184 |
+ :group 'jde-project |
185 |
+ :type 'directory) |
186 |
+ |
187 |
+(defcustom jde-bsh-commands-directory |
188 |
+ (expand-file-name "bsh-commands" jde-java-directory) |
189 |
+ "Directory of beanshell commands." |
190 |
+ :group 'bsh |
191 |
+ :type 'directory) |
192 |
+ |
193 |
+(defcustom jde-classes-directory |
194 |
+ (expand-file-name "classes" jde-java-directory) |
195 |
+ "Directory of JDE classes." |
196 |
+ :group 'jde-project |
197 |
+ :type 'directory) |
198 |
+ |
199 |
+(defcustom jde-checkstyle-jar-file |
200 |
+ (expand-file-name "lib/checkstyle-all.jar" jde-java-directory) |
201 |
+ "Path of the checkstyle-jar file." |
202 |
+ :group 'jde-project |
203 |
+ :type 'file) |
204 |
+ |
205 |
+(defcustom jde-regexp-jar-file |
206 |
+ (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory) |
207 |
+ "Path of the regexp-jar file." |
208 |
+ :group 'jde-project |
209 |
+ :type 'file) |
210 |
+ |
211 |
+(defcustom jde-jde-jar-file |
212 |
+ (expand-file-name "lib/jde.jar" jde-java-directory) |
213 |
+ "Path of the jde-jar file." |
214 |
+ :group 'jde-project |
215 |
+ :type 'file) |
216 |
+ |
217 |
+(defcustom jde-bsh-jar-file |
218 |
+ (expand-file-name "lib/bsh.jar" jde-java-directory) |
219 |
+ "Path of the bsh-jar file." |
220 |
+ :group 'jde-project |
221 |
+ :type 'file) |
222 |
+ |
223 |
(defmethod initialize-instance ((this jde-bsh) &rest fields) |
224 |
"Constructor for the JDEE BeanShell instance." |
225 |
(call-next-method) |
226 |
- (let* ((jde-java-directory |
227 |
- (concat |
228 |
- (jde-find-jde-data-directory) |
229 |
- "java/"))) |
230 |
- |
231 |
- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory)) |
232 |
- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)) |
233 |
- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)) |
234 |
- (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory)) |
235 |
- (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory)) |
236 |
- (oset this jar (expand-file-name "lib/bsh.jar" jde-java-directory)) |
237 |
- (oset this separate-error-buffer jde-bsh-separate-buffer) |
238 |
- (oset-default 'jde-bsh the-bsh this))) |
239 |
+ (oset this bsh-cmd-dir jde-bsh-commands-directory) |
240 |
+ (oset this checkstyle-jar jde-checkstyle-jar-file) |
241 |
+ (oset this regexp-jar jde-regexp-jar-file) |
242 |
+ (oset this jde-classes-dir jde-classes-directory) |
243 |
+ (oset this jde-jar jde-jde-jar-file) |
244 |
+ (oset this jar jde-bsh-jar-file) |
245 |
+ (oset this separate-error-buffer jde-bsh-separate-buffer) |
246 |
+ (oset-default 'jde-bsh the-bsh this)) |
247 |
|
248 |
(defmethod bsh-create-buffer ((this jde-bsh)) |
249 |
"Creates the JDEE's beanshell buffer." |
250 |
@@ -150,6 +187,7 @@ |
251 |
(jde-get-tools-jar) |
252 |
(if ant-home (expand-file-name "lib" ant-home))) |
253 |
(jde-pi-get-bsh-classpath) |
254 |
+ bsh-classpath |
255 |
(jde-expand-classpath (jde-get-global-classpath))))))) |
256 |
|
257 |
;; Create the BeanShell wrapper object. |
258 |
--- jde-orig/lisp/jde-bug.el |
259 |
+++ jde/lisp/jde-bug.el |
260 |
@@ -2438,10 +2438,10 @@ |
261 |
(defun jde-bug-help () |
262 |
"Displays the JDEbug User's Guide." |
263 |
(interactive) |
264 |
- (let* ((jde-dir (jde-find-jde-doc-directory)) |
265 |
- (jdebug-help |
266 |
- (if jde-dir |
267 |
- (expand-file-name "doc/html/jdebug-ug/jdebug-ug.html" jde-dir)))) |
268 |
+ (let ((jdebug-help |
269 |
+ (if jde-html-directory |
270 |
+ (expand-file-name "jdebug-ug/jdebug-ug.html" |
271 |
+ jde-html-directory)))) |
272 |
(if (and |
273 |
jdebug-help |
274 |
(file-exists-p jdebug-help)) |
275 |
--- jde-orig/lisp/jde-checkstyle.el |
276 |
+++ jde/lisp/jde-checkstyle.el |
277 |
@@ -322,10 +322,6 @@ |
278 |
(vm-path (oref (jde-run-get-vm) :path)) |
279 |
(source-file |
280 |
(concat (file-name-nondirectory buffer-file-name))) |
281 |
- (jde-java-directory |
282 |
- (concat |
283 |
- (jde-find-jde-data-directory) |
284 |
- "java/")) |
285 |
(args (append |
286 |
(unless jde-checkstyle-expanded-properties-file |
287 |
(jde-checkstyle-get-property-args this)) |
288 |
@@ -333,13 +329,13 @@ |
289 |
(list "-classpath" |
290 |
(if jde-checkstyle-classpath |
291 |
(jde-build-classpath jde-checkstyle-classpath) |
292 |
- (jde-normalize-path |
293 |
- (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)))) |
294 |
+ (jde-normalize-path jde-checkstyle-jar-file))) |
295 |
(list jde-checkstyle-class) |
296 |
(list "-c" |
297 |
(if jde-checkstyle-style |
298 |
(jde-normalize-path jde-checkstyle-style) |
299 |
- (concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml"))) |
300 |
+ (expand-file-name "lib/sun_checks.xml" |
301 |
+ jde-java-directory))) |
302 |
(if jde-checkstyle-expanded-properties-file |
303 |
(list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file))) |
304 |
(if jde-checkstyle-module-package-names-file |
305 |
--- jde-orig/lisp/jde-dbs.el |
306 |
+++ jde/lisp/jde-dbs.el |
307 |
@@ -907,9 +907,6 @@ |
308 |
(jde-normalize-path 'jde-run-working-directory) |
309 |
source-directory)) |
310 |
(vm (oref (jde-run-get-vm) :path)) |
311 |
- (jde-java-directory |
312 |
- (expand-file-name "java" |
313 |
- (jde-find-jde-data-directory))) |
314 |
(vm-args |
315 |
(let (args) |
316 |
(setq args |
317 |
--- jde-orig/lisp/jde.el |
318 |
+++ jde/lisp/jde.el |
319 |
@@ -1722,14 +1722,19 @@ |
320 |
jde.el." |
321 |
(jde-find-jde-data-directory)) |
322 |
|
323 |
+(defcustom jde-html-directory |
324 |
+ (expand-file-name "doc/html" (jde-find-jde-doc-directory)) |
325 |
+ "Directory of the JDE HTML documentation." |
326 |
+ :group 'jde-project |
327 |
+ :type 'directory) |
328 |
+ |
329 |
;;;###autoload |
330 |
(defun jde-show-help () |
331 |
"Displays the JDE User's Guide in a browser." |
332 |
(interactive) |
333 |
- (let* ((jde-dir (jde-find-jde-doc-directory)) |
334 |
- (jde-help |
335 |
- (if jde-dir |
336 |
- (expand-file-name "doc/html/jde-ug/jde-ug.html" jde-dir)))) |
337 |
+ (let ((jde-help |
338 |
+ (if jde-html-directory |
339 |
+ (expand-file-name "jde-ug/jde-ug.html" jde-html-directory)))) |
340 |
(if (and |
341 |
jde-help |
342 |
(file-exists-p jde-help)) |
343 |
--- jde-orig/lisp/jde-jdb.el |
344 |
+++ jde/lisp/jde-jdb.el |
345 |
@@ -1459,10 +1459,10 @@ |
346 |
|
347 |
(defun jde-jdb-help () |
348 |
(interactive) |
349 |
- (let* ((jde-dir (jde-find-jde-doc-directory)) |
350 |
- (jdb-ug-path |
351 |
- (if jde-dir |
352 |
- (expand-file-name "doc/html/jdb-ug/jdb-ug-frame.html" jde-dir)))) |
353 |
+ (let ((jdb-ug-path |
354 |
+ (if jde-html-directory |
355 |
+ (expand-file-name "jdb-ug/jdb-ug-frame.html" |
356 |
+ jde-html-directory)))) |
357 |
(if (and |
358 |
jdb-ug-path |
359 |
(file-exists-p jdb-ug-path)) |