Merge branch 'feature/ivette/icon' into 'master'

[ivette] The icon now works on Linux

See merge request frama-c/frama-c!3983

ivette/.gitignore

@@ -16,6 +16,6 @@ yarn-error.log
 /src/renderer/sandbox.ts
 /src/dome/doc/guides/icons.md
 /Makefile.plugins
-/ivette.icns
+/icon.icns
 
 # --------------------------------------------------------------------------

ivette/Makefile

@@ -184,21 +184,21 @@ UNAME=$(shell uname)
 
 ifeq ($(UNAME),Darwin)
 
-dome-dist: ivette.icns
-ivette.icns: frama-c-icon.png
-	rm -fr ivette.iconset
-	mkdir ivette.iconset
-	sips -z 16 16     frama-c-icon.png --out "ivette.iconset/icon_16x16.png"
-	sips -z 32 32     frama-c-icon.png --out "ivette.iconset/icon_16x16@2x.png"
-	sips -z 32 32     frama-c-icon.png --out "ivette.iconset/icon_32x32.png"
-	sips -z 64 64     frama-c-icon.png --out "ivette.iconset/icon_32x32@2x.png"
-	sips -z 128 128   frama-c-icon.png --out "ivette.iconset/icon_128x128.png"
-	sips -z 256 256   frama-c-icon.png --out "ivette.iconset/icon_128x128@2x.png"
-	sips -z 256 256   frama-c-icon.png --out "ivette.iconset/icon_256x256.png"
-	sips -z 512 512   frama-c-icon.png --out "ivette.iconset/icon_256x256@2x.png"
-	sips -z 512 512   frama-c-icon.png --out "ivette.iconset/icon_512x512.png"
-	iconutil -c icns ivette.iconset
-	rm -fr ivette.iconset
+dome-dist: icon.icns
+icon.icns: static/icon.png
+	rm -fr icon.iconset
+	mkdir icon.iconset
+	sips -z 16 16    static/icon.png --out "icon.iconset/icon_16x16.png"
+	sips -z 32 32    static/icon.png --out "icon.iconset/icon_16x16@2x.png"
+	sips -z 32 32    static/icon.png --out "icon.iconset/icon_32x32.png"
+	sips -z 64 64    static/icon.png --out "icon.iconset/icon_32x32@2x.png"
+	sips -z 128 128  static/icon.png --out "icon.iconset/icon_128x128.png"
+	sips -z 256 256  static/icon.png --out "icon.iconset/icon_128x128@2x.png"
+	sips -z 256 256  static/icon.png --out "icon.iconset/icon_256x256.png"
+	sips -z 512 512  static/icon.png --out "icon.iconset/icon_256x256@2x.png"
+	sips -z 512 512  static/icon.png --out "icon.iconset/icon_512x512.png"
+	iconutil -c icns icon.iconset
+	rm -fr icon.iconset
 
 endif
 

ivette/electron-builder.json

 {
-  productName: "Ivette",
-  mac: { icon: "ivette.icns" },
-  linux: { icon: "frama-c-icon.png" }
+  "productName": "Ivette",
+  "mac": { "icon": "icon.icns" },
+  "linux": { "icon": "icon.png" }
 }

ivette/src/dome/main/dome.ts

@@ -61,6 +61,11 @@ import SYS, * as System from 'dome/system';
 import { URL } from 'url';
 import * as Menubar from './menubar';
 
+// The __static path is provided by webpack at execution time, but the static
+// type system is not aware of that for now. This is a workaround to avoid
+// an error during compilation.
+declare const __static: string;
+
 // --------------------------------------------------------------------------
 // --- System Helpers
 // --------------------------------------------------------------------------
@@ -388,6 +393,7 @@ function createBrowserWindow(
   const options: BrowserWindowConstructorOptions = {
     show: false,
     backgroundColor: '#f0f0f0',
+    icon: path.join(__static, 'icon.png'),
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false,

ivette/src/dome/renderer/dome.tsx

@@ -119,6 +119,16 @@ export function getWorkingDir(): string { return System.getWorkingDir(); }
 /** Current process ID.. */
 export function getPID(): number { return System.getPID(); }
 
+// The __static path is provided by webpack at execution time, but the static
+// type system is not aware of that for now. This is a workaround to avoid
+// an error during compilation.
+declare const __static: string;
+
+/** Path to application static resources. */
+export function getStatic(file?: string): string {
+  return file ? System.join(__static, file) : __static;
+}
+
 // --------------------------------------------------------------------------
 // --- Application Emitter
 // --------------------------------------------------------------------------