openMSX-builder 1.5.1 → 1.6.0

data/README.markdown

@@ -65,6 +65,9 @@ Current list of tasks is:
 + Add documentation on the YAML configuration files.
 + Add --configure argument that will trigger set up of the configuration files.
 + See if VERSION can be integrated into OpenmsxBuilder instead of just being parsed in the executable.
++ Add support for releasing both universal build and x86 builds.
++ Make sure all shell commands are output as Debug level logs.
++ Integrate CBIOS builds.
 
 ## Notes on Patches/Pull Requests
 ******************************************************************************
@@ -75,7 +78,7 @@ Current list of tasks is:
   This is important so I don't break it in a future version unintentionally.
 4. Commit, but do not mess with Rakefile, version, history, or README.
   Want to have your own version? Bump version in a separate commit!
-  That way I can ignored that commit when I pull.
+  That way I can ignore that commit when I pull.
 5. Send me a pull request. Bonus points for topic branches.
 
 

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

data/lib/openmsx_builder.rb

@@ -13,9 +13,30 @@ class OpenmsxBuilder
         :builds_subdir => 'derived/univ-darwin-opt-3rd',
         :report_bcc => [],
         :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
-        :nice_name => 'openMSX',
+        :nice_name => 'openMSX (universal)',
         :publish_location => 'ssh_host:path/to/existing/publish/dir',
         :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'univ',
+      },
+      :openmsx_x86 => {
+        :source_dir => File.expand_path("~/Development/openMSX"),
+        :builds_subdir => 'derived/x86-darwin-opt-3rd',
+        :report_bcc => [],
+        :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
+        :nice_name => 'openMSX (x86)',
+        :publish_location => 'ssh_host:path/to/existing/publish/dir',
+        :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'x86',
+      },
+      :openmsx_ppc => {
+        :source_dir => File.expand_path("~/Development/openMSX"),
+        :builds_subdir => 'derived/ppc-darwin-opt-3rd',
+        :report_bcc => [],
+        :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
+        :nice_name => 'openMSX (ppc)',
+        :publish_location => 'ssh_host:path/to/existing/publish/dir',
+        :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'ppc',
       },
       :openmsx_debugger => {
         :source_dir => File.expand_path("~/Development/openmsx-debugger"),
@@ -49,7 +70,7 @@ class OpenmsxBuilder
     @log.level = Logger::INFO if @options.include?('--verbose')
     @log.level = Logger::DEBUG if @options.include?('--debug')
     @log.debug("Logger created with level #{@log.level}")
-    @current_revision = `svnversion -n #{setting(:source_dir)}`.to_i
+    @current_revision = `svnversion -cn #{setting(:source_dir)}`.split(':').last.to_i
     @fails = 0
     @build_outputs = []
     config
@@ -131,7 +152,7 @@ class OpenmsxBuilder
   def update_svn
     @log.info "openMSX is currently at #{@current_revision}. Proceeding with `svn update`"
     @log.debug `cd #{setting(:source_dir)} && svn up`
-    @new_revision = `svnversion -n #{setting(:source_dir)}`.to_i
+    @new_revision = `svnversion -nc #{setting(:source_dir)}`.split(':').last.to_i
     @log.info "Now at revision #{@new_revision}"
     nil
   end
@@ -164,7 +185,9 @@ private
   def build
     cleanup_dmg_locks if openmsx?
     @log.info("Will attempt to build revision #{@new_revision}.")
-    @build_outputs << `cd #{setting(:source_dir)} && make clean OPENMSX_TARGET_CPU=univ && make #{'staticbindist OPENMSX_TARGET_CPU=univ' if openmsx?} 2>&1`
+    target_cpu=""
+    target_cpu=" OPENMSX_TARGET_CPU=#{setting(:target_cpu)}" if openmsx? && setting(:target_cpu)
+    @build_outputs << `cd #{setting(:source_dir)} && make clean && make #{"staticbindist#{target_cpu}"} 2>&1`
     if $?.success?
       handle_build_success
       return nil

data/openMSX-builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openMSX-builder}
-  s.version = "1.5.1"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Filip H.F. \"FiXato\" Slagter"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-04-02}
   s.default_executable = %q{build_openmsx}
   s.description = %q{openMSX-Builder is used for building the latest SVN checkouts of openMSX and openMSX-Debugger from their sourceforge repository.
     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

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
-  - 1
-  version: 1.5.1
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Filip H.F. "FiXato" Slagter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +01:00
+date: 2010-04-02 00:00:00 +02:00
 default_executable: build_openmsx
 dependencies: 
 - !ruby/object:Gem::Dependency