Add a way to avoid trying to add a custom icon when building nw… (#1576)

Add a way to avoid trying to add a custom icon when building nw.js
betaflight · Aug 15, 2019 · e513c27 · e513c27
2 parents b44f378 + cbc2152
commit e513c27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/assets/windows/installer.nsi b/assets/windows/installer.nsi
@@ -152,9 +152,9 @@ Section
 
     # create shortcuts in the start menu and on the desktop
     CreateDirectory "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}"    
-    CreateShortCut "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}"
+    CreateShortCut "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}" "" "$INSTDIR\images\bf_icon.ico" "0" "" "" ""
     CreateShortCut "$SMPROGRAMS\${GROUP_NAME}\${FOLDER_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_UNINSTALLER}"
-    CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}"
+    CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${FILE_NAME_EXECUTABLE}" "" "$INSTDIR\images\bf_icon.ico" "0" "" "" ""
 
     # include in add/remove programs
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" \
@@ -209,4 +209,4 @@ Section "Uninstall"
     DeleteRegKey HKCU "Software\${GROUP_NAME}\${APP_NAME}"
     DeleteRegKey /ifempty HKCU "Software\${GROUP_NAME}"
 
-SectionEnd
+SectionEnd
diff --git a/gulpfile.js b/gulpfile.js
@@ -106,10 +106,13 @@ function getInputPlatforms() {
     for (var i = 3; i < process.argv.length; i++) {
         var arg = process.argv[i].match(regEx)[1];
         if (supportedPlatforms.indexOf(arg) > -1) {
-             platforms.push(arg);
+            platforms.push(arg);
+        } else if (arg == 'nowinicon') {
+            console.log('ignoring winIco')
+            delete nwBuilderOptions['winIco'];
         } else {
-             console.log('Unknown platform: ' + arg);
-             process.exit();
+            console.log('Unknown platform: ' + arg);
+            process.exit();
         }
     }