Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b900c6d374d80272340617da67977607d45a7516
commit b900c6d374d80272340617da67977607d45a7516 Author: Marius Cirsta <[email protected]> Date: Sat Jun 23 15:30:15 2012 +0000 * improved mono.sh regarding nant and added mono as dep diff --git a/source/gnome-extra/ikvm/FrugalBuild b/source/gnome-extra/ikvm/FrugalBuild index b12bd12..2340cbf 100644 --- a/source/gnome-extra/ikvm/FrugalBuild +++ b/source/gnome-extra/ikvm/FrugalBuild @@ -6,30 +6,18 @@ pkgver=0.42.0.6 pkgrel=1 pkgdesc="An implementation of Java for Mono and the Microsoft .NET Framework." _F_sourceforge_ext=".zip" -Finclude sourceforge mono +Finclude sourceforge mono openjava source=($source http://www.frijters.net/classpath-0.95-stripped.zip \ http://www.frijters.net/openjdk6-b16-stripped.zip) -depends=('mono>=2.4') -makedepends=('nant' 'j2sdk') groups=('gnome-extra') archs=('i686' 'x86_64') sha1sums=('d045f6d3bf62876430463b2e1f9bc9e41b893a72' \ '8606522fad75b16752fdb4db6a7e7f09ad181183' \ '5815ab6fa7d175cacbc7e393c0c4f08bb51d5c42') +_F_use_nant="y" -build() { +build() +{ Fcd - unset MAKEFLAGS - Fmonoexport - Fnant - #install files - Fmkdir usr/lib/$pkgname - Fcp $pkgname-$pkgver/bin/* usr/lib/$pkgname/ - for exe in bin/*.exe - do - exebase=${exe##*/} - Fwrapper "mono /usr/lib/$pkgname/${exebase} \"\$@\"" ${exebase%.exe} - - done - Fmonocleanup + Fbuild_mono } diff --git a/source/include/mono.sh b/source/include/mono.sh index 5c288e5..c48d5a4 100644 --- a/source/include/mono.sh +++ b/source/include/mono.sh @@ -32,10 +32,16 @@ # * Fmonoexport(): creates MONO_SHARED_DIR ### +depends=("${depends[@]}" 'mono') + if [ -z "$_F_mono_aot" ]; then _F_mono_aot=1 fi +if [ -n "$_F_use_nant" ]; then + makedepends=("${makedepends[@]}" 'nant') +fi + Fmonoexport() { Fmessage "Exporting weird MONO_SHARED_DIR..." export MONO_SHARED_DIR=$Fdestdir/weird @@ -50,10 +56,6 @@ Fmonoexport() { # * Fmonoccompileaot(): AOT all of the libraries in the pkg ### Fmonocompileaot() { - if [ "$CARCH" == "ppc" ]; then - Fmessage "AOTing not supported on this platform" - return - fi Fmessage "AOTing all of the libraries..." for i in $Fdestdir/usr/lib/mono/gac/*/*/*.dll do @@ -78,12 +80,12 @@ Fmonocleanup() { ### Fbuild_mono() { unset MAKEFLAGS - if [ "$CARCH" != "ppc" ]; then - #new garbage collector not supported by ppc - export MONO_ENV_OPTIONS="--gc=sgen" - fi Fmonoexport + if [ -z "$_F_use_nant" ]; then Fbuild $@ + else + Fnant $@ + fi if [ "$_F_mono_aot" -eq 1 ]; then Fmonocompileaot fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
