From f20c44ffc303268fbe0d6fbae37890104d8ae7f4 Mon Sep 17 00:00:00 2001 From: Ken Domino Date: Sun, 20 Aug 2023 06:59:09 -0400 Subject: [PATCH] Add missing to bump. --- _scripts/set-version.sh | 6 +++--- src/trgen/templates/PHP/st.test.sh | 24 +++++++++++++++++++++--- src/trgroup/trgroup.csproj | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/_scripts/set-version.sh b/_scripts/set-version.sh index 8b5be1b60..728792a0b 100644 --- a/_scripts/set-version.sh +++ b/_scripts/set-version.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash -version="0.21.1" +version="0.21.2" cd src directories=`find . -maxdepth 1 -type d -name "tr*"` cwd=`pwd` @@ -41,7 +41,7 @@ do mv asdfasdf *.csproj rm -f asdfasdf2 touch readme.md - cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fixes to trgen for Cpp target. Update run.sh in templates.%' > asdfasdf2 + cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.%' > asdfasdf2 mv asdfasdf2 readme.md cd .. done @@ -78,7 +78,7 @@ do mv asdfasdf *.csproj rm -f asdfasdf2 touch readme.md - cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fixes to trgen for Cpp target. Update run.sh in templates.%' > asdfasdf2 + cat readme.md | sed -e 's%^0[.][0-9]*[.][0-9]*.*$'"%$version"' Fix to trconvert for Bison. Add trquery. Fixes to trperf, trparse.%' > asdfasdf2 mv asdfasdf2 readme.md cd .. done diff --git a/src/trgen/templates/PHP/st.test.sh b/src/trgen/templates/PHP/st.test.sh index c5fa8a7ca..658dda825 100644 --- a/src/trgen/templates/PHP/st.test.sh +++ b/src/trgen/templates/PHP/st.test.sh @@ -1,5 +1,8 @@ # Generated from trgen +# comment for local dotnet tools. +global=1 + # People often specify a test file directory, but sometimes no # tests are provided. Git won't check in an empty directory. # Test if the test file directory does not exist, or it is just @@ -24,7 +27,12 @@ files2=`find ../ -type f | grep -v '.errors$' | grep -v '.tr files=() for f in $files2 do - dotnet triconv -- -f utf-8 $f > /dev/null 2>&1 + if [ "$global" == "" ] + then + dotnet triconv -- -f utf-8 $f > /dev/null 2>&1 + else + triconv -f utf-8 $f > /dev/null 2>&1 + fi if [ "$?" = "0" ] then files+=( $f ) @@ -37,7 +45,12 @@ done rm -f parse.txt for f in ${files[*]} do - dotnet trwdog -- php -d memory_limit=1G Test.php -q -tee -tree $f >> parse.txt 2>&1 + if [ "$global" == "" ] + then + dotnet trwdog -- php -d memory_limit=1G Test.php -q -tee -tree $f >> parse.txt 2>&1 + else + trwdog php -d memory_limit=1G Test.php -q -tee -tree $f >> parse.txt 2>&1 + fi xxx="$?" if [ "$xxx" -ne 0 ] then @@ -46,7 +59,12 @@ do done # Group parsing. -echo "${files[*]}" | dotnet trwdog -- php -d memory_limit=1G Test.php -q -x -tee -tree > parse.txt 2>&1 +if [ "$global" == "" ] +then + echo "${files[*]}" | dotnet trwdog -- php -d memory_limit=1G Test.php -q -x -tee -tree > parse.txt 2>&1 +else + echo "${files[*]}" | trwdog php -d memory_limit=1G Test.php -q -x -tee -tree > parse.txt 2>&1 +fi status=$? diff --git a/src/trgroup/trgroup.csproj b/src/trgroup/trgroup.csproj index 0315e3f86..a88c1a59e 100644 --- a/src/trgroup/trgroup.csproj +++ b/src/trgroup/trgroup.csproj @@ -19,7 +19,7 @@ This program is part of the Trash toolkit.]]> portable true snupkg - 0.21.1 + 0.21.2 https://github.com/kaby76/Domemtech.Trash/tree/main/src/trgroup git