Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Clean legacy build/install generation before each packaging #11991

Merged
merged 2 commits into from
Nov 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions tools/buildPackage.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,19 @@ var cmds = ['echo cleaning up target...']

if (isWindows) {
cmds = cmds.concat([
`(if exist ${appName}-win32-x64 rmdir /s /q ${appName}-win32-x64)`,
`(if exist ${appName}-win32-ia32 rmdir /s /q ${appName}-win32-ia32)`
'cmd.exe /c for /d %x in (*-win32-x64) do rmdir /s /q "%x"',
'cmd.exe /c for /d %x in (*-win32-ia32) do rmdir /s /q "%x"'
])

// Remove the destination folder for the selected arch
if (arch === 'ia32') {
cmds = cmds.concat([
'(if exist dist-ia32 rmdir /s /q dist-ia32)'
])
} else {
cmds = cmds.concat([
'(if exist dist-x64 rmdir /s /q dist-x64)'
])
}
// Remove the destination folder
cmds = cmds.concat([
'(if exist dist rmdir /s /q dist)'
])
} else {
cmds = cmds.concat([
'rm -Rf ' + buildDir,
'rm -Rf ' + '*-' + process.platform + '-' + arch,
'rm -Rf dist',
`rm -f ${appName}.tar.bz2`
`rm -f *.tar.bz2`
])
}

Expand Down
4 changes: 1 addition & 3 deletions tools/lib/ignoredPaths.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,5 @@ module.exports = [
'sqlite3',
'uglify-js',
'webdriverio',
'webpack-dev-server',
'Brave(.+)',
'brave-(.+)'
'webpack-dev-server'
]