v2.0.0-alpha.62

v2/cmd/wails/internal/commands/build/build.go

@@ -39,6 +39,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
+	compress := false
+	command.BoolFlag("compress", "Compress final binary", &compress)
+
 	// Setup Platform flag
 	platform := runtime.GOOS
 	command.StringFlag("platform", "Platform to target", &platform)
@@ -63,6 +66,10 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	outputFilename := ""
 	command.StringFlag("o", "Output filename", &outputFilename)
 
+	// Clean build directory
+	cleanBuildDirectory := false
+	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
+
 	appleIdentity := ""
 	if runtime.GOOS == "darwin" {
 		command.StringFlag("sign", "Signs your app with the given identity.", &appleIdentity)
@@ -110,18 +117,24 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			return fmt.Errorf("platform %s is not supported", platform)
 		}
 
+		if compress && platform == "darwin/universal" {
+			println("Warning: compress flag unsupported for universal binaries. Ignoring.")
+			compress = false
+		}
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:        logger,
-			OutputType:    outputType,
-			OutputFile:    outputFilename,
-			Mode:          mode,
-			Pack:          pack,
-			LDFlags:       ldflags,
-			Compiler:      compilerCommand,
-			KeepAssets:    keepAssets,
-			AppleIdentity: appleIdentity,
-			Verbosity:     verbosity,
+			Logger:              logger,
+			OutputType:          outputType,
+			OutputFile:          outputFilename,
+			CleanBuildDirectory: cleanBuildDirectory,
+			Mode:                mode,
+			Pack:                pack,
+			LDFlags:             ldflags,
+			Compiler:            compilerCommand,
+			KeepAssets:          keepAssets,
+			AppleIdentity:       appleIdentity,
+			Verbosity:           verbosity,
+			Compress:            compress,
 		}
 
 		// Calculate platform and arch
@@ -142,12 +155,15 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 		}
 
 		// Write out the system information
+		fmt.Fprintf(w, "\n")
 		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
 		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
 		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
 		fmt.Fprintf(w, "Compiler: \t%s\n", buildOptions.Compiler)
+		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
 		fmt.Fprintf(w, "Build Mode: \t%s\n", buildModeText)
 		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
+		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
 		fmt.Fprintf(w, "KeepAssets: \t%t\n", buildOptions.KeepAssets)
 		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
 		if len(buildOptions.OutputFile) > 0 {

v2/cmd/wails/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v2.0.0-alpha.55"
+var version = "v2.0.0-alpha.62"

v2/internal/ffenestri/ffenestri_darwin.c

@@ -1049,22 +1049,26 @@ void SetDebug(void *applicationPointer, int flag) {
 void AddContextMenu(struct Application *app, const char *contextMenuJSON) {
     // Guard against calling during shutdown
     if( app->shuttingDown ) return;
-
-    AddContextMenuToStore(app->contextMenuStore, contextMenuJSON);
+    ON_MAIN_THREAD (
+        AddContextMenuToStore(app->contextMenuStore, contextMenuJSON);
+    );
 }
 
 void UpdateContextMenu(struct Application *app, const char* contextMenuJSON) {
     // Guard against calling during shutdown
     if( app->shuttingDown ) return;
-
-    UpdateContextMenuInStore(app->contextMenuStore, contextMenuJSON);
+    ON_MAIN_THREAD(
+        UpdateContextMenuInStore(app->contextMenuStore, contextMenuJSON);
+    );
 }
 
 void AddTrayMenu(struct Application *app, const char *trayMenuJSON) {
     // Guard against calling during shutdown
     if( app->shuttingDown ) return;
 
-	AddTrayMenuToStore(TrayMenuStoreSingleton, trayMenuJSON);
+    ON_MAIN_THREAD(
+        AddTrayMenuToStore(TrayMenuStoreSingleton, trayMenuJSON);
+    );
 }
 
 void SetTrayMenu(struct Application *app, const char* trayMenuJSON) {
@@ -1372,211 +1376,6 @@ void parseMenuRole(struct Application *app, id parentMenu, JsonNode *item) {
 
 }
 
-id parseTextMenuItem(struct Application *app, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char *menuCallback) {
-	id item = ALLOC("NSMenuItem");
-	id wrappedId = ((id(*)(id, SEL, const char*))objc_msgSend)(c("NSValue"), s("valueWithPointer:"), menuid);
-	msg_id(item, s("setRepresentedObject:"), wrappedId);
-
-	id key = processAcceleratorKey(acceleratorkey);
-	((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title),
-			  s(menuCallback), key);
-
-	msg_bool(item, s("setEnabled:"), !disabled);
-	msg_reg(item, s("autorelease"));
-
-	// Process modifiers
-	if( modifiers != NULL ) {
-		unsigned long modifierFlags = parseModifiers(modifiers);
-		msg_int(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
-	}
-	msg_id(parentMenu, s("addItem:"), item);
-
-	return item;
-}
-
-id parseCheckboxMenuItem(struct Application *app, id parentmenu, const char
-*title, const char *menuid, bool disabled, bool checked, const char *key,
-struct hashmap_s *menuItemMap, const char *checkboxCallbackFunction) {
-	id item = ALLOC("NSMenuItem");
-
-	// Store the item in the menu item map
-	hashmap_put(menuItemMap, (char*)menuid, strlen(menuid), item);
-
-	id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)menuid);
-	msg_id(item, s("setRepresentedObject:"), wrappedId);
-	((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s(checkboxCallbackFunction), str(key));
-	msg_bool(item, s("setEnabled:"), !disabled);
-	msg_reg(item, s("autorelease"));
-	msg_int(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
-	msg_id(parentmenu, s("addItem:"), item);
-	return item;
-}
-
-id parseRadioMenuItem(struct Application *app, id parentmenu, const char *title,
- const char *menuid, bool disabled, bool checked, const char *acceleratorkey,
- struct hashmap_s *menuItemMap, const char *radioCallbackFunction) {
-	id item = ALLOC("NSMenuItem");
-
-	// Store the item in the menu item map
-	hashmap_put(menuItemMap, (char*)menuid, strlen(menuid), item);
-
-	id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)menuid);
-	msg_id(item, s("setRepresentedObject:"), wrappedId);
-
-	id key = processAcceleratorKey(acceleratorkey);
-
-	((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s(radioCallbackFunction), key);
-
-	msg_bool(item, s("setEnabled:"), !disabled);
-	msg_reg(item, s("autorelease"));
-	msg_int(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
-
-	msg_id(parentmenu, s("addItem:"), item);
-	return item;
-
-}
-
-void parseMenuItem(struct Application *app, id parentMenu, JsonNode *item,
-struct hashmap_s *menuItemMap, const char *checkboxCallbackFunction, const char
-*radioCallbackFunction, const char *menuCallbackFunction) {
-
-  // Check if this item is hidden and if so, exit early!
-  bool hidden = false;
-  getJSONBool(item, "Hidden", &hidden);
-  if( hidden ) {
-	return;
-  }
-
-  // Get the role
-  JsonNode *role = json_find_member(item, "Role");
-  if( role != NULL ) {
-	parseMenuRole(app, parentMenu, role);
-	return;
-  }
-
-  // Check if this is a submenu
-  JsonNode *submenu = json_find_member(item, "SubMenu");
-  if( submenu != NULL ) {
-	// Get the label
-	JsonNode *menuNameNode = json_find_member(item, "Label");
-	const char *name = "";
-	if ( menuNameNode != NULL) {
-	  name = menuNameNode->string_;
-	}
-
-	id thisMenuItem = createMenuItemNoAutorelease(str(name), NULL, "");
-	id thisMenu = createMenu(str(name));
-
-	msg_id(thisMenuItem, s("setSubmenu:"), thisMenu);
-	msg_id(parentMenu, s("addItem:"), thisMenuItem);
-
-	// Loop over submenu items
-	JsonNode *item;
-	json_foreach(item, submenu) {
-	  // Get item label
-	  parseMenuItem(app, thisMenu, item, menuItemMap, checkboxCallbackFunction, radioCallbackFunction, menuCallbackFunction);
-	}
-
-	return;
-  }
-
-  // This is a user menu. Get the common data
-  // Get the label
-  const char *label = getJSONString(item, "Label");
-  if ( label == NULL) {
-	label = "(empty)";
-  }
-
-  const char *menuid = getJSONString(item, "ID");
-  if ( menuid == NULL) {
-	menuid = "";
-  }
-
-  bool disabled = false;
-  getJSONBool(item, "Disabled", &disabled);
-
-  // Get the Accelerator
-  JsonNode *accelerator = json_find_member(item, "Accelerator");
-  const char *acceleratorkey = NULL;
-  const char **modifiers = NULL;
-
-  // If we have an accelerator
-  if( accelerator != NULL ) {
-	// Get the key
-	  acceleratorkey = getJSONString(accelerator, "Key");
-	  // Check if there are modifiers
-	  JsonNode *modifiersList = json_find_member(accelerator, "Modifiers");
-	  if ( modifiersList != NULL ) {
-		// Allocate an array of strings
-		int noOfModifiers = json_array_length(modifiersList);
-
-		// Do we have any?
-		if (noOfModifiers > 0) {
-			modifiers = malloc(sizeof(const char *) * (noOfModifiers + 1));
-			JsonNode *modifier;
-			int count = 0;
-			// Iterate the modifiers and save a reference to them in our new array
-			json_foreach(modifier, modifiersList) {
-			  // Get modifier name
-			  modifiers[count] = modifier->string_;
-			  count++;
-			}
-			// Null terminate the modifier list
-			modifiers[count] = NULL;
-		  }
-	  }
-  }
-
-
-  // Get the Type
-  JsonNode *type = json_find_member(item, "Type");
-  if( type != NULL ) {
-
-	if( STREQ(type->string_, "Text")) {
-	  parseTextMenuItem(app, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, menuCallbackFunction);
-	}
-	else if ( STREQ(type->string_, "Separator")) {
-	  addSeparator(parentMenu);
-	}
-	else if ( STREQ(type->string_, "Checkbox")) {
-	  // Get checked state
-	  bool checked = false;
-	  getJSONBool(item, "Checked", &checked);
-
-	  parseCheckboxMenuItem(app, parentMenu, label, menuid, disabled, checked, "", menuItemMap, checkboxCallbackFunction);
-	}
-	else if ( STREQ(type->string_, "Radio")) {
-	  // Get checked state
-	  bool checked = false;
-	  getJSONBool(item, "Checked", &checked);
-
-	  parseRadioMenuItem(app, parentMenu, label, menuid, disabled, checked, "", menuItemMap, radioCallbackFunction);
-	}
-
-	if ( modifiers != NULL ) {
-	  free(modifiers);
-	}
-
-	return;
-  }
-}
-
-void parseMenu(struct Application *app, id parentMenu, JsonNode *menu, struct hashmap_s *menuItemMap, const char *checkboxCallbackFunction, const char *radioCallbackFunction, const char *menuCallbackFunction) {
-  JsonNode *items = json_find_member(menu, "Items");
-  if( items == NULL ) {
-	// Parse error!
-	Fatal(app, "Unable to find Items in Menu");
-	return;
-  }
-
-  // Iterate items
-  JsonNode *item;
-  json_foreach(item, items) {
-	// Get item label
-	parseMenuItem(app, parentMenu, item, menuItemMap, checkboxCallbackFunction, radioCallbackFunction, menuCallbackFunction);
-  }
-}
-
 void dumpMemberList(const char *name, id *memberList) {
   void *member = memberList[0];
   int count = 0;
@@ -1589,43 +1388,6 @@ void dumpMemberList(const char *name, id *memberList) {
   printf("]\n");
 }
 
-void processRadioGroup(JsonNode *radioGroup, struct hashmap_s *menuItemMap,
-struct hashmap_s *radioGroupMap) {
-
-  int groupLength;
-  getJSONInt(radioGroup, "Length", &groupLength);
-  JsonNode *members = json_find_member(radioGroup, "Members");
-  JsonNode *member;
-
-  // Allocate array
-  size_t arrayLength = sizeof(id)*(groupLength+1);
-  id memberList[arrayLength];
-
-  // Build the radio group items
-  int count=0;
-  json_foreach(member, members) {
-	// Get menu by id
-	id menuItem = (id)hashmap_get(menuItemMap, (char*)member->string_, strlen(member->string_));
-	// Save Member
-	memberList[count] = menuItem;
-	count = count + 1;
-  }
-  // Null terminate array
-  memberList[groupLength] = 0;
-
-  // dumpMemberList("memberList", memberList);
-
-  // Store the members
-  json_foreach(member, members) {
-	// Copy the memberList
-	char *newMemberList = (char *)malloc(arrayLength);
-	memcpy(newMemberList, memberList, arrayLength);
-	// add group to each member of group
-	hashmap_put(radioGroupMap, member->string_, strlen(member->string_), newMemberList);
-  }
-
-}
-
 // updateMenu replaces the current menu with the given one
 void updateMenu(struct Application *app, const char *menuAsJSON) {
 	Debug(app, "Menu is now: %s", menuAsJSON);
@@ -1649,7 +1411,9 @@ void SetApplicationMenu(struct Application *app, const char *menuAsJSON) {
 	}
 
     // Update menu
-    updateMenu(app, menuAsJSON);
+    ON_MAIN_THREAD (
+        updateMenu(app, menuAsJSON);
+    );
 }
 
 void processDialogIcons(struct hashmap_s *hashmap, const unsigned char *dialogIcons[]) {
@@ -1789,7 +1553,7 @@ void Run(struct Application *app, int argc, char **argv) {
 	// Disable damn smart quotes
 	// Credit: https://stackoverflow.com/a/31640511
 	id userDefaults = msg_reg(c("NSUserDefaults"), s("standardUserDefaults"));
-	((id(*)(id, SEL, id, id))objc_msgSend)(userDefaults, s("setBool:forKey:"), NO, str("NSAutomaticQuoteSubstitutionEnabled"));
+	((id(*)(id, SEL, BOOL, id))objc_msgSend)(userDefaults, s("setBool:forKey:"), false, str("NSAutomaticQuoteSubstitutionEnabled"));
 
 	// Setup drag message handler
 	msg_id_id(manager, s("addScriptMessageHandler:name:"), app->delegate, str("windowDrag"));
@@ -1939,6 +1703,24 @@ void Quit(struct Application *app) {
     Hide(app);
 }
 
+id createImageFromBase64Data(const char *data, bool isTemplateImage) {
+    id nsdata = ALLOC("NSData");
+    id imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(nsdata, s("initWithBase64EncodedString:options:"), str(data), 0);
+
+    // If it's not valid base64 data, use the broken image
+    if ( imageData == NULL ) {
+        imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(nsdata, s("initWithBase64EncodedString:options:"), str(BrokenImage), 0);
+    }
+    id result = ALLOC("NSImage");
+    msg_id(result, s("initWithData:"), imageData);
+
+    if( isTemplateImage ) {
+        msg_bool(result, s("setTemplate:"), YES);
+    }
+
+    return result;
+}
+
 void* NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {
 
     // Load the tray icons

v2/internal/ffenestri/ffenestri_darwin.h

@@ -117,6 +117,8 @@
 #define NSAlertSecondButtonReturn  1001
 #define NSAlertThirdButtonReturn   1002
 
+#define BrokenImage "iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAMAAABl5a5YAAABj1BMVEWopan///+koqSWk5P9/v3///////////+AgACMiovz8/PB0fG9z+3i4+WysbGBfX1Erh80rACLiYqBxolEsDhHlDEbqQDDx+CNho7W1tj4+/bw+O3P5Mn4/f/W1tbK6sX////b2dn////////////8/Pz6+vro6Ojj4+P////G1PL////EzNydmp2cmZnd3eDF1PHs8v/o8P/Q3vrS3vfE0vCdmpqZkpr19/3N2vXI1vPH1fOgnqDg6frP3PbCytvHx8irqq6HhIZtuGtjnlZetU1Xs0NWskBNsi7w9v/d6P7w9P3S4Pzr8Pvl7PrY5PrU4PjQ3fjD1Ozo6Om30NjGzNi7ubm34K+UxKmbnaWXlJeUjpSPi4tppF1TtjxSsTf2+f7L2PTr7e3H2+3V7+q+0uXg4OPg4eLR1uG7z+Hg4ODGzODV2N7V1trP5dmxzs65vcfFxMWq0cKxxr+/vr+0s7apxbWaxrCv2qao05+dlp2Uuo2Dn4F8vIB6xnyAoHmAym9zqGpctENLryNFsgoblJpnAAAAKnRSTlP+hP7+5ZRmYgL+/f39/f39/f38/Pz8/Pv69+7j083My8GocnBPTTMWEgjxeITOAAABEklEQVQY0y3KZXuCYBiG4ceYuu7u3nyVAaKOMBBQ7O5Yd3f3fvheDnd9u8/jBkGwNxP6sjOWVQvY/ftrzfT6bd3yEhCnYZqiaYoKiwX/gXkFiHySTcUTLJMsZ9v8nQvgssWYOEKedKpcOO6CUXD5IlGEY5hLUbyDAAZ6HRf1bnkoavOsFQibg+Q4nuNYL+ON5PHD5nBaraRVyxnzGf6BJzUi2QQCQgMyk8tleL7dg1owpJ17D5IkvV100EingeOopPyo6vfAuXF+9hbDTknZCIaUoeK4efKwG4iT6xDewd7imGlid7gGwv37b6Oh9jwaTdOf/Tc1qH7UZVmuP6G5qZfBr9cAGNy4KiDd4tXIs7tS+QO9aUKvPAIKuQAAAABJRU5ErkJggg=="
+
 struct Application;
 int releaseNSObject(void *const context, struct hashmap_element_s *const e);
 void TitlebarAppearsTransparent(struct Application* app);
@@ -139,4 +141,6 @@ void* lookupStringConstant(id constantName);
 
 void HasURLHandlers(struct Application* app);
 
+id createImageFromBase64Data(const char *data, bool isTemplateImage);
+
 #endif

v2/internal/ffenestri/menu_darwin.c

@@ -578,30 +578,26 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
 
 id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA) {
 
-    // Process Menu Item attributes
+    // Create new Dictionary
     id dictionary = ALLOC_INIT("NSMutableDictionary");
-
-    // Process font
     CGFloat fontSizeFloat = (CGFloat)fontSize;
 
-    // Check if valid
-    id fontNameAsNSString = str(fontName);
-    id font = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
-    if( font == NULL ) {
-        bool supportsMonospacedDigitSystemFont = (bool) ((id(*)(id, SEL, SEL))objc_msgSend)(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:"));
-        if( supportsMonospacedDigitSystemFont ) {
-            font = ((id(*)(id, SEL, CGFloat, CGFloat))objc_msgSend)(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, (CGFloat)NSFontWeightRegular);
-        } else {
-            font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuFontOfSize:"), fontSizeFloat);
+    // Use default font
+    id font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuBarFontOfSize:"), fontSizeFloat);
+
+    // Check user supplied font
+    if( STR_HAS_CHARS(fontName) ) {
+        id fontNameAsNSString = str(fontName);
+        id userFont = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
+        if( userFont != NULL ) {
+            font = userFont;
         }
     }
 
     // Add font to dictionary
     id fan = lookupStringConstant(str("NSFontAttributeName"));
     msg_id_id(dictionary, s("setObject:forKey:"), font, fan);
-    id offset = msg_float(c("NSNumber"), s("numberWithFloat:"), (float)0.0);
-    id offsetAttrName = lookupStringConstant(str("NSBaselineOffsetAttributeName"));
-    msg_id_id(dictionary, s("setObject:forKey:"), offset, offsetAttrName);
+
     // RGBA
     if( RGBA != NULL && strlen(RGBA) > 0) {
         unsigned short r, g, b, a;
@@ -617,14 +613,13 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
 								(CGFloat)a / (CGFloat)255.0);
 			id NSForegroundColorAttributeName = lookupStringConstant(str("NSForegroundColorAttributeName"));
             msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
-            msg_reg(colour, s("autorelease"));
         }
     }
 
     id attributedString = ALLOC("NSMutableAttributedString");
     msg_id_id(attributedString, s("initWithString:attributes:"), str(title), dictionary);
     msg_reg(attributedString, s("autorelease"));
-    msg_reg(dictionary, s("release"));
+    msg_reg(dictionary, s("autorelease"));
     return attributedString;
 }
 
@@ -651,13 +646,7 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
 
     // Process image
     if( image != NULL && strlen(image) > 0) {
-        id data = ALLOC("NSData");
-        id imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(data, s("initWithBase64EncodedString:options:"), str(image), 0);
-        id nsimage = ALLOC("NSImage");
-        msg_id(nsimage, s("initWithData:"), imageData);
-        if( templateImage ) {
-            msg_bool(nsimage, s("setTemplate:"), YES);
-        }
+        id nsimage = createImageFromBase64Data(image, templateImage);
         msg_id(item, s("setImage:"), nsimage);
     }
 
@@ -701,38 +690,6 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         return;
     }
 
-    // Check if this is a submenu
-    JsonNode *submenu = json_find_member(item, "SubMenu");
-    if( submenu != NULL ) {
-        // Get the label
-        JsonNode *menuNameNode = json_find_member(item, "Label");
-        const char *name = "";
-        if ( menuNameNode != NULL) {
-            name = menuNameNode->string_;
-        }
-
-        id thisMenuItem = createMenuItemNoAutorelease(str(name), NULL, "");
-        id thisMenu = createMenu(str(name));
-
-        msg_id(thisMenuItem, s("setSubmenu:"), thisMenu);
-        msg_id(parentMenu, s("addItem:"), thisMenuItem);
-
-        JsonNode *submenuItems = json_find_member(submenu, "Items");
-        // If we have no items, just return
-        if ( submenuItems == NULL ) {
-            return;
-        }
-
-        // Loop over submenu items
-        JsonNode *item;
-        json_foreach(item, submenuItems) {
-            // Get item label
-            processMenuItem(menu, thisMenu, item);
-        }
-
-        return;
-    }
-
     // This is a user menu. Get the common data
     // Get the label
     const char *label = getJSONString(item, "Label");
@@ -798,9 +755,36 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     // Get the Type
     JsonNode *type = json_find_member(item, "Type");
     if( type != NULL ) {
+        if( STREQ(type->string_, "Text") || STREQ(type->string_, "Submenu")) {
+            id thisMenuItem = processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate);
 
-        if( STREQ(type->string_, "Text")) {
-            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate);
+            // Check if this node has a submenu
+            JsonNode *submenu = json_find_member(item, "SubMenu");
+            if( submenu != NULL ) {
+                // Get the label
+                JsonNode *menuNameNode = json_find_member(item, "Label");
+                const char *name = "";
+                if ( menuNameNode != NULL) {
+                    name = menuNameNode->string_;
+                }
+
+                id thisMenu = createMenu(str(name));
+
+                msg_id(thisMenuItem, s("setSubmenu:"), thisMenu);
+
+                JsonNode *submenuItems = json_find_member(submenu, "Items");
+                // If we have no items, just return
+                if ( submenuItems == NULL ) {
+                    return;
+                }
+
+                // Loop over submenu items
+                JsonNode *item;
+                json_foreach(item, submenuItems) {
+                    // Get item label
+                    processMenuItem(menu, thisMenu, item);
+                }
+            }
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);
@@ -819,7 +803,6 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
 
             processRadioMenuItem(menu, parentMenu, label, menuid, disabled, checked, "");
         }
-
     }
 
     if ( modifiers != NULL ) {

v2/internal/ffenestri/traymenu_darwin.c

@@ -102,14 +102,7 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
 
     // If we don't have the image in the icon cache then assume it's base64 encoded image data
     if (trayImage == NULL) {
-        id data = ALLOC("NSData");
-        id imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(data, s("initWithBase64EncodedString:options:"), str(trayMenu->icon), 0);
-        trayImage = ALLOC("NSImage");
-        msg_id(trayImage, s("initWithData:"), imageData);
-
-        if( trayMenu->templateImage ) {
-            msg_bool(trayImage, s("setTemplate:"), YES);
-        }
+        trayImage = createImageFromBase64Data(trayMenu->icon, trayMenu->templateImage);
     }
 
     msg_int(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);

v2/pkg/commands/build/base.go

@@ -10,6 +10,8 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/internal/assetdb"
 	"github.com/wailsapp/wails/v2/internal/fs"
@@ -157,9 +159,11 @@ func (b *BaseBuilder) OutputFilename(options *Options) string {
 // CompileProject compiles the project
 func (b *BaseBuilder) CompileProject(options *Options) error {
 
+	verbose := options.Verbosity == VERBOSE
 	// Run go mod tidy first
 	cmd := exec.Command(options.Compiler, "mod", "tidy")
-	if options.Verbosity == VERBOSE {
+	if verbose {
+		println("")
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}
@@ -183,7 +187,6 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 	// potentially try and see if the assets have changed but will
 	// this take as much time as a `-a` build?
 	commands.Add("-a")
-	commands.Add("-x")
 
 	var tags slicer.StringSlicer
 	tags.Add(options.OutputType)
@@ -212,10 +215,12 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 
 	// Get application build directory
 	appDir := options.BuildDirectory
-	//err = cleanBuildDirectory(options)
-	//if err != nil {
-	//	return err
-	//}
+	if options.CleanBuildDirectory {
+		err = cleanBuildDirectory(options)
+		if err != nil {
+			return err
+		}
+	}
 
 	if options.LDFlags != "" {
 		commands.Add("-ldflags")
@@ -233,7 +238,8 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 
 	// Create the command
 	cmd = exec.Command(options.Compiler, commands.AsSlice()...)
-	if options.Verbosity == VERBOSE {
+	if verbose {
+		println("  Build command:", commands.Join(" "))
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}
@@ -270,14 +276,44 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 		return "1"
 	})
 
+	if verbose {
+		println("  Environment:", strings.Join(cmd.Env, " "))
+	}
+
+	// Setup buffers
+	var stdo, stde bytes.Buffer
+	cmd.Stdout = &stdo
+	cmd.Stderr = &stde
+
 	// Run command
 	err = cmd.Run()
 
 	// Format error if we have one
 	if err != nil {
-		return err
+		return fmt.Errorf("%s\n%s", err, string(stde.Bytes()))
 	}
 
+	if !options.Compress {
+		return nil
+	}
+
+	// Do we have upx installed?
+	if !shell.CommandExists("upx") {
+		println("Warning: Cannot compress binary: upx not found")
+		return nil
+	}
+
+	if verbose {
+		println("  Compressing with:", "upx", "--best", "--no-color", "--no-progress", options.CompiledBinary)
+	}
+
+	output, err := exec.Command(options.BuildDirectory, "upx", "--best", "--no-color", "--no-progress", options.CompiledBinary).Output()
+	if err != nil {
+		return errors.Wrap(err, "Error during compression:")
+	}
+	if verbose {
+		println(output)
+	}
 	return nil
 }
 
@@ -391,7 +427,7 @@ func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger) error {
 		outputLogger.Print("Installing frontend dependencies: ")
 		if verbose {
 			outputLogger.Println("")
-			outputLogger.Println("\tCommand: " + b.projectData.InstallCommand)
+			outputLogger.Println("  Install command: '" + b.projectData.InstallCommand + "'")
 		}
 		if err := b.NpmInstallUsingCommand(frontendDir, b.projectData.InstallCommand, verbose); err != nil {
 			return err
@@ -410,7 +446,7 @@ func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger) error {
 	cmd := strings.Split(b.projectData.BuildCommand, " ")
 	if verbose {
 		outputLogger.Println("")
-		outputLogger.Println("\tCommand: '" + strings.Join(cmd, " ") + "'")
+		outputLogger.Println("  Build command: '" + strings.Join(cmd, " ") + "'")
 	}
 	stdout, stderr, err := shell.RunCommand(frontendDir, cmd[0], cmd[1:]...)
 	if verbose || err != nil {

v2/pkg/commands/build/build.go

@@ -28,22 +28,24 @@ var modeMap = []string{"Debug", "Production"}
 
 // Options contains all the build options as well as the project data
 type Options struct {
-	LDFlags        string               // Optional flags to pass to linker
-	Logger         *clilogger.CLILogger // All output to the logger
-	OutputType     string               // EG: desktop, server....
-	Mode           Mode                 // release or debug
-	ProjectData    *project.Project     // The project data
-	Pack           bool                 // Create a package for the app after building
-	Platform       string               // The platform to build for
-	Arch           string               // The architecture to build for
-	Compiler       string               // The compiler command to use
-	IgnoreFrontend bool                 // Indicates if the frontend does not need building
-	OutputFile     string               // Override the output filename
-	BuildDirectory string               // Directory to use for building the application
-	CompiledBinary string               // Fully qualified path to the compiled binary
-	KeepAssets     bool                 // /Keep the generated assets/files
-	Verbosity      int                  // Verbosity level (0 - silent, 1 - default, 2 - verbose)
-	AppleIdentity  string
+	LDFlags             string               // Optional flags to pass to linker
+	Logger              *clilogger.CLILogger // All output to the logger
+	OutputType          string               // EG: desktop, server....
+	Mode                Mode                 // release or debug
+	ProjectData         *project.Project     // The project data
+	Pack                bool                 // Create a package for the app after building
+	Platform            string               // The platform to build for
+	Arch                string               // The architecture to build for
+	Compiler            string               // The compiler command to use
+	IgnoreFrontend      bool                 // Indicates if the frontend does not need building
+	OutputFile          string               // Override the output filename
+	BuildDirectory      string               // Directory to use for building the application
+	CleanBuildDirectory bool                 // Indicates if the build directory should be cleaned before building
+	CompiledBinary      string               // Fully qualified path to the compiled binary
+	KeepAssets          bool                 // Keep the generated assets/files
+	Verbosity           int                  // Verbosity level (0 - silent, 1 - default, 2 - verbose)
+	Compress            bool                 // Compress the final binary
+	AppleIdentity       string
 }
 
 // GetModeAsString returns the current mode as a string
@@ -129,6 +131,11 @@ func Build(options *Options) (string, error) {
 		// Build amd64 first
 		options.Arch = "amd64"
 		options.OutputFile = amd64Filename
+		options.CleanBuildDirectory = false
+		if options.Verbosity == VERBOSE {
+			println()
+			println("  Building AMD64 Target:", filepath.Join(options.BuildDirectory, options.OutputFile))
+		}
 		err = builder.CompileProject(options)
 		if err != nil {
 			return "", err
@@ -136,11 +143,18 @@ func Build(options *Options) (string, error) {
 		// Build arm64
 		options.Arch = "arm64"
 		options.OutputFile = arm64Filename
+		options.CleanBuildDirectory = false
+		if options.Verbosity == VERBOSE {
+			println("  Building ARM64 Target:", filepath.Join(options.BuildDirectory, options.OutputFile))
+		}
 		err = builder.CompileProject(options)
 		if err != nil {
 			return "", err
 		}
 		// Run lipo
+		if options.Verbosity == VERBOSE {
+			println("  Running lipo: ", "lipo", "-create", "-output", outputFile, amd64Filename, arm64Filename)
+		}
 		_, stderr, err := shell.RunCommand(options.BuildDirectory, "lipo", "-create", "-output", outputFile, amd64Filename, arm64Filename)
 		if err != nil {
 			return "", fmt.Errorf("%s - %s", err.Error(), stderr)

v2/pkg/mac/mac_darwin.go

@@ -0,0 +1,60 @@
+// Package mac provides MacOS related utility functions for Wails applications
+package mac
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/leaanthony/slicer"
+	"github.com/pkg/errors"
+	"github.com/wailsapp/wails/v2/internal/shell"
+)
+
+// StartAtLogin will either add or remove this application to/from the login
+// items, depending on the given boolean flag. The limitation is that the
+// currently running app must be in an app bundle.
+func StartAtLogin(enabled bool) error {
+	exe, err := os.Executable()
+	if err != nil {
+		return errors.Wrap(err, "Error running os.Executable:")
+	}
+	binName := filepath.Base(exe)
+	if !strings.HasSuffix(exe, "/Contents/MacOS/"+binName) {
+		return fmt.Errorf("app needs to be running as package.app file to start at login")
+	}
+	appPath := strings.TrimSuffix(exe, "/Contents/MacOS/"+binName)
+	var command string
+	if enabled {
+		command = fmt.Sprintf("tell application \"System Events\" to make login item at end with properties {name: \"%s\",path:\"%s\", hidden:false}", binName, appPath)
+	} else {
+		command = fmt.Sprintf("tell application \"System Events\" to delete login item \"%s\"", binName)
+	}
+	_, stde, err := shell.RunCommand("/tmp", "osascript", "-e", command)
+	if err != nil {
+		errors.Wrap(err, stde)
+	}
+	return nil
+}
+
+// StartsAtLogin will indicate if this application is in the login
+// items. The limitation is that the currently running app must be
+// in an app bundle.
+func StartsAtLogin() (bool, error) {
+	exe, err := os.Executable()
+	if err != nil {
+		return false, err
+	}
+	binName := filepath.Base(exe)
+	if !strings.HasSuffix(exe, "/Contents/MacOS/"+binName) {
+		return false, fmt.Errorf("app needs to be running as package.app file to start at login")
+	}
+	results, stde, err := shell.RunCommand("/tmp", "osascript", "-e", `tell application "System Events" to get the name of every login item`)
+	if err != nil {
+		return false, errors.Wrap(err, stde)
+	}
+	results = strings.TrimSpace(results)
+	startupApps := slicer.String(strings.Split(results, ", "))
+	return startupApps.Contains(binName), nil
+}