ocra 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.1 / 2009-05-05
+
+* Added stub with windows runtime for windowed applications
+  (e.g. wxRuby) and fixed issue where OCRA would use ruby.exe instead
+  of rubyw.exe for such programs. [#25774]
+
 === 1.0.0 / 2009-04-05
 
 * 1 major enhancement

data/README.txt

@@ -1,5 +1,6 @@
 = ocra
 
+* http://rubyforge.org/projects/ocra/
 * http://github.com/larsch/ocra/
 
 == DESCRIPTION:
@@ -50,7 +51,16 @@ ocra.rb [option] your/script.rb
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+=== Gem
+
+* gem install ocra
+
+Can also be downloaded from http://rubyforge.org/frs/?group_id=8185
+
+== Stand-alone
+
+Get ocrasa.rb from http://rubyforge.org/frs/?group_id=8185. Requires
+nothing but a working Ruby installation on Windows.
 
 == TECHNICAL DETAILS
 

data/Rakefile

@@ -4,13 +4,9 @@ require 'rubygems'
 require 'hoe'
 require './lib/ocra.rb'
 
-r = Hoe.new('ocra', Ocra::VERSION) do |p|
-  # p.rubyforge_name = 'ocrax' # if different than lowercase project name
-  p.rubyforge_name = 'ocra'
+Hoe.new('ocra', Ocra::VERSION) do |p|
   p.developer('Lars Christensen', 'larsch@belunktum.dk')
 end
-require 'pp'
-pp r
 
 task :stub do
   sh "mingw32-make -C src"
@@ -19,17 +15,27 @@ end
 
 task :test => :stub
 
-task :standalone => [ 'bin/ocrasa.rb', 'bin/ocrasa.exe' ]
+task :standalone => [ 'bin/ocrasa.rb' ]
 
+task :release_standalone => :standalone do
+  sh "rubyforge add_release ocra ocra-standalone #{Ocra::VERSION} bin/ocrasa.rb"
+end
 
-file 'bin/ocrasa.rb' => [ 'bin/ocra.rb', 'share/ocra/stub.exe', 'share/ocra/lzma.exe' ] do
+file 'bin/ocrasa.rb' => [ 'bin/ocra.rb', 'share/ocra/stub.exe', 'share/ocra/stubw.exe', 'share/ocra/lzma.exe' ] do
   cp 'bin/ocra.rb', 'bin/ocrasa.rb'
   File.open("bin/ocrasa.rb", "a") do |f|
     f.puts "__END__"
+    
     stub = File.open("share/ocra/stub.exe", "rb") {|g| g.read}
     stub64 = [stub].pack("m")
     f.puts stub64.size
     f.puts stub64
+
+    stub = File.open("share/ocra/stubw.exe", "rb") {|g| g.read}
+    stub64 = [stub].pack("m")
+    f.puts stub64.size
+    f.puts stub64
+    
     lzma = File.open("share/ocra/lzma.exe", "rb") {|g| g.read}
     lzma64 = [lzma].pack("m")
     f.puts lzma64.size
@@ -37,10 +43,6 @@ file 'bin/ocrasa.rb' => [ 'bin/ocra.rb', 'share/ocra/stub.exe', 'share/ocra/lzma
   end
 end
 
-file 'bin/ocrasa.exe' => [ 'bin/ocra.rb', 'bin/ocrasa.rb' ] do
-  sh "ruby bin/ocra.rb bin/ocrasa.rb"
-end
-
 task :clean do
   rm_rf Dir.glob("bin/*.exe")
   sh "mingw32-make -C src clean"

data/bin/ocra.rb

@@ -20,6 +20,7 @@ module Ocra
     attr_accessor :quiet
     attr_reader :lzmapath
     attr_reader :stubimage
+    attr_reader :stubwimage
     
     def get_next_embedded_image
       DATA.read(DATA.readline.to_i).unpack("m")[0]
@@ -29,12 +30,14 @@ module Ocra
   def Ocra.initialize_ocra
     if defined?(DATA)
       @stubimage = get_next_embedded_image
+      @stubwimage = get_next_embedded_image
       lzmaimage = get_next_embedded_image
       @lzmapath = File.join(ENV['TEMP'], 'lzma.exe').tr('/','\\')
       File.open(@lzmapath, "wb") { |file| file << lzmaimage }
     else
       ocrapath = File.dirname(__FILE__)
       @stubimage = File.open(File.join(ocrapath, '../share/ocra/stub.exe'), "rb") { |file| file.read }
+      @stubwimage = File.open(File.join(ocrapath, '../share/ocra/stubw.exe'), "rb") { |file| file.read }
       @lzmapath = File.expand_path('../share/ocra/lzma.exe', ocrapath).tr('/','\\')
       raise "lzma.exe not found" unless File.exist?(@lzmapath)
     end
@@ -172,8 +175,10 @@ EOF
 
     executable = Ocra.files[0].sub(/(\.rbw?)?$/, '.exe')
 
+    windowed = (Ocra.files[0] =~ /\.rbw$/ && !Ocra.force_windows) || Ocra.force_console
+
     puts "=== Building #{executable}" unless Ocra.quiet
-    OcraBuilder.new(executable) do |sb|
+    OcraBuilder.new(executable, windowed) do |sb|
       # Add explicitly mentioned files
       Ocra.files.each do |file|
         path = File.join('src', file).tr('/','\\')
@@ -181,8 +186,8 @@ EOF
       end
 
       # Add the ruby executable and DLL
-      if (Ocra.files[0] =~ /\.rbw$/ && !Ocra.force_windows) || Ocra.force_console
-        rubyexe = "ruby.exe"
+      if windowed
+        rubyexe = "rubyw.exe"
       else
         rubyexe = "ruby.exe"
       end
@@ -224,15 +229,22 @@ EOF
   end
   
   class OcraBuilder
-    def initialize(path)
+    def initialize(path, windowed)
       @paths = {}
       File.open(path, "wb") do |ocrafile|
-        ocrafile.write(Ocra.stubimage)
+
+        if windowed
+          ocrafile.write(Ocra.stubwimage)
+        else
+          ocrafile.write(Ocra.stubimage)
+        end
+          
         if Ocra.lzma_mode
           @of = ""
         else
           @of = ocrafile
         end
+
         yield(self)
 
         if Ocra.lzma_mode

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ocra
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Lars Christensen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 22:00:00 Z
+date: 2009-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - share/ocra/stub.exe
 - test/test_ocra.rb
 has_rdoc: true
-homepage: http://github.com/larsch/ocra/
+homepage: http://rubyforge.org/projects/ocra/
 licenses: []
 
 post_install_message: