tidy up make/build process

This commit is contained in:
Leon van Kammen 2023-11-09 11:24:30 +01:00
parent e42fda84b4
commit e8b5de3665
2 changed files with 45 additions and 34 deletions

View file

@ -37,6 +37,10 @@ Pre-build libraries can be found in [/dist folder](dist)<br>
If you really want to build from source: If you really want to build from source:
``` ```
$ ./make install $ nix-shell # nix-users: drops you into a dev-ready shell
$ ./make build && ./make runtest $ ./make install # debian-users: install deps via apt-get
$ ./make build && ./make tests
``` ```
> NOTE #1: to rebundle the THREE/AFRAME javascripts during dev run `./make build js`
> NOTE #2: to regenerate the parser in various languages (via haxe), run `./make build parser`

19
make
View file

@ -1,7 +1,8 @@
#!/bin/sh !/bin/sh
set -e set -e
try(){ set +e; "$@" 2>/dev/null; set -e; } try(){ set +e; "$@" 2>/dev/null; set -e; }
trace(){ set -x; "$@"; set +x; }
install(){ install(){
which haxe || { which haxe || {
@ -51,15 +52,17 @@ server(){
} }
build(){ build(){
parser(){
try rm dist/* try rm dist/*
haxe build.hxml trace haxe build.hxml
ok=$? ok=$?
sed -i 's|.*nonlocal .*||g' dist/xrfragment.py sed -i 's|.*nonlocal .*||g' dist/xrfragment.py
echo build OK ls -lah dist/*
build_js echo -e "[OK] parser build\n"
} }
build_js(){ js(){
# prepend license to vanilla lib # prepend license to vanilla lib
#echo "// https://xrfragment.org\n// SPDX-License-Identifier: MPL-2.0\n$(cat dist/xrfragment.js)" > dist/xrfragment.js #echo "// https://xrfragment.org\n// SPDX-License-Identifier: MPL-2.0\n$(cat dist/xrfragment.js)" > dist/xrfragment.js
# add js module # add js module
@ -83,6 +86,10 @@ build_js(){
sed 's/export //g' example/assets/js/utils.js > dist/utils.js sed 's/export //g' example/assets/js/utils.js > dist/utils.js
ls -la dist | grep js ls -la dist | grep js
exit $ok exit $ok
}
test -z $1 && { parser && js; }
test -z $1 || "$@"
} }
test -z $1 && build test -z $1 && build