openMSX-builder 1.5.1 → 1.6.0

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/README.markdown CHANGED
@@ -65,6 +65,9 @@ Current list of tasks is:
65
65
  + Add documentation on the YAML configuration files.
66
66
  + Add --configure argument that will trigger set up of the configuration files.
67
67
  + See if VERSION can be integrated into OpenmsxBuilder instead of just being parsed in the executable.
68
+ + Add support for releasing both universal build and x86 builds.
69
+ + Make sure all shell commands are output as Debug level logs.
70
+ + Integrate CBIOS builds.
68
71
 
69
72
  ## Notes on Patches/Pull Requests
70
73
  ******************************************************************************
@@ -75,7 +78,7 @@ Current list of tasks is:
75
78
  This is important so I don't break it in a future version unintentionally.
76
79
  4. Commit, but do not mess with Rakefile, version, history, or README.
77
80
  Want to have your own version? Bump version in a separate commit!
78
- That way I can ignored that commit when I pull.
81
+ That way I can ignore that commit when I pull.
79
82
  5. Send me a pull request. Bonus points for topic branches.
80
83
 
81
84
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.5.1
1
+ 1.6.0
@@ -13,9 +13,30 @@ class OpenmsxBuilder
13
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
- :nice_name => 'openMSX',
16
+ :nice_name => 'openMSX (universal)',
17
17
  :publish_location => 'ssh_host:path/to/existing/publish/dir',
18
18
  :site_path => 'http://your.host.example/publish/dir',
19
+ :target_cpu => 'univ',
20
+ },
21
+ :openmsx_x86 => {
22
+ :source_dir => File.expand_path("~/Development/openMSX"),
23
+ :builds_subdir => 'derived/x86-darwin-opt-3rd',
24
+ :report_bcc => [],
25
+ :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
26
+ :nice_name => 'openMSX (x86)',
27
+ :publish_location => 'ssh_host:path/to/existing/publish/dir',
28
+ :site_path => 'http://your.host.example/publish/dir',
29
+ :target_cpu => 'x86',
30
+ },
31
+ :openmsx_ppc => {
32
+ :source_dir => File.expand_path("~/Development/openMSX"),
33
+ :builds_subdir => 'derived/ppc-darwin-opt-3rd',
34
+ :report_bcc => [],
35
+ :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
36
+ :nice_name => 'openMSX (ppc)',
37
+ :publish_location => 'ssh_host:path/to/existing/publish/dir',
38
+ :site_path => 'http://your.host.example/publish/dir',
39
+ :target_cpu => 'ppc',
19
40
  },
20
41
  :openmsx_debugger => {
21
42
  :source_dir => File.expand_path("~/Development/openmsx-debugger"),
@@ -49,7 +70,7 @@ class OpenmsxBuilder
49
70
  @log.level = Logger::INFO if @options.include?('--verbose')
50
71
  @log.level = Logger::DEBUG if @options.include?('--debug')
51
72
  @log.debug("Logger created with level #{@log.level}")
52
- @current_revision = `svnversion -n #{setting(:source_dir)}`.to_i
73
+ @current_revision = `svnversion -cn #{setting(:source_dir)}`.split(':').last.to_i
53
74
  @fails = 0
54
75
  @build_outputs = []
55
76
  config
@@ -131,7 +152,7 @@ class OpenmsxBuilder
131
152
  def update_svn
132
153
  @log.info "openMSX is currently at #{@current_revision}. Proceeding with `svn update`"
133
154
  @log.debug `cd #{setting(:source_dir)} && svn up`
134
- @new_revision = `svnversion -n #{setting(:source_dir)}`.to_i
155
+ @new_revision = `svnversion -nc #{setting(:source_dir)}`.split(':').last.to_i
135
156
  @log.info "Now at revision #{@new_revision}"
136
157
  nil
137
158
  end
@@ -164,7 +185,9 @@ private
164
185
  def build
165
186
  cleanup_dmg_locks if openmsx?
166
187
  @log.info("Will attempt to build revision #{@new_revision}.")
167
- @build_outputs << `cd #{setting(:source_dir)} && make clean OPENMSX_TARGET_CPU=univ && make #{'staticbindist OPENMSX_TARGET_CPU=univ' if openmsx?} 2>&1`
188
+ target_cpu=""
189
+ target_cpu=" OPENMSX_TARGET_CPU=#{setting(:target_cpu)}" if openmsx? && setting(:target_cpu)
190
+ @build_outputs << `cd #{setting(:source_dir)} && make clean && make #{"staticbindist#{target_cpu}"} 2>&1`
168
191
  if $?.success?
169
192
  handle_build_success
170
193
  return nil
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{openMSX-builder}
8
- s.version = "1.5.1"
8
+ s.version = "1.6.0"
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"]
12
- s.date = %q{2010-03-16}
12
+ s.date = %q{2010-04-02}
13
13
  s.default_executable = %q{build_openmsx}
14
14
  s.description = %q{openMSX-Builder is used for building the latest SVN checkouts of openMSX and openMSX-Debugger from their sourceforge repository.
15
15
  It also supports publishing the created builds to an external location via scp, announcing successfully published builds via Twitter and reporting build-errors via e-mail.}
metadata CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
4
4
  prerelease: false
5
5
  segments:
6
6
  - 1
7
- - 5
8
- - 1
9
- version: 1.5.1
7
+ - 6
8
+ - 0
9
+ version: 1.6.0
10
10
  platform: ruby
11
11
  authors:
12
12
  - Filip H.F. "FiXato" Slagter
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-03-16 00:00:00 +01:00
17
+ date: 2010-04-02 00:00:00 +02:00
18
18
  default_executable: build_openmsx
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency