From e4be846de846371db0326aa1ebfd7033e01ee65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 24 Jan 2022 14:27:25 +0100 Subject: [PATCH] Add `make with-deps` target to install dependencies and build the apps --- LICENSE | 2 +- Makefile | 7 ++++++- README.md | 7 +------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index a6667556..9c4daccb 100644 --- a/LICENSE +++ b/LICENSE @@ -629,7 +629,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Flamenco-Goja-test + flamenco-ng-poc Copyright (C) 2022 Blender This program is free software: you can redistribute it and/or modify diff --git a/Makefile b/Makefile index 6859b7aa..eb7a07b9 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,11 @@ endif all: application +# Install generators and build the software. +with-deps: + go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen + make -s application + application: ${RESOURCES} go generate ${PKG}/... go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-manager-poc @@ -125,4 +130,4 @@ _package_zip: static cd $(dir ${PACKAGE_PATH}) && zip -9 -r -q $(notdir ${PACKAGE_PATH})-${GOOS}.zip $(notdir ${PACKAGE_PATH}) rm ${STATIC_OUT} -.PHONY: run application version static vet lint deploy package release +.PHONY: run application version static vet lint deploy package release prepare diff --git a/README.md b/README.md index 23019655..f0ea6b43 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,7 @@ This repository contains a proof of concept of a next-generation Flamenco implem 1. Install [Go 1.17 or newer](https://go.dev/). 2. Set the environment variable `GOPATH` to where you want Go to put its packages. Defaults to `$HOME/go` if not set. Run `go env GOPATH` if you're not sure. 3. Ensure `$GOPATH/bin` is included in your `$PATH` environment variable. -4. Run the following commands: - -``` -go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen -make -``` +4. Run `make with-deps` to install build-time dependencies and build the application. Subsequent builds can just run `make` without arguments. You should now have two executables: `flamenco-manager-poc` and `flamenco-worker-poc`.