ocran 1.4.2 → 1.4.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocran
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Andi Idogawa
@@ -25,27 +25,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: |
-  OCRAN (One-Click Ruby Application Next) packages Ruby applications for
-  distribution. It bundles your script, the Ruby interpreter, gems, and native
-  libraries into a self-contained artifact that runs without requiring Ruby to
-  be installed on the target machine.
-
-  Three output formats are supported on all platforms:
-  - Self-extracting executable (.exe on Windows, native binary on Linux/macOS)
-  - Directory with a launch script (--output-dir)
-  - Zip archive with a launch script (--output-zip)
-
-  This is a fork of OCRA maintained for Ruby 3.2+ compatibility.
-  Migration guide: replace OCRA_EXECUTABLE with OCRAN_EXECUTABLE in your code.
-
-  Usage:
-    ocran helloworld.rb          # builds helloworld.exe / helloworld
-    ocran --output-dir out/ app.rb
-    ocran --output-zip app.zip app.rb
-
-  See readme at https://github.com/largo/ocran
-  Report problems at https://github.com/largo/ocran/issues
+description: 'OCRAN (One-Click Ruby Application Next) packages Ruby applications for
+  distribution on Windows, Linux, and macOS. It bundles your script, the Ruby interpreter,
+  gems, and native libraries into a self-contained artifact that runs without Ruby
+  installed on the target machine: a self-extracting executable (default), a directory
+  (--output-dir), a zip archive (--output-zip), or a macOS .app bundle (--macosx-bundle).
+  Fork of OCRA maintained for Ruby 3.2+; migrating code should replace OCRA_EXECUTABLE
+  with OCRAN_EXECUTABLE.'
 email:
 - andi@idogawa.com
 executables:
@@ -66,12 +52,14 @@ files:
 - lib/ocran/command_output.rb
 - lib/ocran/dir_builder.rb
 - lib/ocran/direction.rb
+- lib/ocran/ed_icon.rb
 - lib/ocran/empty_source
 - lib/ocran/file_path_set.rb
 - lib/ocran/gem_spec_queryable.rb
 - lib/ocran/host_config_helper.rb
 - lib/ocran/inno_setup_script_builder.rb
 - lib/ocran/launcher_batch_builder.rb
+- lib/ocran/launcher_event_recorder.rb
 - lib/ocran/library_detector.rb
 - lib/ocran/library_detector_posix.rb
 - lib/ocran/option.rb
@@ -83,7 +71,6 @@ files:
 - lib/ocran/windows_command_escaping.rb
 - share/ocran/lzma.exe
 - src/Makefile
-- src/edicon.c
 - src/error.c
 - src/error.h
 - src/inst_dir.c
@@ -110,7 +97,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/largo/ocran
   source_code_uri: https://github.com/largo/ocran
-  changelog_uri: https://github.com/largo/ocran/CHANGELOG.txt
+  changelog_uri: https://github.com/largo/ocran/blob/master/CHANGELOG.txt
 rdoc_options: []
 require_paths:
 - lib
@@ -125,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: OCRAN (One-Click Ruby Application Next) packages Ruby applications for distribution
   on Windows, Linux, and macOS.

data/src/edicon.c

@@ -1,161 +0,0 @@
-/**
-   Changes the Icon in a PE executable.
-*/
-
-#include <windows.h>
-#include <stdio.h>
-
-#pragma pack(push, 2)
-
-/* Icon file header */
-typedef struct
-{
-   WORD Reserved;
-   WORD ResourceType;
-   WORD ImageCount;
-} IconFileHeader;
-
-/* Icon File directory entry structure */
-typedef struct
-{
-   BYTE Width;
-   BYTE Height;
-   BYTE Colors;
-   BYTE Reserved;
-   WORD Planes;
-   WORD BitsPerPixel;
-   DWORD ImageSize;
-   DWORD ImageOffset;
-} IconDirectoryEntry;
-
-/* Group Icon Resource directory entry structure */
-typedef struct
-{
-   BYTE Width;
-   BYTE Height;
-   BYTE Colors;
-   BYTE Reserved;
-   WORD Planes;
-   WORD BitsPerPixel;
-   DWORD ImageSize;
-   WORD ResourceID;
-} IconDirResEntry, *PIconDirResEntry;
-
-/* Group Icon Structore (RT_GROUP_ICON) */
-typedef struct
-{
-   WORD Reserved;
-   WORD ResourceType;
-   WORD ImageCount;
-   IconDirResEntry Enries[0]; /* Number of these is in ImageCount */
-} GroupIcon;
-
-#pragma pack(pop)
-
-BOOL UpdateIcon(LPTSTR ExecutableFileName, LPTSTR IconFileName)
-{
-   HANDLE h = BeginUpdateResource(ExecutableFileName, FALSE);
-   if (h == INVALID_HANDLE_VALUE)
-   {
-      printf("Failed to BeginUpdateResource\n");
-      return FALSE;
-   }
-
-   /* Read the Icon file */
-   HANDLE hIconFile = CreateFile(IconFileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
-   if (hIconFile == INVALID_HANDLE_VALUE)
-   {
-      fprintf(stderr, "Failed to open icon file.\n");
-      return FALSE;
-   }
-   DWORD Size = GetFileSize(hIconFile, NULL);
-   BYTE* Data = LocalAlloc(LMEM_FIXED, Size);
-   DWORD BytesRead;
-   if (!ReadFile(hIconFile, Data, Size, &BytesRead, NULL))
-   {
-      fprintf(stderr, "Failed to read icon file.\n");
-      return FALSE;
-   }
-   CloseHandle(hIconFile);
-   
-   IconFileHeader* header = (IconFileHeader*)Data;
-   IconDirectoryEntry* entries = (IconDirectoryEntry*)(header + 1);
-
-   /* Validate that all directory entries fit within the file */
-   DWORD entriesEnd = sizeof(IconFileHeader) + header->ImageCount * sizeof(IconDirectoryEntry);
-   if (entriesEnd > Size)
-   {
-      fprintf(stderr, "Icon file too small for declared ImageCount.\n");
-      LocalFree(Data);
-      return FALSE;
-   }
-
-   /* Create the RT_ICON resources */
-   int i;
-   for (i = 0; i < header->ImageCount; ++i)
-   {
-      if (entries[i].ImageOffset + entries[i].ImageSize > Size)
-      {
-         fprintf(stderr, "Icon entry %d exceeds file bounds.\n", i);
-         LocalFree(Data);
-         return FALSE;
-      }
-      BOOL b = UpdateResource(h, MAKEINTRESOURCE(RT_ICON), MAKEINTRESOURCE(101 + i), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), Data + entries[i].ImageOffset, entries[i].ImageSize);
-      if (!b)
-      {
-         fprintf(stderr, "failed to UpdateResource %lu\n", GetLastError());
-         return FALSE;
-      }
-   }
-
-   /* Create the RT_GROUP_ICON structure */
-   DWORD GroupIconSize = sizeof(GroupIcon) + header->ImageCount * sizeof(IconDirectoryEntry);
-   GroupIcon* gi = (GroupIcon*)LocalAlloc(LMEM_FIXED, GroupIconSize);
-   gi->Reserved = 0;
-   gi->ResourceType = header->ResourceType;
-   gi->ImageCount = header->ImageCount;
-   for (i = 0; i < header->ImageCount; ++i)
-   {
-      IconDirResEntry* e = &gi->Enries[i];
-      e->Width = entries[i].Width;
-      e->Height = entries[i].Height;
-      e->Colors = entries[i].Colors;
-      e->Reserved = entries[i].Reserved;
-      e->Planes = entries[i].Planes;
-      e->BitsPerPixel = entries[i].BitsPerPixel;
-      e->ImageSize = entries[i].ImageSize;
-      e->ResourceID = 101 + i;
-   }
-
-   /* Save the RT_GROUP_ICON resource */
-   BOOL b = UpdateResource(h, MAKEINTRESOURCE(RT_GROUP_ICON), MAKEINTRESOURCE(100), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), gi, GroupIconSize);
-   if (!b)
-   {
-      fprintf(stderr, "Failed to create group icon.\n");
-      return FALSE;
-   }
-
-   if (!EndUpdateResource(h, FALSE))
-   {
-      fprintf(stderr, "Failed to EndUpdateResource.\n");
-      return FALSE;
-   }
-   
-   return TRUE;
-}
-
-int main(int argc, char* argv[])
-{
-   if (argc == 3)
-   {
-      if (UpdateIcon(argv[1], argv[2]))
-         return 0;
-      else
-         return -1;
-   }
-   else
-   {
-      fprintf(stderr, "Usage: edicon.exe <exefile> <icofile>\n");
-      return -1;
-   }
-}