Commit graph

3260 commits

Author SHA1 Message Date
Phil Hagelberg
5b26b89d9c Support :pedantic? :abort/:warn.
Move range/overlap detection into l.c.classpath.

Fixes #1197.
2013-07-22 18:45:16 -07:00
Jean Niklas L'orange
b540e8ae95 Merge branch 'expand-composite-profiles' 2013-07-20 18:50:34 +02:00
Jean Niklas L'orange
7a935545c4 Don't attach subprofiles to metadata map.
Whenever composite profiles were added to project maps, their children
were also attached as active profiles. This confuses `with-profile` and
profile merging task where excluded profiles only remove the name of the
composite profile, not the subprofiles. This allows uberjar to exclude
the default profile without excluding subprofiles, without excluding
active subprofiles themselves.

So these task actions now produce sensible results:
`lein with-profile +dev uberjar` -> uberjar with dev-dependencies, but
without the other default profiles
`lein -U uberjar` -> uberjar with snapshot updates, but not with any
default dependencies added.

Fixes #1233.
2013-07-20 18:45:07 +02:00
Jean Niklas L'orange
cd8ed45638 Expand composite profiles before removing them.
This seem to handle #1233 correctly, but breaks a pom test. I assume
there's some part of the merge logic I've forgotten, so feel free to
peek around and comment on what I've currently done.
2013-07-18 01:45:25 +02:00
Phil Hagelberg
39fa6afb52 Default to recursive checkout deps.
Fixes #1190.
2013-07-16 20:22:09 -07:00
Jean Niklas L'orange
afb8882578 Exit if trampoline file is empty. Fixes #1254.
A consequence of this fix is that travis-ci will complain on errors and
fails again, and I expect this build to fail due to that very reason.
2013-07-16 11:40:51 +02:00
Jean Niklas L'orange
9bef321ece Always add concrete filespec files. Fixes #1242. 2013-07-16 01:51:28 +02:00
Jean Niklas L'orange
e288c1a7fd Remove cruft remaining from older lein versions. 2013-07-16 01:27:39 +02:00
Phil Hagelberg
b46a1a35a2 Merge pull request #1243 from richo/features/git_plumbing
Use git's plumbing to lookup HEAD
2013-07-15 13:58:18 -07:00
Phil Hagelberg
214fd7c6a2 Empty :*-paths when running outside a project dir.
Fixes #1253.
2013-07-15 13:33:43 -07:00
Richo Healey
4fc9e61fdd Fallback to the original behaviour on any error invoking git plumbing 2013-07-15 11:42:27 -07:00
Richo Healey
5dfa542f8f Always return full SHA1 hash of HEAD 2013-07-15 11:42:26 -07:00
Richo Healey
36b2d62d12 Fallback to original behaviour on IOException 2013-07-15 11:42:16 -07:00
Phil Hagelberg
57c0b1e0e2 Remove :target-path from :base profile.
Fixes #1222; might introduce even more problems.
2013-07-12 07:45:07 -07:00
Phil Hagelberg
1225f0bf4f Error message when aws creds are missing. 2013-07-12 07:44:51 -07:00
Phil Hagelberg
c701c57440 Move download-calculating script. 2013-07-12 07:40:06 -07:00
Phil Hagelberg
f4b489b8da Merge pull request #1252 from gphil/leiningen-download-stats
automate collection and reporting of leiningen download statistics
2013-07-12 07:37:36 -07:00
Greg Phillips
2560d7abfb automate collection and reporting of current leiningen download statistics 2013-07-11 12:27:45 -07:00
Jean Niklas L'orange
c3aa8d51be Add resources dir to app template, ref #1016. 2013-07-10 12:21:49 +02:00
Jean Niklas L'orange
583fcdaf88 We always tend to forget one of these. 2013-07-10 02:46:05 +02:00
Michael Klishin
201c044894 Merge pull request #1249 from josteink/master
Fix Windows: lein.bat can't handle spaces in %USERPROFILE%
2013-07-09 11:23:53 -07:00
Jostein Kjønigsen
00b4b1bda7 Fix problem with spaces in user-profile. 2013-07-09 19:58:01 +02:00
Phil Hagelberg
c1c7f6ba4b Merge pull request #1247 from MichaelBlume/preprocess-for-get-jar-filename
make sure get-jar-filename does the same preprocessing jar does.
2013-07-08 08:24:08 -07:00
Mike Blume
eeaf0fef1f make sure get-jar-filename does the same preprocessing jar does. 2013-07-07 14:20:38 -07:00
Phil Hagelberg
cdf30e66aa Use EPL 1.0 or later in new project templates. 2013-07-06 15:59:15 -07:00
Phil Hagelberg
7bbb9e0e1a Replace bare println with main/info calls. 2013-07-06 15:58:36 -07:00
Phil Hagelberg
44eb86cfd5 Don't blow up on test failures in test-ns-hook.
Fixes #1201.
2013-07-06 15:57:26 -07:00
Phil Hagelberg
7dceb40aac Narrower github readme means banner looks weird.
[ci skip]
2013-07-02 11:21:33 -07:00
Phil Hagelberg
9da3c34cab Reduce silly uberjar output.
[ci skip]
2013-07-02 10:06:22 -07:00
Michael Klishin
f55b52e8fb Merge pull request #1244 from cldwalker/fix-typos
Fix typos
2013-07-01 06:16:52 -07:00
Gabriel Horner
f0bf04007e fix typo in docstring 2013-07-01 07:29:18 -04:00
Gabriel Horner
7b03f8733c fix typos in docs 2013-07-01 07:26:30 -04:00
Richo Healey
b850f7b5c1 Use git's plumbing to lookup HEAD 2013-07-01 16:45:54 +10:00
Jean Niklas L'orange
0f861c8349 Fix garbled sentence and broken formatting. 2013-06-26 13:56:16 +02:00
Jean Niklas L'orange
29d3776f28 Add FAQ entry on background procs. Closes #1173. 2013-06-26 13:53:28 +02:00
Jean Niklas L'orange
82c4f15171 Merge pull request #1231 from juergenhoetzel/fix-trampoline3
Use single quotes in shell command
2013-06-26 04:25:28 -07:00
Jean Niklas L'orange
0c6b417d9f Merge pull request #1239 from djanatyn/master
add suggestion to deploy to clojars when running `lein deploy` with no arguments
2013-06-26 04:07:58 -07:00
Jonathan Strickland
83e6febdf0 added suggestion to run lein deploy clojars after runing lein deploy 2013-06-25 21:00:48 -04:00
Jean Niklas L'orange
a2d22c1a24 Merge pull request #1234 from juergenhoetzel/fast-trampoline-keep-init-file
Keep init-file when using LEIN_FAST_TRAMPOLINE
2013-06-23 15:28:03 -07:00
Juergen Hoetzel
28fad91bfb Keep init-file when using LEIN_FAST_TRAMPOLINE 2013-06-20 22:20:42 +02:00
Michael Klishin
0ef2ac4731 Merge pull request #1232 from w01fe/faq-entry-for-long-term-performance
Update FAQ to add entry about long-term performance
2013-06-20 02:35:01 -07:00
Jason Wolfe
8eca6a1c08 Update FAQ to add entry about long-term performance 2013-06-20 00:12:35 -07:00
Phil Hagelberg
8dfacb98db Merge pull request #1230 from stuartsierra/displace-jvm-opts
Set default :jvm-opts in :base profile to :displace
2013-06-19 07:48:06 -07:00
Jean Niklas L'orange
48a19e1c05 Merge pull request #1229 from juergenhoetzel/secure-tempfiles
Secure handling of temporary trampoline file
2013-06-18 14:09:30 -07:00
Stuart Sierra
fb133fdb67 Set default :jvm-opts in :base profile to :displace
When the default behavior for `:jvm-opts` is additive, it can lead to
unexpected results if a project tries to add its own options which
conflict with the defaults. For example, the following setting:

    :jvm-opts ["-XX:-TieredCompilation"]

Results in a JVM command line like this, in which the project's JVM
options are overridden by the defaults:

    -XX:-TieredCompilation -XX:+TieredCompilation -XX:TieredStopAtLevel=1

By setting :displace metadata on the default :jvm-opts, any project
configuration of :jvm-opts will replace the defaults.
2013-06-18 14:55:08 -04:00
Juergen Hoetzel
6e5c5a1714 Secure handling of temporary trampoline file
File name is easy to predict when using PID ($$) as template.
2013-06-17 21:51:22 +02:00
Juergen Hoetzel
d5c1083de4 Use single quotes in shell command
Fixes shell evaluation issues on Cygwin (in double-quoted strings, a backslash gets evaluated)
2013-06-17 20:37:51 +02:00
Jean Niklas L'orange
9fbbcd1d85 Merge pull request #1226 from juergenhoetzel/fix-trampoline
Fix trampoline files when running subprocesses.
2013-06-16 08:45:12 -07:00
Juergen Hoetzel
43fe245b4f Delete the initfile when the subprocess exits, not when the Leiningen process exits
Fixes issues when a task is applied via trampoline:

Exception in thread "main" java.io.FileNotFoundException: /tmp/form-init2098686718977910298.clj (No such file or directory)
2013-06-16 16:05:22 +02:00
Juergen Hoetzel
0bac7b7ea0 Use (pr-str form) to write form to init-file
Ensures that the form can be read by read-string. Fixes issues when
the form is lazy, which result in invalid init files like:

clojure.lang.LazySeq@451d3cd3
2013-06-16 15:51:13 +02:00