ocra 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d39cc2c2502c3c19310430c5968e6ec68ce38d3
-  data.tar.gz: 4996817cb2821e188abc48f0b87ee830e0ce6280
+  metadata.gz: 7aea8c543e947bab9fd80bdd43d5d0b9c6d4b3f2
+  data.tar.gz: a5934881e20aef9ada0e3c207f8289f32cb216fb
 SHA512:
-  metadata.gz: 3ceb5d5590f5961e46d078ff469f8ba9b079dd338c541c8d295da336162963e321dd8ca5cea52d4d321eef3b5ba4d31767dc1cd6fc364df2ecd94af06b7c3e0a
-  data.tar.gz: b68476c168a28e19966796002498267f2f53ceb750cb78b2e854d6680b874d4a5c4a96942964e5dfbb0b93fdde73cc75f67e5cfee9f875ffa2b27e8569a64ba6
+  metadata.gz: c49768dc85800112527d7ad489a41d40c1bd271c35b75448a722d3b1d75b70dd86c1ec9ef0552d4b7d5558e86c27c3cd005db54d906f57211f00b7e7193aa621
+  data.tar.gz: 2cab95aaa7178760fd337044c1190f091e09a31beb44d8670543e5c9f515db89f6a92c7d1da793113554f847d453e77211e2e011d8c3deeb3aece42c396aa19e

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.3.10
+
+* Reduce memory usage while building & compressing (avoids out of
+  memory issue on really big programs).
+
+* Compile stub.exe with 32-bit compiler again
+
 === 1.3.9
 
 * Support Ruby 2.4.1p111 (include manifest)

data/bin/ocra

@@ -179,7 +179,7 @@ module Ocra
     a.sort.inject([]) { |r, e| r.last == e ? r : r << e }
   end
 
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 
   IGNORE_MODULES = /\/(enumerator.so|rational.so|complex.so|thread.rb)$/
 
@@ -1039,8 +1039,10 @@ EOF
       opcode_offset = File.size(path)
 
       File.open(path, "ab") do |ocrafile|
+        tmpinpath = 'tmpin'
+
         if Ocra.lzma_mode
-          @of = ""
+          @of = File.open(tmpinpath, 'wb')
         else
           @of = ocrafile
         end
@@ -1054,16 +1056,20 @@ EOF
 
         yield(self)
 
+        @of.close if Ocra.lzma_mode
+
         if Ocra.lzma_mode and not Ocra.inno_script
+          tmpoutpath = 'tmpout'
           begin
-            File.open("tmpin", "wb") { |tmp| tmp.write(@of) }
-            Ocra.msg "Compressing #{@of.size} bytes"
-            system("\"#{Ocra.lzmapath}\" e tmpin tmpout 2>NUL") or fail
-            compressed_data = File.open("tmpout", "rb") { |tmp| tmp.read }
-            ocrafile.write([OP_DECOMPRESS_LZMA, compressed_data.size, compressed_data].pack("VVA*"))
+            data_size = File.size(tmpinpath)
+            Ocra.msg "Compressing #{data_size} bytes"
+            system(Ocra.lzmapath, 'e', tmpinpath, tmpoutpath) or fail
+            compressed_data_size = File.size?(tmpoutpath)
+            ocrafile.write([OP_DECOMPRESS_LZMA, compressed_data_size].pack("VV"))
+            IO.copy_stream(tmpoutpath, ocrafile)
           ensure
-            File.unlink("tmpin") if File.exist?("tmpin")
-            File.unlink("tmpout") if File.exist?("tmpout")
+            File.unlink(@of.path) if File.exist?(@of.path)
+            File.unlink(tmpoutpath) if File.exist?(tmpoutpath)
           end
         end
 
@@ -1152,7 +1158,8 @@ EOF
       str = File.open(src, "rb") { |file| file.read }
       Ocra.verbose_msg "a #{showtempdir tgt}"
       unless Ocra.inno_script # InnoSetup will install the file with a [Files] statement
-        @of << [OP_CREATE_FILE, tgt.to_native, str.size, str].pack("VZ*VA*")
+        @of << [OP_CREATE_FILE, tgt.to_native, str.size].pack("VZ*V")
+        @of << str
       end
     end
 

data/lib/ocra.rb

@@ -1,3 +1,3 @@
 class Ocra
-  VERSION = '1.3.9'
+  VERSION = '1.3.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocra
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Lars Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: OCRA (One-Click Ruby Application) builds Windows executables from Ruby source