Commit graph

659 commits

Author SHA1 Message Date
AtKaaZ
533f4725db fix repo name should not contain path delims under windows so test won't
fail
all tests pass under windows
2013-05-16 05:32:38 +03:00
AtKaaZ
0277ec3e41 Merge remote-tracking branch 'upstream/master' into testsUnderWindows1 2013-05-16 05:04:16 +03:00
Phil Hagelberg
a99d923cb2 Preliminary support for :java-agents. 2013-05-15 17:32:43 -07:00
Phil Hagelberg
d432377964 Hold back on :aot :all in the uberjar profile till 3.0. 2013-05-15 15:36:38 -07:00
Phil Hagelberg
94beeeffc4 Some todos. 2013-05-15 13:53:07 -07:00
Phil Hagelberg
cbff7f06fb Fix -o and -U aliases to be additive. 2013-05-15 13:53:01 -07:00
Phil Hagelberg
bba38c436a Don't block :user profile from ~/.lein/profiles.d. 2013-05-15 13:31:29 -07:00
Phil Hagelberg
c5e5ed61af Fix classpath test to match new checkout-deps behaviour. 2013-05-14 20:44:18 -07:00
AtKaaZ
9f984cbf46 Merge remote-tracking branch 'upstream/master' into testsUnderWindows1
Conflicts:
	leiningen-core/test/leiningen/core/test/classpath.clj
2013-05-15 06:16:13 +03:00
AtKaaZ
3521a21a9d moving 2 functions from utils to helper
merged all commits to date which required adding "dev-resources" so a
test wouldn't fail
`bin\lein test` tested under windows (currently 2 failures and 1 error)
2013-05-15 02:39:23 +03:00
AtKaaZ
6c34ce7e6f Merge branch 'master' into testsUnderWindows1 2013-05-15 01:53:44 +03: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
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
AtKaaZ
9588d307d5 Merge branch 'master' into testsUnderWindows1 2013-05-13 21:00:58 +03:00
Phil Hagelberg
cf679d4f1c Normalize :mirrors like :repositories. Fixes #1171. 2013-05-13 09:40:34 -07:00
AtKaaZ
a8e20e96ce fix some path errors in windows tests
lein test still has 2 failures and 1 error after this.
normalize-path should now handle absolute *nix paths correctly under
windows
addresses #1176
2013-05-13 08:15:55 +03:00
Colin Jones
b4660d52db Bump nrepl & clojure-complete dependencies 2013-05-12 15:19:07 -05: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
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
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
Christoffer Sawicki
f20230c490 Make error messages in project/read refer to correct file 2013-04-27 23:53:19 +02: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
Phil Hagelberg
7ef8170aea Back to 2.2.0-SNAPSHOT. 2013-04-12 10:16:37 -07:00
Phil Hagelberg
eccd23d062 Release 2.1.3 2013-04-12 10:02:18 -07:00
Marko Topolnik
26cb21935b Revert "project.clj setting overrides profile setting" 2013-04-10 14:25:59 +02:00
Marko Topolnik
f19eeeb746 Populate project-map meta when outside project
// cherry-picked from master
2013-04-10 13:48:02 +02:00
Marko Topolnik
7a7e7fb623 project.clj setting overrides profile setting
// fixes #1128
2013-04-10 12:19:52 +02:00
Marko Topolnik
ea29210d23 Populate project-map meta when outside project
// fixes #1129
2013-04-10 12:08:26 +02:00
bdollard
3debae78c0 fixes #1123: mirrors can get credentials using gpg 2013-04-03 14:06:19 -04:00
Marko Topolnik
0908397422 Add resolve-and-apply to main and use it
Fixes #1120
2013-04-03 16:20:32 +02:00
Jean Niklas L'orange
95185a9b0a Improve error messages when reading user profiles.
Also associates :origin to the file the user profile were defined in,
and tags it within its metadata.
2013-03-30 16:36:21 +01:00
Phil Hagelberg
da76893c23 Back to 2.2.0-SNAPSHOT. 2013-03-28 15:38:43 -07:00
Phil Hagelberg
10d7d1faa3 Release 2.1.2 2013-03-28 14:46:32 -07:00
Phil Hagelberg
078ff98f3d Merge pull request #1114 from joelittlejohn/system-no-proxy
Add support for no_proxy environment variable
2013-03-28 12:15:57 -07:00
Phil Hagelberg
f5c2d04b57 Move default :test-selectors to :leiningen/test profile.
Fixes #1099.
2013-03-28 11:38:04 -07:00
Phil Hagelberg
a42c5521f4 Move Tiered Compilation to LEIN_JVM_OPTS and document.
Fixes #1111.
2013-03-28 11:04:13 -07:00
Joe Littlejohn
802e666f14 Add support for no_proxy environment variable
Closes #816.
2013-03-28 17:47:46 +00:00
Jean Niklas L'orange
51a2e1e625 Add tests for IObj vs. non IObjs merging. 2013-03-27 20:20:53 +01:00
Jean Niklas L'orange
664da4a3df Allow IObjs to be cmp. to non IObjs when merging.
Fixes #1110.
2013-03-27 20:20:15 +01:00
Jean Niklas L'orange
c42bb2a2c0 Only try to open file when needed in lein-version.
(This should fix the breaking tests.)
2013-03-27 19:38:15 +01:00
Pierre-Yves Ritschard
dc3cade47c Fetch version from pom.properties
After clarifying things with @technomancy, it makes more sense
to pull the version from the already provisionned pom.properties
file.
2013-03-27 00:37:24 +01:00
Pierre-Yves Ritschard
ea0b00a199 Provide a default version for leiningen
For odd cases where leiningen is called without the wrapper shell script, any occurence of `:min-lein-version` will throw an exception since `leiningen-version` will return nil.

This fixes jenkinsci/leiningen-plugin#1 for instance.
I see two other ways to fix this:

- have the version be propagated from project.clj directly, through substitution
- let leiningen-version return a string that always passes or always fails (not sure which is best) the `:min-lein-version` requirement
2013-03-26 23:54:21 +01:00