Commit graph

3207 commits

Author SHA1 Message Date
Juergen Hoetzel
90a74131c9 use init-file (-i) instead of form (-e) when evaluating forms in subprocess.
The form is still not passed correctly on Windows, when it has nested quotes is passed via "-e".
See: http://bugs.sun.com/view_bug.do?bug_id=6468220

Refs #1203
Refs #863
Refs #1224
2013-06-15 14:01:01 +02:00
Juergen Hoetzel
89c4bf7520 Use nested strings in test-eval-in-project, refs #1203
Test double quote issues on Windows platform: http://bugs.sun.com/view_bug.do?bug_id=6468220
2013-06-15 13:43:51 +02:00
Phil Hagelberg
36c1a9633d Merge pull request #1221 from malyn/unix-path-copy-to-jar-bytes
copy-to-jar :bytes needs to unix-path the :path
2013-06-14 12:37:38 -07:00
Phil Hagelberg
e22d0aada7 Don't need this now with read-edn. 2013-06-14 12:32:56 -07:00
Phil Hagelberg
a41c7e4bd0 Merge pull request #1223 from kanej/hostreplarg
Add :host as an option to 'lein repl :start' and 'lein repl :headless' commands
2013-06-14 12:36:42 -07:00
John Kane
e8665af01f Include host in nrepl start message.
This makes the default use of localhost for nrepl port binding
explicit, see issue #1217.
2013-06-14 08:32:57 +01:00
Phil Hagelberg
0908ca7be0 Remove mention of 1.x in readme. 2013-06-12 17:11:18 -07:00
Phil Hagelberg
12d0ec95f9 Point to the djpowell installer for Windows.
The choclatey package appears to still have some usability issues.
2013-06-12 17:08:51 -07:00
Phil Hagelberg
f92ca69c8b gpg-agent caching is time-bounded. 2013-06-12 17:05:12 -07:00
Jean Niklas L'orange
ec7775dd39 Merge pull request #1220 from malyn/normalized-template-slurping
Normalize line endings in slurp-resource
2013-06-12 08:50:35 -07:00
Michael Alyn Miller
5eb63c73b6 Normalize line endings in slurp-resource
slurp-resource previously expected the resource to use Unix-style line
endings, which it would then convert into system-specific line endings
using fix-line-separators.  The problem with that approach is that
templates built on Windows contain resources with CRLF-terminated lines
and so slurp-resource returned CRCRLF-terminated lines.

The new slurp-to-lf function behaves similarly to slurp, but it
normalizes the line endings in the resource to LF.  This ensures that
slurp-resource is able to produce the correct system-specific line
endings.
2013-06-11 21:39:40 -07:00
Michael Alyn Miller
7bd6b26bf3 copy-to-jar :bytes needs to unix-path the :path
All of the other copy-to-jar methods call unix-path on (:path spec),
thus ensuring that files added to the jar from a Windows machine end up
with Unix-style path names.  The byte array variant of copy-to-jar is
the one exception though and the result is that tools such as
lein-cljsbuild will leave Windows-style paths in jar files generated
with the "lein jar" command.
2013-06-11 20:55:09 -07:00
John Kane
6cabea9be8 Add Host as arg to "repl :start" and "repl :headless" commands.
This is a step towards easier setting up of remote nrepl
sessions, see issue #1217.
2013-06-11 00:39:10 +01:00
Phil Hagelberg
8f566613df Merge pull request #1218 from leon-barrett/line-fix
Fixed long line support in make-manifest.
2013-06-10 16:32:13 -07:00
Leon Barrett
2d5e1b04de Fixed long line support in make-manifest. 2013-06-10 16:08:00 -07:00
Phil Hagelberg
803ebaef7f Merge pull request #1213 from zachpendleton/search-documentation
add documentation on `lein search` options to tutorial.
2013-06-06 16:49:39 -07:00
Zach Pendleton
6f24bd12ac add documentation on lein search options to tutorial. 2013-06-06 16:40:12 -06:00
Phil Hagelberg
8307aa58fc Fix long line.
[ci skip]
2013-06-06 09:37:33 -07:00
Phil Hagelberg
8531b8ee8d Merge pull request #1209 from robermann/master
Suggestion on when you have to set the 'http_proxy' variable
2013-06-06 09:39:41 -07:00
Michael Klishin
93f4bb7e89 Merge pull request #1211 from Iristyle/patch-1
README - Update Windows install instructions
2013-06-06 05:48:00 -07:00
Ethan J. Brown
2a3158cbea README - Update Windows install instructions
- Use Chocolatey to install
2013-06-06 09:02:05 -03:00
Roberto Mannai
f4a0fcfa34 Suggestion on when you have to set the 'http_proxy' variable
For example, on Windows:
set http_proxy=http://user:pwd@proxyserver:port
2013-06-05 16:14:08 +03:00
Jean Niklas L'orange
e92e4a92d3 Merge pull request #1208 from robermann/patch-1
CLASSPATH space-tolerant
2013-06-05 04:43:34 -07:00
Roberto Mannai
bd20685fa4 CLASSPATH space-tolerant
The remaining path after the first space was considered as being a class name.
2013-06-05 14:09:23 +03:00
Phil Hagelberg
fa83ea7ae8 Merge pull request #1206 from fredericksgary/issue-1205
Crash on :aot [does.not.exist]; also regression test; Fixes #1205
2013-06-04 15:51:44 -07:00
Gary Fredericks
61091d44c3 Crash on :aot [does.not.exist]; also regression test; Fixes #1205
We want missing namespaces in :aot to not be silently ignored.
Implemented by removing the file-existence check from the function
that determines which namespaces need to be compiled.

This means we won't get the error if you compile an existing namespace
and subsequently delete the *.clj file. Oh well.
2013-06-04 16:39:58 -05:00
Michael Klishin
9160433313 Merge pull request #1196 from leon-barrett/master
Fix bug where manifest is missing its last line.
2013-05-31 11:36:47 -07:00
Leon Barrett
38090775f8 Fix a bug where the manifest is missing its last line.
Despite the documentation on java.util.jar.Manifest [1], the Manifest class
seems to require an endline in its input. If not, it drops the last line (on my
system, version [2], anyway).

[1] http://docs.oracle.com/javase/6/docs/technotes/guides/jar/jar.html
[2] $ java -version
java version "1.7.0_21"
OpenJDK Runtime Environment (IcedTea 2.3.9) (7u21-2.3.9-0ubuntu0.12.04.1)
OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)
2013-05-31 10:51:51 -07:00
Colin Jones
ea443fecf4 Move to using LEIN_JVM_OPTS for cygwin UnixTerminal
refs #1194
2013-05-31 09:52:32 -05:00
Michael Klishin
093491c9e8 Merge pull request #1192 from dadinn/patch-1
Fix for issue #1113: file paths with spaces passed incorrectly as javac arguments on Windows
2013-05-30 19:52:57 -07:00
Daniel Dinnyes
12db0c6478 Fix for issue #1113: file paths with spaces are not passed correctly as javac arguments on Windows
The bug is from a commit from Feb 6 which changes how the classpath is passed javac to use @argfiles parameter.

SHA-1: 3867d4d17c

According to the javac specification (http://docs.oracle.com/javase/6/docs/technotes/tools/windows/javac.html) :

"An argument file can include javac options and source filenames in any combination. The arguments within a file can be space-separated or newline-separated. If a filename contains embedded spaces, put the whole filename in double quotes, and double each backslash ("My Files\\\\Stuff.java")."
2013-05-30 22:22:17 +02:00
Phil Hagelberg
577ef23d55 FAQ update.
[ci skip]
2013-05-29 20:38:50 -07:00
Phil Hagelberg
2b604ad2bc Style notes in CONTRIBUTING.md. 2013-05-29 19:02:07 -07:00
Alan Malloy
256ae00364 Fix typo in NEWS.md
The markdown formatting was off.
2013-05-28 22:55:46 -06:00
Phil Hagelberg
e4b66b2b9e Bump back to snapshot.
[ci skip]
2013-05-28 21:43:13 -07:00
Phil Hagelberg
5eaad5c48d Release 2.2.0 2013-05-28 17:04:23 -07:00
Phil Hagelberg
f362d596f5 Only use when for side-effects. 2013-05-27 21:05:27 -07:00
Colin Jones
3118083d44 Add custom-help to reply-options expectation 2013-05-27 22:20:51 -05:00
Colin Jones
ebf75345d8 Allow trampoline repl without specifying init-ns 2013-05-27 21:56:17 -05:00
Phil Hagelberg
a6938be044 Not using todo.org any more; just grep for TODO. 2013-05-27 14:43:04 -07:00
Phil Hagelberg
722afb92c5 Support custom repl :welcome message.
Fixes #1178.
2013-05-27 14:42:33 -07:00
Colin Jones
774850b1c0 Bump REPLy to 0.2.0 2013-05-23 23:22:17 -05:00
Toby Crawley
39b03b9457 Fix markdown render issue in GPG.md. 2013-05-23 16:16:19 -04:00
Colin Jones
124938db68 Merge pull request #1184 from fredericksgary/master
Add back support for java classes in :main
2013-05-22 21:34:15 -07:00
Gary Fredericks
230edf500d Terribly minor improvement to the previous commit 2013-05-22 22:35:36 -05:00
Gary Fredericks
5e6d9fcfe7 Add back support for java classes in :main
This commit bends over backwards to add back support for java
classes in :main that was removed in 71e609c8a1. The crux of
the complexity was that when we try to require the namespace
relevant to the argument to `lein run`, we could get a
FileNotFoundException for two distinct reasons -- either the
namespace we were trying to run doesn't exist, in which case
we want to check if it was actually a class name; or the
namespace exists but it or some other dependency is trying
to require a namespace that doesn't exist. In the latter case
we definitely want the FileNotFoundException to propagate up
to the top. But distinguishing these two cases by examining
the exception is hacky at best, so the alternative adopted
here is to hold on to the exception, check if a class exists,
and if not, re-throw the exception.

This should handle the majority of use cases correctly. The
test added in 71e609c8a1 is still relevant and still passes.
2013-05-22 22:25:15 -05:00
Jean Niklas L'orange
587e13bc7b Merge pull request #1183 from fredericksgary/master
Better error message for require failures
2013-05-22 18:17:37 -07:00
Gary Fredericks
71e609c8a1 Don't try static methods on lein run: better error msg
lein run tries to support invoking static methods on classes by
swallowing FileNotFoundExceptions when requiring the namespace to run,
which can obscure the real error when there's a real issue loading a
namespace.

Phil said he wasn't interested in keeping the (undocumented) feature
around, so the easiest fix to the error message problem was to remove
that feature.

Added a test as well.
2013-05-22 17:32:23 -05:00
Colin Jones
daebefbf50 Don't print nrepl server info on trampoline exit 2013-05-21 23:08:11 -05:00
Colin Jones
1679488845 Send init code to trampoline repl as well 2013-05-21 23:07:11 -05:00