openMSX-builder 1.4.1 → 1.4.2
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/VERSION +1 -1
- data/lib/openmsx_builder.rb +8 -8
- data/openMSX-builder.gemspec +1 -1
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.4.
|
1
|
+
1.4.2
|
data/lib/openmsx_builder.rb
CHANGED
@@ -10,7 +10,7 @@ class OpenmsxBuilder
|
|
10
10
|
:projects => {
|
11
11
|
:openmsx => {
|
12
12
|
:source_dir => File.expand_path("~/Development/openMSX"),
|
13
|
-
:builds_subdir => 'derived/
|
13
|
+
:builds_subdir => 'derived/univ-darwin-opt-3rd',
|
14
14
|
:report_bcc => [],
|
15
15
|
:report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
|
16
16
|
:nice_name => 'openMSX',
|
@@ -99,7 +99,7 @@ private
|
|
99
99
|
|
100
100
|
def dmg_for_revision?(revision)
|
101
101
|
return false unless openmsx?
|
102
|
-
files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{revision}-mac-
|
102
|
+
files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{revision}-mac-univ-bin.dmg"))
|
103
103
|
@log.debug files.to_yaml unless files.size == 0
|
104
104
|
files.size > 0
|
105
105
|
end
|
@@ -128,7 +128,7 @@ private
|
|
128
128
|
|
129
129
|
def publish
|
130
130
|
if openmsx?
|
131
|
-
archive_name = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@new_revision}-mac-
|
131
|
+
archive_name = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@new_revision}-mac-univ-bin.dmg")).first
|
132
132
|
elsif openmsx_debugger?
|
133
133
|
archive_name = File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{@new_revision}-mac-x86.tbz")
|
134
134
|
archive(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX_Debugger.app'),File.basename(archive_name))
|
@@ -140,7 +140,7 @@ private
|
|
140
140
|
def publish_all
|
141
141
|
@log.info "Publishing all #{@type} builds found"
|
142
142
|
if openmsx?
|
143
|
-
files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-mac-
|
143
|
+
files = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-mac-univ-bin.dmg")).sort.map do |f|
|
144
144
|
if f =~ /openmsx-.+-(\d+)-mac-x86-bin.dmg$/
|
145
145
|
rev = $1
|
146
146
|
else
|
@@ -166,7 +166,7 @@ private
|
|
166
166
|
|
167
167
|
def publish_current
|
168
168
|
if openmsx?
|
169
|
-
archive_name = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@current_revision}-mac-
|
169
|
+
archive_name = Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@current_revision}-mac-univ-bin.dmg")).first
|
170
170
|
elsif openmsx_debugger?
|
171
171
|
archive_name = File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{@current_revision}-mac-x86.tbz")
|
172
172
|
archive(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX_Debugger.app'),File.basename(archive_name))
|
@@ -195,7 +195,7 @@ private
|
|
195
195
|
def build
|
196
196
|
if openmsx?
|
197
197
|
if dmg_for_revision?(@new_revision)
|
198
|
-
@log.info "Revision already build as #{Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@new_revision}-mac-
|
198
|
+
@log.info "Revision already build as #{Dir.glob(File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{@new_revision}-mac-univ-bin.dmg")).first}"
|
199
199
|
return nil
|
200
200
|
end
|
201
201
|
cleanup_dmg_locks
|
@@ -206,7 +206,7 @@ private
|
|
206
206
|
end
|
207
207
|
end
|
208
208
|
@log.info("Will attempt to build revision #{@new_revision}.")
|
209
|
-
build_output = `cd #{setting(:source_dir)} && make clean OPENMSX_TARGET_CPU=univ && make #{'staticbindist' if openmsx?}
|
209
|
+
build_output = `cd #{setting(:source_dir)} && make clean OPENMSX_TARGET_CPU=univ && make #{'staticbindist OPENMSX_TARGET_CPU=univ' if openmsx?} 2>&1`
|
210
210
|
if $?.success?
|
211
211
|
@log.info "++++++SUCCESS++++++"
|
212
212
|
build_output.each_line do |line|
|
@@ -240,7 +240,7 @@ private
|
|
240
240
|
|
241
241
|
def cleanup_dmg_locks
|
242
242
|
@log.info("Checking for existing filelocks on DMGs.")
|
243
|
-
locks = `/usr/sbin/lsof | grep #{@new_revision}-mac-
|
243
|
+
locks = `/usr/sbin/lsof | grep #{@new_revision}-mac-univ-bin.dmg`
|
244
244
|
@log.debug locks
|
245
245
|
locks.each_line do |lock_line|
|
246
246
|
pid = lock_line.split[1].to_i
|
data/openMSX-builder.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{openMSX-builder}
|
8
|
-
s.version = "1.4.
|
8
|
+
s.version = "1.4.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Filip H.F. \"FiXato\" Slagter"]
|