From d649726399fc1af1ac7baab83c73dab4f6c8ec6a Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Mon, 16 Nov 2015 12:07:17 +0100
Subject: [PATCH] fixes #28

---
 gulpfile.vscode.js                       |  12 ++++++------
 product.json                             |  10 +++++-----
 resources/{mac => darwin}/code.icns      | Bin
 resources/{mac => darwin}/code_file.icns | Bin
 resources/{win => win32}/bin/code.cmd    |   0
 resources/{win => win32}/bin/code.js     |   0
 resources/{win => win32}/code.ico        | Bin
 resources/{win => win32}/code_file.ico   | Bin
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename resources/{mac => darwin}/code.icns (100%)
 rename resources/{mac => darwin}/code_file.icns (100%)
 rename resources/{win => win32}/bin/code.cmd (100%)
 rename resources/{win => win32}/bin/code.js (100%)
 rename resources/{win => win32}/code.ico (100%)
 rename resources/{win => win32}/code_file.ico (100%)

diff --git a/gulpfile.vscode.js b/gulpfile.vscode.js
index e6ebe6dee4f..35e43228bb4 100644
--- a/gulpfile.vscode.js
+++ b/gulpfile.vscode.js
@@ -222,6 +222,12 @@ function packageTask(platform, arch, opts) {
 
 		var resources = gulp.src('resources/*', { base: '.' });
 
+		if (platform === 'win32') {
+			resources = es.merge(resources, gulp.src(product.icons.file.ico, { base: '.' }));
+		} else if (platform === 'linux') {
+			resources = es.merge(resources, gulp.src(product.icons.application.png, { base: '.' }));
+		}
+
 		var all = es.merge(
 			api,
 			packageJson,
@@ -242,12 +248,6 @@ function packageTask(platform, arch, opts) {
 			result = es.merge(result, gulp.src('resources/win/bin/**', { base: 'resources/win' }));
 		}
 
-		if (platform === 'win32') {
-			result = es.merge(result, gulp.src(product.icons.file.ico, { base: '.' }));
-		} else if (platform === 'linux') {
-			result = es.merge(result, gulp.src(product.icons.application.png, { base: '.' }));
-		}
-
 		return result.pipe(opts.zip ? electron.zfsdest(destination + '.zip') : symdest(destination));
 	};
 }
diff --git a/product.json b/product.json
index e5062678ec9..e6d55e6cb90 100644
--- a/product.json
+++ b/product.json
@@ -10,17 +10,17 @@
 		"role": "Editor",
 		"ostypes": ["TEXT", "utxt", "TUTX", "****"],
 		"extensions": ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "nqp", "p6", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xml", "yaml", "yml", "zsh"],
-		"iconFile": "resources/mac/code_file.icns"
+		"iconFile": "resources/darwin/code_file.icns"
 	}],
 	"icons": {
 		"application": {
 			"png": "resources/linux/code.png",
-			"icns": "resources/mac/code.icns",
-			"ico": "resources/win/code.ico"
+			"icns": "resources/darwin/code.icns",
+			"ico": "resources/win32/code.ico"
 		},
 		"file": {
-			"icns": "resources/mac/code_file.icns",
-			"ico": "resources/win/code_file.ico"
+			"icns": "resources/darwin/code_file.icns",
+			"ico": "resources/win32/code_file.ico"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resources/mac/code.icns b/resources/darwin/code.icns
similarity index 100%
rename from resources/mac/code.icns
rename to resources/darwin/code.icns
diff --git a/resources/mac/code_file.icns b/resources/darwin/code_file.icns
similarity index 100%
rename from resources/mac/code_file.icns
rename to resources/darwin/code_file.icns
diff --git a/resources/win/bin/code.cmd b/resources/win32/bin/code.cmd
similarity index 100%
rename from resources/win/bin/code.cmd
rename to resources/win32/bin/code.cmd
diff --git a/resources/win/bin/code.js b/resources/win32/bin/code.js
similarity index 100%
rename from resources/win/bin/code.js
rename to resources/win32/bin/code.js
diff --git a/resources/win/code.ico b/resources/win32/code.ico
similarity index 100%
rename from resources/win/code.ico
rename to resources/win32/code.ico
diff --git a/resources/win/code_file.ico b/resources/win32/code_file.ico
similarity index 100%
rename from resources/win/code_file.ico
rename to resources/win32/code_file.ico