mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 15:43:49 +02:00
j: update jconsole wrapper script; update tests
This commit is contained in:
parent
7703143041
commit
f4c18da1e4
1 changed files with 21 additions and 15 deletions
|
@ -4,7 +4,7 @@ _vmaj=901
|
||||||
_vmin=e
|
_vmin=e
|
||||||
_vrel=${_vmaj}-release${_vmin:+-}${_vmin}
|
_vrel=${_vmaj}-release${_vmin:+-}${_vmin}
|
||||||
version=${_vmaj}.${_vmin}
|
version=${_vmaj}.${_vmin}
|
||||||
revision=1
|
revision=2
|
||||||
archs="aarch64* x86_64*"
|
archs="aarch64* x86_64*"
|
||||||
wrksrc="jsource-j${_vrel}"
|
wrksrc="jsource-j${_vrel}"
|
||||||
makedepends="libedit-devel libgomp-devel libomp-devel"
|
makedepends="libedit-devel libgomp-devel libomp-devel"
|
||||||
|
@ -29,20 +29,22 @@ aarch64*) _jpl="raspberry";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "${XBPS_TARGET_MACHINE}" in
|
case "${XBPS_TARGET_MACHINE}" in
|
||||||
*-musl) makedepends+=" musl-fts-devel";;
|
*-musl) makedepends+=" musl-fts-devel";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
sed "/jversion/s@${_vmaj}@${_vrel}@
|
cp jsrc/jversion-x.h jsrc/jversion.h
|
||||||
/jplatform/s@unknown@${_jpl}@
|
vsed -i "/jversion/s@${_vmaj}@${_vrel}@;
|
||||||
/jtype/s@beta@${_jtype}@
|
/jplatform/s@unknown@${_jpl}@;
|
||||||
/jbuilder/s@unknown@${_jbuilder}@" \
|
/jtype/s@beta@${_jtype}@;
|
||||||
jsrc/jversion-x.h > jsrc/jversion.h
|
/jbuilder/s@unknown@${_jbuilder}@" \
|
||||||
|
jsrc/jversion.h
|
||||||
|
|
||||||
sed -i "/^install=./s@/usr/share/j/[0-9.]\+@${_jshare}@
|
cp jlibrary/bin/profile.ijs jlibrary/bin/profile.ijs.new
|
||||||
/^user=./s@home,userx@home,'/${_juser}'@" \
|
vsed -i "/^install=./s@/usr/share/j/[0-9.]\+@${_jshare}@;
|
||||||
jlibrary/bin/profile.ijs
|
/^user=./s@home,userx@home,'/${_juser}'@" \
|
||||||
|
jlibrary/bin/profile.ijs.new
|
||||||
}
|
}
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@ -72,10 +74,14 @@ do_check() {
|
||||||
javx=''
|
javx=''
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ln -srf jlibrary/bin/* bin/${_jpl}/${_jsz}${javx}/
|
mkdir -p test/bin
|
||||||
ln -srf jlibrary/{addons,system,tools} bin/${_jpl}/
|
cp -r jlibrary/addons test/bin
|
||||||
|
cp -r jlibrary/system test/bin
|
||||||
|
cp -r jlibrary/tools test/bin
|
||||||
|
cp -r "bin/${_jpl}/${_jsz}${javx}" test/bin
|
||||||
|
cp jlibrary/bin/profile.ijs "test/bin/${_jsz}${javx}"
|
||||||
|
|
||||||
echo 'RECHO ddall' | "bin/${_jpl}/${_jsz}${javx}/jconsole" test/tsu.ijs
|
echo 'RECHO ddall' | "test/bin/${_jsz}${javx}/jconsole" test/tsu.ijs
|
||||||
}
|
}
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@ -98,7 +104,7 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${_jlib}/${_jsz}\${javx}/jconsole -jprofile "${_jetc}/profile.ijs" "\${@}"
|
exec ${_jlib}/${_jsz}\${javx}/jconsole -jprofile "${_jetc}/profile.ijs" "\${@}"
|
||||||
JC
|
JC
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +118,7 @@ do_install() {
|
||||||
|
|
||||||
vmkdir "${_jetc}" 0755
|
vmkdir "${_jetc}" 0755
|
||||||
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
|
vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
|
||||||
vinstall "jlibrary/bin/profile.ijs" 644 "${_jetc}"
|
vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
|
||||||
|
|
||||||
_jconsole_wrapper_script >bin/jc.sh
|
_jconsole_wrapper_script >bin/jc.sh
|
||||||
vbin "bin/jc.sh" jc
|
vbin "bin/jc.sh" jc
|
||||||
|
|
Loading…
Add table
Reference in a new issue