Skip to content

Commit

Permalink
add tokensh to makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
zachmann committed May 8, 2024
1 parent 829e759 commit c0a9f33
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ GEN = oidc-gen
ADD = oidc-add
CLIENT = oidc-token
KEYCHAIN = oidc-keychain
TOKENSH = oidc-tokensh
AGENT_SERVICE = oidc-agent-service
PROMPT = oidc-prompt

Expand Down Expand Up @@ -334,6 +335,7 @@ endif
SIMPLECSS_FILE := $(shell CSS="/usr/share/simple.css/simple.min.css" && [ -f "$$CSS" ] || CSS="$(PROMPT_SRCDIR)/html/static/css/lib/simple.min.css" ; echo "$$CSS")
ifndef ANY_MSYS
KEYCHAIN_SOURCES := $(SRCDIR)/$(KEYCHAIN)/$(KEYCHAIN)
TOKENSH_SOURCES := $(SRCDIR)/$(TOKENSH)/$(TOKENSH)
AGENTSERVICE_SRCDIR := $(SRCDIR)/$(AGENT_SERVICE)
endif
endif
Expand Down Expand Up @@ -421,7 +423,7 @@ else
ifdef MINGW
build: shared_lib $(APILIB)/liboidc-agent.a
else
build: $(BINDIR)/$(AGENT) $(BINDIR)/$(GEN) $(BINDIR)/$(ADD) $(BINDIR)/$(CLIENT) $(BINDIR)/$(AGENT_SERVICE) $(BINDIR)/$(KEYCHAIN) $(BINDIR)/$(PROMPT)
build: $(BINDIR)/$(AGENT) $(BINDIR)/$(GEN) $(BINDIR)/$(ADD) $(BINDIR)/$(CLIENT) $(BINDIR)/$(AGENT_SERVICE) $(BINDIR)/$(KEYCHAIN) $(BINDIR)/$(TOKENSH) $(BINDIR)/$(PROMPT)
endif
endif

Expand Down Expand Up @@ -508,6 +510,10 @@ $(BINDIR)/$(KEYCHAIN): $(KEYCHAIN_SOURCES) $(BINDIR)
@cat $(KEYCHAIN_SOURCES) >$@ && chmod 755 $@
@echo "Building "$@" complete!"

$(BINDIR)/$(TOKENSH): $(TOKENSH_SOURCES) $(BINDIR)
@cat $(TOKENSH_SOURCES) >$@ && chmod 755 $@
@echo "Building "$@" complete!"

$(BINDIR)/$(AGENT_SERVICE): $(AGENTSERVICE_SRCDIR)/$(AGENT_SERVICE) $(AGENTSERVICE_SRCDIR)/options $(BINDIR)
@sed -n '/OIDC_INCLUDE/!p;//q' $< >$@
@sed 's!/etc/oidc-agent!$(CONFIG_AFTER_INST_PATH)/oidc-agent!' $(AGENTSERVICE_SRCDIR)/options | sed 's!/usr/bin/oidc-agent!$(BIN_AFTER_INST_PATH)/bin/$(AGENT)!' >>$@
Expand Down Expand Up @@ -541,15 +547,15 @@ endif

ifndef ANY_MSYS
.PHONY: install_bin
install_bin: $(BIN_PATH)/bin/$(AGENT) $(BIN_PATH)/bin/$(GEN) $(BIN_PATH)/bin/$(ADD) $(BIN_PATH)/bin/$(CLIENT) $(BIN_PATH)/bin/$(KEYCHAIN) $(BIN_PATH)/bin/$(AGENT_SERVICE) $(PROMPT_BIN_PATH)/bin/$(PROMPT)
install_bin: $(BIN_PATH)/bin/$(AGENT) $(BIN_PATH)/bin/$(GEN) $(BIN_PATH)/bin/$(ADD) $(BIN_PATH)/bin/$(CLIENT) $(BIN_PATH)/bin/$(KEYCHAIN) $(BIN_PATH)/bin/$(TOKENSH) $(BIN_PATH)/bin/$(AGENT_SERVICE) $(PROMPT_BIN_PATH)/bin/$(PROMPT)
@echo "Installed binaries"

.PHONY: install_conf
install_conf: $(CONFIG_PATH)/oidc-agent/$(PROVIDERCONFIGD) $(CONFIG_PATH)/oidc-agent/$(PROVIDERCONFIG) $(CONFIG_PATH)/oidc-agent/$(GLOBALCONFIG) $(CONFIG_PATH)/oidc-agent/$(SERVICECONFIG) $(TMPFILES_PATH)/oidc-agent.conf
@echo "Installed config files"

.PHONY: install_bash
install_bash: $(BASH_COMPLETION_PATH)/$(AGENT) $(BASH_COMPLETION_PATH)/$(GEN) $(BASH_COMPLETION_PATH)/$(ADD) $(BASH_COMPLETION_PATH)/$(CLIENT) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) $(BASH_COMPLETION_PATH)/$(KEYCHAIN)
install_bash: $(BASH_COMPLETION_PATH)/$(AGENT) $(BASH_COMPLETION_PATH)/$(GEN) $(BASH_COMPLETION_PATH)/$(ADD) $(BASH_COMPLETION_PATH)/$(CLIENT) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) $(BASH_COMPLETION_PATH)/$(KEYCHAIN) $(BASH_COMPLETION_PATH)/$(TOKENSH)
@echo "Installed bash completion"

.PHONY: install_man
Expand Down Expand Up @@ -650,6 +656,9 @@ $(BIN_PATH)/bin/$(CLIENT): $(BINDIR)/$(CLIENT) $(BIN_PATH)/bin
$(BIN_PATH)/bin/$(KEYCHAIN): $(BINDIR)/$(KEYCHAIN) $(BIN_PATH)/bin
@install -p $< $@

$(BIN_PATH)/bin/$(TOKENSH): $(BINDIR)/$(TOKENSH) $(BIN_PATH)/bin
@install -p $< $@

$(BIN_PATH)/bin/$(AGENT_SERVICE): $(BINDIR)/$(AGENT_SERVICE) $(BIN_PATH)/bin
@install -p $< $@

Expand Down Expand Up @@ -686,6 +695,9 @@ $(BASH_COMPLETION_PATH)/$(CLIENT): $(BASH_COMPLETION_PATH)
$(BASH_COMPLETION_PATH)/$(KEYCHAIN): $(BASH_COMPLETION_PATH)
@ln -s $(AGENT) $@

$(BASH_COMPLETION_PATH)/$(TOKENSH): $(BASH_COMPLETION_PATH)
@ln -s $(AGENT) $@

$(BASH_COMPLETION_PATH)/$(AGENT_SERVICE): $(CONFDIR)/bash-completion/oidc-agent-service $(BASH_COMPLETION_PATH)
@install -p -m 644 $< $@

Expand Down Expand Up @@ -777,6 +789,7 @@ uninstall_bin:
@$(rm) $(BIN_PATH)/bin/$(ADD)
@$(rm) $(BIN_PATH)/bin/$(CLIENT)
@$(rm) $(BIN_PATH)/bin/$(KEYCHAIN)
@$(rm) $(BIN_PATH)/bin/$(TOKENSH)
@$(rm) $(BIN_PATH)/bin/$(AGENT_SERVICE)
@$(rm) $(PROMPT_BIN_PATH)/bin/$(PROMPT)
@echo "Uninstalled binaries"
Expand Down Expand Up @@ -808,6 +821,7 @@ uninstall_bashcompletion:
@$(rm) $(BASH_COMPLETION_PATH)/$(AGENT)
@$(rm) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE)
@$(rm) $(BASH_COMPLETION_PATH)/$(KEYCHAIN)
@$(rm) $(BASH_COMPLETION_PATH)/$(TOKENSH)
@echo "Uninstalled bash completion"

endif
Expand Down

0 comments on commit c0a9f33

Please sign in to comment.