fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/145-build-system-rewrite' into fradrive/merge-jost-new-build

Browse Source
This commit is contained in:
Steffen Jost 2024-11-26 08:48:16 +01:00
commit 7d8f8e0dfc
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -254,10 +254,11 @@ endif
fi
# HELP(start-backend): start development instance
--start-backend: --compile-backend
--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=//'`; \
export HOST=`hostname -s` ; \
export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
export LOG_ALL=$${LOG_ALL:-false} ; \
export LOGLEVEL=$${LOGLEVEL:-info} ; \
@ -270,7 +271,7 @@ endif
export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
export AVSPASS=$${AVSPASS:-nopasswordset} ; \
./bin/uniworx
stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
# 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 --copy-bins

2
package.yaml
View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 Sarah Vaupel <sarah.vaupel@uniworx.de>
# SPDX-FileCopyrightText: 2023-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>
#
# SPDX-License-Identifier: AGPL-3.0-or-later

9
utils/develop-status.pl
View File

@ -75,10 +75,6 @@ my @devs = filesFromDir($develop,
[qr((?:[0-9]{4}-[0-9]{2}-[0-9]{2}T)), 1, "File '%fn' does not look like a development dir, skip"],
]);
for my $devStamp(@devs) {
print "+ Development $devStamp found\n";
devdirInfo($devStamp, "$develop/$devStamp")
}
#my $devDir = undef;
#opendir($devDir, "$develop") or die "Cannot open develop directory, because: $!";
#while(my $devStamp = readdir($devDir)) {
@ -99,6 +95,11 @@ for my $k(sort {
print "Fradrive container outside develop file: ($c->{state}) $c->{name} $c->{id}\n" if $show
}
for my $devStamp(@devs) {
print "+ Development $devStamp found\n";
devdirInfo($devStamp, "$develop/$devStamp")
}
exit 0;
sub devdirInfo {