Skip to content

Commit

Permalink
fixes microsoft#28
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomoreno committed Nov 16, 2015
1 parent c522d6e commit d649726
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions gulpfile.vscode.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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));
};
}
Expand Down
10 changes: 5 additions & 5 deletions product.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit d649726

Please sign in to comment.