Anonymous avatar Anonymous committed 3ef8e03 Merge

merge

Comments (0)

Files changed (7)

Binary file modified.

clojure-box-setup.iss

+#define ClojureDir "clojure-1.2.0-RC1"
+#define ClojureJar "clojure.jar"
+#define ContribDir "clojure-contrib-1.2.0-RC1"
+#define ContribJar "clojure-contrib-1.2.0-RC1.jar"
+
 [Setup]
 AllowNoIcons=yes
 AppId={{8BECBEE2-A1EF-4326-B1C6-8B4515E21916}
 AppName=Clojure Box
-AppVerName=Clojure Box 1.1.0-1
+AppVerName=Clojure Box 1.2.0 RC1
 AppPublisher=Clojure Box
 AppPublisherURL=http://clojure.bighugh.com
 AppSupportURL=http://http://www.bitbucket.org/shoover/clojure-box
 DefaultGroupName=Clojure Box
 InfoBeforeFile=README.rtf
 InfoAfterFile=post-install.txt
-OutputDir=C:\Documents and Settings\Shawn\Desktop\clojure-box-setup
-OutputBaseFilename=clojure-box-1.1.0-1-setup
+;OutputDir=C:\Documents and Settings\Shawn\Desktop\clojure-box-setup
+OutputBaseFilename=clojure-box-1.2.0-RC1-setup
 Compression=lzma
 SolidCompression=yes
 
 [Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: english; MessagesFile: compiler:Default.isl
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
 
 [Files]
 ; Clojure from the official download zip
-Source: "clojure-1.1.0\*"; Excludes: ".git*,\classes,*.jar"; DestDir: "{app}\clojure"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: {#ClojureDir}\*; Excludes: .git*,\classes,*.jar; DestDir: {app}\clojure; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; contrib from github/richhickey
-Source: "clojure-contrib\*"; Excludes: ".git*,*.class,*.jar,\DLR_Main,bin,obj"; DestDir: "{app}\clojure-contrib"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: {#ContribDir}\*; Excludes: .git*,*.class,*.jar,\DLR_Main,bin,obj; DestDir: {app}\clojure-contrib; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; jars need to be in a dir for swank-clojure-jar-home
-Source: "clojure-1.1.0\clojure.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
-Source: "clojure-contrib\clojure-contrib.jar"; DestDir: "{app}\lib"; Flags: ignoreversion
+Source: {#ClojureDir}\{#ClojureJar}; DestDir: {app}\lib; Flags: ignoreversion
+Source: {#ContribDir}\target\{#ContribJar}; DestDir: {app}\lib; Flags: ignoreversion
 
 ; Emacs from emacsw32 install
-Source: "c:\program files\emacs\*"; Excludes: ".cvsignore,CVS,\unins*"; DestDir: "{app}\emacs"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: c:\program files\emacs\*; Excludes: .cvsignore,CVS,\unins*; DestDir: {app}\emacs; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; We make no assumption of the user's .emacs existing or doing
 ; anything useful, so we need this to load clojure-mode and start
 ; the REPL. The user can (setq inhibit-default-init t) to
 ; prevent this from loading.
-Source: "default.el"; DestDir: "{app}\emacs\site-lisp"; Flags: ignoreversion
+Source: default.el; DestDir: {app}\emacs\site-lisp; Flags: ignoreversion
 
 ; clojure-mode, swank-clojure, and slime from github/technomancy.
 ; swank-clojure is hacked with a couple fixes for Windows
-Source: "clojure-mode\*"; Excludes: ".git*"; DestDir: "{app}\clojure-mode"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "slime\*"; Excludes: ".git*"; DestDir: "{app}\slime-cvs"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "swank-clojure\*"; Excludes: ".hg*,.git*"; DestDir: "{app}\swank-clojure"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: clojure-mode\*; Excludes: .git*; DestDir: {app}\clojure-mode; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: slime\*; Excludes: .git*; DestDir: {app}\slime; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: swank-clojure\*; Excludes: .hg*,.git*; DestDir: {app}\swank-clojure; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; Including paredit as a convenience. Users still have to turn it on
 ; as http://kyle-burton.tumblr.com/post/86984817/clojure-box-paredit
-Source: "lisp\paredit.el"; DestDir: "{app}\emacs\site-lisp"; Flags: ignoreversion
+Source: lisp\paredit.el; DestDir: {app}\emacs\site-lisp; Flags: ignoreversion
 
-Source: "clojure-box-setup.iss"; DestDir: "{app}"; Flags: ignoreversion
-Source: "README.rtf"; DestDir: "{app}"; Flags: ignoreversion
-Source: "post-install.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: clojure-box-setup.iss; DestDir: {app}; Flags: ignoreversion
+Source: README.rtf; DestDir: {app}; Flags: ignoreversion
+Source: post-install.txt; DestDir: {app}; Flags: ignoreversion
 
 [Icons]
-Name: "{app}\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"
-Name: "{group}\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"
-Name: "{group}\Clojure REPL"; Filename: "java.exe"; Parameters: "-cp ""{app}/clojure/clojure.jar;{app}/clojure-contrib/clojure-contrib.jar"" clojure.main --repl"
-Name: "{group}\Clojure Box README"; Filename: "{app}\README.rtf"
-Name: "{group}\Clojure Box Post-install tips"; Filename: "{app}\post-install.txt"
-Name: "{commondesktop}\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Clojure Box"; Filename: "{app}\emacs\emacs\bin\emacsclientw.exe"; Parameters: "-n"; Tasks: quicklaunchicon
+Name: {app}\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n
+Name: {group}\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n
+Name: {group}\Clojure REPL; Filename: java.exe; Parameters: "-cp ""{app}/lib/{#ClojureJar};{app}/lib/{#ContribJar}"" clojure.main --repl"
+Name: {group}\Clojure Box README; Filename: {app}\README.rtf
+Name: {group}\Clojure Box Post-install tips; Filename: {app}\post-install.txt
+Name: {commondesktop}\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n; Tasks: desktopicon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Clojure Box; Filename: {app}\emacs\emacs\bin\emacsclientw.exe; Parameters: -n; Tasks: quicklaunchicon
 
 [Registry]
-Root: HKCR; Subkey: ".clj"; ValueType: string; ValueName: ""; ValueData: "ClojureFile"; Flags: uninsdeletevalue
-Root: HKCR; Subkey: "ClojureFile"; ValueType: string; ValueName: ""; ValueData: "Clojure File"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "ClojureFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\emacs\emacs\bin\emacsclientw.exe,0"
-Root: HKCR; Subkey: "ClojureFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\emacs\emacs\bin\emacsclientw.exe"" -n ""%1"""
+Root: HKCR; Subkey: .clj; ValueType: string; ValueName: ; ValueData: ClojureFile; Flags: uninsdeletevalue
+Root: HKCR; Subkey: ClojureFile; ValueType: string; ValueName: ; ValueData: Clojure File; Flags: uninsdeletekey
+Root: HKCR; Subkey: ClojureFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\emacs\emacs\bin\emacsclientw.exe,0
+Root: HKCR; Subkey: ClojureFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\emacs\emacs\bin\emacsclientw.exe"" -n ""%1"""
 
 [Run]
-Filename: "{app}\emacs\emacs\bin\runemacs.exe"; Description: "{cm:LaunchProgram,Clojure Box}"; Flags: nowait postinstall skipifsilent
+Filename: {app}\emacs\emacs\bin\runemacs.exe; Description: {cm:LaunchProgram,Clojure Box}; Flags: nowait postinstall skipifsilent
 
+
+
 
   ;; swank-clojure assumes its autoloads run and define this before slime
   ;; is loaded.
-  (defadvice slime-read-interactive-args (before add-clojure)
+  (defadvice slime-read-interactive-args (after add-clojure)
     ;; Unfortunately we need to construct our Clojure-launching command
     ;; at slime-launch time to reflect changes in the classpath. Slime
     ;; has no mechanism to support this, so we must resort to advice.
-    (require 'assoc)
-    (aput 'slime-lisp-implementations 'clojure
-	  (list (swank-clojure-cmd) :init 'swank-clojure-init)))
+    (swank-clojure-reset-implementation))
 
-  (add-to-list 'load-path (concat clojure-home "slime-cvs/"))
+  (add-to-list 'load-path (concat clojure-home "slime/"))
   (require 'slime)
-  (slime-setup '(slime-repl))
+  (slime-setup '(slime-repl slime-fancy))
+  ;; Redefine this to not complain about the so called ChangeLog file.
+  (defun slime-repl-insert-banner ()
+    (when (zerop (buffer-size))
+      (let ((welcome (concat "; SLIME"
+                             ;;(or (slime-changelog-date)
+                             ;;    "- ChangeLog file not found")
+                             )))
+        (insert welcome))))
 
   (add-to-list 'load-path (concat clojure-home "clojure-mode/"))
   (require 'clojure-mode)
   (defadvice swank-clojure-project (before init-clojure-box-classpath)
     (setq clojure-box-initial-classpath swank-clojure-classpath))
   (add-hook 'swank-clojure-project-hook
-	    (lambda ()
-	      (setq swank-clojure-classpath
-		    (append swank-clojure-classpath
-			    clojure-box-initial-classpath))))
+            (lambda ()
+              (setq swank-clojure-classpath
+                    (append swank-clojure-classpath
+                            clojure-box-initial-classpath))
+              (swank-clojure-reset-implementation)
+              (message (format "clojure box hook %s" swank-clojure-classpath))))
 
   (add-to-list 'load-path (concat clojure-home "swank-clojure/"))
   (setq swank-clojure-jar-home (concat clojure-home "lib"))
     (add-to-list 'swank-clojure-classpath item 'append))
   ;; And of course we need our swank sources in there.
   (add-to-list 'swank-clojure-classpath
-	       (concat clojure-home "swank-clojure/src"))
+               (concat clojure-home "swank-clojure/src") 'append)
 
   ;; Start the REPL
-  (slime))
+  (require 'assoc)
+  (swank-clojure-reset-implementation)
+  (slime 'clojure))
 <title>Clojure Box</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2010-07-15 15:23:58 "/>
+<meta name="generated" content="2010-07-31 22:32:03 EDT"/>
 <meta name="author" content="Shawn Hoover"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
 
 
 <p>
-Here's the box. See the <a href="release-log.html">release notes</a> for more details. Clojure 1.2 just went
-into beta, so I hope to have a release with that soon.
+Here's the box. See the <a href="release-log.html">release notes</a> for more details.
+</p>
+<p>
+<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
+1.2.0 RC1 download.
 </p>
 <p>
 <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
 </div>
 </div>
 <div id="postamble">
-<p class="date"> Date: 2010-07-15 15:23:58 </p>
+<p class="date"> Date: 2010-07-31 22:32:03 EDT</p>
 </div>
 </div>
 </body>
 
 * Download
 
-Here's the box. See the [[file:release-log.org][release notes]] for more details. Clojure 1.2 just went
-into beta, so I hope to have a release with that soon.
+Here's the box. See the [[file:release-log.org][release notes]] for more details.
+
+[[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
+1.2.0 RC1 download.
 
 [[file:releases/clojure-box-1.1.0-1-setup.exe][Clojure Box 1.1.0]] published December 31, 2009, updated January 5, 2010, built
 from the official Clojure 1.1.0 download.

web/release-log.html

 <title>Clojure Box Release Notes</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2010-07-15 15:22:27 "/>
+<meta name="generated" content="2010-07-31 22:28:44 EDT"/>
 <meta name="author" content="Shawn Hoover"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
 
 
 <style type="text/css">
+  body {max-width:600px;}
   /* hide the generated h1.title so I can put a link at the top
      (and then I have to add a replacement title) */
   h1.title { display: none; }
   li {list-style-type:disc;}
 
   h3 {margin:15px 0px 0px 0px;}
-  #postamble {text-align:right;}
-  body {max-width:600px; text-align:justify;}
 </style>
 
 <h1 style="text-align:center;">Clojure Box Release Notes</h1>
 
 
 <div id="outline-container-1" class="outline-3">
-<h3 id="sec-1">1.1.0-1 </h3>
+<h3 id="sec-1">1.2.0 RC1 </h3>
 <div class="outline-text-3" id="text-1">
 
 
 <ul>
 <li>
+Updated Clojure and Contrib to 1.2.0 RC1.
+
+</li>
+<li>
+Fixed the Clojure REPL shortcut to use the right jars.
+
+</li>
+<li>
+Simplified README paredit instructions.
+
+</li>
+<li>
+Added slime-fancy to the slime-setup call.
+
+
+</li>
+</ul>
+</div>
+
+</div>
+
+<div id="outline-container-2" class="outline-3">
+<h3 id="sec-2">1.1.0-1 </h3>
+<div class="outline-text-3" id="text-2">
+
+
+<ul>
+<li>
 Updated clojure.contrib.jar with the same version but this time compiled.
 
 </li>
 
 </div>
 
-<div id="outline-container-2" class="outline-3">
-<h3 id="sec-2">1.1.0 </h3>
-<div class="outline-text-3" id="text-2">
+<div id="outline-container-3" class="outline-3">
+<h3 id="sec-3">1.1.0 </h3>
+<div class="outline-text-3" id="text-3">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-3" class="outline-3">
-<h3 id="sec-3">1.1RC1 </h3>
-<div class="outline-text-3" id="text-3">
+<div id="outline-container-4" class="outline-3">
+<h3 id="sec-4">1.1RC1 </h3>
+<div class="outline-text-3" id="text-4">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-4" class="outline-3">
-<h3 id="sec-4">1.0 </h3>
-<div class="outline-text-3" id="text-4">
+<div id="outline-container-5" class="outline-3">
+<h3 id="sec-5">1.0 </h3>
+<div class="outline-text-3" id="text-5">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-5" class="outline-3">
-<h3 id="sec-5">20090320 </h3>
-<div class="outline-text-3" id="text-5">
+<div id="outline-container-6" class="outline-3">
+<h3 id="sec-6">20090320 </h3>
+<div class="outline-text-3" id="text-6">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-6" class="outline-3">
-<h3 id="sec-6">r1327.1 </h3>
-<div class="outline-text-3" id="text-6">
+<div id="outline-container-7" class="outline-3">
+<h3 id="sec-7">r1327.1 </h3>
+<div class="outline-text-3" id="text-7">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-7" class="outline-3">
-<h3 id="sec-7">r1327 </h3>
-<div class="outline-text-3" id="text-7">
+<div id="outline-container-8" class="outline-3">
+<h3 id="sec-8">r1327 </h3>
+<div class="outline-text-3" id="text-8">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-8" class="outline-3">
-<h3 id="sec-8">r1235 </h3>
-<div class="outline-text-3" id="text-8">
+<div id="outline-container-9" class="outline-3">
+<h3 id="sec-9">r1235 </h3>
+<div class="outline-text-3" id="text-9">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-9" class="outline-3">
-<h3 id="sec-9">r1142 </h3>
-<div class="outline-text-3" id="text-9">
+<div id="outline-container-10" class="outline-3">
+<h3 id="sec-10">r1142 </h3>
+<div class="outline-text-3" id="text-10">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-10" class="outline-3">
-<h3 id="sec-10">r1109.1 </h3>
-<div class="outline-text-3" id="text-10">
+<div id="outline-container-11" class="outline-3">
+<h3 id="sec-11">r1109.1 </h3>
+<div class="outline-text-3" id="text-11">
 
 
 <ul>
 
 </div>
 
-<div id="outline-container-11" class="outline-3">
-<h3 id="sec-11">r1109 </h3>
-<div class="outline-text-3" id="text-11">
+<div id="outline-container-12" class="outline-3">
+<h3 id="sec-12">r1109 </h3>
+<div class="outline-text-3" id="text-12">
 
 
 <p>
 </div>
 </div>
 <div id="postamble">
-<p class="date"> Date: 2010-07-15 15:22:27 </p>
+<p class="date"> Date: 2010-07-31 22:28:44 EDT</p>
 </div>
 </div>
 </body>

web/release-log.org

 #+END_HTML
 
 
+** 1.2.0 RC1
+
+- 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.
+
+
 ** 1.1.0-1
 
 - Updated clojure.contrib.jar with the same version but this time compiled.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.