diff --git a/Makefile b/Makefile index 730e52ecf..ff73bd03e 100644 --- a/Makefile +++ b/Makefile @@ -253,7 +253,7 @@ endif $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \ fi -# HELP(start-backend): start yesod-devel instance +# HELP(start-backend): start development instance --start-backend: export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ @@ -270,10 +270,10 @@ endif export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \ export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \ export AVSPASS=$${AVSPASS:-nopasswordset} ; \ - stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" + ./bin/uniworx # HELP(compile-backend): compile backend binaries --compile-backend: - stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin + stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins # HELP(dependencies-backend): (re-)build backend dependencies --dependencies-backend: uniworx.cabal stack build $(STACK_CORES) --fast --only-dependencies @@ -311,7 +311,7 @@ well-known: static; --compile-uniworxdb: --compile-backend SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \ AVSPASS=${AVSPASS:-nopasswordset} ; \ - stack exec uniworxdb -- $(UNIWORXDB_OPTS) + ./bin/uniworxdb $(UNIWORXDB_OPTS) --shell-ghci: stack exec -- ghci diff --git a/stack.yaml b/stack.yaml index 3c331178f..c881ba7b1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -10,6 +10,8 @@ rebuild-ghc-options: true #ghc-options: # "$everything": -fno-prof-auto +local-bin-path: ./bin + build: library-profiling: true executable-profiling: true