buildr 1.4.5-x86-mswin32 → 1.4.6-x86-mswin32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG +28 -1
- data/_buildr +1 -1
- data/_jbuildr +1 -1
- data/buildr.gemspec +1 -2
- data/doc/download.textile +41 -76
- data/doc/index.textile +46 -6
- data/doc/installing.textile +2 -2
- data/doc/languages.textile +3 -3
- data/doc/scripts/install-jruby.sh +2 -2
- data/lib/buildr/core/shell.rb +1 -1
- data/lib/buildr/core/transports.rb +1 -1
- data/lib/buildr/ide/eclipse.rb +8 -2
- data/lib/buildr/ide/idea.rb +42 -26
- data/lib/buildr/java/bdd.rb +8 -5
- data/lib/buildr/java/jtestr_result.rb +36 -0
- data/lib/buildr/java/tests.rb +4 -4
- data/lib/buildr/packaging/artifact.rb +4 -2
- data/lib/buildr/packaging/tar.rb +1 -1
- data/lib/buildr/packaging/zip.rb +6 -0
- data/lib/buildr/scala/bdd.rb +17 -4
- data/lib/buildr/scala/compiler.rb +18 -12
- data/lib/buildr/scala/doc.rb +1 -1
- data/lib/buildr/scala/tests.rb +40 -11
- data/lib/buildr/version.rb +1 -1
- data/rakelib/checks.rake +9 -9
- data/rakelib/doc.rake +1 -1
- data/rakelib/package.rake +7 -7
- data/rakelib/release.rake +0 -1
- data/rakelib/rspec.rake +3 -2
- data/rakelib/setup.rake +2 -0
- data/rakelib/stage.rake +3 -3
- data/spec/core/common_spec.rb +1 -1
- data/spec/ide/idea_spec.rb +16 -25
- data/spec/java/bdd_spec.rb +1 -1
- data/spec/packaging/artifact_spec.rb +51 -0
- data/spec/sandbox.rb +41 -5
- data/spec/scala/bdd_spec.rb +1 -6
- data/spec/scala/compiler_spec.rb +56 -24
- data/spec/scala/doc_spec.rb +2 -7
- data/spec/scala/scala.rb +1 -8
- data/spec/scala/tests_spec.rb +14 -6
- metadata +164 -169
- data/lib/buildr/core/#application.rb# +0 -700
- data/lib/buildr/packaging/#package.rb.rej# +0 -19
- data/lib/buildr/scala/#Untitled-2# +0 -7
data/CHANGELOG
CHANGED
@@ -1,3 +1,30 @@
|
|
1
|
+
1.4.6 (2011-06-21)
|
2
|
+
* Added: BUILDR-592 Allow Users to Specify SSH Options for Deployment (Marc-André Laverdière)
|
3
|
+
* Fixed: BUILDR-591 Sort modules in iml files generated by idea task to ensure
|
4
|
+
main_dependencies are exported
|
5
|
+
* Added: Support for Scala 2.9.0+ (with help of Alexis Midon)
|
6
|
+
* Fixed: BUILDR-583 Update jruby install to use jruby version 1.6.1 (Alexis Midon)
|
7
|
+
* Fixed: BUILDR-582 Revert the name change for the task to generate Intellij
|
8
|
+
project files to 'idea'
|
9
|
+
* Change: BUILDR-579 Format generated IDEA project files to look more like what
|
10
|
+
IntelliJ generates (Peter Royal)
|
11
|
+
* Change: BUILDR-574 Enhance idea task to generate test resources with test scope
|
12
|
+
(Jean-Philippe Caruana)
|
13
|
+
* Change: BUILDR-576 Upgrade to JUnit 4.8.2
|
14
|
+
* Change: Upgrade to JRuby 1.6.2
|
15
|
+
* Change: Scala 2.9.0-1 is now default, along with ScalaCheck 1.9, ScalaTest 1.6.1
|
16
|
+
and Specs 1.6.8.
|
17
|
+
* Change: ScalaCheck, ScalaTest and Specs now default to sane versions when using
|
18
|
+
older Scala versions.
|
19
|
+
* Fixed: BUILDR-571 Generated IDEA projects include resources multiple times (Peter Royal)
|
20
|
+
* Fixed: BUILDR-573 HTTP upload PUT request with incorrect Content-Type (Mathias Doenitz)
|
21
|
+
* Fixed: BUILDR-578 Tar task does not preserve uid/gid on folders (Jean-Philippe Caruana)
|
22
|
+
* Fixed: BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)
|
23
|
+
* Fixed: BUILDR-585 "TypeError : can't dup NilClass" when merging jars
|
24
|
+
* Fixed: BUILDR-586 ScalaTest uses deprecated ant task (Martin Partel)
|
25
|
+
* Fixed: BUILDR-584 eclipse plugin should use absolute path
|
26
|
+
* Fixed: BUILDR-587 ScalaTest uses deprecated reporter parameters
|
27
|
+
|
1
28
|
1.4.5 (2011-02-20)
|
2
29
|
* Added: BUILDR-555 Add support for the jaxb binding compiler (Mark Petrovic)
|
3
30
|
* Added: BUILDR-554 Add support for OSGi bundle packages by importing the
|
@@ -21,7 +48,7 @@
|
|
21
48
|
* Change: Upgrade to ScalaCheck 1.8
|
22
49
|
* Change: Upgrade to ScalaTest 1.3
|
23
50
|
* Change: Upgrade to Specs 1.6.6
|
24
|
-
*
|
51
|
+
* Change: Upgrade to JRuby 1.5.6
|
25
52
|
* Fixed: BUILDR-542 Release task: SVN tagging fails if parent tag directory
|
26
53
|
does not exist yet (Gerolf Seitz)
|
27
54
|
* Fixed: BUILDR-543 POMs are installed and uploaded twice when using artifacts
|
data/_buildr
CHANGED
@@ -24,7 +24,7 @@ require 'buildr/version'
|
|
24
24
|
spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
|
25
25
|
# To avoid a warning about the version_requirements deprecation, we use this method inline.
|
26
26
|
def version_required(gem_def)
|
27
|
-
return Gem::Dependency.instance_methods.include?(
|
27
|
+
return Gem::Dependency.instance_methods.map(&:to_sym).include?(:requirement) ? gem_def.requirement : gem_def.version_requirements
|
28
28
|
end
|
29
29
|
spec.dependencies.each do |dep|
|
30
30
|
gem dep.name, version_required(dep).to_s if dep.type == :runtime
|
data/_jbuildr
CHANGED
@@ -24,7 +24,7 @@ require 'buildr/version'
|
|
24
24
|
spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'buildr.gemspec'))
|
25
25
|
# To avoid a warning about the version_requirements deprecation, we use this method inline.
|
26
26
|
def version_required(gem_def)
|
27
|
-
return Gem::Dependency.instance_methods.include?(
|
27
|
+
return Gem::Dependency.instance_methods.map(&:to_sym).include?(:requirement) ? gem_def.requirement : gem_def.version_requirements
|
28
28
|
end
|
29
29
|
spec.dependencies.each do |dep|
|
30
30
|
gem dep.name, version_required(dep).to_s if dep.type == :runtime
|
data/buildr.gemspec
CHANGED
@@ -43,7 +43,6 @@ for those one-off tasks, with a language that's a joy to use.
|
|
43
43
|
spec.bindir = 'bin' # Use these for applications.
|
44
44
|
spec.executable = 'buildr'
|
45
45
|
|
46
|
-
spec.has_rdoc = true
|
47
46
|
spec.extra_rdoc_files = 'README.rdoc', 'CHANGELOG', 'LICENSE', 'NOTICE'
|
48
47
|
spec.rdoc_options = '--title', 'Buildr', '--main', 'README.rdoc',
|
49
48
|
'--webcvs', 'http://svn.apache.org/repos/asf/buildr/trunk/'
|
@@ -70,7 +69,7 @@ for those one-off tasks, with a language that's a joy to use.
|
|
70
69
|
spec.add_dependency 'xml-simple', '1.0.12'
|
71
70
|
spec.add_dependency 'minitar', '0.5.3'
|
72
71
|
spec.add_dependency 'jruby-openssl', '>= 0.7' if spec.platform.to_s == 'java'
|
73
|
-
spec.add_development_dependency 'jekyll',
|
72
|
+
spec.add_development_dependency 'jekyll', '~> 0.10.0'
|
74
73
|
spec.add_development_dependency 'sdoc'
|
75
74
|
spec.add_development_dependency 'rcov', '0.9.9' unless spec.platform.to_s == 'java'
|
76
75
|
spec.add_development_dependency 'win32console' if spec.platform.to_s == 'x86-mswin32'
|
data/doc/download.textile
CHANGED
@@ -23,47 +23,11 @@ h2(#dist). Binaries and Source Code
|
|
23
23
|
h3. buildr 1.4.5 (2011-02-21)
|
24
24
|
|
25
25
|
|_. Package |_. MD5 Checksum |_. PGP |
|
26
|
-
| "buildr-1.4.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.gem | "
|
27
|
-
| "buildr-1.4.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "
|
28
|
-
| "buildr-1.4.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-java.gem | "
|
29
|
-
| "buildr-1.4.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.tgz | "
|
30
|
-
| "buildr-1.4.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.zip | "
|
31
|
-
|
32
|
-
p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.5/KEYS)
|
33
|
-
|
34
|
-
|
35
|
-
h3. buildr 1.4.5 (2011-02-21)
|
36
|
-
|
37
|
-
|_. Package |_. MD5 Checksum |_. PGP |
|
38
|
-
| "buildr-1.4.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.gem | "3f92c102106ee7882a40b7d9fff0d053":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.asc |
|
39
|
-
| "buildr-1.4.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "7c9432e0d7607878a703f1e83d913b60":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.asc |
|
40
|
-
| "buildr-1.4.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-java.gem | "ce63e88a1ce9979964af4e0e45295fe0":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.asc |
|
41
|
-
| "buildr-1.4.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.tgz | "1169dc2ee594c90a2aecfeebd8709ac0":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.asc |
|
42
|
-
| "buildr-1.4.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.zip | "59344c0ddfe8afe0c2d286c577bfbb03":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.asc |
|
43
|
-
|
44
|
-
p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.5/KEYS)
|
45
|
-
|
46
|
-
|
47
|
-
h3. buildr 1.4.5 (2011-02-20)
|
48
|
-
|
49
|
-
|_. Package |_. MD5 Checksum |_. PGP |
|
50
|
-
| "buildr-1.4.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.gem | "c43e9ce25729c681fcd4a1124b1a9417":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.asc |
|
51
|
-
| "buildr-1.4.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "a23d0a2cc318bc58ef684117020c71ef":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.asc |
|
52
|
-
| "buildr-1.4.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-java.gem | "e6a4309da91c6a725798a8ed36b4f20c":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.asc |
|
53
|
-
| "buildr-1.4.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.tgz | "756aac6e81d35c594b1a5b7666fc7447":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.asc |
|
54
|
-
| "buildr-1.4.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.zip | "ceb45fc68aa2db5f626a2b5d07152145":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.asc |
|
55
|
-
|
56
|
-
p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.5/KEYS)
|
57
|
-
|
58
|
-
|
59
|
-
h3. buildr 1.4.5 (2011-02-20)
|
60
|
-
|
61
|
-
|_. Package |_. MD5 Checksum |_. PGP |
|
62
|
-
| "buildr-1.4.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.gem | "71683a1a7d97bf6423c341c13150a61d":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.asc |
|
63
|
-
| "buildr-1.4.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "1d0cdbf7cb6202ea53f094fa2b4b658b":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.asc |
|
64
|
-
| "buildr-1.4.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-java.gem | "2e97b286a525638b5a003e211f05fdf9":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.asc |
|
65
|
-
| "buildr-1.4.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.tgz | "c3b959b8da9722b8a1456a955c34d41d":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.asc |
|
66
|
-
| "buildr-1.4.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.zip | "7c2b80e3b7802b16831718c2fa34f2a1":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.asc |
|
26
|
+
| "buildr-1.4.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.gem | "57cccec175e0b1b682a36f75e54d15cf":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.gem.asc |
|
27
|
+
| "buildr-1.4.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem | "d24b11446eaa01e24b9ec1be4b6d93d1":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-x86-mswin32.gem.asc |
|
28
|
+
| "buildr-1.4.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5-java.gem | "c167e67e33e7c3b4bf2316d7405eb11e":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5-java.gem.asc |
|
29
|
+
| "buildr-1.4.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.tgz | "9b335479ce006caf109c4786d83aa00c":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.tgz.asc |
|
30
|
+
| "buildr-1.4.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.5/buildr-1.4.5.zip | "0d3b3b474a3c90c717bdc953aab8e626":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.5/buildr-1.4.5.zip.asc |
|
67
31
|
|
68
32
|
p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.5/KEYS)
|
69
33
|
|
@@ -71,69 +35,69 @@ p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.5/KEYS)
|
|
71
35
|
h3. buildr 1.4.4 (2010-11-16)
|
72
36
|
|
73
37
|
|_. Package |_. MD5 Checksum |_. PGP |
|
74
|
-
| "buildr-1.4.4-x86-mswin32.gem":http://
|
75
|
-
| "buildr-1.4.4.gem":http://
|
76
|
-
| "buildr-1.4.4-java.gem":http://
|
77
|
-
| "buildr-1.4.4.tgz":http://
|
78
|
-
| "buildr-1.4.4.zip":http://
|
38
|
+
| "buildr-1.4.4-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4-x86-mswin32.gem | "7d9cfb91a15dfcebc2abaa7f0cc18512":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4-x86-mswin32.gem.asc |
|
39
|
+
| "buildr-1.4.4.gem":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.gem | "581e7951c07607f0437a924ec131a706":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.gem.asc |
|
40
|
+
| "buildr-1.4.4-java.gem":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4-java.gem | "0076cdb62e248b525d71916713f5b290":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4-java.gem.asc |
|
41
|
+
| "buildr-1.4.4.tgz":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.tgz | "246208815e2efc29fad0df1cee031830":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.tgz.asc |
|
42
|
+
| "buildr-1.4.4.zip":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.zip | "a932b66401102bf9814e77a3c5541d73":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.4/buildr-1.4.4.zip.asc |
|
79
43
|
|
80
|
-
p>. ("Release signing keys":http://
|
44
|
+
p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.4/KEYS)
|
81
45
|
|
82
46
|
|
83
47
|
h3. buildr 1.4.3 (2010-10-15)
|
84
48
|
|
85
49
|
|_. Package |_. MD5 Checksum |_. PGP |
|
86
|
-
| "buildr-1.4.3-x86-mswin32.gem":http://
|
87
|
-
| "buildr-1.4.3-java.gem":http://
|
88
|
-
| "buildr-1.4.3.gem":http://
|
89
|
-
| "buildr-1.4.3.tgz":http://
|
90
|
-
| "buildr-1.4.3.zip":http://
|
50
|
+
| "buildr-1.4.3-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3-x86-mswin32.gem | "7d21269d4dc6d04c81637eec3a97dd89":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3-x86-mswin32.gem.asc |
|
51
|
+
| "buildr-1.4.3-java.gem":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3-java.gem | "5e12a84fbb8a5ffdd9f995995fa78d77":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3-java.gem.asc |
|
52
|
+
| "buildr-1.4.3.gem":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.gem | "b8ff992f07f8d400902e74d5d0e488b8":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.gem.asc |
|
53
|
+
| "buildr-1.4.3.tgz":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.tgz | "01514479fad89e6a44f4f4d9fc5d0198":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.tgz.asc |
|
54
|
+
| "buildr-1.4.3.zip":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.zip | "2b2e996775e6152c618308901b6815be":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.3/buildr-1.4.3.zip.asc |
|
91
55
|
|
92
|
-
p>. ("Release signing keys":http://
|
56
|
+
p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.3/KEYS)
|
93
57
|
|
94
58
|
|
95
59
|
h3. buildr 1.4.2 (2010-09-18)
|
96
60
|
|
97
61
|
|_. Package |_. MD5 Checksum |_. PGP |
|
98
|
-
| "buildr-1.4.2-java.gem":http://
|
99
|
-
| "buildr-1.4.2-x86-mswin32.gem":http://
|
100
|
-
| "buildr-1.4.2.gem":http://
|
101
|
-
| "buildr-1.4.2.tgz":http://
|
102
|
-
| "buildr-1.4.2.zip":http://
|
62
|
+
| "buildr-1.4.2-java.gem":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2-java.gem | "481b5dffac34ef368352f9dea095ad42":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2-java.gem.asc |
|
63
|
+
| "buildr-1.4.2-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2-x86-mswin32.gem | "ddd6d1bee497b514bc17507f411b57c9":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2-x86-mswin32.gem.asc |
|
64
|
+
| "buildr-1.4.2.gem":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.gem | "5f3a83491b1e7ea372fd2f7d5331195b":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.gem.asc |
|
65
|
+
| "buildr-1.4.2.tgz":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.tgz | "15fbb3b1fa46d6e0c99f08f169f380dc":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.tgz.asc |
|
66
|
+
| "buildr-1.4.2.zip":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.zip | "33f1c15537bb5b28cb05244d8696e70b":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.2/buildr-1.4.2.zip.asc |
|
103
67
|
|
104
|
-
p>. ("Release signing keys":http://
|
68
|
+
p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.2/KEYS)
|
105
69
|
|
106
70
|
|
107
71
|
h3. buildr 1.4.0 (2010-06-18)
|
108
72
|
|
109
73
|
|_. Package |_. MD5 Checksum |_. PGP |
|
110
|
-
| "buildr-1.4.0-java.gem":http://
|
111
|
-
| "buildr-1.4.0-x86-mswin32.gem":http://
|
112
|
-
| "buildr-1.4.0.gem":http://
|
113
|
-
| "buildr-1.4.0.tgz":http://
|
114
|
-
| "buildr-1.4.0.zip":http://
|
74
|
+
| "buildr-1.4.0-java.gem":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0-java.gem | "6304234b3e4b49ffb95dd5f155442935":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0-java.gem.asc |
|
75
|
+
| "buildr-1.4.0-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0-x86-mswin32.gem | "6a4b0ab7cc651128c25a4b7cc4867479":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0-x86-mswin32.gem.asc |
|
76
|
+
| "buildr-1.4.0.gem":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.gem | "96c4c4d56ac4baffbaa1980af39c2220":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.gem.asc |
|
77
|
+
| "buildr-1.4.0.tgz":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.tgz | "f025d57e1a71e40bb02def291eb02363":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.tgz.asc |
|
78
|
+
| "buildr-1.4.0.zip":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.zip | "a7c39d799e0e7f31827d803d788927f0":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.0/buildr-1.4.0.zip.asc |
|
115
79
|
|
116
|
-
p>. ("Release signing keys":http://
|
80
|
+
p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.0/KEYS)
|
117
81
|
|
118
82
|
|
119
83
|
h3. buildr 1.3.5 (2009-10-05)
|
120
84
|
|
121
85
|
|_. Package |_. MD5 Checksum |_. PGP |
|
122
|
-
| "buildr-1.3.5.gem":http://
|
123
|
-
| "buildr-1.3.5-java.gem":http://
|
124
|
-
| "buildr-1.3.5-x86-mswin32.gem":http://
|
125
|
-
| "buildr-1.3.5.tgz":http://
|
126
|
-
| "buildr-1.3.5.zip":http://
|
86
|
+
| "buildr-1.3.5.gem":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.gem | "5a04d8593f98606f15dd589988afe24d":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.gem.asc |
|
87
|
+
| "buildr-1.3.5-java.gem":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5-java.gem | "d930c851196cd8f9ea66b7190d324dd4":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5-java.gem.asc |
|
88
|
+
| "buildr-1.3.5-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5-x86-mswin32.gem | "a6dfc07b4c22e1902de6269e5776a32c":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5-x86-mswin32.gem.asc |
|
89
|
+
| "buildr-1.3.5.tgz":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.tgz | "d246b84d70a5934536a3f0cd8de1abf7":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.tgz.asc |
|
90
|
+
| "buildr-1.3.5.zip":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.zip | "d05f9a24f488318d22964bd2f443a76c":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.5/buildr-1.3.5.zip.asc |
|
127
91
|
|
128
|
-
p>. ("Release signing keys":http://
|
92
|
+
p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.3.5/KEYS)
|
129
93
|
|
130
94
|
h3. buildr 1.3.4 (2009-04-21)
|
131
95
|
|
132
96
|
|_. Package |_. MD5 Checksum |_. PGP |
|
133
|
-
| "buildr-1.3.4.gem":http://
|
134
|
-
| "buildr-1.3.4-java.gem":http://
|
135
|
-
| "buildr-1.3.4.tgz":http://
|
136
|
-
| "buildr-1.3.4.zip":http://
|
97
|
+
| "buildr-1.3.4.gem":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.gem | "34247286f910be1724f63b9e795e75ed":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.gem.asc |
|
98
|
+
| "buildr-1.3.4-java.gem":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4-java.gem | "44ed67bf835cf2abdc2b6723b5eceadb":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4-java.gem.asc |
|
99
|
+
| "buildr-1.3.4.tgz":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.tgz | "7d918b88a3bb8139f28f6ff0b39d003c":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.tgz.asc |
|
100
|
+
| "buildr-1.3.4.zip":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.zip | "8f4cf84dc6e293aac5fba7e2a9cc0776":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.3.4/buildr-1.3.4.zip.asc |
|
137
101
|
|
138
102
|
p>. ("Release signing keys":http://www.apache.org/dist/buildr/KEYS)
|
139
103
|
|
@@ -183,4 +147,5 @@ h3. buildr 1.3.0-incubating (2008-05-01)
|
|
183
147
|
p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.3.0-incubating/KEYS)
|
184
148
|
|
185
149
|
|
186
|
-
p(note). When downloading from files please check the "md5sum":http://www.apache.org/dev/release-signing#md5 and verify the "OpenPGP":http://www.apache.org/dev/release-signing#openpgp compatible signature from the main Apache site. This "KEYS":http://
|
150
|
+
p(note). When downloading from files please check the "md5sum":http://www.apache.org/dev/release-signing#md5 and verify the "OpenPGP":http://www.apache.org/dev/release-signing#openpgp compatible signature from the main Apache site. This "KEYS":http://www.apache.org/dist/buildr/KEYS file contains the public keys used for signing releases. It is recommended that (when possible) a web of trust is used to confirm the identity of these keys. For more information, please see the "Apache Release FAQ":http://www.apache.org/dev/release.html.
|
151
|
+
|
data/doc/index.textile
CHANGED
@@ -46,12 +46,52 @@ So let's get started. You can "read the documentation online":quick_start.html,
|
|
46
46
|
|
47
47
|
h2(#news). What's New
|
48
48
|
|
49
|
-
New in Buildr 1.4.
|
50
|
-
|
51
|
-
*
|
52
|
-
|
53
|
-
|
54
|
-
*
|
49
|
+
New in Buildr 1.4.5 (Feb. 20th, 2011)
|
50
|
+
|
51
|
+
* Added: BUILDR-555 Add support for the jaxb binding compiler (Mark Petrovic)
|
52
|
+
* Added: BUILDR-554 Add support for OSGi bundle packages by importing the
|
53
|
+
buildr_bnd plugin
|
54
|
+
* Added: BUILDR-125 Add support for <security-role> in application.xml of
|
55
|
+
EAR packaging (Mikael Amborn)
|
56
|
+
* Added: BUILDR-550 Add support for groovydoc
|
57
|
+
* Added: BUILDR-521: System tray notifications for Linux systems
|
58
|
+
(via libnotify/notify-send)
|
59
|
+
* Added: BUILDR-537 Shell tasks should use JAVA_OPTS by default
|
60
|
+
* Added: BUILDR-538 Shell tasks should support passing :java_args
|
61
|
+
* Added: BUILDR-544 Support ${groupId} in pom files (Chris Dean)
|
62
|
+
* Added: BUILDR-552 Projects may now be defined using project(:name) and a block
|
63
|
+
* Added: BUILDR-564 Add package(:scaladoc)
|
64
|
+
* Added: Automatically add "require buildr/{groovy,scala}" when generating
|
65
|
+
project if Groovy/Scala files are detected.
|
66
|
+
* Change: BUILDR-540 Upgrade to rspec 2.1.0
|
67
|
+
* Change: BUILDR-546 Upgrade to Rubyzip 0.9.4 (Michael Guymon)
|
68
|
+
* Change: BUILDR-556 Merge buildr-iidea extension back into buildr.
|
69
|
+
* Change: Upgrade default Scala compiler version to 2.8.1-final
|
70
|
+
* Change: Upgrade to ScalaCheck 1.8
|
71
|
+
* Change: Upgrade to ScalaTest 1.3
|
72
|
+
* Change: Upgrade to Specs 1.6.6
|
73
|
+
* Change: Upgrade to JRuby 1.5.6
|
74
|
+
* Fixed: BUILDR-542 Release task: SVN tagging fails if parent tag directory
|
75
|
+
does not exist yet (Gerolf Seitz)
|
76
|
+
* Fixed: BUILDR-543 POMs are installed and uploaded twice when using artifacts
|
77
|
+
with classifier
|
78
|
+
* Fixed: BUILDR-522 Send notifications when continuous compilation
|
79
|
+
succeeds/fails.
|
80
|
+
* Fixed: BUILDR-551 Continuous compilation not working for project trees
|
81
|
+
* Fixed: BUILDR-557 MD5 + SHA1 checksums are not Maven compliant (Tammo van Lessen)
|
82
|
+
* Change: Upgrade to Groovy 1.7.5
|
83
|
+
* Change: BUILDR-545 Add the ability to specify the description element in in
|
84
|
+
application.xml contained within an ear.
|
85
|
+
* Fixed: BUILDR-547 - Ensure ECJ compiler works when there is a space in the
|
86
|
+
path of dependencies.
|
87
|
+
* Fixed: BUILDR-558 Artifact uploads should show a progress bar (Tammo van Lessen)
|
88
|
+
* Fixed: BUILDR-560 show a meaning full error message when POM cannot be parsed
|
89
|
+
(Tammo van Lessen)
|
90
|
+
* Fixed: BUILDR-562 WAR package isn't updated if files under src/main/webapp
|
91
|
+
are updated
|
92
|
+
* Fixed: BUILDR-569 Buildr fails under JRuby 1.6.0.RC1 due to read-only $? variable
|
93
|
+
* Fixed: BUILDR-570 Buildr does not work with Rubygems 1.5.x
|
94
|
+
* Fixed: Scaladoc task would cause build to exit prematurely
|
55
95
|
|
56
96
|
See the "CHANGELOG":CHANGELOG for full details.
|
57
97
|
|
data/doc/installing.textile
CHANGED
@@ -137,11 +137,11 @@ To upgrade to a new version or install a specific version:
|
|
137
137
|
|
138
138
|
h2(#jruby). Installing for JRuby
|
139
139
|
|
140
|
-
*The easy way:* Use this bash script to "install Buildr on JRuby":scripts/install-jruby.sh. This script will install the most recent version of Buildr, or if already installed, upgrade to the most recent version. If necessary, it will also install JRuby 1.1
|
140
|
+
*The easy way:* Use this bash script to "install Buildr on JRuby":scripts/install-jruby.sh. This script will install the most recent version of Buildr, or if already installed, upgrade to the most recent version. If necessary, it will also install JRuby 1.6.1 in @/opt/jruby@ and update the @PATH@ variable in @~/.bash_profile@ or @~/.profile@.
|
141
141
|
|
142
142
|
<br>
|
143
143
|
|
144
|
-
*In details:* If you don't already have JRuby 1.1
|
144
|
+
*In details:* If you don't already have JRuby 1.5.1 or later installed, you can download it from the "JRuby site":http://www.jruby.org/download.
|
145
145
|
|
146
146
|
After uncompressing JRuby, update your @PATH@ to include both @java@ and @jruby@ executables.
|
147
147
|
|
data/doc/languages.textile
CHANGED
@@ -170,7 +170,7 @@ Before using Scala, you must first @require@ the Scala compiler:
|
|
170
170
|
require 'buildr/scala'
|
171
171
|
{% endhighlight %}
|
172
172
|
|
173
|
-
By default, Buildr will attempt to use the latest stable release of Scala, which is currently Scala 2.
|
173
|
+
By default, Buildr will attempt to use the latest stable release of Scala, which is currently Scala 2.9.0 as of May 2011. Of course you can configure a specific version of Scala for your project by adding the following entry in @build.yaml@:
|
174
174
|
|
175
175
|
{% highlight yaml %}
|
176
176
|
scala.version: 2.8.0.Beta1 # Pick your version
|
@@ -210,11 +210,11 @@ When using the Scala compiler, if you don't specify the packaging type, it defau
|
|
210
210
|
The Scala compiler supports the following options:
|
211
211
|
|
212
212
|
|_. Option |_. Usage |
|
213
|
-
| @:debug@ |
|
213
|
+
| @:debug@ | If true, generates bytecode with debugging information. Scala 2.9 also accepts: none,source,line,vars,notc. |
|
214
214
|
| @:deprecation@ | If true, shows deprecation messages. False by default. |
|
215
|
+
| @:make@ | Make strategy to be used by the compiler (e.g. @:make=>'transitive'@). *Scala 2.8 only* |
|
215
216
|
| @:optimise@ | Generates faster bytecode by applying optimisations to the program. |
|
216
217
|
| @:other@ | Array of options passed to the compiler (e.g. @:other=>'-Xprint-types'@). |
|
217
|
-
| @:make@ | Make strategy to be used by the compiler (e.g. @:make=>'transitive'@). *Scala 2.8 only* |
|
218
218
|
| @:target@ | Bytecode compatibility (e.g. '1.4'). |
|
219
219
|
| @:warnings@ | Issue warnings when compiling. True when running in verbose mode. |
|
220
220
|
| @:javac@ | A hash of options passed to the @javac@ compiler verbatim. |
|
@@ -14,11 +14,11 @@
|
|
14
14
|
# License for the specific language governing permissions and limitations under
|
15
15
|
# the License.
|
16
16
|
if [ -z `which jruby` ] ; then
|
17
|
-
version=1.
|
17
|
+
version=1.6.2
|
18
18
|
target=/opt/jruby
|
19
19
|
echo "Installing JRuby ${version} in ${target}"
|
20
20
|
sudo mkdir -p $(dirname ${target})
|
21
|
-
wget http://
|
21
|
+
wget http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz
|
22
22
|
tar -xz < jruby-bin-${version}.tar.gz
|
23
23
|
sudo mv jruby-${version} ${target}
|
24
24
|
rm jruby-bin-${version}.tar.gz
|
data/lib/buildr/core/shell.rb
CHANGED
@@ -327,7 +327,7 @@ module URI
|
|
327
327
|
while chunk = yield(RW_CHUNK_SIZE)
|
328
328
|
content << chunk
|
329
329
|
end
|
330
|
-
headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string) }
|
330
|
+
headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream' }
|
331
331
|
request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
|
332
332
|
request.basic_auth self.user, self.password if self.user
|
333
333
|
response = nil
|
data/lib/buildr/ide/eclipse.rb
CHANGED
@@ -389,9 +389,15 @@ module Buildr
|
|
389
389
|
msg = [:to_path, :to_str, :to_s].find { |msg| path.respond_to? msg }
|
390
390
|
path = path.__send__(msg)
|
391
391
|
begin
|
392
|
-
Util.relative_path(File.expand_path(path), @project.path_to)
|
392
|
+
relative = Util.relative_path(File.expand_path(path), @project.path_to)
|
393
|
+
if relative['..']
|
394
|
+
# paths don't share same root
|
395
|
+
Util.normalize_path(path)
|
396
|
+
else
|
397
|
+
relative
|
398
|
+
end
|
393
399
|
rescue ArgumentError
|
394
|
-
|
400
|
+
Util.normalize_path(path)
|
395
401
|
end
|
396
402
|
end
|
397
403
|
|
data/lib/buildr/ide/idea.rb
CHANGED
@@ -21,6 +21,10 @@ require 'stringio'
|
|
21
21
|
|
22
22
|
module Buildr
|
23
23
|
module IntellijIdea
|
24
|
+
def self.new_document(value)
|
25
|
+
REXML::Document.new(value, :attribute_quote => :quote)
|
26
|
+
end
|
27
|
+
|
24
28
|
# Abstract base class for IdeaModule and IdeaProject
|
25
29
|
class IdeaFile
|
26
30
|
DEFAULT_SUFFIX = ""
|
@@ -47,7 +51,7 @@ module Buildr
|
|
47
51
|
end
|
48
52
|
|
49
53
|
def write(f)
|
50
|
-
document.write
|
54
|
+
document.write(f, 2, false, true)
|
51
55
|
end
|
52
56
|
|
53
57
|
protected
|
@@ -61,7 +65,7 @@ module Buildr
|
|
61
65
|
Builder::XmlMarkup.new(:target => target, :indent => 2).component(attrs.merge({:name => name})) do |xml|
|
62
66
|
yield xml if block_given?
|
63
67
|
end
|
64
|
-
|
68
|
+
Buildr::IntellijIdea.new_document(target.string).root
|
65
69
|
end
|
66
70
|
|
67
71
|
def components
|
@@ -69,7 +73,7 @@ module Buildr
|
|
69
73
|
end
|
70
74
|
|
71
75
|
def load_document(filename)
|
72
|
-
|
76
|
+
Buildr::IntellijIdea.new_document(File.read(filename))
|
73
77
|
end
|
74
78
|
|
75
79
|
def document
|
@@ -179,7 +183,7 @@ module Buildr
|
|
179
183
|
Builder::XmlMarkup.new(:target => target, :indent => 2).facet(:name => name, :type => type) do |xml|
|
180
184
|
yield xml if block_given?
|
181
185
|
end
|
182
|
-
self.facets <<
|
186
|
+
self.facets << Buildr::IntellijIdea.new_document(target.string).root
|
183
187
|
end
|
184
188
|
|
185
189
|
def skip_content?
|
@@ -206,7 +210,6 @@ module Buildr
|
|
206
210
|
end
|
207
211
|
[dependency_path, export, source_path]
|
208
212
|
end
|
209
|
-
|
210
213
|
end
|
211
214
|
|
212
215
|
def base_directory
|
@@ -216,7 +219,7 @@ module Buildr
|
|
216
219
|
def base_document
|
217
220
|
target = StringIO.new
|
218
221
|
Builder::XmlMarkup.new(:target => target).module(:version => "4", :relativePaths => "true", :type => self.type)
|
219
|
-
|
222
|
+
Buildr::IntellijIdea.new_document(target.string)
|
220
223
|
end
|
221
224
|
|
222
225
|
def initial_components
|
@@ -246,27 +249,38 @@ module Buildr
|
|
246
249
|
generate_initial_order_entries(xml)
|
247
250
|
project_dependencies = []
|
248
251
|
|
249
|
-
|
252
|
+
|
250
253
|
self.test_dependency_details.each do |dependency_path, export, source_path|
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
end
|
259
|
-
project_dependencies << project_for_dependency
|
260
|
-
next
|
261
|
-
else
|
262
|
-
generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil))
|
263
|
-
end
|
254
|
+
next unless export
|
255
|
+
generate_lib(xml, dependency_path, export, source_path, project_dependencies)
|
256
|
+
end
|
257
|
+
|
258
|
+
self.test_dependency_details.each do |dependency_path, export, source_path|
|
259
|
+
next if export
|
260
|
+
generate_lib(xml, dependency_path, export, source_path, project_dependencies)
|
264
261
|
end
|
265
262
|
|
266
263
|
xml.orderEntryProperties
|
267
264
|
end
|
268
265
|
end
|
269
266
|
|
267
|
+
def generate_lib(xml, dependency_path, export, source_path, project_dependencies)
|
268
|
+
project_for_dependency = Buildr.projects.detect do |project|
|
269
|
+
[project.packages, project.compile.target, project.resources.target, project.test.compile.target, project.test.resources.target].flatten.
|
270
|
+
detect { |artifact| artifact.to_s == dependency_path }
|
271
|
+
end
|
272
|
+
if project_for_dependency
|
273
|
+
if project_for_dependency.iml? &&
|
274
|
+
!project_dependencies.include?(project_for_dependency) &&
|
275
|
+
project_for_dependency != self.buildr_project
|
276
|
+
generate_project_dependency(xml, project_for_dependency.iml.name, export, !export)
|
277
|
+
end
|
278
|
+
project_dependencies << project_for_dependency
|
279
|
+
else
|
280
|
+
generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil), !export)
|
281
|
+
end
|
282
|
+
end
|
283
|
+
|
270
284
|
def jar_path(path)
|
271
285
|
"jar://#{resolve_path(path)}!/"
|
272
286
|
end
|
@@ -338,15 +352,17 @@ module Buildr
|
|
338
352
|
xml.orderEntry :type => "inheritedJdk"
|
339
353
|
end
|
340
354
|
|
341
|
-
def generate_project_dependency(xml, other_project, export =
|
355
|
+
def generate_project_dependency(xml, other_project, export, test = false)
|
342
356
|
attribs = {:type => 'module', "module-name" => other_project}
|
343
357
|
attribs[:exported] = '' if export
|
358
|
+
attribs[:scope] = 'TEST' if test
|
344
359
|
xml.orderEntry attribs
|
345
360
|
end
|
346
361
|
|
347
|
-
def generate_module_lib(xml, path, export, source_path)
|
362
|
+
def generate_module_lib(xml, path, export, source_path, test = false)
|
348
363
|
attribs = {:type => 'module-library'}
|
349
364
|
attribs[:exported] = '' if export
|
365
|
+
attribs[:scope] = 'TEST' if test
|
350
366
|
xml.orderEntry attribs do
|
351
367
|
xml.library do
|
352
368
|
xml.CLASSES do
|
@@ -408,7 +424,7 @@ module Buildr
|
|
408
424
|
def base_document
|
409
425
|
target = StringIO.new
|
410
426
|
Builder::XmlMarkup.new(:target => target).project(:version => "4", :relativePaths => "false")
|
411
|
-
|
427
|
+
Buildr::IntellijIdea.new_document(target.string)
|
412
428
|
end
|
413
429
|
|
414
430
|
def default_components
|
@@ -483,19 +499,19 @@ module Buildr
|
|
483
499
|
|
484
500
|
first_time do
|
485
501
|
desc "Generate Intellij IDEA artifacts for all projects"
|
486
|
-
Project.local_task "idea
|
502
|
+
Project.local_task "idea" => "artifacts"
|
487
503
|
|
488
504
|
desc "Delete the generated Intellij IDEA artifacts"
|
489
505
|
Project.local_task "idea:clean"
|
490
506
|
end
|
491
507
|
|
492
508
|
before_define do |project|
|
493
|
-
project.recursive_task("idea
|
509
|
+
project.recursive_task("idea")
|
494
510
|
project.recursive_task("idea:clean")
|
495
511
|
end
|
496
512
|
|
497
513
|
after_define do |project|
|
498
|
-
idea = project.task("idea
|
514
|
+
idea = project.task("idea")
|
499
515
|
|
500
516
|
files = [
|
501
517
|
(project.iml if project.iml?),
|