From ea3160431a53850d81f9f1a5b850ac61305c9d65 Mon Sep 17 00:00:00 2001 From: blundellc Date: Sat, 13 Sep 2008 13:25:37 +0000 Subject: [PATCH] rJava: depend upon autotools-dev, run R CMD javareconf before build. build hook for R CMD javareconf is hacky and needs to be replaced, but works for now. rJava needs to depend upon autotools-dev to ensure it has up to date configure scripts. also drop BioC for now. git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@116 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- pkg/trunk/R/zzz.R | 2 +- pkg/trunk/data/populate_depend_aliases | 1 + pkg/trunk/data/populate_forcedep | 1 + pkg/trunk/exec/update_cache | 7 +++---- pkg/trunk/inst/etc/hook/A80rjava | 4 ++++ 5 files changed, 10 insertions(+), 5 deletions(-) create mode 100755 pkg/trunk/inst/etc/hook/A80rjava diff --git a/pkg/trunk/R/zzz.R b/pkg/trunk/R/zzz.R index 39a935e..fe75b9a 100644 --- a/pkg/trunk/R/zzz.R +++ b/pkg/trunk/R/zzz.R @@ -10,7 +10,7 @@ global("dinstall_archive", file.path(root,'var/archive')) global("r_depend_fields", c('Depends','Imports')) # Suggests, Enhances # git_revision { - global("git_revision","0a42c69323bbf485eb18fc4345253bee2efd7aff") + global("git_revision","3278eadbf43c0c5a8a46f2298a38860c34f07ba4") # git_revision } global("changesfile", function(srcname,version='*') { return(file.path(pbuilder_results diff --git a/pkg/trunk/data/populate_depend_aliases b/pkg/trunk/data/populate_depend_aliases index b36f536..175d74a 100644 --- a/pkg/trunk/data/populate_depend_aliases +++ b/pkg/trunk/data/populate_depend_aliases @@ -37,3 +37,4 @@ alias_run sqlite libsqlite3-0 alias_build sqlite libsqlite3-dev alias zlib zlib1g-dev alias cshell tsch|csh|c-shell +alias_build autotools autotools-dev diff --git a/pkg/trunk/data/populate_forcedep b/pkg/trunk/data/populate_forcedep index 5da35da..cdd8495 100644 --- a/pkg/trunk/data/populate_forcedep +++ b/pkg/trunk/data/populate_forcedep @@ -1,4 +1,5 @@ force java rJava +force autotools rJava force sqlite RSQLite force sqlite SQLiteDF force boost RBGL diff --git a/pkg/trunk/exec/update_cache b/pkg/trunk/exec/update_cache index 9fc98a2..5370210 100755 --- a/pkg/trunk/exec/update_cache +++ b/pkg/trunk/exec/update_cache @@ -11,10 +11,9 @@ mirror <- 'http://cran.r-project.org/' message('updating list of available R packages...') available <- available.packages(contrib.url(mirror)) -available <- rbind(available,available.packages(contrib.url('http://www.bioconductor.org/'))) -# prefer CRAN -dupes <- duplicated(rownames(available), fromLast=T) -available <- available[!dupes,] +#available <- rbind(available,available.packages(contrib.url('http://www.bioconductor.org/'))) +#dupes <- duplicated(rownames(available), fromLast=T) +#available <- available[!dupes,] message('updating list of available R task views...') ctv.available <- available.views(repo=mirror) diff --git a/pkg/trunk/inst/etc/hook/A80rjava b/pkg/trunk/inst/etc/hook/A80rjava new file mode 100755 index 0000000..1d37c8b --- /dev/null +++ b/pkg/trunk/inst/etc/hook/A80rjava @@ -0,0 +1,4 @@ +if [ -n "$(which java)" ] +then + R CMD javareconf +fi -- 2.39.5