From 2c609574a5414522d41f275545ee561694e90c3a Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Tue, 26 Nov 2019 15:56:33 -0800 Subject: [PATCH 1/2] Fixed MakeRelease permissions for Mac, plus ignored Mac's .DS_Store files and updated BlocklyProp.icns to be proper. --- .gitignore | 5 ++++- MakeRelease | 0 package/BlocklyProp.icns | 3 +++ package/blocklyprop.icns | 3 --- 4 files changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 MakeRelease create mode 100644 package/BlocklyProp.icns delete mode 100644 package/blocklyprop.icns diff --git a/.gitignore b/.gitignore index ccecb65..de69d54 100644 --- a/.gitignore +++ b/.gitignore @@ -68,4 +68,7 @@ release_exe/ *.zip # Windows thumb files -Thumbs.db \ No newline at end of file +Thumbs.db + +# Mac finder files +.DS_Store diff --git a/MakeRelease b/MakeRelease old mode 100644 new mode 100755 diff --git a/package/BlocklyProp.icns b/package/BlocklyProp.icns new file mode 100644 index 0000000..90b4dd3 --- /dev/null +++ b/package/BlocklyProp.icns @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1692b7fda3eb85e6096cbab8cffd389e0bdc4fcd01b0463dbe5a511db78b8ab9 +size 55955 diff --git a/package/blocklyprop.icns b/package/blocklyprop.icns deleted file mode 100644 index 999e19d..0000000 --- a/package/blocklyprop.icns +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0221b73c5ee851ed681db08aebf4d5f001ad7299cff33549e928ee751088c670 -size 100223 From 8d532aa1e78f66b4efbb652b8149f36ceb44b882 Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Tue, 26 Nov 2019 17:21:01 -0800 Subject: [PATCH 2/2] Set to ignore mac-resources/nwjs folder and moved BlocklyProp.icns to mac-resources. --- .gitignore | 1 + package/{ => mac-resources}/BlocklyProp.icns | 0 2 files changed, 1 insertion(+) rename package/{ => mac-resources}/BlocklyProp.icns (100%) diff --git a/.gitignore b/.gitignore index de69d54..f8e4b42 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ typings/ # Node modules, extracted nwjs files, releases, installers, and zip archives node_modules/ package/win-resources/nwjs/dependencies/ +package/mac-resources/nwjs/ release/ release_exe/ *.zip diff --git a/package/BlocklyProp.icns b/package/mac-resources/BlocklyProp.icns similarity index 100% rename from package/BlocklyProp.icns rename to package/mac-resources/BlocklyProp.icns