Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-02 10:40:49 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-05-06 11:44:31 +0300
commita62176db357c3b66b02f01a4271ecda5bb2db35c (patch)
tree46a7793189f2c48ae4d6fa3472e6019a2688dc74
parent44b15190d40cfe6aeb27e8751dd646ac44db379d (diff)
tools: Move `noticegen` into top-level `tools/` directory
Move the `noticegen` tool into the top-level `tools/` directory so that all of our custom build tools are in one place. This also makes its sources discoverable for our formatter.
-rw-r--r--Makefile2
-rw-r--r--tools/noticegen/notice.template (renamed from _support/noticegen/notice.template)0
-rw-r--r--tools/noticegen/noticegen.go (renamed from _support/noticegen/noticegen.go)2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index de76c62f2..2c5844cfa 100644
--- a/Makefile
+++ b/Makefile
@@ -502,7 +502,7 @@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
${BUILD_DIR}/NOTICE: ${GO_LICENSES} clean-ruby-vendor-go
${Q}rm -rf ${BUILD_DIR}/licenses
${Q}GOOS=linux GOFLAGS="-tags=${SERVER_BUILD_TAGS},${GIT2GO_BUILD_TAGS}" ${GO_LICENSES} save ${SOURCE_DIR}/... --save_path=${BUILD_DIR}/licenses
- ${Q}go run ${SOURCE_DIR}/_support/noticegen/noticegen.go -source ${BUILD_DIR}/licenses -template ${SOURCE_DIR}/_support/noticegen/notice.template > ${BUILD_DIR}/NOTICE
+ ${Q}go run ${SOURCE_DIR}/tools/noticegen/noticegen.go -source ${BUILD_DIR}/licenses -template ${SOURCE_DIR}/tools/noticegen/notice.template > ${BUILD_DIR}/NOTICE
${BUILD_DIR}:
${Q}mkdir -p ${BUILD_DIR}
diff --git a/_support/noticegen/notice.template b/tools/noticegen/notice.template
index 28484c208..28484c208 100644
--- a/_support/noticegen/notice.template
+++ b/tools/noticegen/notice.template
diff --git a/_support/noticegen/noticegen.go b/tools/noticegen/noticegen.go
index 0d54f221a..3c8db0fb5 100644
--- a/_support/noticegen/noticegen.go
+++ b/tools/noticegen/noticegen.go
@@ -39,7 +39,7 @@ func main() {
if err != nil {
log.Fatal(err)
}
- var modInfo = struct {
+ modInfo := struct {
Module struct {
Path string
}