Commit graph

222 commits

Author SHA1 Message Date
Anthony Grimes
31217cfdb2 Hardcore merging action. 2012-02-07 02:59:48 -06:00
Phil Hagelberg
772679473c Allow :dependencies to be loaded after profiles in :eval-in-leiningen. 2012-02-06 17:30:03 -08:00
Anthony Grimes
75a062dfb7 WIP new lein repl task that uses reply. 2012-02-06 19:29:31 -06:00
Phil Hagelberg
00b3caea1b Honor :hooks. Allow hook namespaces to contain "activate" defn.
This lets us avoid nasty top-level side-effects.
2012-02-06 17:29:31 -08:00
Phil Hagelberg
cddd1d96ac Help, search, and repl tasks may run outside projects. 2012-02-06 17:24:40 -08:00
Anthony Grimes
a68774c36a Inc lein-newnew version to fix boogz. 2012-02-05 14:56:56 -06:00
Anthony Grimes
8f2c0c178e Remove newnew stuff from leiningen and add it as a dependency. 2012-02-05 04:21:14 -06:00
Anthony Grimes
32543350d9 Clean up a bit.
Don't pass the whole project when we can just pass the single value it
uses from it instead.
2012-02-04 17:34:40 -06:00
Anthony Grimes
91efae3327 Add native deps extraction. 2012-02-04 17:28:53 -06:00
Nelson Morris
09483ed64d Update pomegranate; all repo/dependency options should work 2012-02-01 21:20:20 -06:00
Phil Hagelberg
a1e5ee9bb9 Don't splice injected forms. 2012-02-01 17:58:51 -08:00
Phil Hagelberg
2f73e7dcef Merge remote branch 'JulianBirch/master' 2012-01-29 14:00:58 -08:00
Phil Hagelberg
0f855f96b8 Document prep-tasks, clean up ignores. 2012-01-29 13:59:07 -08:00
Phil Hagelberg
8a2baf54cc Warn when encountering user-level repositories. 2012-01-29 13:48:49 -08:00
Julian Birch
7f58cbcee5 Added support for replacing/displacing profile values instead of merging. 2012-01-28 21:10:52 +00:00
Phil Hagelberg
751a75532e Support :injections project key. 2012-01-24 20:55:24 -08:00
Phil Hagelberg
326df9578a Merge pull request #377 from timmc/master
\d+ for extracting version segments
2012-01-23 19:18:07 -08:00
Phil Hagelberg
b26928441b Add prep-tasks for precompile/javac. 2012-01-23 19:05:04 -08:00
Tim McCormack
ea91d3f1e9 Fix version comparison for multi-digit version segments (e.g. 1.273) 2012-01-23 20:45:38 -05:00
Nelson Morris
d7c335cee7 Update pomegranate version
This allows most lein v1 repository options to work.
Still need to re-add user auth from config file.
2012-01-22 22:41:47 -06:00
Phil Hagelberg
92dfe67a85 Re-enable ci for master branch. 2012-01-17 20:08:19 -08:00
Phil Hagelberg
e50ee1ba4e Fix tests for main in leiningen-core. 2012-01-17 20:08:06 -08:00
Phil Hagelberg
6ff6d603ad Move dynamic resolution of eval-in-leiningen :dependencies. 2012-01-17 15:11:46 -08:00
Phil Hagelberg
bb33e60639 Fix typo. 2012-01-17 14:58:02 -08:00
Phil Hagelberg
205c58695b Move HACKING.md into leiningen-core README.md. 2012-01-15 20:43:12 -08:00
Phil Hagelberg
d5ceec16fc Update leiningen.core.main tests. 2012-01-15 20:20:15 -08:00
Phil Hagelberg
d8190b1cb7 Move -main to leiningen.core.main. 2012-01-15 20:20:02 -08:00
Phil Hagelberg
2aa664b24f Fix checkout-deps classpath test. 2012-01-12 17:07:40 -08:00
Phil Hagelberg
39b63be344 Remove support for profiles.clj in root; read profiles.clj instead of load. 2012-01-12 17:07:27 -08:00
Phil Hagelberg
f4836379c9 Fix help task to work with plugins added to the classpath dynamically. 2012-01-12 09:19:51 -08:00
Phil Hagelberg
0da32574a7 Load :dependencies in eval-in-leiningen cases. 2012-01-12 09:07:26 -08:00
Phil Hagelberg
2c58368012 Load plugins inside leiningen.core.project/read. 2012-01-12 09:06:56 -08:00
Phil Hagelberg
4064065bd5 Fix compile task and tests. Punt on transitive cleaning for now. 2012-01-10 22:12:37 -08:00
Phil Hagelberg
c2b40834e0 OK, so relative paths in project maps was the wrong way to go. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
f6b2882b7f Fix a couple tests. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
d9a3cdd82f Checkout deps shouldn't apply default profiles. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
da54afa8c8 Document a couple functions. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
284c06476f Add debug profile. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
7a0449e6d6 Fix run tests. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
0b3314b0ad Expose pre-merged project without profiles applied on metadata. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
69e286628c Fix and test profile aliases. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
4ccbbfd2bb Allow profiles to be aliased to other profiles using keywords. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
d490acd9d7 Read profiles from ~/.lein/profiles.clj and :profiles key in defproject. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
7a59a30193 Merge maps in profiles correctly. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
d170dae303 Implement merging profiles into project maps. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
a9c945505b Add a test for unquote. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
57ac6a705c Simplify representation of paths and deps to prepare for profiles.
Basically any path not considered an output (target) is expanded to
support a vector rather than a single value. This will allow profiles
to work by concatenating additional values into these keys.
:dev-dependencies is also dropped in favour of :dependencies inside a
:dev profile, though the actual implementation of profiles isn't
implemented.
2012-01-06 21:27:20 -08:00
Justin Balthrop
ac3e84ea24 classlojure 0.6.5 2011-12-08 15:42:39 -08:00
Anthony Grimes
4c4ede10b9 Fix a bug where native deps were not being added to the java.library.path. Hyphens vs dots. 2011-12-08 14:13:11 -06:00
Phil Hagelberg
07e9b4d0bc Fixed deps task; tests are still a mess. 2011-12-03 13:11:39 -08:00
Phil Hagelberg
6540de69a4 Un-mapify :repositories before handing off to pomegranate. 2011-12-03 12:41:11 -08:00
Nelson Morris
5184b8017e Update tests for compile tests
The classpath was changed to use absolute paths for the checkout
dependencies.  They were pointing to the wrong directory since the
working directory would be the leiningen project instead of the
test project.

This adds the absolute paths for test projects back, as just
changing the classpath does not help for the other tasks.
2011-12-03 13:39:22 -06:00
Phil Hagelberg
2c4fdac5e1 Normalize :repositories values into map. This fixes search task. 2011-12-02 21:02:01 -08:00
Phil Hagelberg
85b1dc5e81 Absolutize paths inside get-classpath for now. 2011-12-02 20:48:58 -08:00
Phil Hagelberg
08097d409c Add test for leiningen.core.project namespace. 2011-12-02 19:23:59 -08:00
Phil Hagelberg
4b7d53740e Merge remote-tracking branch 'ninjudd/master' 2011-12-02 19:18:03 -08:00
Phil Hagelberg
7ff6478f5a Try to fix reading of sample projects in leiningen.test.helper.
Still broken unfortunately; getting inexplicable NPE out of resolve.
2011-12-02 16:00:32 -08:00
Justin Balthrop
18719c9e01 add eval-in :classloader 2011-11-24 08:31:43 -08:00
Justin Balthrop
4cd8c4b355 remove :eval-in-leiningen check 2011-11-23 17:49:15 -08:00
Justin Balthrop
b15736008b add eval-in multimethod and add support for :eval-in project key 2011-11-23 16:27:51 -08:00
Justin Balthrop
fd1a2b3539 simple leiningen-core eval test 2011-11-23 16:16:47 -08:00
Phil Hagelberg
4eb88c7861 Add explicit hooke dep to leiningen-core. 2011-11-23 14:07:10 -08:00
Phil Hagelberg
0b8f061f2a Fix silly classpath test. 2011-11-22 17:50:20 -08:00
Phil Hagelberg
da3028a514 Fix eval-in-project and project/read. 2011-11-22 13:47:52 -08:00
Phil Hagelberg
cadde5a2a0 Drop deprecated arities of eval-in-project. 2011-11-21 12:31:09 -08:00
Phil Hagelberg
98d8aa8f97 Better marginalia-friendly docs for leiningen-core. 2011-11-21 12:31:05 -08:00
Phil Hagelberg
6bdfd3e5c3 Fix compile task. 2011-11-20 14:37:15 -08:00
Phil Hagelberg
8488b22764 Move leiningen.util.ns to leiningen.core.ns. 2011-11-20 13:46:36 -08:00
Phil Hagelberg
74fcb25976 OK, now lein version at least runs again. Whew! 2011-11-19 21:07:34 -08:00
Phil Hagelberg
9598ab778a Add repositories handling in defproject. 2011-11-19 20:36:29 -08:00
Phil Hagelberg
8131832fdd Add leiningen.core.eval; still needs plenty of work. 2011-11-19 16:08:29 -08:00
Phil Hagelberg
91d7a283f9 Begin work on 2.0 in leiningen-core library. 2011-11-19 16:01:07 -08:00