AniNIX
/
HelloWorld
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updates for Java and makepkg changes

This commit is contained in:
DarkFeather 2021-01-16 19:37:29 -06:00
parent 216021b633
commit e4184ec775
Signed by: DarkFeather
GPG Key ID: 1CC1E3F4ED06F296
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,6 +2,7 @@ HelloWorld
HelloWorld.class HelloWorld.class
HelloWorld.exe HelloWorld.exe
tests/__pycache__ tests/__pycache__
*.tar.xz *.tar.zst
*.tar.zst.sig
pkg/ pkg/
src/ src/

4
Makefile
View File

@ -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/bin/java /usr/bin/javac java: HelloWorld.java /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk/bin/javac
javac HelloWorld.java /usr/lib/jvm/java-15-openjdk/bin/javac HelloWorld.java
bash: HelloWorld.bash /usr/bin/bash bash: HelloWorld.bash /usr/bin/bash
#bash HelloWorld.bash #bash HelloWorld.bash

6
PKGBUILD
View File

@ -1,4 +1,4 @@
pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//' | tr '[[:upper:]]' '[[:lower:]]')" pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')"
pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)" pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)"
pkgrel=1 pkgrel=1
pkgrel() { pkgrel() {
@ -10,8 +10,8 @@ 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' 'java-environment' 'python>=3.7') depends=('bash>=4.4' 'php' 'perl' 'jre-openjdk>=15.0.1' 'python>=3.7')
makedepends=('make>=4.2' 'mono>5.0.0' 'gcc') makedepends=('make>=4.2' 'mono>5.0.0' 'gcc' 'python-pytest')
checkdepends=() checkdepends=()
optdepends=() optdepends=()
provides=("${pkgname}") provides=("${pkgname}")

2
tests/test_unit.py
View File

@ -21,7 +21,7 @@ def test_cs():
def test_java(): def test_java():
print(os.getcwd()) print(os.getcwd())
fh = os.popen("java HelloWorld", mode='r', buffering=-1) fh = os.popen("/usr/lib/jvm/java-15-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)