Add TS building in makefile; yarn run build now just runs HOME=/root go build -v -ldflags="-s -w" -o dist/bin/checkCertificate src/go/checkCertificate/checkCertificate.go

merge-requests/4/head
Matthew 2020-01-18 02:05:22 -05:00
parent 9544e231ee
commit 36f7660afd
No known key found for this signature in database
GPG Key ID: 766BE43AE75F7559
2 changed files with 7 additions and 2 deletions

View File

@ -1,8 +1,10 @@
# Builds TypeScript & Go
check_certificate_files := $(wildcard src/go/checkCertificate/*.go) check_certificate_files := $(wildcard src/go/checkCertificate/*.go)
check_certificate_signatures_files := $(wildcard src/go/checkCertSignatures/*.go) check_certificate_signatures_files := $(wildcard src/go/checkCertSignatures/*.go)
storage_files := $(wildcard src/go/storage/*.go) storage_files := $(wildcard src/go/storage/*.go)
all: check_certificate check_cert_signatures storage all: check_certificate check_cert_signatures storage typescript
check_certificate: check_certificate:
HOME=/root go build -v -ldflags="-s -w" -o dist/bin/checkCertificate ${check_certificate_files} HOME=/root go build -v -ldflags="-s -w" -o dist/bin/checkCertificate ${check_certificate_files}
@ -18,3 +20,6 @@ storage:
HOME=/root go build -v -ldflags="-s -w" -o dist/bin/storage ${storage_files} HOME=/root go build -v -ldflags="-s -w" -o dist/bin/storage ${storage_files}
@chmod 740 dist/bin/storage @chmod 740 dist/bin/storage
file dist/bin/storage file dist/bin/storage
typescript:
tsc -p ./tsconfig.json

View File

@ -5,7 +5,7 @@
"main": "dist/Client.js", "main": "dist/Client.js",
"scripts": { "scripts": {
"lint": "eslint ./ --ext ts --fix", "lint": "eslint ./ --ext ts --fix",
"build": "tsc -p ./tsconfig.json && make", "build": "make",
"lint-find": "eslint ./ --ext ts" "lint-find": "eslint ./ --ext ts"
}, },
"author": "Library of Code sp-us Engineering Team", "author": "Library of Code sp-us Engineering Team",