Skip to content

Commit 8682c36

Browse files
author
Shawn Hoover
committed
Updated Clojure and Contrib to 1.2.0 RC1.
Fixed the Clojure REPL shortcut to use the right jars. Simplified README paredit instructions. Added slime-fancy to the slime-setup call. Updated default.el hacks to work with latest swank-clojure. Append swank-clojure/src like the jars are appended.
1 parent c8b4e1f commit 8682c36

7 files changed

+144
-84
lines changed

‎README.rtf

-10.8 KB
Binary file not shown.

‎clojure-box-setup.iss

+38-31
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
#define ClojureDir "clojure-1.2.0-RC1"
2+
#define ClojureJar "clojure.jar"
3+
#define ContribDir "clojure-contrib-1.2.0-RC1"
4+
#define ContribJar "clojure-contrib-1.2.0-RC1.jar"
5+
16
[Setup]
27
AllowNoIcons=yes
38
AppId={{8BECBEE2-A1EF-4326-B1C6-8B4515E21916}
49
AppName=Clojure Box
5-
AppVerName=Clojure Box 1.1.0-1
10+
AppVerName=Clojure Box 1.2.0 RC1
611
AppPublisher=Clojure Box
712
AppPublisherURL=http://clojure.bighugh.com
813
AppSupportURL=http://http://www.bitbucket.org/shoover/clojure-box
@@ -12,67 +17,69 @@ DefaultDirName={pf}\Clojure Box
1217
DefaultGroupName=Clojure Box
1318
InfoBeforeFile=README.rtf
1419
InfoAfterFile=post-install.txt
15-
OutputDir=C:\Documents and Settings\Shawn\Desktop\clojure-box-setup
16-
OutputBaseFilename=clojure-box-1.1.0-1-setup
20+
;OutputDir=C:\Documents and Settings\Shawn\Desktop\clojure-box-setup
21+
OutputBaseFilename=clojure-box-1.2.0-RC1-setup
1722
Compression=lzma
1823
SolidCompression=yes
1924

2025
[Languages]
21-
Name: "english"; MessagesFile: "compiler:Default.isl"
26+
Name: english; MessagesFile: compiler:Default.isl
2227

2328
[Tasks]
24-
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
25-
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
29+
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
30+
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
2631

2732
[Files]
2833
; Clojure from the official download zip
29-
Source: "clojure-1.1.0\*"; Excludes: ".git*,\classes,*.jar"; DestDir: "{app}\clojure"; Flags: ignoreversion recursesubdirs createallsubdirs
34+
Source: {#ClojureDir}\*; Excludes: .git*,\classes,*.jar; DestDir: {app}\clojure; Flags: ignoreversion recursesubdirs createallsubdirs
3035

3136
; contrib from github/richhickey
32-
Source: "clojure-contrib\*"; Excludes: ".git*,*.class,*.jar,\DLR_Main,bin,obj"; DestDir: "{app}\clojure-contrib"; Flags: ignoreversion recursesubdirs createallsubdirs
37+
Source: {#ContribDir}\*; Excludes: .git*,*.class,*.jar,\DLR_Main,bin,obj; DestDir: {app}\clojure-contrib; Flags: ignoreversion recursesubdirs createallsubdirs
3338

3439
; jars need to be in a dir for swank-clojure-jar-home
35-
Source: "clojure-1.1.0\clojure.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
36-
Source: "clojure-contrib\clojure-contrib.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
40+
Source: {#ClojureDir}\{#ClojureJar}; DestDir: {app}\lib; Flags: ignoreversion
41+
Source: {#ContribDir}\target\{#ContribJar}; DestDir: {app}\lib; Flags: ignoreversion
3742

3843
; Emacs from emacsw32 install
39-
Source: "c:\program files\emacs\*"; Excludes: ".cvsignore,CVS,\unins*"; DestDir: "{app}\emacs"; Flags: ignoreversion recursesubdirs createallsubdirs
44+
Source: c:\program files\emacs\*; Excludes: .cvsignore,CVS,\unins*; DestDir: {app}\emacs; Flags: ignoreversion recursesubdirs createallsubdirs
4045

4146
; We make no assumption of the user's .emacs existing or doing
4247
; anything useful, so we need this to load clojure-mode and start
4348
; the REPL. The user can (setq inhibit-default-init t) to
4449
; prevent this from loading.
45-
Source: "default.el"; DestDir: "{app}\emacs\site-lisp"; Flags: ignoreversion
50+
Source: default.el; DestDir: {app}\emacs\site-lisp; Flags: ignoreversion
4651

4752
; clojure-mode, swank-clojure, and slime from github/technomancy.
4853
; swank-clojure is hacked with a couple fixes for Windows
49-
Source: "clojure-mode\*"; Excludes: ".git*"; DestDir: "{app}\clojure-mode"; Flags: ignoreversion recursesubdirs createallsubdirs
50-
Source: "slime\*"; Excludes: ".git*"; DestDir: "{app}\slime-cvs"; Flags: ignoreversion recursesubdirs createallsubdirs
51-
Source: "swank-clojure\*"; Excludes: ".hg*,.git*"; DestDir: "{app}\swank-clojure"; Flags: ignoreversion recursesubdirs createallsubdirs
54+
Source: clojure-mode\*; Excludes: .git*; DestDir: {app}\clojure-mode; Flags: ignoreversion recursesubdirs createallsubdirs
55+
Source: slime\*; Excludes: .git*; DestDir: {app}\slime; Flags: ignoreversion recursesubdirs createallsubdirs
56+
Source: swank-clojure\*; Excludes: .hg*,.git*; DestDir: {app}\swank-clojure; Flags: ignoreversion recursesubdirs createallsubdirs
5257

5358
; Including paredit as a convenience. Users still have to turn it on
5459
; as http://kyle-burton.tumblr.com/post/86984817/clojure-box-paredit
55-
Source: "lisp\paredit.el"; DestDir: "{app}\emacs\site-lisp"; Flags: ignoreversion
60+
Source: lisp\paredit.el; DestDir: {app}\emacs\site-lisp; Flags: ignoreversion
5661

57-
Source: "clojure-box-setup.iss"; DestDir: "{app}"; Flags: ignoreversion
58-
Source: "README.rtf"; DestDir: "{app}"; Flags: ignoreversion
59-
Source: "post-install.txt"; DestDir: "{app}"; Flags: ignoreversion
62+
Source: clojure-box-setup.iss; DestDir: {app}; Flags: ignoreversion
63+
Source: README.rtf; DestDir: {app}; Flags: ignoreversion
64+
Source: post-install.txt; DestDir: {app}; Flags: ignoreversion
6065

6166
[Icons]
62-
Name: "{app}\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"
63-
Name: "{group}\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"
64-
Name: "{group}\Clojure REPL"; Filename: "java.exe"; Parameters: "-cp ""{app}/clojure/clojure.jar;{app}/clojure-contrib/clojure-contrib.jar"" clojure.main --repl"
65-
Name: "{group}\Clojure Box README"; Filename: "{app}\README.rtf"
66-
Name: "{group}\Clojure Box Post-install tips"; Filename: "{app}\post-install.txt"
67-
Name: "{commondesktop}\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"; Tasks: desktopicon
68-
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"; Tasks: quicklaunchicon
67+
Name: {app}\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n
68+
Name: {group}\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n
69+
Name: {group}\Clojure REPL; Filename: java.exe; Parameters: "-cp ""{app}/lib/{#ClojureJar};{app}/lib/{#ContribJar}"" clojure.main --repl"
70+
Name: {group}\Clojure Box README; Filename: {app}\README.rtf
71+
Name: {group}\Clojure Box Post-install tips; Filename: {app}\post-install.txt
72+
Name: {commondesktop}\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n; Tasks: desktopicon
73+
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n; Tasks: quicklaunchicon
6974

7075
[Registry]
71-
Root: HKCR; Subkey: ".clj"; ValueType: string; ValueName: ""; ValueData: "ClojureFile"; Flags: uninsdeletevalue
72-
Root: HKCR; Subkey: "ClojureFile"; ValueType: string; ValueName: ""; ValueData: "Clojure File"; Flags: uninsdeletekey
73-
Root: HKCR; Subkey: "ClojureFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\emacs\emacs\bin\emacsclientw.exe,0"
74-
Root: HKCR; Subkey: "ClojureFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\emacs\emacs\bin\emacsclientw.exe"" -n ""%1"""
76+
Root: HKCR; Subkey: .clj; ValueType: string; ValueName: ; ValueData: ClojureFile; Flags: uninsdeletevalue
77+
Root: HKCR; Subkey: ClojureFile; ValueType: string; ValueName: ; ValueData: Clojure File; Flags: uninsdeletekey
78+
Root: HKCR; Subkey: ClojureFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\emacs\emacs\bin\emacsclientw.exe,0
79+
Root: HKCR; Subkey: ClojureFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\emacs\emacs\bin\emacsclientw.exe"" -n ""%1"""
7580

7681
[Run]
77-
Filename: "{app}\emacs\emacs\bin\runemacs.exe"; Description: "{cm:LaunchProgram,Clojure Box}"; Flags: nowait postinstall skipifsilent
82+
Filename: {app}\emacs\emacs\bin\runemacs.exe; Description: {cm:LaunchProgram,Clojure Box}; Flags: nowait postinstall skipifsilent
83+
84+
7885

‎default.el

+22-12
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,23 @@
1515

1616
;; swank-clojure assumes its autoloads run and define this before slime
1717
;; is loaded.
18-
(defadvice slime-read-interactive-args (before add-clojure)
18+
(defadvice slime-read-interactive-args (after add-clojure)
1919
;; Unfortunately we need to construct our Clojure-launching command
2020
;; at slime-launch time to reflect changes in the classpath. Slime
2121
;; has no mechanism to support this, so we must resort to advice.
22-
(require 'assoc)
23-
(aput 'slime-lisp-implementations 'clojure
24-
(list (swank-clojure-cmd) :init 'swank-clojure-init)))
22+
(swank-clojure-reset-implementation))
2523

26-
(add-to-list 'load-path (concat clojure-home "slime-cvs/"))
24+
(add-to-list 'load-path (concat clojure-home "slime/"))
2725
(require 'slime)
28-
(slime-setup '(slime-repl))
26+
(slime-setup '(slime-repl slime-fancy))
27+
;; Redefine this to not complain about the so called ChangeLog file.
28+
(defun slime-repl-insert-banner ()
29+
(when (zerop (buffer-size))
30+
(let ((welcome (concat "; SLIME"
31+
;;(or (slime-changelog-date)
32+
;; "- ChangeLog file not found")
33+
)))
34+
(insert welcome))))
2935

3036
(add-to-list 'load-path (concat clojure-home "clojure-mode/"))
3137
(require 'clojure-mode)
@@ -41,10 +47,12 @@
4147
(defadvice swank-clojure-project (before init-clojure-box-classpath)
4248
(setq clojure-box-initial-classpath swank-clojure-classpath))
4349
(add-hook 'swank-clojure-project-hook
44-
(lambda ()
45-
(setq swank-clojure-classpath
46-
(append swank-clojure-classpath
47-
clojure-box-initial-classpath))))
50+
(lambda ()
51+
(setq swank-clojure-classpath
52+
(append swank-clojure-classpath
53+
clojure-box-initial-classpath))
54+
(swank-clojure-reset-implementation)
55+
(message (format "clojure box hook %s" swank-clojure-classpath))))
4856

4957
(add-to-list 'load-path (concat clojure-home "swank-clojure/"))
5058
(setq swank-clojure-jar-home (concat clojure-home "lib"))
@@ -59,7 +67,9 @@
5967
(add-to-list 'swank-clojure-classpath item 'append))
6068
;; And of course we need our swank sources in there.
6169
(add-to-list 'swank-clojure-classpath
62-
(concat clojure-home "swank-clojure/src"))
70+
(concat clojure-home "swank-clojure/src") 'append)
6371

6472
;; Start the REPL
65-
(slime))
73+
(require 'assoc)
74+
(swank-clojure-reset-implementation)
75+
(slime 'clojure))

‎web/index.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Clojure Box</title>
88
<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
99
<meta name="generator" content="Org-mode"/>
10-
<meta name="generated" content="2010-07-15 15:23:58 "/>
10+
<meta name="generated" content="2010-07-31 22:32:03 EDT"/>
1111
<meta name="author" content="Shawn Hoover"/>
1212
<meta name="description" content=""/>
1313
<meta name="keywords" content=""/>
@@ -101,8 +101,11 @@ <h2 id="sec-2">Download </h2>
101101

102102

103103
<p>
104-
Here's the box. See the <a href="release-log.html">release notes</a> for more details. Clojure 1.2 just went
105-
into beta, so I hope to have a release with that soon.
104+
Here's the box. See the <a href="release-log.html">release notes</a> for more details.
105+
</p>
106+
<p>
107+
<a href="releases/clojure-box-1.2.0-RC1-setup.exe">Clojure Box 1.2.0 RC1</a> published July 31, 2010, built from the official Clojure
108+
1.2.0 RC1 download.
106109
</p>
107110
<p>
108111
<a href="releases/clojure-box-1.1.0-1-setup.exe">Clojure Box 1.1.0</a> published December 31, 2009, updated January 5, 2010, built
@@ -229,7 +232,7 @@ <h2 id="sec-5">Contact </h2>
229232
</div>
230233
</div>
231234
<div id="postamble">
232-
<p class="date"> Date: 2010-07-15 15:23:58 </p>
235+
<p class="date"> Date: 2010-07-31 22:32:03 EDT</p>
233236
</div>
234237
</div>
235238
</body>

‎web/index.org

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ system (usually it's in c:\windows\system32), it provides the rest.
2020

2121
* Download
2222

23-
Here's the box. See the [[file:release-log.org][release notes]] for more details. Clojure 1.2 just went
24-
into beta, so I hope to have a release with that soon.
23+
Here's the box. See the [[file:release-log.org][release notes]] for more details.
24+
25+
[[file:releases/clojure-box-1.2.0-RC1-setup.exe][Clojure Box 1.2.0 RC1]] published July 31, 2010, built from the official Clojure
26+
1.2.0 RC1 download.
2527

2628
[[file:releases/clojure-box-1.1.0-1-setup.exe][Clojure Box 1.1.0]] published December 31, 2009, updated January 5, 2010, built
2729
from the official Clojure 1.1.0 download.

0 commit comments

Comments
 (0)