buildr 1.4.6-x86-mswin32 → 1.4.7-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 +81 -0
- data/Rakefile +5 -2
- data/addon/buildr/antlr.rb +0 -4
- data/addon/buildr/bnd.rb +3 -1
- data/addon/buildr/checkstyle.rb +201 -0
- data/addon/buildr/cobertura.rb +0 -1
- data/addon/buildr/drb.rb +0 -2
- data/addon/buildr/emma.rb +0 -1
- data/addon/buildr/findbugs.rb +227 -0
- data/addon/buildr/gwt.rake +82 -0
- data/addon/buildr/hibernate.rb +0 -4
- data/addon/buildr/javacc.rb +0 -4
- data/addon/buildr/javancss.rb +155 -0
- data/addon/buildr/jdepend.rb +138 -24
- data/addon/buildr/jdepend.rb.orig +178 -0
- data/addon/buildr/jetty.rb +0 -5
- data/addon/buildr/jibx.rb +85 -86
- data/addon/buildr/nailgun.rb +2 -2
- data/addon/buildr/openjpa.rb +0 -4
- data/addon/buildr/pmd.rb +166 -0
- data/addon/buildr/protobuf.rb +0 -1
- data/addon/buildr/sonar.rb +142 -0
- data/addon/buildr/xmlbeans.rb +0 -5
- data/buildr.gemspec +36 -21
- data/doc/_layouts/default.html +1 -0
- data/doc/contributing.textile +11 -2
- data/doc/download.textile +17 -5
- data/doc/index.textile +21 -46
- data/doc/installing.textile +18 -8
- data/doc/installing.textile.orig +282 -0
- data/doc/languages.textile +0 -38
- data/doc/more_stuff.textile +199 -12
- data/doc/more_stuff.textile.orig +1004 -0
- data/doc/packaging.textile +10 -0
- data/doc/settings_profiles.textile +2 -2
- data/etc/KEYS +44 -0
- data/lib/buildr.rb +67 -4
- data/lib/buildr/clojure.rb +0 -2
- data/lib/buildr/core/application.rb +23 -32
- data/lib/buildr/core/build.rb +0 -7
- data/lib/buildr/core/cc.rb +0 -5
- data/lib/buildr/core/checks.rb +0 -4
- data/lib/buildr/core/common.rb +0 -5
- data/lib/buildr/core/compile.rb +5 -10
- data/lib/buildr/core/doc.rb +9 -3
- data/lib/buildr/core/environment.rb +0 -1
- data/lib/buildr/core/filter.rb +0 -5
- data/lib/buildr/core/generate.rb +2 -6
- data/lib/buildr/core/help.rb +1 -6
- data/lib/buildr/core/linux.rb +0 -1
- data/lib/buildr/core/osx.rb +0 -1
- data/lib/buildr/core/project.rb +0 -4
- data/lib/buildr/core/run.rb +1 -5
- data/lib/buildr/core/shell.rb +1 -6
- data/lib/buildr/core/test.rb +1 -7
- data/lib/buildr/core/transports.rb +4 -6
- data/lib/buildr/core/util.rb +2 -65
- data/lib/buildr/groovy/doc.rb +0 -3
- data/lib/buildr/groovy/shell.rb +0 -2
- data/lib/buildr/ide/eclipse.rb +4 -13
- data/lib/buildr/ide/eclipse/java.rb +0 -4
- data/lib/buildr/ide/eclipse/plugin.rb +0 -4
- data/lib/buildr/ide/eclipse/scala.rb +0 -4
- data/lib/buildr/ide/idea.rb +284 -52
- data/lib/buildr/java/ant.rb +2 -6
- data/lib/buildr/java/bdd.rb +5 -123
- data/lib/buildr/java/cobertura.rb +16 -10
- data/lib/buildr/java/commands.rb +33 -7
- data/lib/buildr/java/compiler.rb +0 -7
- data/lib/buildr/java/deprecated.rb +0 -4
- data/lib/buildr/java/doc.rb +0 -2
- data/lib/buildr/java/emma.rb +0 -4
- data/lib/buildr/java/jruby.rb +0 -2
- data/lib/buildr/java/packaging.rb +0 -4
- data/lib/buildr/java/pom.rb +24 -16
- data/lib/buildr/java/rjb.rb +1 -1
- data/lib/buildr/java/test_result.rb +1 -2
- data/lib/buildr/java/tests.rb +68 -6
- data/lib/buildr/packaging/archive.rb +0 -1
- data/lib/buildr/packaging/artifact.rb +19 -16
- data/lib/buildr/packaging/artifact_namespace.rb +51 -24
- data/lib/buildr/packaging/artifact_search.rb +1 -2
- data/lib/buildr/packaging/gems.rb +1 -13
- data/lib/buildr/packaging/package.rb +0 -6
- data/lib/buildr/packaging/tar.rb +2 -4
- data/lib/buildr/packaging/version_requirement.rb +1 -1
- data/lib/buildr/packaging/zip.rb +1 -2
- data/lib/buildr/packaging/ziptask.rb +0 -4
- data/lib/buildr/run.rb +3 -3
- data/lib/buildr/scala/bdd.rb +129 -11
- data/lib/buildr/scala/compiler.rb +53 -6
- data/lib/buildr/scala/doc.rb +6 -4
- data/lib/buildr/scala/org/apache/buildr/Specs2Runner.class +0 -0
- data/lib/buildr/scala/org/apache/buildr/Specs2Runner.java +38 -0
- data/lib/buildr/scala/shell.rb +0 -4
- data/lib/buildr/scala/tests.rb +15 -6
- data/lib/buildr/shell.rb +0 -1
- data/lib/buildr/version.rb +1 -1
- data/rakelib/all-in-one.rake +20 -11
- data/rakelib/checks.rake +0 -31
- data/rakelib/doc.rake +86 -100
- data/rakelib/package.rake +3 -3
- data/rakelib/release.rake +1 -1
- data/rakelib/rspec.rake +23 -7
- data/rakelib/stage.rake +18 -21
- data/spec/addon/bnd_spec.rb +2 -2
- data/spec/addon/jaxb_xjc_spec.rb +5 -0
- data/spec/core/application_spec.rb +11 -64
- data/spec/core/cc_spec.rb +12 -5
- data/spec/core/compile_spec.rb +11 -0
- data/spec/core/doc_spec.rb +1 -1
- data/spec/core/run_spec.rb +17 -4
- data/spec/core/test_spec.rb +5 -3
- data/spec/ide/idea_spec.rb +60 -0
- data/spec/java/bdd_spec.rb +8 -218
- data/spec/java/cobertura_spec.rb +4 -0
- data/spec/java/compiler_spec.rb +11 -8
- data/spec/java/emma_spec.rb +4 -1
- data/spec/java/java_spec.rb +1 -1
- data/spec/java/pom_spec.rb +125 -0
- data/spec/java/tests_spec.rb +185 -0
- data/spec/packaging/archive_spec.rb +1 -1
- data/spec/packaging/artifact_namespace_spec.rb +15 -0
- data/spec/packaging/artifact_spec.rb +26 -1
- data/spec/sandbox.rb +7 -1
- data/spec/scala/bdd_spec.rb +111 -8
- data/spec/scala/tests_spec.rb +5 -1
- data/spec/spec_helpers.rb +9 -4
- data/spec/version_requirement_spec.rb +2 -0
- metadata +570 -505
- data/lib/buildr/core.rb +0 -34
- data/lib/buildr/ide.rb +0 -19
- data/lib/buildr/java.rb +0 -25
- data/lib/buildr/java/jtestr_result.rb +0 -331
- data/lib/buildr/java/jtestr_runner.rb.erb +0 -116
- data/lib/buildr/packaging.rb +0 -25
- data/rakelib/setup.rake +0 -68
data/lib/buildr/scala/bdd.rb
CHANGED
@@ -13,12 +13,6 @@
|
|
13
13
|
# License for the specific language governing permissions and limitations under
|
14
14
|
# the License.
|
15
15
|
|
16
|
-
|
17
|
-
require 'buildr/core/build'
|
18
|
-
require 'buildr/core/compile'
|
19
|
-
require 'buildr/java/bdd'
|
20
|
-
require 'buildr/scala/tests'
|
21
|
-
|
22
16
|
module Buildr::Scala
|
23
17
|
|
24
18
|
# Specs is a Scala based BDD framework.
|
@@ -35,13 +29,12 @@ module Buildr::Scala
|
|
35
29
|
VERSION = case
|
36
30
|
when Buildr::Scala.version?("2.8.0")
|
37
31
|
'1.6.5'
|
38
|
-
when Buildr::Scala.version?("2.8.1")
|
32
|
+
when Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2"), Buildr::Scala.version?("2.9.0")
|
39
33
|
'1.6.8'
|
40
34
|
else
|
41
|
-
'1.6.
|
35
|
+
'1.6.9'
|
42
36
|
end
|
43
37
|
|
44
|
-
|
45
38
|
class << self
|
46
39
|
def version
|
47
40
|
custom = Buildr.settings.build['scala.specs']
|
@@ -61,14 +54,17 @@ module Buildr::Scala
|
|
61
54
|
unless @dependencies
|
62
55
|
super
|
63
56
|
# Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
|
64
|
-
@dependencies |= [ File.join(File.dirname(__FILE__)) ] +
|
57
|
+
@dependencies |= [ File.join(File.dirname(__FILE__)) ] +
|
58
|
+
specs +
|
65
59
|
Check.dependencies + JUnit.dependencies + Scalac.dependencies
|
66
60
|
end
|
67
61
|
@dependencies
|
68
62
|
end
|
69
63
|
|
70
64
|
def applies_to?(project) #:nodoc:
|
71
|
-
|
65
|
+
scala_files = Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')]
|
66
|
+
return false if scala_files.empty?
|
67
|
+
scala_files.detect { |f| find(f, /\s+(org\.specs\.)/) }
|
72
68
|
end
|
73
69
|
|
74
70
|
private
|
@@ -77,6 +73,15 @@ module Buildr::Scala
|
|
77
73
|
Buildr.application.deprecated "Please use Scala::Specs.dependencies/.version instead of ScalaSpecs::REQUIRES/VERSION"
|
78
74
|
dependencies
|
79
75
|
end
|
76
|
+
|
77
|
+
def find(file, pattern)
|
78
|
+
File.open(file, "r") do |infile|
|
79
|
+
while (line = infile.gets)
|
80
|
+
return true if line.match(pattern)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
false
|
84
|
+
end
|
80
85
|
end
|
81
86
|
|
82
87
|
def initialize(task, options) #:nodoc:
|
@@ -121,6 +126,117 @@ module Buildr::Scala
|
|
121
126
|
end
|
122
127
|
end
|
123
128
|
end
|
129
|
+
|
130
|
+
class Specs2 < Buildr::TestFramework::JavaBDD
|
131
|
+
@lang = :scala
|
132
|
+
@bdd_dir = :spec
|
133
|
+
|
134
|
+
VERSION = case
|
135
|
+
when Buildr::Scala.version?("2.8.0"), Buildr::Scala.version?("2.8.1"), Buildr::Scala.version?("2.8.2")
|
136
|
+
'1.5'
|
137
|
+
else
|
138
|
+
'1.6.1'
|
139
|
+
end
|
140
|
+
|
141
|
+
class << self
|
142
|
+
def version
|
143
|
+
custom = Buildr.settings.build['scala.specs2']
|
144
|
+
(custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
|
145
|
+
end
|
146
|
+
|
147
|
+
def specs
|
148
|
+
custom = Buildr.settings.build['scala.specs2']
|
149
|
+
[ (custom =~ /:/) ? custom : "org.specs2:#{artifact}:jar:#{version}" ]
|
150
|
+
end
|
151
|
+
|
152
|
+
def artifact
|
153
|
+
Buildr.settings.build['scala.specs2.artifact'] || "specs2_#{Buildr::Scala.version_without_build}"
|
154
|
+
end
|
155
|
+
|
156
|
+
def scalaz_dependencies
|
157
|
+
if Buildr::Scala.version?("2.8")
|
158
|
+
[]
|
159
|
+
else
|
160
|
+
default_version = "6.0.1"
|
161
|
+
custom_version = Buildr.settings.build['scala.specs2-scalaz']
|
162
|
+
version = (custom_version =~ /:/) ? Buildr.artifact(custom_version).version : default_version
|
163
|
+
|
164
|
+
artifact = Buildr.settings.build['scala.specs2-scalaz.artifact'] || "specs2-scalaz-core_#{Buildr::Scala.version_without_build}"
|
165
|
+
|
166
|
+
custom_spec = Buildr.settings.build['scala.specs2-scalaz']
|
167
|
+
spec = [ (custom_spec =~ /:/) ? custom_spec : "org.specs2:#{artifact}:jar:#{version}" ]
|
168
|
+
Buildr.transitive(spec, :scopes => [nil, "compile", "runtime", "provided", "optional"], :optional => true)
|
169
|
+
end
|
170
|
+
end
|
171
|
+
|
172
|
+
def dependencies
|
173
|
+
unless @dependencies
|
174
|
+
super
|
175
|
+
|
176
|
+
# Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
|
177
|
+
options = {
|
178
|
+
:scopes => [nil, "compile", "runtime", "provided", "optional"],
|
179
|
+
:optional => true
|
180
|
+
}
|
181
|
+
@dependencies |= [ File.join(File.dirname(__FILE__)) ] + Buildr.transitive(specs, options) +
|
182
|
+
scalaz_dependencies + Check.dependencies + JUnit.dependencies +
|
183
|
+
Scalac.dependencies
|
184
|
+
end
|
185
|
+
@dependencies
|
186
|
+
end
|
187
|
+
|
188
|
+
def applies_to?(project) #:nodoc:
|
189
|
+
scala_files = Dir[project.path_to(:source, bdd_dir, lang, '**/*.scala')]
|
190
|
+
return false if scala_files.empty?
|
191
|
+
scala_files.detect { |f| find(f, /\s+(org\.specs2\.)/) }
|
192
|
+
end
|
193
|
+
|
194
|
+
private
|
195
|
+
|
196
|
+
def find(file, pattern)
|
197
|
+
File.open(file, "r") do |infile|
|
198
|
+
while (line = infile.gets)
|
199
|
+
return true if line.match(pattern)
|
200
|
+
end
|
201
|
+
end
|
202
|
+
false
|
203
|
+
end
|
204
|
+
end
|
205
|
+
|
206
|
+
def initialize(task, options) #:nodoc:
|
207
|
+
super
|
208
|
+
|
209
|
+
specs = task.project.path_to(:source, :spec, :scala)
|
210
|
+
task.compile.from specs if File.directory?(specs)
|
211
|
+
|
212
|
+
resources = task.project.path_to(:source, :spec, :resources)
|
213
|
+
task.resources.from resources if File.directory?(resources)
|
214
|
+
end
|
215
|
+
|
216
|
+
def tests(dependencies)
|
217
|
+
filter_classes(dependencies, :interfaces => ['org.specs2.Specification', 'org.specs2.mutable.Specification'])
|
218
|
+
end
|
219
|
+
|
220
|
+
def run(specs, dependencies) #:nodoc:
|
221
|
+
properties = { "specs2.outDir" => task.compile.target.to_s }
|
222
|
+
|
223
|
+
cmd_options = { :properties => options[:properties].merge(properties),
|
224
|
+
:java_args => options[:java_args],
|
225
|
+
:classpath => dependencies,
|
226
|
+
:name => false }
|
227
|
+
|
228
|
+
runner = 'org.apache.buildr.Specs2Runner'
|
229
|
+
specs.inject [] do |passed, spec|
|
230
|
+
begin
|
231
|
+
Java::Commands.java(runner, spec, cmd_options)
|
232
|
+
rescue => e
|
233
|
+
passed
|
234
|
+
else
|
235
|
+
passed << spec
|
236
|
+
end
|
237
|
+
end
|
238
|
+
end
|
239
|
+
end
|
124
240
|
end
|
125
241
|
|
126
242
|
# Backwards compatibility stuff. Remove in 1.5.
|
@@ -129,3 +245,5 @@ module Buildr
|
|
129
245
|
end
|
130
246
|
|
131
247
|
Buildr::TestFramework << Buildr::Scala::Specs
|
248
|
+
Buildr::TestFramework << Buildr::Scala::Specs2
|
249
|
+
|
@@ -13,13 +13,8 @@
|
|
13
13
|
# License for the specific language governing permissions and limitations under
|
14
14
|
# the License.
|
15
15
|
|
16
|
-
require 'buildr/core/project'
|
17
|
-
require 'buildr/core/common'
|
18
|
-
require 'buildr/core/compile'
|
19
|
-
require 'buildr/packaging'
|
20
|
-
|
21
16
|
module Buildr::Scala
|
22
|
-
DEFAULT_VERSION = '2.9.
|
17
|
+
DEFAULT_VERSION = '2.9.1'
|
23
18
|
|
24
19
|
class << self
|
25
20
|
|
@@ -216,8 +211,60 @@ module Buildr::Scala
|
|
216
211
|
end
|
217
212
|
end
|
218
213
|
|
214
|
+
protected
|
215
|
+
|
216
|
+
# :nodoc: see Compiler:Base
|
217
|
+
def compile_map(sources, target)
|
218
|
+
target_ext = self.class.target_ext
|
219
|
+
ext_glob = Array(self.class.source_ext).join(',')
|
220
|
+
sources.flatten.map{|f| File.expand_path(f)}.inject({}) do |map, source|
|
221
|
+
sources = if File.directory?(source)
|
222
|
+
FileList["#{source}/**/*.{#{ext_glob}}"].reject { |file| File.directory?(file) }
|
223
|
+
else
|
224
|
+
[source]
|
225
|
+
end
|
226
|
+
|
227
|
+
sources.each do |source|
|
228
|
+
# try to extract package name from .java or .scala files
|
229
|
+
if ['.java', '.scala'].include? File.extname(source)
|
230
|
+
name = File.basename(source).split(".")[0]
|
231
|
+
package = findFirst(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
|
232
|
+
packages = count(source, /^\s*package\s+([^\s;]+)\s*;?\s*/)
|
233
|
+
found = findFirst(source, /((trait)|(class)|(object))\s+(#{name})/)
|
234
|
+
|
235
|
+
# if there's only one package statement and we know the target name, then we can depend
|
236
|
+
# directly on a specific file, otherwise, we depend on the general target
|
237
|
+
if (found && packages == 1)
|
238
|
+
map[source] = package ? File.join(target, package[1].gsub('.', '/'), name.ext(target_ext)) : target
|
239
|
+
else
|
240
|
+
map[source] = target
|
241
|
+
end
|
242
|
+
|
243
|
+
elsif
|
244
|
+
map[source] = target
|
245
|
+
end
|
246
|
+
end
|
247
|
+
|
248
|
+
map.each do |key,value|
|
249
|
+
map[key] = first_file unless map[key]
|
250
|
+
end
|
251
|
+
|
252
|
+
map
|
253
|
+
end
|
254
|
+
end
|
255
|
+
|
219
256
|
private
|
220
257
|
|
258
|
+
def count(file, pattern)
|
259
|
+
count = 0
|
260
|
+
File.open(file, "r") do |infile|
|
261
|
+
while (line = infile.gets)
|
262
|
+
count += 1 if line.match(pattern)
|
263
|
+
end
|
264
|
+
end
|
265
|
+
count
|
266
|
+
end
|
267
|
+
|
221
268
|
def java_sources(sources)
|
222
269
|
sources.flatten.map { |source| File.directory?(source) ? FileList["#{source}/**/*.java"] : source } .
|
223
270
|
flatten.reject { |file| File.directory?(file) || File.extname(file) != '.java' }.map { |file| File.expand_path(file) }.uniq
|
data/lib/buildr/scala/doc.rb
CHANGED
@@ -13,9 +13,6 @@
|
|
13
13
|
# License for the specific language governing permissions and limitations under
|
14
14
|
# the License.
|
15
15
|
|
16
|
-
require 'buildr/core/doc'
|
17
|
-
require 'buildr/scala/compiler' # ensure Scala dependencies are ready
|
18
|
-
|
19
16
|
module Buildr
|
20
17
|
module Doc
|
21
18
|
|
@@ -62,7 +59,12 @@ module Buildr
|
|
62
59
|
trace (['scaladoc'] + cmd_args).join(' ')
|
63
60
|
Java.load
|
64
61
|
begin
|
65
|
-
|
62
|
+
if Scala.version?(2.7, 2.8)
|
63
|
+
Java.scala.tools.nsc.ScalaDoc.process(cmd_args.to_java(Java.java.lang.String))
|
64
|
+
else
|
65
|
+
scaladoc = Java.scala.tools.nsc.ScalaDoc.new
|
66
|
+
scaladoc.process(cmd_args.to_java(Java.java.lang.String))
|
67
|
+
end
|
66
68
|
rescue => e
|
67
69
|
fail 'Failed to generate Scaladocs, see errors above: ' + e
|
68
70
|
end
|
Binary file
|
@@ -0,0 +1,38 @@
|
|
1
|
+
/* Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
* contributor license agreements. See the NOTICE file distributed with this
|
3
|
+
* work for additional information regarding copyright ownership. The ASF
|
4
|
+
* licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
* "License"); you may not use this file except in compliance with the License.
|
6
|
+
* You may obtain a copy of the License at
|
7
|
+
*
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
*
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
* License for the specific language governing permissions and limitations
|
14
|
+
* under the License.
|
15
|
+
*/
|
16
|
+
|
17
|
+
package org.apache.buildr;
|
18
|
+
|
19
|
+
import java.lang.reflect.Field;
|
20
|
+
import java.lang.reflect.Method;
|
21
|
+
|
22
|
+
public class Specs2Runner {
|
23
|
+
|
24
|
+
public static void main(String[] args) {
|
25
|
+
try {
|
26
|
+
ClassLoader loader = Thread.currentThread().getContextClassLoader();
|
27
|
+
Class clazz = loader.loadClass("org.specs2.runner.ClassRunner");
|
28
|
+
Object instance = clazz.newInstance();
|
29
|
+
Method main = clazz.getMethod("main", String[].class);
|
30
|
+
main.invoke(instance, new Object[] { args });
|
31
|
+
} catch (Exception e) {
|
32
|
+
throw new RuntimeException(e);
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
}
|
37
|
+
|
38
|
+
|
data/lib/buildr/scala/shell.rb
CHANGED
data/lib/buildr/scala/tests.rb
CHANGED
@@ -13,14 +13,23 @@
|
|
13
13
|
# License for the specific language governing permissions and limitations under
|
14
14
|
# the License.
|
15
15
|
|
16
|
+
module Buildr::Scala
|
16
17
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
require 'buildr/java/tests'
|
18
|
+
# Mockito is available when running ScalaTest
|
19
|
+
module Mockito
|
20
|
+
VERSION = '1.8.5'
|
21
21
|
|
22
|
+
class << self
|
23
|
+
def version
|
24
|
+
Buildr.settings.build['scalatest-mockito'] || Buildr.settings.build['mockito'] || VERSION
|
25
|
+
end
|
26
|
+
|
27
|
+
def dependencies
|
28
|
+
@dependencies ||= ["org.mockito:mockito-all:jar:#{version}"]
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
22
32
|
|
23
|
-
module Buildr::Scala
|
24
33
|
# Scala::Check is available when using Scala::Test or Scala::Specs
|
25
34
|
module Check
|
26
35
|
VERSION = case
|
@@ -93,7 +102,7 @@ module Buildr::Scala
|
|
93
102
|
end
|
94
103
|
|
95
104
|
def dependencies
|
96
|
-
[specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies
|
105
|
+
[specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies + Mockito.dependencies
|
97
106
|
end
|
98
107
|
|
99
108
|
def applies_to?(project) #:nodoc:
|
data/lib/buildr/shell.rb
CHANGED
data/lib/buildr/version.rb
CHANGED
data/rakelib/all-in-one.rake
CHANGED
@@ -14,15 +14,15 @@
|
|
14
14
|
# the License.
|
15
15
|
|
16
16
|
desc "Create JRuby all-in-one distribution"
|
17
|
-
task "all-in-one" => 'all-in-one:all-in-one'
|
17
|
+
task "all-in-one" => 'all-in-one:all-in-one'
|
18
18
|
|
19
19
|
namespace :'all-in-one' do
|
20
|
-
|
21
|
-
version = "1.
|
20
|
+
|
21
|
+
version = "1.6.4"
|
22
22
|
jruby_distro = "jruby-bin-#{version}.tar.gz"
|
23
23
|
url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
|
24
24
|
dir = "jruby-#{version}"
|
25
|
-
|
25
|
+
|
26
26
|
task "all-in-one" => [:gem,
|
27
27
|
# Prepare to run
|
28
28
|
:prepare,
|
@@ -73,41 +73,50 @@ namespace :'all-in-one' do
|
|
73
73
|
rm_rf 'samples'
|
74
74
|
rm_rf 'share'
|
75
75
|
end
|
76
|
-
|
76
|
+
|
77
77
|
desc 'Install Buildr gem and dependencies'
|
78
78
|
task :install_dependencies do
|
79
|
+
puts "Install rubygems-update"
|
80
|
+
sh "bin/jruby -S gem install rubygems-update"
|
81
|
+
|
82
|
+
puts "Upgrade Rubygems"
|
83
|
+
sh "bin/jruby -S gem update --system"
|
84
|
+
|
85
|
+
puts "Install ffi-ncurses"
|
86
|
+
sh "bin/jruby -S gem install ffi-ncurses"
|
87
|
+
|
79
88
|
puts "Install Buildr gem ..."
|
80
89
|
sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
|
81
90
|
'--no-rdoc', '--no-ri'
|
82
91
|
puts "[X] Install Buildr gem"
|
83
92
|
end
|
84
|
-
|
93
|
+
|
85
94
|
desc 'Add Buildr executables/scripts'
|
86
95
|
task :add_execs do
|
87
96
|
cp 'bin/jruby.exe', 'bin/_buildr.exe'
|
88
97
|
cp Dir["../../all-in-one/*"], 'bin'
|
89
98
|
end
|
90
|
-
|
99
|
+
|
91
100
|
desc 'Package distribution'
|
92
101
|
task :package do
|
93
102
|
puts "Zipping distribution ..."
|
94
103
|
cd '..'
|
95
|
-
new_dir = "#{spec.name}-#{spec.version}"
|
104
|
+
new_dir = "#{spec.name}-all-in-one-#{spec.version}"
|
96
105
|
mv dir, new_dir
|
97
106
|
zip = "#{new_dir}.zip"
|
98
107
|
rm zip if File.exist? zip
|
99
108
|
sh 'zip', '-q', '-r', zip, new_dir
|
100
109
|
puts "[X] Zipped distribution"
|
101
|
-
|
110
|
+
|
102
111
|
puts "Tarring distribution ..."
|
103
112
|
tar = "#{new_dir}.tar.gz"
|
104
113
|
rm tar if File.exist? tar
|
105
114
|
sh 'tar', 'czf', tar, new_dir
|
106
115
|
puts "[X] Tarred distribution"
|
107
|
-
|
116
|
+
|
108
117
|
rm_rf new_dir
|
109
118
|
end
|
110
|
-
|
119
|
+
|
111
120
|
end
|
112
121
|
|
113
122
|
task(:clobber) { rm_rf '_all-in-one' }
|