Skip to content
Open
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
28 changes: 8 additions & 20 deletions build-release
Original file line number Diff line number Diff line change
Expand Up @@ -142,23 +142,11 @@ getBinPath () {
}

dumpSymbols () {
local dumpsyms_bin="${1}"
local symbol_dir="${2}"
local exec_file="${3}"

local temp_file="$(mktemp)"

"${dumpsyms_bin}" "${exec_file}" > "${temp_file}"

local symbol_basename="$(head -n'1' "${temp_file}" | cut -f'5' -d' ')"

local build_id="$(head -n'1' "${temp_file}" | cut -f'4' -d' ')"

local exec_symbol_dir="${symbol_dir}/${symbol_basename}/${build_id}"

mkdir -pv "${exec_symbol_dir}"
local symbol_dir="${1}"
local exec_file="${2}"

mv "${temp_file}" "${exec_symbol_dir}/${symbol_basename}.sym"
mkdir -pv "${symbol_dir}"
"${breakpad_dir}/symbolize.py" --symbol-directory "${symbol_dir}" "${exec_file}"
}

findDll () {
Expand Down Expand Up @@ -385,7 +373,7 @@ build () {
'windows-'*)
build_engine='true'
system_windows='true'
dumpsyms_relpath=windows/dump_syms_dwarf/dump_syms
dumpsyms_relpath=windows/dump_syms_dwarf/dump_syms_dwarf
;;
esac

Expand Down Expand Up @@ -679,7 +667,7 @@ build () {
local make_targets=''
if "${host_windows}"
then
make_targets='src/tools/windows/dump_syms_dwarf/dump_syms.exe'
make_targets='src/tools/windows/dump_syms_dwarf/dump_syms_dwarf.exe'
fi
make -j"${job_count}" -C"${breakpad_dir}" $make_targets \
|| throwError INTERNAL 'breakpad build failed'
Expand Down Expand Up @@ -716,7 +704,7 @@ build () {

ln -s "${vm_file}" 'main.nexe'

dumpSymbols "${dumpsyms_bin}" "${symbol_dir}" "${main_nexe}"
dumpSymbols "${symbol_dir}" "${main_nexe}"

mkdir -pv "${content_dir}"

Expand Down Expand Up @@ -772,7 +760,7 @@ build () {
do
bin_path="${target_build_dir}/${bin}"
printf 'extracting symbols from %s\n' "${bin_path}"
dumpSymbols "${dumpsyms_bin}" "${symbol_dir}" "${bin_path}"
dumpSymbols "${symbol_dir}" "${bin_path}"
done
fi

Expand Down