Commit graph

2979 commits

Author SHA1 Message Date
Phil Hagelberg
c5e5ed61af Fix classpath test to match new checkout-deps behaviour. 2013-05-14 20:44:18 -07:00
Phil Hagelberg
7b32caf8f6 Merge default profiles in checkout-deps project reading.
Fixes #1180, but in a way that's probably too clever.

Makes it possible to recursively descend into checkout dependencies
with the following addition to the `:user` profile:

`:checkout-deps-shares [#=(resolve leiningen.core.classpath/checkout-deps-paths)]`
2013-05-14 15:15:40 -07:00
Phil Hagelberg
f21a2c4a64 Merge :uberjar profile when uberjarring.
Fixes #1170.
2013-05-14 14:31:01 -07:00
Phil Hagelberg
8d1818f973 Merge found :deploy-repositories entry with :repositories entry in deploy.
Fixes #765.
2013-05-14 14:06:53 -07:00
Phil Hagelberg
f40da67ece Make profile-scope-target-path work with anonymous profiles.
Also make it work in scenarios where the project map lacks :target-path.
2013-05-14 13:42:41 -07:00
Phil Hagelberg
a1d7b6f3ea Scope :target-path by profile unless it's the default (:base).
Anyone using a %s pattern in their custom :target-path will get this
behaviour, but strings that don't have it will continue to behave as
normal.

Fixes #468.
2013-05-14 11:40:56 -07:00
Phil Hagelberg
f2c95e8f65 Default to writing repl-port in ~/.lein when outside projects.
Fixes #589.
2013-05-13 10:02:11 -07:00
Phil Hagelberg
2e9f2708cc Remove prefix clauses and :use from ns.
Prefix clauses break greppability and should be avoided.
2013-05-13 09:53:37 -07:00
Phil Hagelberg
cf679d4f1c Normalize :mirrors like :repositories. Fixes #1171. 2013-05-13 09:40:34 -07:00
Phil Hagelberg
0ddd6ca629 Deploy ad-hoc files. 2013-05-12 14:11:24 -07:00
Colin Jones
b4660d52db Bump nrepl & clojure-complete dependencies 2013-05-12 15:19:07 -05:00
Colin Jones
0bfe4b8506 Delete .leiningen-cmdline tempfiles when complete
Thanks to @AtKaaz
fixes #1175
2013-05-12 15:13:55 -05:00
Colin Jones
efcca90cd4 Merge pull request #1177 from AtKaaZ/2StringsWere1
two strings were one for windows x86_64 test
2013-05-12 12:07:32 -07:00
AtKaaZ
eb30389ff8 two strings were one for windows x86_64 test 2013-05-12 20:41:24 +03:00
Phil Hagelberg
92615f15ce Don't create target/classes unless we're in an actual project.
Fixes #589.
2013-05-09 16:35:20 -07:00
Phil Hagelberg
1f65fa4468 Remove stray println. 2013-05-09 16:34:58 -07:00
Michał Marczyk
995ae1c570 #1166: reinstate support for :licenses, :licence, :licences 2013-05-09 16:08:34 -07:00
Phil Hagelberg
b5c308335f Merge pull request #1164 from ryfow/rememoize-get-dependencies
Better at knowing what get-dependencies calls have been memoized
2013-05-09 15:57:06 -07:00
Phil Hagelberg
9663106e84 Work around completely bonkers test failure.
Running deps on a project that includes ring causes an error
extracting the zip file for native deps, but only when you do it from
the first test in deps.clj and even then only when doing a full test
run.
2013-05-09 09:51:38 -07:00
Phil Hagelberg
eee0984de2 Merge pull request #1160 from JacekLach/1160-pom-extra-test-typo
[lein pom] Extra tests paths are never added to the maven source path
2013-05-09 09:25:09 -07:00
Jacek Lach
c485e9a345 Correctly add extra test classpath to generated pom 2013-05-09 11:06:52 +01:00
Colin Jones
6d83a6f2cd Stop claiming sample.project.clj is exhaustive
refs #1168
2013-05-08 20:54:47 -04:00
Ryan Fowler
1ab531fcc8 Better at knowing what get-dependencies calls have been memoized
It turns out that #1162 wasn't that helpful because the project
argument keeps changing. This new version makes the real worker get a
filtered version of project, so that memoization hits are much more
likely.
2013-05-02 19:04:42 -05:00
Phil Hagelberg
058a6061f5 Merge pull request #1163 from technomancy/issue-1154
Set *command-line-args* in lein run
2013-05-02 16:06:44 -07:00
Anthony Grimes
f4a50b744f Set *command-line-args* in lein run. 2013-05-02 15:44:14 -07:00
Phil Hagelberg
01dd252b8a Fix a bunch of tests from reorg-repl. 2013-05-02 14:12:58 -07:00
Phil Hagelberg
5adef11d33 Some more don't-warn-when-missing profiles. 2013-05-02 13:59:10 -07:00
Phil Hagelberg
086ab45ad3 Merge remote-tracking branch 'ryfow/memoize-get-dependencies'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-05-02 13:51:33 -07:00
Phil Hagelberg
c508badfd9 Add :repl to list of don't-warn-when-missing profiles. 2013-05-02 13:48:55 -07:00
Phil Hagelberg
02f1d5dc82 Merge branch 'reorg-repl'
Conflicts:
	leiningen-core/src/leiningen/core/main.clj
	leiningen-core/src/leiningen/core/project.clj
	src/leiningen/repl.clj
2013-05-02 13:13:55 -07:00
Ryan Fowler
f613c40668 memoize get-dependencies
get-dependencies is expensive and sometimes gets called multiple times
with the same arguments. This pretty consistently knocks a couple
tenths of a second off of the extremely common
 `lein repl < /dev/null`.
2013-05-01 17:26:35 -05:00
Colin Jones
d29614a7f0 Merge pull request #1159 from AtKaaZ/bootstrapPathsGet
get \leiningen-core\.lein-bootstrap paths properly in windows
2013-04-30 06:56:14 -07:00
AtKaaZ
9750e0ebb9 Handle folders with spaces in their names (under windows)
Show error message when parent folders(LEIN_ROOT) contain semicolon in
their names and require that .lein-bootstrap be recreated in this case.
Semicolon in files/folder names is not supported even though windows
allows such names.
2013-04-30 15:51:42 +03:00
Colin Jones
1c99645e19 Merge pull request #1158 from AtKaaZ/bootstrapTypo
bootstrap typo in lein.bat
2013-04-29 14:30:33 -07:00
AtKaaZ
2510ab24f0 get \leiningen-core\.lein-bootstrap paths properly in windows
else getting:
Error: Could not find or load main class clojure.main

this now allows compiling leiningen on windows successfuly
2013-04-29 23:54:15 +03:00
AtKaaZ
4bf8dcbd8d bootstrap typo in lein.bat 2013-04-29 22:38:41 +03:00
Phil Hagelberg
a21c3f13fc Merge pull request #1157 from qerub/master
Make error messages in project/read refer to correct file
2013-04-28 11:41:51 -07:00
Christoffer Sawicki
f20230c490 Make error messages in project/read refer to correct file 2013-04-27 23:53:19 +02:00
Colin Jones
4fe1b3df09 Update offline test metadata & run configuration 2013-04-27 12:15:24 -05:00
Colin Jones
9164c197d7 Don't bother trying to save the same source files 2013-04-27 12:15:24 -05:00
Nelson Morris
b9506555f2 Add warnings when some dependencies are ignored for deps :tree
Pull out the range transformer into its own project to be
used in other places with pomegranate.
Extend it to also warn for when dependencies are

1) top level and ignored (due to version range)
2) transative and ignored due to a lower version earlier in the chain

Currently this does not provide any instruction of how to change
the project.clj to remove the warnings.
2013-04-24 00:11:20 -04:00
Michael Klishin
0dab883ec0 Merge pull request #1147 from joelittlejohn/template-executable
Add support for executable files to 'lein new' templates
2013-04-16 14:29:50 -07:00
Joe Littlejohn
c78c7f7165 Add support for executable files to lein new templates
Paths that are marked with the additional option `:executable true`
will be set executable when template files are rendered.

Fixes #976.
2013-04-16 22:09:19 +01:00
Phil Hagelberg
532681dc40 Merge pull request #1146 from bendlas/patch-1
Rename `hooks` to `activate` in hooks code sample
2013-04-15 09:38:18 -07:00
bendlas
deba9c59ae Rename hooks to activate in hooks code sample
I'm not sure, if `hooks` was there on purpose, but if it was, it would need additional explainations.
2013-04-15 17:16:34 +03:00
Colin Jones
f0582e2314 Escape quotes for Java versions below 7
See http://gluck-md.blogspot.com/2012/12/jdk7-surprise.html

fixes #1121
2013-04-14 21:03:57 -05:00
Colin Jones
e6529bc5da Allow bootstrap from batch file 2013-04-14 21:00:08 -05:00
Colin Jones
0d6a7a70cc Stop pretending shell is a reasonable language 2013-04-12 16:07:40 -05:00
Colin Jones
0d19edb0cc Handle cygwin jline issues
fixes #850
2013-04-12 15:24:34 -05:00
Colin Jones
1f6ce39712 Isolate OSTYPE checks for cygwin a bit 2013-04-12 15:19:00 -05:00