@@ -1,5 +1,16 @@ module Silverline::Essential - # Nothing on purpose =) + + # What should generate the Xap? + # + # Uses rubyzip to generate the XAP. This is the default behavior, so + # setting nothing is the same. + # Note: you can install rubyzip with "gem install rubyzip" + # Xap = :rubyzip + # + # Uses Chiron.exe to generate the XAP + # Note: This requires mono installed on Linux/Mac + Xap = :chiron + end require 'silverline/essential/generator' vendor/plugins/silverline/lib/silverline/essential.rb @@ -1,6 +1,7 @@ # NOTE: requires filesystemwatcher to be installed # http://www.jhorman.org/FileSystemWatcher/index.html require "filesystemwatcher" + require 'silverline/essential/xap' def logger @@ -10,8 +11,7 @@ end # Generates the XAP on modification of watched files module Silverline::Essential::Generator include Silverline - Xap = Silverline::Essential::XAPChiron - + # List of files/directories to watch for modification. # Triggers generation of the Silverlight package (XAP) def self.register @@ -49,7 +49,7 @@ module Silverline::Essential::Generator # Lastly, client root wins FileUtils.cp_r "#{CLIENT_ROOT}/.", TMP_CLIENT - Xap.new(XAP_FILE, TMP_CLIENT).generate + Silverline::Essential::XAP.new(XAP_FILE, TMP_CLIENT).generate FileUtils.rm_r TMP_CLIENT end vendor/plugins/silverline/lib/silverline/essential/generator.rb @@ -1,46 +1,65 @@ module Silverline::Essential # Handles packaging the Silverlight application. - class XAP - - # require rubyzip (gem install rubyzip | http://rubyzip.sourceforge.net/) - require 'zip/zipfilesystem' - require 'erb' - + class XAPBase def initialize(file, directory) @file = file @directory = directory @files = [] end + end - def generate - Zip::ZipFile.open @file, Zip::ZipFile::CREATE do |zip| - xap zip, @directory - zip.file.open "AppManifest.xaml", 'w' do |m| - m.puts manifest - @files << "AppManifest.xaml" - end + if Xap == :chiron + + # Handles packaging the Silverlight application with Chiron, a .NET console + # application written in C#. It handles generation of the AppManifest.xaml, as + # well as packaging the app and including language assemblies if needed. + # Note: because Chiron is a .NET application, it requires mono to run on + # Mac/Linux. If you don't want to install mono, use the pure-ruby XAP module. + class XAP < XAPBase + def generate + cmd = "public/ironruby/Chiron.exe /s /d:#{@directory} /z:#{@file}" + # TODO: Should I do some platform detection rather than trial&error? + system "#{cmd}" unless system "mono #{cmd}" end - # Remove temp files left behind by rubyzip - # Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1702240&group_id=43107&atid=435170 - @files.each do |file| - file = file.split("/").last - Dir["public/#{file}.*"].each do |f| - File.delete f + end + + else + + # require rubyzip (gem install rubyzip | http://rubyzip.sourceforge.net/) + require 'zip/zipfilesystem' + require 'erb' + + class XAP < XAPBase + + def generate + Zip::ZipFile.open @file, Zip::ZipFile::CREATE do |zip| + xap zip, @directory + zip.file.open "AppManifest.xaml", 'w' do |m| + m.puts manifest + @files << "AppManifest.xaml" + end + end + # Remove temp files left behind by rubyzip + # Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1702240&group_id=43107&atid=435170 + @files.each do |file| + file = file.split("/").last + Dir["public/#{file}.*"].each do |f| + File.delete f + end end + @files = [] end - @files = [] - end private - + def manifest @assembly_path = "/public/ironruby" # Note: Silverlight entry-point assembly must be the first in this list # (Microsoft.Scripting.Silverlight in this case) @assemblies = %w(Microsoft.Scripting.Silverlight Microsoft.Scripting.Core Microsoft.Scripting IronRuby IronRuby.Libraries) @entry_point_type = "Microsoft.Scripting.Silverlight.DynamicSilverlight" - file = File.open("#{PLUGIN_ROOT}/templates/AppManifest.xaml.erb", 'r'){|f| f.read } + file = File.open("#{Silverline::PLUGIN_ROOT}/templates/AppManifest.xaml.erb", 'r'){|f| f.read } xaml = ERB.new(file) xaml.run(binding) end @@ -48,7 +67,7 @@ module Silverline::Essential def xap(zip, dir) xap_helper(zip, dir) end - + def xap_helper(zip, dir, root = dir) Dir["#{dir}/*"].each do |client| short_client = client.split(root).last @@ -65,22 +84,9 @@ module Silverline::Essential @files << short_client end end - - end - - # Handles packaging the Silverlight application with Chiron, a .NET console - # application written in C#. It handles generation of the AppManifest.xaml, as - # well as packaging the app and including language assemblies if needed. - # Note: because Chiron is a .NET application, it requires mono to run on - # Mac/Linux. If you don't want to install mono, use the pure-ruby XAP module. - class XAPChiron < XAP - def generate - cmd = "public/ironruby/Chiron.exe /s /d:#{@directory} /z:#{@file}" - # TODO: Should I do some platform detection rather than trial&error? - system "#{cmd}" unless system "mono #{cmd}" end end - + end \ No newline at end of file vendor/plugins/silverline/lib/silverline/essential/xap.rb @@ -4,7 +4,7 @@ EntryPointAssembly="<%= @assemblies.first %>" EntryPointType="<%= @entry_point_type %>"> <Deployment.Parts> - <%= for assembly in @assemblies %> + <% for assembly in @assemblies %> <AssemblyPart source="<%= @assembly_path %>/<%= assembly %>.dll" <% if assembly == @assemblies.first %> name="<%= assembly %>" /> vendor/plugins/silverline/templates/AppManifest.xaml.erb db/schema.rb log/production.log log/server.log log/test.log spec/controllers/test_rspec_controller_spec.rb spec/helpers/test_rspec_helper_spec.rb 7462d5d8d4be7e872ee82e79931d9c3526338a32 Jimmy Schementi jschementi@gmail.com http://github.com/jschementi/silverline-demos/commit/b2b1bd52708622ef5d7275c01e8f966b88414d16 b2b1bd52708622ef5d7275c01e8f966b88414d16 2008-06-21T14:51:56-07:00 2008-06-21T14:51:56-07:00 Added Silverline::Essential::Xap to switch between :chiron and :rubyzip Fixed AppManifest.xaml.erb 819236180c88a0b235c5912f8f8c91fcbb8423e2 Jimmy Schementi jschementi@gmail.com