Skip to content

Commit

Permalink
fix: electron-builder loses *.o file
Browse files Browse the repository at this point in the history
Quite uncommon for apps to have o files, so, we just should include it — if someone need to exclude it, well, just ignore. For node_modules should be removed as before.

Fix #1971
  • Loading branch information
develar committed Aug 21, 2017
1 parent 04f51fc commit 970ba66
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/electron-builder/src/fileMatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export function getMainFileMatchers(appDir: string, destination: string, macroEx
}

patterns.push("!**/node_modules/*/{README.md,karma.conf.js,.coveralls.yml,readme.markdown,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples}")
patterns.push(`!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj,cc,obj,pdb}`)
patterns.push(`!**/*.{iml,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj,cc,obj,pdb}`)
patterns.push("!**/._*")
patterns.push("!**/electron-builder.{yaml,yml,json,json5,toml}")
//noinspection SpellCheckingInspection
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/src/util/AppFileWalker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class AppFileWalker implements FileConsumer {
const dirs: Array<string> = []
// our handler is async, but we should add sorted files, so, we add file to result not in the mapper, but after map
const sortedFilePaths = await BluebirdPromise.map(childNames, name => {
if (excludedFiles.has(name) || name.endsWith(".h") || name.endsWith(".obj") || name.endsWith(".cc") || name.endsWith(".pdb") || name.endsWith(".d.ts")) {
if (excludedFiles.has(name) || name.endsWith(".h") || name.endsWith(".o") || name.endsWith(".obj") || name.endsWith(".cc") || name.endsWith(".pdb") || name.endsWith(".d.ts")) {
return null
}

Expand Down

0 comments on commit 970ba66

Please sign in to comment.