buildr-as3 0.2.31.pre → 0.2.32.pre
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/buildr-as3.gemspec +2 -2
- data/lib/buildr/as3/compiler/base.rb +9 -5
- data/lib/buildr/as3/packaging/air.rb +1 -2
- data/lib/buildr/as3/packaging/airi.rb +1 -1
- data/lib/buildr/as3/packaging/swc.rb +1 -1
- data/lib/buildr/as3/packaging/swf.rb +1 -1
- data/lib/buildr/as3/project.rb +9 -9
- data/lib/buildr/as3/test/flexunit4.rb +7 -2
- data/lib/buildr/as3/toolkits/apparat.rb +9 -5
- metadata +21 -21
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.2.
|
1
|
+
0.2.32.pre
|
data/buildr-as3.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "buildr-as3"
|
8
|
-
s.version = "0.2.
|
8
|
+
s.version = "0.2.32.pre"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Dominic Graefen"]
|
12
|
-
s.date = "
|
12
|
+
s.date = "2012-02-19"
|
13
13
|
s.description = "Build like you code - now supporting ActionScript 3 & Flex"
|
14
14
|
s.email = "dominic @nospam@ devboy.org"
|
15
15
|
s.executables = ["buildr-as3"]
|
@@ -39,7 +39,7 @@ module Buildr
|
|
39
39
|
def compile(sources, target, dependencies) #:nodoc:
|
40
40
|
check_options options, COMPILE_OPTIONS
|
41
41
|
flex_sdk = options[:flexsdk].invoke
|
42
|
-
output =
|
42
|
+
output = get_output_file(target)
|
43
43
|
cmd_args = compiler_args(get_as3_dependencies(sources,target,dependencies), flex_sdk, output, sources)
|
44
44
|
unless Buildr.application.options.dryrun
|
45
45
|
trace(cmd_args.join(' '))
|
@@ -48,13 +48,13 @@ module Buildr
|
|
48
48
|
end
|
49
49
|
|
50
50
|
def needed?(sources, target, dependencies)
|
51
|
-
return true unless File.exist?(
|
52
|
-
source_files = Dir.glob(sources.
|
51
|
+
return true unless File.exist? get_output_file(target)
|
52
|
+
source_files = Dir.glob(sources.map{|source| "#{source}/**/*"})
|
53
53
|
dep_files = dependencies.collect{ |dep|
|
54
54
|
File.directory?(dep) ? Dir.glob("#{dep}/**/*") : dep
|
55
55
|
}.flatten
|
56
56
|
maxtime = (source_files + dep_files).collect{ |file| File.stat(file).mtime }.max || Time.at(0)
|
57
|
-
maxtime > File.stat(
|
57
|
+
maxtime > File.stat(get_output_file(target)).mtime
|
58
58
|
end
|
59
59
|
|
60
60
|
private
|
@@ -87,8 +87,12 @@ module Buildr
|
|
87
87
|
args + Array(options[:args]) + Array(options[:flexsdk].default_options)
|
88
88
|
end
|
89
89
|
|
90
|
+
def get_output_file target
|
91
|
+
File.join(target.to_s, options["output"] || "#{@project.name.split(":").last}.#{self.class.packaging.to_s}")
|
92
|
+
end
|
93
|
+
|
90
94
|
def is_test( sources, target, dependencies )
|
91
|
-
sources==@project.test.compile.sources && dependencies==@project.test.compile.dependencies.
|
95
|
+
sources==@project.test.compile.sources && dependencies==@project.test.compile.dependencies.map(&:to_s) && target==@project.test.compile.target.to_s
|
92
96
|
end
|
93
97
|
|
94
98
|
end
|
@@ -27,7 +27,6 @@ module Buildr
|
|
27
27
|
module Packaging
|
28
28
|
|
29
29
|
class AirTask < Rake::FileTask
|
30
|
-
|
31
30
|
include Extension
|
32
31
|
|
33
32
|
attr_writer :target_air, :src_swf, :flexsdk
|
@@ -109,7 +108,7 @@ module Buildr
|
|
109
108
|
def package_as_air(file_name)
|
110
109
|
fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
|
111
110
|
AirTask.define_task(file_name).tap do |swf|
|
112
|
-
swf.src_swf =
|
111
|
+
swf.src_swf = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
|
113
112
|
swf.target_air = file_name
|
114
113
|
swf.flexsdk = compile.options[:flexsdk]
|
115
114
|
end
|
@@ -103,7 +103,7 @@ module Buildr
|
|
103
103
|
def package_as_airi(file_name)
|
104
104
|
fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
|
105
105
|
AiriTask.define_task(file_name).tap do |swf|
|
106
|
-
swf.src_swf =
|
106
|
+
swf.src_swf = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
|
107
107
|
swf.target_air = file_name
|
108
108
|
swf.flexsdk = compile.options[:flexsdk]
|
109
109
|
end
|
@@ -69,7 +69,7 @@ module Buildr
|
|
69
69
|
def package_as_swc(file_name)
|
70
70
|
fail("Package types don't match! :swc vs. :#{compile.packaging.to_s}") unless compile.packaging == :swc
|
71
71
|
SwcTask.define_task(file_name).tap do |swc|
|
72
|
-
swc.src_swc =
|
72
|
+
swc.src_swc = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
|
73
73
|
swc.target_swc = file_name
|
74
74
|
end
|
75
75
|
end
|
@@ -69,7 +69,7 @@ module Buildr
|
|
69
69
|
def package_as_swf(file_name)
|
70
70
|
fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
|
71
71
|
SwfTask.define_task(file_name).tap do |swf|
|
72
|
-
swf.src_swf =
|
72
|
+
swf.src_swf = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
|
73
73
|
swf.target_swf = file_name
|
74
74
|
end
|
75
75
|
end
|
data/lib/buildr/as3/project.rb
CHANGED
@@ -24,14 +24,14 @@ require "buildr"
|
|
24
24
|
|
25
25
|
class Buildr::Project
|
26
26
|
|
27
|
-
def get_as3_output( is_test = false )
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
end
|
27
|
+
#def get_as3_output( is_test = false )
|
28
|
+
# compile_task = is_test ? test.compile : compile
|
29
|
+
# target = compile_task.target
|
30
|
+
# options = compile_task.options
|
31
|
+
# return compile_task.options[:output] if compile_task.options.has_key? :output
|
32
|
+
# return "#{target}/#{File.basename(options[:main].to_s, File.extname(options[:main].to_s))}.swf" if compile_task.packaging == :swf
|
33
|
+
# return "#{target}/#{name.gsub(":", "-")}.swc" if compile_task.packaging == :swc
|
34
|
+
# fail("Could not guess output file for #{name}")
|
35
|
+
#end
|
36
36
|
|
37
37
|
end
|
@@ -47,7 +47,7 @@ module Buildr
|
|
47
47
|
end
|
48
48
|
|
49
49
|
def swcs flexunit_version=DEFAULT_FLEXUNIT_VERSION, flexsdk_version=DEFAULT_FLEX_SDK_VERSION, type=:as3
|
50
|
-
raise "type has to be :as3 or :flex" unless [:flex
|
50
|
+
raise "type has to be :as3 or :flex" unless [:flex, :as3].include? type
|
51
51
|
[
|
52
52
|
"com.adobe.flexunit:flexunit-cilistener:swc:#{flexsdk_version}:#{flexunit_version}",
|
53
53
|
"com.adobe.flexunit:flexunit-aircilistener:swc:#{flexsdk_version}:#{flexunit_version}",
|
@@ -107,7 +107,7 @@ module Buildr
|
|
107
107
|
:headless => options[:headless] || false,
|
108
108
|
:display => options[:display] || 99,
|
109
109
|
:port => options[:port] || 1024,
|
110
|
-
:swf => task.project
|
110
|
+
:swf => get_output_file(task.project)
|
111
111
|
|
112
112
|
ant.taskdef :name=>'junitreport',
|
113
113
|
:classname=>'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
|
@@ -136,6 +136,11 @@ module Buildr
|
|
136
136
|
tests
|
137
137
|
end
|
138
138
|
|
139
|
+
def get_output_file project
|
140
|
+
compile = project.test.compile
|
141
|
+
File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
|
142
|
+
end
|
143
|
+
|
139
144
|
end
|
140
145
|
end
|
141
146
|
end
|
@@ -48,9 +48,9 @@ module Buildr
|
|
48
48
|
version = DEFAULT_SCALA_VERSION
|
49
49
|
Buildr.artifacts('org.scala-lang:scala-library:jar:' + version).
|
50
50
|
map { |a|
|
51
|
-
|
52
|
-
|
53
|
-
|
51
|
+
a.install
|
52
|
+
a.to_s
|
53
|
+
}
|
54
54
|
end
|
55
55
|
|
56
56
|
|
@@ -87,7 +87,7 @@ module Buildr
|
|
87
87
|
include Extension
|
88
88
|
|
89
89
|
def apparat_tdsi(options = {})
|
90
|
-
output =
|
90
|
+
output = get_output_file
|
91
91
|
compile.options[:apparat].invoke
|
92
92
|
cmd_args = []
|
93
93
|
cmd_args << "apparat.tools.tdsi.TurboDieselSportInjection"
|
@@ -102,7 +102,7 @@ module Buildr
|
|
102
102
|
end
|
103
103
|
|
104
104
|
def apparat_reducer(options ={})
|
105
|
-
output =
|
105
|
+
output = get_output_file
|
106
106
|
compile.options[:apparat].invoke
|
107
107
|
cmd_args = []
|
108
108
|
cmd_args << "apparat.tools.reducer.Reducer"
|
@@ -125,6 +125,10 @@ module Buildr
|
|
125
125
|
end
|
126
126
|
end
|
127
127
|
|
128
|
+
def get_output_file
|
129
|
+
File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
|
130
|
+
end
|
131
|
+
|
128
132
|
end
|
129
133
|
end
|
130
134
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: buildr-as3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.32.pre
|
5
5
|
prerelease: 7
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2012-02-19 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: shoulda
|
16
|
-
requirement: &
|
16
|
+
requirement: &2154164580 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2154164580
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: bundler
|
27
|
-
requirement: &
|
27
|
+
requirement: &2154180480 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 1.0.0
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2154180480
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: jeweler
|
38
|
-
requirement: &
|
38
|
+
requirement: &2154180000 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 1.5.2
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2154180000
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: buildr
|
49
|
-
requirement: &
|
49
|
+
requirement: &2154179520 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 1.4.6
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *2154179520
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: simplecov
|
60
|
-
requirement: &
|
60
|
+
requirement: &2154179040 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2154179040
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: simplecov-rcov
|
71
|
-
requirement: &
|
71
|
+
requirement: &2154178560 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2154178560
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: rspec
|
82
|
-
requirement: &
|
82
|
+
requirement: &2154178080 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ~>
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: 2.1.0
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *2154178080
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: ci_reporter
|
93
|
-
requirement: &
|
93
|
+
requirement: &2154177600 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ~>
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: 1.6.5
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *2154177600
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: buildr
|
104
|
-
requirement: &
|
104
|
+
requirement: &2154177120 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,7 +109,7 @@ dependencies:
|
|
109
109
|
version: 1.4.6
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *2154177120
|
113
113
|
description: Build like you code - now supporting ActionScript 3 & Flex
|
114
114
|
email: dominic @nospam@ devboy.org
|
115
115
|
executables:
|
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
180
180
|
version: '0'
|
181
181
|
segments:
|
182
182
|
- 0
|
183
|
-
hash:
|
183
|
+
hash: 3682499044271835405
|
184
184
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
185
185
|
none: false
|
186
186
|
requirements:
|