diff --git a/CI/teal_ci.sh b/CI/teal_ci.sh index 14aff96bc5..f08a1f8c9e 100755 --- a/CI/teal_ci.sh +++ b/CI/teal_ci.sh @@ -1,9 +1,7 @@ -pushd . - docs/source/install_luadocumentor_in_docker.sh - PATH=$PATH:~/luarocks/bin +pushd . echo "Install Teal Cyan" git clone https://github.com/teal-language/cyan.git --depth 1 cd cyan @@ -12,7 +10,6 @@ luarocks make cyan-dev-1.rockspec LUAROCKS=~/luarocks/bin export LUAROCKS popd -pushd docs -./generate_teal_declarations.sh ../teal_declarations -popd + +scripts/generate_teal_declarations.sh ./teal_declarations zip teal_declarations.zip -r teal_declarations diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh index 7c8815e808..0c5a8e5a6a 100755 --- a/docs/source/generate_luadoc.sh +++ b/docs/source/generate_luadoc.sh @@ -7,7 +7,7 @@ DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor if [ ! -x $DOCUMENTOR_PATH ]; then if [ -f /.dockerenv ] || [ -f /home/docs/omw_luadoc_docker ]; then - . install_luadocumentor_in_docker.sh + ./install_luadocumentor_in_docker.sh else # running on Windows? DOCUMENTOR_PATH="$APPDATA/LuaRocks/bin/openmwluadocumentor.bat" diff --git a/docs/generate_teal_declarations.sh b/scripts/generate_teal_declarations.sh similarity index 72% rename from docs/generate_teal_declarations.sh rename to scripts/generate_teal_declarations.sh index 99cf60416b..94f6ea125a 100755 --- a/docs/generate_teal_declarations.sh +++ b/scripts/generate_teal_declarations.sh @@ -4,13 +4,15 @@ if [ -z "$LUAROCKS" ]; then fi if [ -z "$1" ]; then - echo "Takes an absolute path to the output directory as the argument" + echo "Takes a path to the output directory as the argument" exit fi -DOCS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -FILES_DIR=$(realpath $DOCS_DIR/../files) -OUTPUT_DIR=$1 +SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +OPENMW_DIR=$(realpath $SCRIPTS_DIR/..) +DOCS_DIR=$(realpath $OPENMW_DIR/docs) +FILES_DIR=$(realpath $OPENMW_DIR/files) +OUTPUT_DIR=$(realpath "$1") DOCUMENTOR_PATH=$LUAROCKS/openmwluadocumentor TEAL_PATH=$LUAROCKS/cyan