Compare commits

...

3 Commits

View File

@ -13,7 +13,6 @@ export UNIWORXDB_OPTS ?= -cf
export CONTAINER_ID
export FRADRIVE_SERVICE
# TODO: to be deprecated
export DEV_PORT_HTTP
export DEV_PORT_HTTPS
export HOOGLE_PORT
@ -338,17 +337,17 @@ NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE))
new-develop:
$(NEW_DEVELOP)
mkdir -p $(DEVELOP)
$(MAKE) .current-develop
$(MAKE) develop/.current
.PHONY: --develop
--develop:
if ! [[ -e develop ]]; then \
$(MAKE) new-develop; \
fi
$(MAKE) .current-develop
.PHONY: .current-develop
.current-develop:
$(MAKE) develop/.current
.PHONY: develop/.current
develop/.current:
$(SET_DEVELOP)
echo "$(DEVELOP)" > .current-develop
echo "$(DEVELOP)" > develop/.current
start: develop start-database start-memcached start-minio start-frontend start-backend;
@ -377,15 +376,18 @@ start-frontend: WATCH = false
# HELP(start-backend): serve yesod development site
# HELP(start-frontend): start frontend watcher. Watches frontend source files for changes and recompiles on change. (TODO: watcher functionality currently broken!)
# HELP(start-hoogle): serve local hoogle instance
# TODO: abort with error if a singleton service is already running
start-%: FRADRIVE_SERVICE = %
start-%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT)))
start-%: --ensure-develop
start-%: --develop
echo "$*"
echo "$(DATE)"
echo "DEV $(DEVELOP)"
if [[ "$(SINGLETON)" = "true" ]]; then \
CONTAINER_FILE=$(DEVELOP)/$* ; \
if ! [[ -e $${CONTAINER_FILE} ]]; then \
>&2 echo "Another $* service is already running! Use \"make new-develop\" or \"make start\" to start a new develop instance despite currently running services." ; \
exit 1 ; \
fi \
else \
DEVDIR=$(DEVELOP)/$*; \
I=`ls $${DEVDIR} | sort -n | tail -n1`; \
@ -399,9 +401,10 @@ start-%: --ensure-develop
DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
./start.sh
--start-hoogle-backend: hoogle.sh
--start-hoogle-backend:
HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
./hoogle.sh
echo "${HOOGLE_PORT}" ; \
stack --work-dir .stack-work-doc hoogle -- -server --local --port $${HOOGLE_PORT}
--start-frontend: static
npm run start