beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deduplicate make package, package_static (#1344)

Browse source
This commit is contained in:
mmetc 2022-03-15 11:19:35 +01:00 committed by GitHub
parent b050d27e20
commit 6d42a8c8be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Makefile
View file

@ -1,10 +1,9 @@
ROOT= $(shell pwd)
SYSTEM?= $(shell uname -s | tr '[A-Z]' '[a-z]') SYSTEM?= $(shell uname -s | tr '[A-Z]' '[a-z]')
ifneq ("$(wildcard $(ROOT)/platform/$(SYSTEM).mk)", "") ifneq ("$(wildcard $(CURDIR)/platform/$(SYSTEM).mk)", "")
include $(ROOT)/platform/$(SYSTEM).mk include $(CURDIR)/platform/$(SYSTEM).mk
else else
include $(ROOT)/platform/linux.mk include $(CURDIR)/platform/linux.mk
endif endif
CROWDSEC_FOLDER = "./cmd/crowdsec" CROWDSEC_FOLDER = "./cmd/crowdsec"
@ -97,6 +96,7 @@ clean: testclean
@$(RM) $(CSCLI_BIN) @$(RM) $(CSCLI_BIN)
@$(RM) *.log @$(RM) *.log
@$(RM) crowdsec-release.tgz @$(RM) crowdsec-release.tgz
@$(RM) crowdsec-release-static.tgz
@$(RM) $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN) @$(RM) $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN)
@$(RM) $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN) @$(RM) $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN)
@$(RM) $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN) @$(RM) $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN)
@ -148,8 +148,7 @@ testclean: bats-clean
test: goversion test: goversion
$(GOTEST) $(LD_OPTS) ./... $(GOTEST) $(LD_OPTS) ./...
.PHONY: package package-common:
package:
@echo Building Release to dir $(RELDIR) @echo Building Release to dir $(RELDIR)
@mkdir -p $(RELDIR)/cmd/crowdsec @mkdir -p $(RELDIR)/cmd/crowdsec
@mkdir -p $(RELDIR)/cmd/crowdsec-cli @mkdir -p $(RELDIR)/cmd/crowdsec-cli
@ -174,33 +173,12 @@ package:
@cp -R ./config/ $(RELDIR) @cp -R ./config/ $(RELDIR)
@cp wizard.sh $(RELDIR) @cp wizard.sh $(RELDIR)
@cp scripts/test_env.sh $(RELDIR) @cp scripts/test_env.sh $(RELDIR)
.PHONY: package
package: package-common
@tar cvzf crowdsec-release.tgz $(RELDIR) @tar cvzf crowdsec-release.tgz $(RELDIR)
package_static: package_static: package-common
@echo Building Release to dir $(RELDIR)
@mkdir -p $(RELDIR)/cmd/crowdsec
@mkdir -p $(RELDIR)/cmd/crowdsec-cli
@mkdir -p $(RELDIR)/$(subst ./,,$(HTTP_PLUGIN_FOLDER))
@mkdir -p $(RELDIR)/$(subst ./,,$(SLACK_PLUGIN_FOLDER))
@mkdir -p $(RELDIR)/$(subst ./,,$(SPLUNK_PLUGIN_FOLDER))
@mkdir -p $(RELDIR)/$(subst ./,,$(EMAIL_PLUGIN_FOLDER))
@cp $(CROWDSEC_FOLDER)/$(CROWDSEC_BIN) $(RELDIR)/cmd/crowdsec
@cp $(CSCLI_FOLDER)/$(CSCLI_BIN) $(RELDIR)/cmd/crowdsec-cli
@cp $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_BIN) $(RELDIR)/$(subst ./,,$(HTTP_PLUGIN_FOLDER))
@cp $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_BIN) $(RELDIR)/$(subst ./,,$(SLACK_PLUGIN_FOLDER))
@cp $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_BIN) $(RELDIR)/$(subst ./,,$(SPLUNK_PLUGIN_FOLDER))
@cp $(EMAIL_PLUGIN_FOLDER)/$(EMAIL_PLUGIN_BIN) $(RELDIR)/$(subst ./,,$(EMAIL_PLUGIN_FOLDER))
@cp $(HTTP_PLUGIN_FOLDER)/$(HTTP_PLUGIN_CONFIG) $(RELDIR)/$(subst ./,,$(HTTP_PLUGIN_FOLDER))
@cp $(SLACK_PLUGIN_FOLDER)/$(SLACK_PLUGIN_CONFIG) $(RELDIR)/$(subst ./,,$(SLACK_PLUGIN_FOLDER))
@cp $(SPLUNK_PLUGIN_FOLDER)/$(SPLUNK_PLUGIN_CONFIG) $(RELDIR)/$(subst ./,,$(SPLUNK_PLUGIN_FOLDER))
@cp $(EMAIL_PLUGIN_FOLDER)/$(EMAIL_PLUGIN_CONFIG) $(RELDIR)/$(subst ./,,$(EMAIL_PLUGIN_FOLDER))
@cp -R ./config/ $(RELDIR)
@cp wizard.sh $(RELDIR)
@cp scripts/test_env.sh $(RELDIR)
@tar cvzf crowdsec-release-static.tgz $(RELDIR) @tar cvzf crowdsec-release-static.tgz $(RELDIR)
.PHONY: check_release .PHONY: check_release

2
tests/bats.mk
View file

@ -1,4 +1,4 @@
TEST_DIR = $(ROOT)/tests TEST_DIR = $(CURDIR)/tests
LOCAL_DIR = $(TEST_DIR)/local LOCAL_DIR = $(TEST_DIR)/local
BIN_DIR = $(LOCAL_DIR)/bin BIN_DIR = $(LOCAL_DIR)/bin