Skip to content

Commit 5f1a84a

Browse files
committed
fix: build and copy to bin/platform directory
1 parent 837cf1d commit 5f1a84a

File tree

5 files changed

+38
-28
lines changed

5 files changed

+38
-28
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ jobs:
3535
- name: Upload artifacts
3636
uses: actions/upload-artifact@v2
3737
with:
38-
path: |
39-
./build
40-
./deps
38+
path: ./bin
4139

4240
Skip:
4341
if: contains(github.event.head_commit.message, '[skip ci]')

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/build
33
*.swp
44
npm-debug.log
5+
bin

build.js

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@ const fs = require('fs')
22
const path = require('path')
33
const childProcess = require('child_process')
44

5-
// exe paths
65
const exe = process.platform === 'win32' ? '.exe' : ''
7-
const minidumpStackwalk = path.resolve(__dirname, 'build', 'src', 'processor', 'minidump_stackwalk') + exe
8-
const minidumpDump = path.resolve(__dirname, 'build', 'src', 'processor', 'minidump_dump') + exe
9-
const dumpSyms = (() => {
10-
if (process.platform === 'darwin') {
11-
return path.resolve(__dirname, 'deps', 'breakpad', 'src', 'tools', 'mac', 'dump_syms', 'build', 'Release', 'dump_syms')
12-
} else if (process.platform === 'linux') {
13-
return path.resolve(__dirname, 'build', 'src', 'tools', 'linux', 'dump_syms', 'dump_syms')
14-
}
15-
})()
6+
const binDir = path.join(__dirname, 'bin', process.platform)
7+
8+
const minidumpStackwalkDest = path.join(binDir, 'minidump_stackwalk') + exe
9+
const minidumpDumpDest = path.join(binDir, 'minidump_dump') + exe
10+
const dumpSymsDest = path.join(binDir, 'dump_syms') + exe
1611

1712
// do not build if executables already exist
18-
if (fs.existsSync(minidumpStackwalk) && fs.existsSync(minidumpDump) && fs.existsSync(dumpSyms)) {
13+
if (
14+
fs.existsSync(minidumpStackwalkDest) &&
15+
fs.existsSync(minidumpDumpDest) &&
16+
fs.existsSync(dumpSymsDest)
17+
) {
1918
process.exit(0)
2019
}
2120

@@ -53,3 +52,23 @@ if (process.platform === 'darwin') {
5352
stdio: 'inherit'
5453
})
5554
}
55+
56+
// copy to bin folder
57+
if (!fs.existsSync(binDir)) {
58+
fs.mkdirSync(binDir, { recursive: true })
59+
}
60+
61+
const minidumpStackwalk = path.resolve(__dirname, 'build', 'src', 'processor', 'minidump_stackwalk') + exe
62+
fs.copyFileSync(minidumpStackwalk, minidumpStackwalkDest)
63+
64+
const minidumpDump = path.resolve(__dirname, 'build', 'src', 'processor', 'minidump_dump') + exe
65+
fs.copyFileSync(minidumpDump, minidumpDumpDest)
66+
67+
const dumpSyms = (() => {
68+
if (process.platform === 'darwin') {
69+
return path.resolve(__dirname, 'deps', 'breakpad', 'src', 'tools', 'mac', 'dump_syms', 'build', 'Release', 'dump_syms')
70+
} else if (process.platform === 'linux') {
71+
return path.resolve(__dirname, 'build', 'src', 'tools', 'linux', 'dump_syms', 'dump_syms')
72+
}
73+
})()
74+
fs.copyFileSync(dumpSyms, dumpSymsDest)

lib/minidump.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@ const spawn = require('child_process').spawn
44
const format = require('./format')
55

66
const exe = process.platform === 'win32' ? '.exe' : ''
7+
const binDir = path.join(path.dirname(__dirname), 'bin', process.platform)
8+
79
const commands = {
8-
minidump_stackwalk: path.resolve(__dirname, '..', 'build', 'src', 'processor', 'minidump_stackwalk') + exe,
9-
minidump_dump: path.resolve(__dirname, '..', 'build', 'src', 'processor', 'minidump_dump') + exe,
10-
dump_syms: (() => {
11-
if (process.platform === 'darwin') {
12-
return path.resolve(__dirname, '..', 'deps', 'breakpad', 'src', 'tools', 'mac', 'dump_syms', 'build', 'Release', 'dump_syms')
13-
} else if (process.platform === 'linux') {
14-
return path.resolve(__dirname, '..', 'build', 'src', 'tools', 'linux', 'dump_syms', 'dump_syms')
15-
}
16-
})()
10+
minidump_stackwalk: path.join(binDir, 'minidump_stackwalk') + exe,
11+
minidump_dump: path.join(binDir, 'minidump_dump') + exe,
12+
dump_syms: path.join(binDir, 'dump_syms') + exe
1713
}
1814

1915
function execute (command, args, callback) {

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
"index.d.ts",
3636
"build.js",
3737
"deps",
38-
"./build/src/processor/minidump_stackwalk",
39-
"./build/src/processor/minidump_stackwalk.exe",
40-
"./build/src/processor/minidump_dump",
41-
"./build/src/processor/minidump_dump.exe",
42-
"./build/src/tools/linux/dump_syms/dump_syms"
38+
"bin"
4339
]
4440
}

0 commit comments

Comments
 (0)