Mercurial > mxe-octave

changeset 5959:bf9be5e7ab00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave-launch: Add icons and version info. * installer-files/octave-launch.rc: Add file with resource definition for octave-launch binaries. * binary-dist-rules.mk (installer-files/octave-launch.res): Add build rules for ressource file. * dist-files.mk: Add new files to tarball.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 21 Nov 2021 11:55:46 +0100
parents ea224bb389e3
children 49b3f6c6d255
files binary-dist-rules.mk dist-files.mk installer-files/octave-launch.rc
diffstat 3 files changed, 36 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/binary-dist-rules.mk	Sat Nov 20 16:44:42 2021 +0100
+++ b/binary-dist-rules.mk	Sun Nov 21 11:55:46 2021 +0100
@@ -98,15 +98,18 @@
 octave-launch: installer-files/octave-launch.exe
 
 ## FIXME: We aren't using VPATH?
-installer-files/octave-launch.exe: $(TOP_DIR)/installer-files/octave-launch.c | installer-files/.dirstamp
-	$(MXE_CC) $< -o $@ -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE
+installer-files/octave-launch.exe: $(TOP_DIR)/installer-files/octave-launch.c installer-files/octave-launch.res | installer-files/.dirstamp
+	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE
 
 .PHONY: octave-launch-firsttime
 octave-launch-firsttime: installer-files/octave-launch-firsttime.exe
 
 ## FIXME: We aren't using VPATH?
-installer-files/octave-launch-firsttime.exe: $(TOP_DIR)/installer-files/octave-launch.c | installer-files/.dirstamp
-	$(MXE_CC) $< -o $@ -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME
+installer-files/octave-launch-firsttime.exe: $(TOP_DIR)/installer-files/octave-launch.c installer-files/octave-launch.res | installer-files/.dirstamp
+	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME
+
+installer-files/octave-launch.res: $(TOP_DIR)/installer-files/octave-launch.rc | installer-files/.dirstamp
+	$(MXE_WINDRES) $< -o $@ -O coff
 endif
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
--- a/dist-files.mk	Sat Nov 20 16:44:42 2021 +0100
+++ b/dist-files.mk	Sun Nov 21 11:55:46 2021 +0100
@@ -1108,6 +1108,8 @@
   octave-bat-no-short-path.patch \
   octave-firsttime.vbs \
   octave-hdr.bmp \
+  octave-launch.c \
+  octave-launch.rc \
   octave-logo.ico \
   octave-no-short-path.patch \
   post-install.bat \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/installer-files/octave-launch.rc	Sun Nov 21 11:55:46 2021 +0100
@@ -0,0 +1,27 @@
+#include "winver.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904B0"  // US-English, Unicode
+    BEGIN
+      VALUE "CompanyName", "GNU Octave"
+      VALUE "FileDescription", "GNU Octave Launcher"
+      VALUE "FileVersion", "1.0"
+      VALUE "InternalName", "octave-launcher.exe"
+      VALUE "LegalCopyright", " Copyright (C) 2021 The Octave Project Developers"
+      VALUE "OriginalFilename", "octave-launcher.exe"
+      VALUE "ProductName", "GNU Octave Launcher"
+      VALUE "ProductVersion", "1.0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 0x04B0  // US-English, Unicode
+  END
+END
+
+11 ICON "octave-logo.ico"