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

build: update windows build paths #367

Merged
merged 1 commit into from
Feb 19, 2018
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ prof*
*test
/vendor

agent/windows_resources/trace-agent-msg.rc
agent/windows_resources/*.bin
/cmd/trace-agent/windows_resources/trace-agent-msg.rc
/cmd/trace-agent/windows_resources/*.bin
# file generated at build time by message compiler
trace-agent-msg.h
4 changes: 2 additions & 2 deletions gorake.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ def go_build(program, opts={})

if ENV['windres'] then
# first compile the message table, as it's an input to the resource file
msgcmd = "windmc --target pe-x86-64 -r agent/windows_resources agent/windows_resources/trace-agent-msg.mc"
msgcmd = "windmc --target pe-x86-64 -r cmd/trace-agent/windows_resources cmd/trace-agent/windows_resources/trace-agent-msg.mc"
puts msgcmd
sh msgcmd

ver_array = agentversion.split(".")
rescmd = "windres --define MAJ_VER=#{ver_array[0]} --define MIN_VER=#{ver_array[1]} --define PATCH_VER=#{ver_array[2]} "
rescmd += "-i agent/windows_resources/trace-agent.rc --target=pe-x86-64 -O coff -o agent/rsrc.syso"
rescmd += "-i cmd/trace-agent/windows_resources/trace-agent.rc --target=pe-x86-64 -O coff -o cmd/trace-agent/rsrc.syso"
sh rescmd

end
Expand Down