openMSX-builder 1.6.5 → 1.7.0

data/README.markdown

@@ -34,6 +34,8 @@ Currently `build_openmsx` supports the following command-line arguments:
 * --dont-update           => Don't update the SVN repository
 * --report-build-failure  => If an error occurs during build, report failure via e-mail
 * --version               => Return the current VERSION of openMSX-Builder
+* --profiles              => Print a list of (hardcoded) profiles to build
+* --profiles name1,name2  => Build just builds with profile name 'name1' and 'name2'
 
 By default only fatal errors will be output via STDOUT.
 However, the following command-line arguments are available to set the verbosity:
@@ -69,6 +71,7 @@ Current list of tasks is:
 + See if VERSION can be integrated into OpenmsxBuilder instead of just being parsed in the executable.
 + Make sure all shell commands are output as Debug level logs.
 + Integrate CBIOS builds.
++ Use the profile names from the YAML config for --profiles instead of hardcoded defaults
 
 ## Notes on Patches/Pull Requests
 ******************************************************************************
@@ -85,7 +88,7 @@ Current list of tasks is:
 
 ## Copyright
 ******************************************************************************
-Copyright (c) 2010 Filip H.F. "FiXato" Slagter. See LICENSE for details.
+Copyright (c) 2010-2012 Filip H.F. "FiXato" Slagter. See LICENSE for details.
 
 
 ******************************************************************************

data/Rakefile

@@ -18,19 +18,19 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
+if false
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
 end
-
 task :spec => :check_dependencies
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.7.0

data/bin/build_openmsx

@@ -14,8 +14,22 @@ log.level = Logger::WARN if ARGV.include?('--warn')
 log.level = Logger::INFO if ARGV.include?('--verbose')
 log.level = Logger::DEBUG if ARGV.include?('--debug')
 log.info('-'*50)
-log.info("Starting with openMSX")
-OpenmsxBuilder.new(ARGV,:openmsx).run
-log.info('-'*50)
-log.info("Proceeding with openMSX-Debugger")
-OpenmsxBuilder.new(ARGV,:openmsx_debugger).run
+
+profiles = [:openmsx_x86_64, :openmsx_x86, :openmsx_ppc, :openmsx_univ, :openmsx_debugger, :openmsx_debugger_x86_64]
+if profile_index = ARGV.index('--profiles')
+  unless ARGV[profile_index + 1]
+    log.info("The following profiles are available: #{profiles.map{|profile|profile.to_s}.join(', ')}")
+    exit
+  end
+  profiles = ARGV[profile_index + 1].split(',').map{|profile| profile.to_sym}
+end
+log.info("Will build the following profiles: #{profiles.join(', ')}")
+profiles.each_with_index do |profile, index|
+  log.info("Starting with #{profile}")
+  OpenmsxBuilder.new(ARGV,profile).run
+  log.info('-'*50)
+
+  #Prevent further SVN updates so we continue building the same revision during this round
+  ARGV << '--dont-update' if index == 0
+end
+log.info("Build process finished")

data/lib/openmsx_builder.rb

@@ -8,12 +8,12 @@ class OpenmsxBuilder
   CONFIG_FILENAME = File.expand_path('~/.openMSX-builder.yaml')
   DEFAULTS = {
     :projects => {
-      :openmsx => {
+      :openmsx_univ => {
         :source_dir => File.expand_path("~/Development/openMSX"),
         :builds_subdir => 'derived/univ-darwin-opt-3rd',
         :report_bcc => [],
         :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
-        :nice_name => 'openMSX (universal)',
+        :nice_name => 'openMSX Universal Mac OS X (ppc/i386/x86_64)',
         :publish_location => 'ssh_host:path/to/existing/publish/dir',
         :site_path => 'http://your.host.example/publish/dir',
         :target_cpu => 'univ',
@@ -23,17 +23,27 @@ class OpenmsxBuilder
         :builds_subdir => 'derived/x86-darwin-opt-3rd',
         :report_bcc => [],
         :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
-        :nice_name => 'openMSX (x86)',
+        :nice_name => 'openMSX for 32-bit Mac OS X',
         :publish_location => 'ssh_host:path/to/existing/publish/dir',
         :site_path => 'http://your.host.example/publish/dir',
         :target_cpu => 'x86',
       },
+      :openmsx_x86_64 => {
+        :source_dir => File.expand_path("~/Development/openMSX"),
+        :builds_subdir => 'derived/x86_64-darwin-opt-3rd',
+        :report_bcc => [],
+        :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
+        :nice_name => 'openMSX for 64-bit Mac OS X',
+        :publish_location => 'ssh_host:path/to/existing/publish/dir',
+        :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'x86_64',
+      },
       :openmsx_ppc => {
         :source_dir => File.expand_path("~/Development/openMSX"),
-        :builds_subdir => 'derived/ppc-darwin-opt-3rd',
+        :builds_subdir => 'derived/ppc-darwin-ppc-3rd',
         :report_bcc => [],
         :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
-        :nice_name => 'openMSX (ppc)',
+        :nice_name => 'openMSX for PowerPC Mac OS',
         :publish_location => 'ssh_host:path/to/existing/publish/dir',
         :site_path => 'http://your.host.example/publish/dir',
         :target_cpu => 'ppc',
@@ -43,9 +53,30 @@ class OpenmsxBuilder
         :builds_subdir => 'derived',
         :report_bcc => [],
         :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
-        :nice_name => 'openMSX Debugger',
+        :nice_name => 'openMSX Debugger, 32-Bit Mac OS X',
         :publish_location => 'ssh_host:path/to/existing/publish/dir',
         :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'x86',
+      },
+      :openmsx_debugger_x86 => {
+        :source_dir => File.expand_path("~/Development/openmsx-debugger"),
+        :builds_subdir => 'derived',
+        :report_bcc => [],
+        :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
+        :nice_name => 'openMSX Debugger, 32-Bit Mac OS X',
+        :publish_location => 'ssh_host:path/to/existing/publish/dir',
+        :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'x86',
+      },
+      :openmsx_debugger_x86_64 => {
+        :source_dir => File.expand_path("~/Development/openmsx-debugger"),
+        :builds_subdir => 'derived',
+        :report_bcc => [],
+        :report_from => "openMSX auto-builder by FiXato <username@mailhost.example>",
+        :nice_name => 'openMSX Debugger, 64-Bit Mac OS X',
+        :publish_location => 'ssh_host:path/to/existing/publish/dir',
+        :site_path => 'http://your.host.example/publish/dir',
+        :target_cpu => 'x86_64',
       },
     },
     :smtp_settings => {
@@ -60,7 +91,7 @@ class OpenmsxBuilder
   }
 
   attr_accessor :type,:build_outputs
-  def initialize(options,type=:openmsx)
+  def initialize(options,type=:openmsx_univ)
     @options = options
     @type = type
     @log = Logger.new(STDOUT)
@@ -96,9 +127,9 @@ class OpenmsxBuilder
   def publish_all
     @log.info "Publishing all #{@type} builds found"
     if openmsx?
-      regexp = /openmsx-.+-(\d+)-mac-univ-bin.dmg$/
+      regexp = /openmsx-.+-(\d+)-mac-#{setting(:target_cpu)}-bin.dmg$/
     elsif openmsx_debugger?
-      regexp = /openMSX-debugger-(\d+)-mac-x86.tbz$/
+      regexp = /openMSX-debugger-(\d+)-mac-#{setting(:target_cpu)}.tbz$/
     end
     Dir.glob(filemask_for_revision('*')).sort.each do |file|
       publish_revision($1,file) if file =~ regexp
@@ -114,6 +145,10 @@ class OpenmsxBuilder
         archive_name = filemask_for_revision(revision)
         archive(File.join(setting(:source_dir),setting(:builds_subdir),'openMSX_Debugger.app'),File.basename(archive_name))
       end
+      if archive_name.nil?
+        @log.error "No archive could be found for revision #{revision} in '#{File.join(setting(:source_dir),setting(:builds_subdir))}' for target_cpu #{setting(:target_cpu)}"
+        return nil
+      end
     end
 
     destination = File.join(setting(:publish_location),File.basename(archive_name))
@@ -122,7 +157,7 @@ class OpenmsxBuilder
 
     return nil unless @options.include?('--tweet')
     url = File.join(setting(:site_path),File.basename(archive_name))
-    message = "[#{setting(:nice_name)}] Revision #{revision} is now available:\r\n #{url}"
+    message = "[#{setting(:nice_name)}] Revision #{revision} added: \r\n#{url}"
     tweetmsx.update(message)
   rescue TweetMsx::NotConfigured => e
     @log.error e.message
@@ -188,10 +223,13 @@ private
     if openmsx? 
       build_args+=" staticbindist"
       build_args+=" OPENMSX_TARGET_CPU=#{setting(:target_cpu)}" if setting(:target_cpu)
+      build_args+=" CPU_LIST=\"x86 x86_64 ppc\"" if setting(:target_cpu) == 'univ'
     elsif openmsx_debugger?
-      build_args+=" CHANGELOG_REVISION=#{@new_revision}"
+      build_args+=" CHANGELOG_REVISION=#{@new_revision} OPENMSX_TARGET_CPU=#{setting(:target_cpu)} CXX=\"g++ -arch #{setting(:target_cpu) == 'x86' ? 'i386' : setting(:target_cpu)}\""
     end
-    @build_outputs << `cd #{setting(:source_dir)} && make clean && make#{"#{build_args}"} 2>&1`
+    cmd = "cd #{setting(:source_dir)} && make clean && make#{"#{build_args}"} 2>&1"
+    puts cmd
+    @build_outputs << `#{cmd}`
     if $?.success?
       handle_build_success
       return nil
@@ -206,7 +244,7 @@ private
 
   def cleanup_dmg_locks
     @log.info("Checking for existing filelocks on DMGs.")
-    locks = `/usr/sbin/lsof | grep #{@new_revision}-mac-univ-bin.dmg`
+    locks = `/usr/sbin/lsof | grep #{@new_revision}-mac-#{setting(:target_cpu)}-bin.dmg`
     @log.debug locks
     locks.each_line do |lock_line|
       pid = lock_line.split[1].to_i
@@ -218,9 +256,9 @@ private
 
   def filemask_for_revision(revision)
     if openmsx?
-      File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{revision}-mac-univ-bin.dmg")
+      File.join(setting(:source_dir),setting(:builds_subdir),"openmsx-*-#{revision}-mac-#{setting(:target_cpu)}-bin.dmg")
     elsif openmsx_debugger?
-      File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{revision}-mac-x86.tbz")
+      File.join(setting(:source_dir),setting(:builds_subdir),"openMSX-debugger-#{revision}-mac-#{setting(:target_cpu)}.tbz")
     end
   end
 
@@ -240,7 +278,7 @@ private
 
   #Capture the weird random build error that seems to be more OSX related than openMSX related.
   def handle_build_hdiutil_error?
-    return false unless build_output.include?('hdiutil: create failed - error 49168')
+    return false unless build_output.include?('hdiutil: create failed - error 49168') || build_output.include?('hdiutil: create failed - Resource busy')
     @fails += 1
     @log.error build_output
     @log.error "Weird bug (attempt #{@fails}/3)"
@@ -261,11 +299,11 @@ private
   end
 
   def openmsx?
-    @type == :openmsx
+    @type == :openmsx || @type == :openmsx_univ || @type == :openmsx_x86 || @type == :openmsx_x86_64 || @type == :openmsx_ppc 
   end
 
   def openmsx_debugger?
-    @type == :openmsx_debugger
+    @type.to_s.include?('openmsx_debugger')
   end
 
   def report_build_failure

data/lib/tweet_msx.rb

@@ -1,16 +1,16 @@
 require 'logger'
 require 'twitter_oauth'
 require 'yaml'
-# Patch for Ruby 1.9.2
-module Net
-  module HTTPHeader
-    alias_method :url_encode_original, :urlencode
-    def urlencode(str)
-      str = str.to_s if str.kind_of?(Symbol)
-      url_encode_original(str)
-    end
-  end
-end
+# # Patch for Ruby 1.9.2
+# module Net
+#   module HTTPHeader
+#     alias_method :url_encode_original, :urlencode
+#     def urlencode(str)
+#       str = str.to_s if str.kind_of?(Symbol)
+#       url_encode_original(str)
+#     end
+#   end
+# end
 class TweetMsx
   class NotConfigured < RuntimeError;end
   CONFIG_FILENAME = File.expand_path('~/.openMSX-builder-TweetMSX.yaml')

data/openMSX-builder.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{openMSX-builder}
-  s.version = "1.6.5"
+  s.version = "1.7.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-04-02}
+  s.date = %q{2012-06-13}
   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.}
@@ -17,37 +17,30 @@ Gem::Specification.new do |s|
   s.executables = ["build_openmsx"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bin/build_openmsx",
-     "lib/openmsx_builder.rb",
-     "lib/tweet_msx.rb",
-     "openMSX-builder.gemspec",
-     "spec/openMSX-builder_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "bin/build_openmsx",
+    "lib/openmsx_builder.rb",
+    "lib/tweet_msx.rb",
+    "openMSX-builder.gemspec",
+    "spec/openMSX-builder_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/FiXato/openMSX-builder}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Builds the latest openMSX and openMSX-Debugger for Mac OSX from SVN and publishes it via scp while tweeting about the new release.}
-  s.test_files = [
-    "spec/openMSX-builder_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<twitter_oauth>, [">= 0.3.3"])
       s.add_runtime_dependency(%q<mail>, [">= 2.1.3"])

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: openMSX-builder
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 5
-  version: 1.6.5
+  prerelease: 
+  version: 1.7.0
 platform: ruby
 authors: 
 - Filip H.F. "FiXato" Slagter
@@ -14,20 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +02:00
+date: 2012-06-13 00:00:00 +02:00
 default_executable: build_openmsx
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id001
@@ -35,13 +28,10 @@ dependencies:
   name: twitter_oauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 3
         version: 0.3.3
   type: :runtime
   version_requirements: *id002
@@ -49,13 +39,10 @@ dependencies:
   name: mail
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 3
         version: 2.1.3
   type: :runtime
   version_requirements: *id003
@@ -71,7 +58,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
@@ -88,31 +74,28 @@ homepage: http://github.com/FiXato/openMSX-builder
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Builds the latest openMSX and openMSX-Debugger for Mac OSX from SVN and publishes it via scp while tweeting about the new release.
-test_files: 
-- spec/openMSX-builder_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1 +0,0 @@
-pkg/