* [gentoo-commits] gentoo-x86 commit in dev-lang/scala: scala-2.7.7.ebuild ChangeLog
@ 2009-11-30 9:16 Alistair Bush (ali_bush)
0 siblings, 0 replies; 2+ messages in thread
From: Alistair Bush (ali_bush) @ 2009-11-30 9:16 UTC (permalink / raw
To: gentoo-commits
ali_bush 09/11/30 09:16:19
Modified: ChangeLog
Added: scala-2.7.7.ebuild
Log:
version bump.
(Portage version: 2.1.7.9/cvs/Linux x86_64)
Revision Changes Path
1.18 dev-lang/scala/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 5 Jun 2009 08:45:17 -0000 1.17
+++ ChangeLog 30 Nov 2009 09:16:19 -0000 1.18
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/scala
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.17 2009/06/05 08:45:17 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.18 2009/11/30 09:16:19 ali_bush Exp $
+
+*scala-2.7.7 (30 Nov 2009)
+
+ 30 Nov 2009; Alistair Bush <ali_bush@gentoo.org> +scala-2.7.7.ebuild:
+ Version bump. See #295955
*scala-2.7.5 (05 Jun 2009)
1.1 dev-lang/scala/scala-2.7.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild?rev=1.1&content-type=text/plain
Index: scala-2.7.7.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild,v 1.1 2009/11/30 09:16:19 ali_bush Exp $
JAVA_PKG_IUSE="doc examples source"
WANT_ANT_TASKS="ant-nodeps"
inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
MY_P="${P}.final-sources"
# creating the binary:
# JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile
# cd $WORDKIR
# fix dist/latest link.
# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO
DESCRIPTION="The Scala Programming Language"
HOMEPAGE="http://www.scala-lang.org/"
SRC_URI="!binary? ( http://www.scala-lang.org/downloads/distrib/files/${MY_P}.tgz )
binary? ( mirror://gentoo/${P}-gentoo-binary.tar.bz2 )"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="binary emacs"
# one fails with 1.7, two with 1.4 (blackdown)
RESTRICT="test"
DEPEND=">=virtual/jdk-1.5
!binary? (
dev-java/ant-contrib
dev-java/jline
)"
RDEPEND=">=virtual/jre-1.5
dev-java/jline
!dev-java/scala-bin"
PDEPEND="emacs? ( app-emacs/scala-mode )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
java-pkg-2_pkg_setup
if ! use binary; then
debug-print "Checking for sufficient physical RAM"
ewarn "This package can fail to build with memory allocation errors in some cases."
ewarn "If you are unable to build from sources, please try USE=binary"
ewarn "for this package. See bug #181390 for more information."
ebeep 3
epause 5
if use amd64; then
CHECKREQS_MEMORY="1024"
else
CHECKREQS_MEMORY="512"
fi
check_reqs
fi
}
src_unpack() {
unpack ${A}
cd "${S}"
if ! use binary; then
epatch "${FILESDIR}/${PN}-2.7.3-build.xml.patch"
cd lib || die
# other jars are needed for bootstrap
rm -v jline.jar #cldcapi10.jar midpapi10.jar msil.jar *.dll || die
java-pkg_jar-from --build-only ant-contrib
java-pkg_jar-from jline
fi
}
src_compile() {
if ! use binary; then
eant all.clean dist.done
else
einfo "Skipping compilation, USE=binary is set."
fi
}
src_test() {
eant test.suite || die "Some tests aren't passed"
}
scala_launcher() {
local SCALADIR="/usr/share/${PN}"
local bcp="${SCALADIR}/lib/scala-library.jar"
java-pkg_dolauncher "${1}" --main "${2}" \
--java_args "-Xmx256M -Xms32M -Dscala.home=${SCALADIR} -Denv.emacs=${EMACS}"
}
src_install() {
cd dists/latest || die
local SCALADIR="/usr/share/${PN}/"
#sources are .scala so no use for java-pkg_dosrc
if use source; then
dodir "${SCALADIR}/src"
insinto "${SCALADIR}/src"
doins src/*-src.jar
fi
java-pkg_dojar lib/*.jar
use binary && java-pkg_register-dependency jline
doman man/man1/*.1 || die
local docdir="doc/${PN}-devel-docs"
dodoc doc/README ../../docs/TODO || die
if use doc; then
java-pkg_dojavadoc "${docdir}/api"
dohtml -r "${docdir}/tools" || die
fi
use examples && java-pkg_doexamples "${docdir}/examples"
scala_launcher fsc scala.tools.nsc.CompileClient
scala_launcher scala scala.tools.nsc.MainGenericRunner
scala_launcher scalac scala.tools.nsc.Main
scala_launcher scaladoc scala.tools.nsc.ScalaDoc
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/scala: scala-2.7.7.ebuild ChangeLog
@ 2010-01-09 14:29 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 2+ messages in thread
From: Petteri Raty (betelgeuse) @ 2010-01-09 14:29 UTC (permalink / raw
To: gentoo-commits
betelgeuse 10/01/09 14:29:08
Modified: scala-2.7.7.ebuild ChangeLog
Log:
Split compiling to multiple ant invocations to lower resources needed to build. Hopefully fixes bug #282023.
(Portage version: 2.2_rc61/cvs/Linux i686)
Revision Changes Path
1.2 dev-lang/scala/scala-2.7.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild?r1=1.1&r2=1.2
Index: scala-2.7.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scala-2.7.7.ebuild 30 Nov 2009 09:16:19 -0000 1.1
+++ scala-2.7.7.ebuild 9 Jan 2010 14:29:08 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild,v 1.1 2009/11/30 09:16:19 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.7.7.ebuild,v 1.2 2010/01/09 14:29:08 betelgeuse Exp $
JAVA_PKG_IUSE="doc examples source"
WANT_ANT_TASKS="ant-nodeps"
@@ -78,7 +78,11 @@
src_compile() {
if ! use binary; then
- eant all.clean dist.done
+ # reported in bugzilla that multiple launches use less resources
+ # https://bugs.gentoo.org/show_bug.cgi?id=282023
+ eant all.clean
+ eant build
+ eant dist.done
else
einfo "Skipping compilation, USE=binary is set."
fi
1.19 dev-lang/scala/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 30 Nov 2009 09:16:19 -0000 1.18
+++ ChangeLog 9 Jan 2010 14:29:08 -0000 1.19
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/scala
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.18 2009/11/30 09:16:19 ali_bush Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.19 2010/01/09 14:29:08 betelgeuse Exp $
+
+ 09 Jan 2010; Petteri Räty <betelgeuse@gentoo.org> scala-2.7.7.ebuild:
+ Split compiling to multiple ant invocations to lower resources needed to
+ build. Hopefully fixes bug #282023.
*scala-2.7.7 (30 Nov 2009)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-09 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-30 9:16 [gentoo-commits] gentoo-x86 commit in dev-lang/scala: scala-2.7.7.ebuild ChangeLog Alistair Bush (ali_bush)
-- strict thread matches above, loose matches on Subject: below --
2010-01-09 14:29 Petteri Raty (betelgeuse)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox