Commit Graph

170 Commits

Author SHA1 Message Date
Mark Harrah 9d21724129 API for evaluating a setting or task in multiple scopes 2013-03-27 09:17:53 -04:00
Mark Harrah 4abc8f3d7b make classpaths exported 2013-02-28 17:59:38 -05:00
Mark Harrah d69db30af7 deprecations 2013-02-25 09:24:04 -05:00
Mark Harrah badee8bacd Update to 2.10.1-RC1
Needed an explicit type in PMap to workaround an error.
Need to drop tuple assignment of parser.parsed in input task macro as a workaround
  for macro/resetAllAttrs/pattern matching/annotation issue in RC1.
2013-02-13 07:17:20 -05:00
Mark Harrah 89c645db44 remove deprecated Initialize.scoped method 2013-01-28 17:14:53 -05:00
Paolo G. Giarrusso ef84332a51 Silence boring Eclipse warnings: catching all exceptions, part 2
These warning fixes are new since my last pull request, please verify.
2013-01-22 09:05:15 -05:00
Paolo G. Giarrusso e5673f7426 Silence boring Eclipse warnings: catching all exceptions
Here I make explicit where catching all exceptions is intended.
Mark Harrah corrected one decision during review.
2013-01-22 09:05:15 -05:00
Paolo G. Giarrusso cf08f2dd18 Don't catch org.scalacheck.Prop.Exception 2013-01-22 09:05:14 -05:00
Grzegorz Kossakowski 6c5e4ae21c Follow source layout convention supported by Eclipse.
Moved source files so directory structure follow package
structure. That makes it possible to use Scala Eclipse plugin
with sbt's source code.
2012-12-07 10:27:08 -08:00
Mark Harrah 237b80eb22 Transition to all camelCase key labels.
1. Hyphenated labels are still accepted when parsing scoped keys (so 'sbt test-only' still works)
   There is currently no timeline for removing this support for hyphenated keys.
2. Only camelCase is shown for tab completion.
3. AttributeKey.rawLabel provides the unnormalized label.
   This should only be used to implement support for accepting hyphenated keys as input for compatibility.
4. AttributeKey.normLabel provides the normalized label (hyphenated converted to camelCase)
2012-11-17 20:23:07 -05:00
Mark Harrah ed41547a47 InputTask macro
Similar to task macros, the parsed value is accessed by calling `parsed`
on a Parser[T], Initialize[Parser[T]], or Initialize[State => Parser[T]].
Values of tasks and settings may be accessed as usual via `value`.
2012-11-17 20:23:07 -05:00
Mark Harrah 64e000a37d Properly apply transformations to dynamic tasks.
That is, implement Initialize[Task[T]].flatten correctly.
This requires preserving the transformations applied in a scope so that
they can be applied to an Initialize value after static settings have been
evaluated.
2012-11-17 20:23:06 -05:00
Mark Harrah c95df4681b task setting macros for :=, +=, ++=
also, bump to 2.10.0-M6
2012-11-17 20:19:24 -05:00
Mark Harrah 15fec197c3 2.10.0-M5, different arity generalization
1. KList[M[_]] now instead of KList[HL <: HList, M[_]]
  a. head, tail work properly in this variant
  b. disadvantage is that full type not easily transformed to new type constructor
2. AList abstracts on K[L[x]], a higher order type constructor.
 A. Instances written for:
  a. KList
  b. Seq[M[T]] for a fixed T
  c. TupleN
  d. single values
  e. operate on one type constructor when nested
 B. Main disadvantage is type inference.  It just doesn't happen for K[L[x]].
    This is mitigated by AList being used internally and rarely needing to construct a K.
2012-11-17 20:19:24 -05:00
Mark Harrah dbe4b74c10 reorganization of main/
* split several source files
* move base settings sources (Scope, Structure, ...) into main/settings/
* breaks cycles.  In particular, setting system moved from Project to Def
2012-11-17 20:19:24 -05:00
Mark Harrah 19315265c1 taking care of deprecations removed in Scala master 2012-11-14 11:48:06 -05:00
Mark Harrah c8ffd6a54d better error message for null setting values 2012-09-18 13:22:40 -04:00
Eugene Vigdorchik b65a7078f1 Fix compilation error for 2.10.0-M5 for all but main project. 2012-07-17 15:20:37 -04:00
Mark Harrah 9fea4d1703 methods for working with Scala identifiers 2012-07-13 14:33:27 -04:00
Eugene Vigdorchik 35cfba21c0 Break compiler dependency from 'collection' project. 2012-07-13 14:33:26 -04:00
Mark Harrah fbb09b1433 fix task tests 2012-07-01 15:16:41 -04:00
Mark Harrah 94b4a3784a rank settings, tasks and use this to restrict help/settings/tasks output. fixes #315 2012-03-25 20:35:09 -04:00
Mark Harrah c7c4969eb7 Revert "work around for 2.10. pattern matching on KNil now requires KNil()"
This reverts commit 2f726b34c3.

This commit caused "java.lang.Error: typeConstructor inapplicable for <none>" when running 'sxr'
2012-03-17 22:58:13 -04:00
Mark Harrah 8fc5db4a8a work around for 2.10. pattern matching on KNil now requires KNil() 2012-03-17 19:31:03 -04:00
Indrajit Raychaudhuri 51db55d847 Replace `Pair.apply` with `Util.pairID`, avoids extra class generation 2012-03-12 05:25:12 +05:30
Mark Harrah d6bc087271 handle absence of CONT signal 2012-03-09 13:38:45 -05:00
Mark Harrah 1848d14815 handle CONT signal to reset JLine after resuming from stop. fixes #394 2012-03-09 07:08:38 -05:00
Mark Harrah 5893aa0e55 cleanup SourcePosition hierarchy 2012-02-25 12:01:07 -05:00
Eugene Vigdorchik 786fe5f4ce Remember the range for settings read from .sbt files 2012-02-16 16:58:51 +04:00
Mark Harrah 6e90399a30 Merge pull request #342 from vigdorchik/wip_sourcepos_eugenevigdorchik
Wip sourcepos eugenevigdorchik
2012-01-30 14:34:03 -08:00
Eugene Vigdorchik e2c1ef32fa More cleanup. 2012-01-30 19:06:26 +04:00
Eugene Vigdorchik 5f0774fe9a Change SourcePosition definition + minor cleanup. 2012-01-30 19:06:24 +04:00
Eugene Vigdorchik c6cba20682 Add SourcePosition to setting. 2012-01-30 19:06:18 +04:00
Mark Harrah 4945534614 split command core to main/command/ 2012-01-29 14:36:27 -05:00
Mark Harrah 74eaee5a5e new aggregation approach, still need exclusion mechanism 2012-01-09 08:01:24 -05:00
Mark Harrah 392ec5150a moved task axis before the key 2012-01-09 08:00:29 -05:00
Mark Harrah 9e708b17e2 fixes #280. sort aggregate and classpath dependencies separately to keep cycle detection for them separate 2011-11-27 17:48:01 -05:00
Mark Harrah b94c6e8949 in cyclic error message, put each node string on different line 2011-11-05 08:53:42 -04:00
Mark Harrah 64bf50cd08 task execution interruptible using ctrl+c. fixes #228,#229
- interrupts task execution only
- no further tasks scheduled
- existing tasks interrupted
- a task must terminate any other started threads when interrupted
- set cancelable to true to enable
- currently, 'run' properly terminates if the application properly
   terminates when interrupted
- 'console' does not, 'test' depends on the test framework

- also bundled: set connectInput to true to connect standard input to forked run
2011-10-18 22:43:25 -04:00
Mark Harrah 5898cba4a8 brief API documentation on some core settings types 2011-10-16 20:20:45 -04:00
Mark Harrah f18c44d00d fix stackoverflow caused by using List.separate, as tracked down by pvlugter 2011-10-09 21:48:15 -04:00
Mark Harrah ba4c6de918 generalize addArtifact arguments to Initialize[...]. fixes #207 2011-10-01 14:40:14 -04:00
Mark Harrah 5874d45525 local settings, sbt-package-private for now 2011-10-01 14:40:14 -04:00
Mark Harrah 7d85f3c047 fix order of returned lists in Util.separate 2011-09-26 08:20:07 -04:00
Mark Harrah fdb47eca8d fix dependsOn breakage from Initialize rework 2011-08-26 23:27:03 -04:00
Mark Harrah 8e4906f410 fix undefined key suggestion for updating settings 2011-08-14 10:53:38 -04:00
Mark Harrah 8ce9950327 allow setting initialization to be partially dynamic and run in parallel 2011-08-14 10:53:37 -04:00
Mark Harrah 0b5e6484ba drop unused KApply from settings 2011-08-14 10:53:37 -04:00
Mark Harrah 93b64e0fd3 clean up undefined reference checking to be a proper function 2011-08-14 10:53:37 -04:00
Mark Harrah 01b27f5875 Settings overhaul, intended to be source compatible where it matters.
Moves many methods previously provided by implicit conversions directly onto the classes
  for better discoverability, especially with scaladoc.

1. Initialize now allowed in more places.  Minor renamings in Initialize to avoid conflicts
  a. map -> apply
  b. get -> evaluate
2. Identity on Scoped* is deprecated- it is now redundant
3. Can now use += and <+= for String, Int, Long, Double settings.
  There may be some problematic corner cases in inference, especially with +=, ++, <+=, <++=
4. Some classes with a scoped: ScopedKey[T] method now have scopedKey: ScopedKey[T] instead.
5. The implicit conversion to ScopedKey[T] is now deprecated.  Use the scopedKey method.
6. :== and ::= are now private[sbt] to better reflect that they were internal use only.
2011-08-14 10:53:37 -04:00
Mark Harrah ebddc4009f fix ScalaProviderTest 2011-08-14 10:53:37 -04:00
Mark Harrah baea865ecf try out simplified display of scoped keys 2011-08-04 07:20:25 -04:00
Mark Harrah 96d46b2c7a Seq[Setting[_]] <=> SettingsDefinition 2011-07-30 18:11:20 -04:00
Mark Harrah 65c1320c60 for undefined references, suggest the nearest defined scope that is more specific if it exists. fixes #135 2011-07-27 22:35:20 -04:00
Mark Harrah 9c70e479d8 display all undefined settings at once 2011-07-25 21:59:22 -04:00
Mark Harrah a6dd6b07b5 proper resolvedScoped implementation 2011-07-19 21:29:05 -04:00
Mark Harrah a6f7e9840c global settings preparation: separate compilation/loading stages of Eval 2011-07-09 16:54:41 -04:00
Mark Harrah a612cc0ba1 settings example and simple test 2011-06-29 21:44:55 -04:00
Mark Harrah c25c92da40 add missing Attributed.get method 2011-06-29 21:44:37 -04:00
Mark Harrah cb2c37afa0 rearrange products settings
1. enables exporting jar to classpath instead of class directory
2. starts to make post-processing class files easier
2011-05-31 18:37:07 -04:00
Mark Harrah f0608da0a8 more release-worthy compile message and analysis toString 2011-05-29 19:17:31 -04:00
Mark Harrah fa90cc7de6 forgot a test 2011-05-26 22:24:26 -04:00
Mark Harrah 59ffcac74a back A.Key with Manifest, dropping object equality. fixes #27
type inference restoration pending switch to 2.9.0
2011-05-26 08:21:33 -04:00
Mark Harrah dd5177bc2b task axis delegation 2011-05-23 08:13:13 -04:00
Mark Harrah 13a0c155df support extra axis for streams 2011-05-07 22:02:06 -04:00
Mark Harrah 99110c1dd3 basic optional input support 2011-05-07 22:02:06 -04:00
Mark Harrah 375f09cd26 speed up startup 2011-05-02 20:43:19 -04:00
Mark Harrah b727cf94f2 task/setting/attribute descriptions 2011-04-20 20:18:58 -04:00
Mark Harrah ed7721bb7d add Types.idFun to replace Predef.identity, replace a :== overload
idFun[T]: T => T instead of identity[T](t: T): T
  doesn't require a new class file when used as a function value
replaced overloads of :== that assigned the Scoped reference on
  the right to the Scoped on the left with <<= scoped.identity
2011-04-16 11:24:58 -04:00
Mark Harrah 19ac4b51b2 support explicitly defining sequences of settings in .sbt files 2011-04-13 19:09:33 -04:00
Mark Harrah 8b7e421807 improve error messages for cycles 2011-04-13 19:06:36 -04:00
Mark Harrah 90aa53a19e String representation for Compiled 2011-04-13 19:04:53 -04:00
Mark Harrah c368a34d36 clean up scope delegation implementation 2011-04-12 20:58:59 -04:00
Mark Harrah 33206fc537 move toSeq up from IMap to PMap 2011-04-07 22:50:26 -04:00
Mark Harrah 1ddf5c8c31 'inspect actual <key>' for actual dependencies, 'inspect <key>' for declared 2011-03-29 20:53:21 -04:00
Mark Harrah c803a4a16d tab completion fixes and cleanup 2011-03-24 21:28:02 -04:00
Mark Harrah 95e5206c3f work on displaying task errors 2011-03-20 22:54:01 -04:00
Mark Harrah f9e8534a89 join for tasks and settings 2011-03-01 08:48:14 -05:00
Mark Harrah 9e080d7418 configurable shell prompt
for example:
 Command.ShellPrompt := {
   s => Project.extract(s).cid + "> "
 }
2011-02-21 19:35:05 -05:00
Mark Harrah a6df926d41 fix issue with updating a non-definitive setting 2011-02-15 18:43:44 -05:00
Mark Harrah 86d82141a3 cleanup/rework related to Settings/InputParser
- drop fillThis: handle in injectStreams instead
- simplify InputParser construction (at the expense of implementation simplicity)
- split out ScopeKey/initialization parts of Setting with separate Initialize trait
  + makes Apply obsolete
  + makes the Initialize trait properly composable
  + this allowed splitting the InputParser definition into
    an Initialize for parsing and one for the action
- implement test-only
- inject resolved scope
2011-02-11 20:22:17 -05:00
Mark Harrah b503716e38 'get' now shows defining scope, related definitions, dependencies 2011-02-06 11:33:56 -05:00
Mark Harrah 80ae202965 overhaul Streams injection 2011-02-05 21:39:34 -05:00
Mark Harrah 6688c4fdf1 improve Setting construction
- make all constructing methods end in = for lowest precedence
- rename Scope constructing method 'apply' to 'in' to allow 'apply' to
    be used on single settings as well as tuples and 'in' reads better
2011-02-04 22:02:39 -05:00
Mark Harrah 536e95cca5 translate Uninitialized message to use 'display' 2011-01-31 18:16:25 -05:00
Mark Harrah 2f41690269 KList updates
- exchange variance annotations on KList for a bounded existential
   in KList.toList
 - add foldr (reason for dropping variance annotations)
 - add functions stating equivalence between
   + KList[M,H :+: T] and KCons[H,T,M]
   + KList[M,HNil] and KNil
2011-01-28 21:07:29 -05:00
Mark Harrah e41d4cc8c8 convenience method on Settings to get all (Scope, AttributeKey[_]) pairs 2011-01-25 22:19:03 -05:00
Mark Harrah d906455aed split load-time project structure scope resolution into two phases
first phase resolves referenced build URIs as each build is loaded
second phase resolves references without an explicit project ID
  (this requires the whole structure to be known and this isn't available during the first phase)
setting resolution is unchanged (done after both phases)
2011-01-25 22:14:02 -05:00
Mark Harrah 5f9c6f7f26 improve commands, proper build/project base resolution
finish alias support
better project printing in 'projects'
completion support for 'help'
resolve URIs in ProjectRef against base URI of defining build in keys and project relations
resolve base directories and record build URI in BuildUnit
preserve relative paths in File to URI conversion for later resolution
2011-01-23 22:34:17 -05:00
Mark Harrah bcc8c37f4d multi-project model based on Settings and ProjectRef 2011-01-18 18:48:32 -05:00
Mark Harrah c24c0b7a23 fully-scoped Settings 2011-01-18 18:48:32 -05:00
Mark Harrah 783d732868 Remove obsolete comments 2011-01-18 18:43:58 -05:00
Mark Harrah c436a1d3eb Settings 2010-12-12 21:33:32 -05:00
Mark Harrah 8ed0f36dbe TaskGroups, Context in tasks, new tasks
add syncTask task constructor and copy-resources/copy-test-resources instances
add console-quick, test-console, console, test-run
add IntegrationTest trait
make Context available through 'context' task
update 'last' and 'show' to use Context to retrieve task by name
drop SingleProject (superseded by Project)
add TaskGroup to be able to inject groups of named tasks
fix watchPaths missing flat sources
proper logging in a few more places, such as compile
2010-11-24 14:18:59 -05:00
Mark Harrah 4a0461c34f minor updates to utilities 2010-10-30 11:54:43 -04:00
Mark Harrah 7dca038bde improving incremental compilation
support lazy arguments in data type generator
SafeLazy implementation that explicitly clears the reference to the thunk
in API representation, drop synthetic modifier and merge deferred into abstract
handle cyclic structures in API generation, display, comparison, persistence
gzip compile cache file
bump to 2.8.1.RC3, project definition cleanup
fix main method detection to check for the right name
properly view inherited definitions
exclude constructors of ancestors
2010-10-22 21:55:16 -04:00
Mark Harrah ccb3a840c6 Attributed, attaches attributes to arbitrary data 2010-09-17 20:46:31 -04:00
Mark Harrah b033bc889d toString for HList and KList 2010-09-12 22:27:11 -04:00
Mark Harrah f884fa9cdd hierarchical in-memory settings 2010-09-08 14:29:00 -04:00
Mark Harrah f14e7883ed fix PMap test 2010-09-04 08:12:17 -04:00