More work for the nw: 0.54.1-sdk ➡️ 0.58.0 upgrade

FPGAwars · Feb 10, 2022 · bcefbb6 · bcefbb6
1 parent be4ae81
commit bcefbb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -391,8 +391,11 @@ module.exports = function (grunt) {
       },
     },
 
-    // Wget: Python installer and Default collection
+    // Wget: NWjs for ARM, Python installer, Default collection
     wget: {
+
+      //-- Download NWjs for ARM arquitecture, as it is not part of the oficial NWjs project
+      //-- It is downloaded during the ARM build process
       nwjsAarch64: {
         options: {
           overwrite: false,

diff --git a/scripts/mergeAarch64.sh b/scripts/mergeAarch64.sh
@@ -6,8 +6,8 @@ BLUE="\033[1;34m"
 RED="\033[1;31m"
 GREEN="\033[1;32m"
 binaryBundleDir="cache/nwjsAarch64"
-brandingDir="$binaryBundleDir/nwjs-v0.54.2-linux-arm64"
-distBundle="cache/nwjsAarch64/usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-v0.54.2-linux-arm64.tar.gz"
+brandingDir="$binaryBundleDir/nwjs-v0.58.1-linux-arm64"
+distBundle="cache/nwjsAarch64/usr/docker/dist/nwjs-chromium-ffmpeg-branding/nwjs-v0.58.1-linux-arm64.tar.gz"
 binaryBundleDirDocker="cache/nwjsAarch64/usr"
 binaryBundle="cache/nwjsAarch64/nwjs.tar.gz"
 icestudioBundle="dist/icestudio/aarch64/"
@@ -30,26 +30,3 @@ echo "${GREEN}Ready for merge Arm64 bundle${NC}"
 
 echo "${GREEN}Arm64 bundle ready${NC}"
 
-#BASE_DIR=`find dist/icestudio/osx64 -d -name "nwjs Framework.framework"`
-#ls "$BASE_DIR" | while read f ; do
-
-#	is_link="$BASE_DIR"/"$f"
-
-#	echo "    Check $is_link"
-#	if [ -L "$is_link" ] ; then
-#		echo "    =>${RED}Deleting $is_link${NC}"
-#		rm -f "$is_link"
-#   	else
-
-#		echo "    =>${GREEN}Preserving $is_link${NC}"
-#	fi
-#done
-
-#echo "${BLUE}Repairing OSX bundle${NC}"
-#cp -R "$BASE_DIR"/Versions/A/* "$BASE_DIR"/
-#rm -rf "$BASE_DIR"/Versions/Current 
-#cp -R "$BASE_DIR"/Versions/A "$BASE_DIR"/Versions/Current
-
-#echo "    =>${BLUE}OSX bundle ${GREEN}OK${NC}"
-
-