Correcting Java issues; improvements for `make clean`

This commit is contained in:
DarkFeather 2022-05-17 23:52:04 -05:00
parent 4398103dc4
commit 0324ce8bbe
Signed by: DarkFeather
GPG Key ID: 1CC1E3F4ED06F296
4 changed files with 6 additions and 9 deletions

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
HelloWorld HelloWorld
HelloWorld.class HelloWorld.class
HelloWorld.exe HelloWorld.exe
tests/__pycache__ __pycache__
*.tar.zst *.tar.zst
*.tar.zst.sig *.tar.zst.sig
pkg/ pkg/

View File

@ -11,7 +11,7 @@ test: compile
python3 -m pytest python3 -m pytest
clean: clean:
cat .gitignore | xargs rm -Rf for i in `cat .gitignore`; do /bin/bash -c "rm -Rf $$i"; done
diff: diff:
@echo Nothing to do. @echo Nothing to do.
@ -25,8 +25,8 @@ checkperm:
c: HelloWorld.c /usr/bin/gcc c: HelloWorld.c /usr/bin/gcc
gcc -o HelloWorld HelloWorld.c gcc -o HelloWorld HelloWorld.c
java: HelloWorld.java /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk/bin/javac java: HelloWorld.java /usr/lib/jvm/java-18-openjdk/bin/javac /usr/lib/jvm/java-18-openjdk/bin/java
/usr/lib/jvm/java-15-openjdk/bin/javac HelloWorld.java /usr/lib/jvm/java-18-openjdk/bin/javac HelloWorld.java
bash: HelloWorld.bash /usr/bin/bash bash: HelloWorld.bash /usr/bin/bash
#bash HelloWorld.bash #bash HelloWorld.bash
@ -34,9 +34,6 @@ bash: HelloWorld.bash /usr/bin/bash
php: HelloWorld.php /usr/bin/php php: HelloWorld.php /usr/bin/php
#php HelloWorld.php #php HelloWorld.php
#hack: HelloWorld.php /usr/bin/hhvm
#hhvm --php HelloWorld.php
perl: HelloWorld.pl /usr/bin/perl perl: HelloWorld.pl /usr/bin/perl
#perl ./HelloWorld.pl #perl ./HelloWorld.pl

View File

@ -10,7 +10,7 @@ arch=("x86_64")
url="https://aninix.net/foundation/${pkgname}" url="https://aninix.net/foundation/${pkgname}"
license=('custom') license=('custom')
groups=() groups=()
depends=('bash>=4.4' 'php' 'perl' 'jre-openjdk>=15.0.1' 'python>=3.7') depends=('bash>=4.4' 'php' 'perl' 'jdk-openjdk>=18.0.1.1.u2-1' 'jre-openjdk-headless>=18.0.1.1.u2-1' 'python>=3.7')
makedepends=('make>=4.2' 'mono>5.0.0' 'gcc' 'python-pytest') makedepends=('make>=4.2' 'mono>5.0.0' 'gcc' 'python-pytest')
checkdepends=() checkdepends=()
optdepends=() optdepends=()

View File

@ -21,7 +21,7 @@ def test_cs():
def test_java(): def test_java():
print(os.getcwd()) print(os.getcwd())
fh = os.popen("/usr/lib/jvm/java-15-openjdk/bin/java HelloWorld", mode='r', buffering=-1) fh = os.popen("/usr/lib/jvm/java-18-openjdk/bin/java HelloWorld", mode='r', buffering=-1)
output = fh.read() output = fh.read()
retcode = fh.close() retcode = fh.close()
assert retcode == None and CheckOutput(output) assert retcode == None and CheckOutput(output)