From e5819f2d3b377b080f8d6d2faac925e9ce5e1dc9 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Thu, 15 Apr 2021 16:33:19 +0000 Subject: [PATCH] Replace gowinsvc with goxsyswinsvc --- projects/goservice/config | 6 +++--- projects/{gowinsvc => goxsyswinsvc}/config | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) rename projects/{gowinsvc => goxsyswinsvc}/config (53%) diff --git a/projects/goservice/config b/projects/goservice/config index 5fbbeae..b0333ac 100644 --- a/projects/goservice/config +++ b/projects/goservice/config @@ -50,7 +50,7 @@ targets: windows: var: go_lib_deps: - - gowinsvc + - goxsyswinsvc - gosvcutils - goeasyconfig cgo: 0 @@ -65,8 +65,8 @@ input_files: - name: binutils project: binutils enable: '[% c("var/linux") && c("var/cgo") %]' - - name: gowinsvc - project: gowinsvc + - name: goxsyswinsvc + project: goxsyswinsvc enable: '[% c("var/windows") %]' - name: gosvcutils project: gosvcutils diff --git a/projects/gowinsvc/config b/projects/goxsyswinsvc/config similarity index 53% rename from projects/gowinsvc/config rename to projects/goxsyswinsvc/config index 8475f5c..ca6d4f0 100644 --- a/projects/gowinsvc/config +++ b/projects/goxsyswinsvc/config @@ -1,6 +1,7 @@ -version: 1.0.0 -git_url: https://github.com/btcsuite/winsvc.git -git_hash: f8fb11f83f7e860e3769a08e6811d1b399a43722 +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: '[% pc("goxsys", "git_url") %]' +git_hash: '[% pc("goxsys", "git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -8,10 +9,10 @@ build: '[% c("projects/go/var/build_go_lib") %]' var: container: use_container: 1 - go_lib: github.com/btcsuite/winsvc + go_lib: golang.org/x/sys go_lib_install: - - github.com/btcsuite/winsvc/mgr - - github.com/btcsuite/winsvc/svc + - golang.org/x/sys/windows/svc + - golang.org/x/sys/windows/svc/mgr input_files: - project: container-image