]> git.donarmstrong.com Git - cran2deb.git/log
cran2deb.git
15 years agorm pkg (R-forge does not appear to like symlink)
blundellc [Tue, 16 Sep 2008 14:27:00 +0000 (14:27 +0000)]
rm pkg (R-forge does not appear to like symlink)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@167 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoMerged branch/multisys into trunk.
blundellc [Tue, 16 Sep 2008 14:25:40 +0000 (14:25 +0000)]
Merged branch/multisys into trunk.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@166 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoMerge branch/multisys into trunk.
blundellc [Tue, 16 Sep 2008 14:25:15 +0000 (14:25 +0000)]
Merge branch/multisys into trunk.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@165 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoRebase to trunk. Pull in patching fun.
blundellc [Mon, 15 Sep 2008 12:27:36 +0000 (12:27 +0000)]
Rebase to trunk. Pull in patching fun.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@164 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoMerged branch/patch into trunk
blundellc [Mon, 15 Sep 2008 11:32:14 +0000 (11:32 +0000)]
Merged branch/patch into trunk

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@163 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoMerge branch/patch into trunk
blundellc [Mon, 15 Sep 2008 11:31:44 +0000 (11:31 +0000)]
Merge branch/patch into trunk

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@162 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomissed system from build log recreation(!)
blundellc [Mon, 15 Sep 2008 11:12:39 +0000 (11:12 +0000)]
missed system from build log recreation(!)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@161 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoremove invalid forced dependencies
blundellc [Sat, 13 Sep 2008 17:32:25 +0000 (17:32 +0000)]
remove invalid forced dependencies

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@160 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolatest overrides from vienna
blundellc [Sat, 13 Sep 2008 17:17:30 +0000 (17:17 +0000)]
latest overrides from vienna

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@159 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodb: record which system a particular build was for.
blundellc [Sat, 13 Sep 2008 17:07:05 +0000 (17:07 +0000)]
db: record which system a particular build was for.

the biggest side-effect of this change is the database schema must change in a way that
sqlite will not let happen without rebuilding the database. (Hence take this
opportunity to rename git_revision to scm_revision.)

cran2deb essentially behaves as if it cannot see any builds for any system
other than the currently configured one.

Also: note some changes in the documentation. One bit just has a fat warning as
I am feeling lazy. Sorry.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@158 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agouse system-dependent config for pbuilder in update
blundellc [Sat, 13 Sep 2008 16:36:01 +0000 (16:36 +0000)]
use system-dependent config for pbuilder in update

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@157 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomake update use mini-dinstall config from system-depenent config (oops!)
blundellc [Sat, 13 Sep 2008 16:34:14 +0000 (16:34 +0000)]
make update use mini-dinstall config from system-depenent config (oops!)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@156 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoadapt for pbuilder base.tgz moving to system specific naming
blundellc [Sat, 13 Sep 2008 16:09:37 +0000 (16:09 +0000)]
adapt for pbuilder base.tgz moving to system specific naming

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@155 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoinfomercial + host_arch regression
blundellc [Sat, 13 Sep 2008 16:01:22 +0000 (16:01 +0000)]
infomercial + host_arch regression

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@154 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomissing parentheses
blundellc [Sat, 13 Sep 2008 15:59:16 +0000 (15:59 +0000)]
missing parentheses

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@153 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomultisys: support for multiple os-arch configurations (preliminary)
blundellc [Sat, 13 Sep 2008 15:56:25 +0000 (15:56 +0000)]
multisys: support for multiple os-arch configurations (preliminary)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@152 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoBuild-Depend upon dpatch
blundellc [Sat, 13 Sep 2008 15:15:11 +0000 (15:15 +0000)]
Build-Depend upon dpatch

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@151 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodrop simple-patchsys; r-cran.mk already uses dpatch.
blundellc [Sat, 13 Sep 2008 15:07:25 +0000 (15:07 +0000)]
drop simple-patchsys; r-cran.mk already uses dpatch.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@150 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoA first simple attempt at patching.
blundellc [Sat, 13 Sep 2008 14:54:23 +0000 (14:54 +0000)]
A first simple attempt at patching.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@149 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agochange git_revision to scm_revision; use svn $Id$.
blundellc [Sat, 13 Sep 2008 14:03:29 +0000 (14:03 +0000)]
change git_revision to scm_revision; use svn $Id$.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@148 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolink R-forge pkg to the trunk of development.
blundellc [Sat, 13 Sep 2008 13:40:38 +0000 (13:40 +0000)]
link R-forge pkg to the trunk of development.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@147 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoremove pkg (to replace next commit...)
blundellc [Sat, 13 Sep 2008 13:39:51 +0000 (13:39 +0000)]
remove pkg (to replace next commit...)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@146 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agopkg/trunk -> trunk
blundellc [Sat, 13 Sep 2008 13:38:05 +0000 (13:38 +0000)]
pkg/trunk -> trunk

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@145 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agosome extra licenses
blundellc [Sat, 13 Sep 2008 13:29:14 +0000 (13:29 +0000)]
some extra licenses

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@144 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolicense: try looking in inst/ for LICENSE; fail nicely if it is missing.
blundellc [Sat, 13 Sep 2008 13:29:06 +0000 (13:29 +0000)]
license: try looking in inst/ for LICENSE; fail nicely if it is missing.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@143 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoDESCRIPTION: if Maintainer and/or Author are not defined, use the other, or fail...
blundellc [Sat, 13 Sep 2008 13:28:57 +0000 (13:28 +0000)]
DESCRIPTION: if Maintainer and/or Author are not defined, use the other, or fail gracefully.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@142 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoiconv: don't truncate input; omit the invalid character and continue.
blundellc [Sat, 13 Sep 2008 13:28:50 +0000 (13:28 +0000)]
iconv: don't truncate input; omit the invalid character and continue.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@141 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agotypo! if length is *less* than one, then substitute.
blundellc [Sat, 13 Sep 2008 13:28:43 +0000 (13:28 +0000)]
typo! if length is *less* than one, then substitute.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@140 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agonew overrides from a most productive session with Dirk!
blundellc [Sat, 13 Sep 2008 13:28:36 +0000 (13:28 +0000)]
new overrides from a most productive session with Dirk!

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@139 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agofix umask to 002
blundellc [Sat, 13 Sep 2008 13:28:29 +0000 (13:28 +0000)]
fix umask to 002

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@138 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agowork around lintian's extended-description-is-empty message.
blundellc [Sat, 13 Sep 2008 13:28:21 +0000 (13:28 +0000)]
work around lintian's extended-description-is-empty message.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@137 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepend: change ls output to match the input. this should help compare the database...
blundellc [Sat, 13 Sep 2008 13:28:12 +0000 (13:28 +0000)]
depend: change ls output to match the input. this should help compare the database to what's in git.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@136 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agorepopulate: the repopulate command, as previously promised but somehow missed from...
blundellc [Sat, 13 Sep 2008 13:28:03 +0000 (13:28 +0000)]
repopulate: the repopulate command, as previously promised but somehow missed from the commit.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@135 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolatest_log: small tool to show the latest log messages for a failed or successful...
blundellc [Sat, 13 Sep 2008 13:27:56 +0000 (13:27 +0000)]
latest_log: small tool to show the latest log messages for a failed or successful build of a package.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@134 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agotypo: build->bin, correctly report forced binary dependencies.
blundellc [Sat, 13 Sep 2008 13:27:46 +0000 (13:27 +0000)]
typo: build->bin, correctly report forced binary dependencies.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@133 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoforce cairoDevice to depend upon libgtk
blundellc [Sat, 13 Sep 2008 13:27:39 +0000 (13:27 +0000)]
force cairoDevice to depend upon libgtk

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@132 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomore verbose dependency messages. rewrite some scripts to use sh not rc (a few compl...
blundellc [Sat, 13 Sep 2008 13:27:30 +0000 (13:27 +0000)]
more verbose dependency messages.  rewrite some scripts to use sh not rc (a few complicated ones remain).  separate update into update and repopulate. add some documentation.

cran2deb repopulate will bump the DB version, cran2deb update will not.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@131 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodoc: add a pointer to `cran2deb help'
blundellc [Sat, 13 Sep 2008 13:27:22 +0000 (13:27 +0000)]
doc: add a pointer to `cran2deb help'

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@130 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodoc: document installation and some of the database internals
blundellc [Sat, 13 Sep 2008 13:27:13 +0000 (13:27 +0000)]
doc: document installation and some of the database internals

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@129 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoset the default umask for cran2deb to 002 and clean up the archive after build. hopef...
blundellc [Sat, 13 Sep 2008 13:27:05 +0000 (13:27 +0000)]
set the default umask for cran2deb to 002 and clean up the archive after build. hopefully this will allow smoother group operation.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@128 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoremaining archive transistion
blundellc [Sat, 13 Sep 2008 13:26:58 +0000 (13:26 +0000)]
remaining archive transistion

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@127 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agorevert to using git commit id in zzz.R; git $Id$ is not the same as CVS $Id$
blundellc [Sat, 13 Sep 2008 13:26:51 +0000 (13:26 +0000)]
revert to using git commit id in zzz.R; git $Id$ is not the same as CVS $Id$

git $Id$ binds to the identity of the resident object, not of the
ocmmit.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@126 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoremove git revision hack (use git's $Id$ equivalent). put archive symlink in /etc...
blundellc [Sat, 13 Sep 2008 13:26:43 +0000 (13:26 +0000)]
remove git revision hack (use git's $Id$ equivalent). put archive symlink in /etc/cran2deb

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@125 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agotypo: extra )
blundellc [Sat, 13 Sep 2008 13:26:35 +0000 (13:26 +0000)]
typo: extra )

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@124 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoconfig: move ROOT/etc to /etc/cran2deb
blundellc [Sat, 13 Sep 2008 13:26:26 +0000 (13:26 +0000)]
config: move ROOT/etc to /etc/cran2deb

installing a new cran2deb no longer will clobber the previous config.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@123 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agosupport local CRAN/BioC mirror in /srv/R/Repositories
blundellc [Sat, 13 Sep 2008 13:26:18 +0000 (13:26 +0000)]
support local CRAN/BioC mirror in /srv/R/Repositories

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@122 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoadd amd64 to repository.
blundellc [Sat, 13 Sep 2008 13:26:11 +0000 (13:26 +0000)]
add amd64 to repository.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@121 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepend: typo tsch -> tcsh.
blundellc [Sat, 13 Sep 2008 13:26:04 +0000 (13:26 +0000)]
depend: typo tsch -> tcsh.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@120 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agogsoc_final
blundellc [Sat, 13 Sep 2008 13:25:59 +0000 (13:25 +0000)]
gsoc_final

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@119 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoThis directory will host the tags
blundellc [Sat, 13 Sep 2008 13:25:55 +0000 (13:25 +0000)]
This directory will host the tags

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@118 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepend: update dependencies to match what's in the Debian repository. force run...
blundellc [Sat, 13 Sep 2008 13:25:46 +0000 (13:25 +0000)]
depend: update dependencies to match what's in the Debian repository.  force run dependencies as build dependencies.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@117 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agorJava: depend upon autotools-dev, run R CMD javareconf before build.
blundellc [Sat, 13 Sep 2008 13:25:37 +0000 (13:25 +0000)]
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

15 years agobuild: always force the build of packages mentioned on the command line.
blundellc [Sat, 13 Sep 2008 13:25:29 +0000 (13:25 +0000)]
build: always force the build of packages mentioned on the command line.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@115 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agopkg: push more of the responsibility for the source archive into getrpkg.
blundellc [Sat, 13 Sep 2008 13:25:22 +0000 (13:25 +0000)]
pkg: push more of the responsibility for the source archive into getrpkg.

in particular this allows us to use a previous source archive for a new
build of the same upstream version.  the factorisation is much simpler
this way too.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@114 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodoc: document the commands better
blundellc [Sat, 13 Sep 2008 13:25:13 +0000 (13:25 +0000)]
doc: document the commands better

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@113 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodata: cran2deb.db should not be here -- it is created in /var/cache/cran2deb
blundellc [Sat, 13 Sep 2008 13:25:05 +0000 (13:25 +0000)]
data: cran2deb.db should not be here -- it is created in /var/cache/cran2deb

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@112 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agouse NULL instead of NA. include git revision and date stamp in build log. generate...
blundellc [Sat, 13 Sep 2008 13:24:56 +0000 (13:24 +0000)]
use NULL instead of NA. include git revision and date stamp in build log. generate changelog.

NA has length 1 and conveys perhaps-ok information. NULL was often more
appropriate.

a configure script edits R/zzz.R to add a new global 'git_revision'
prior to R building the package. This assumes that the current working
directory is in a git repository and will fail if it is not.

changelog generated according to Debian guidelines---latest builds to
the top. Included: the git revision of cran2deb, the time/date, and the
database version.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@111 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodata: add some more default dependency aliases, forced dependencies, and licenses.
blundellc [Sat, 13 Sep 2008 13:24:49 +0000 (13:24 +0000)]
data: add some more default dependency aliases, forced dependencies, and licenses.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@110 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agogetrpkg: increase the timeout: there's a 45MB R package!
blundellc [Sat, 13 Sep 2008 13:24:42 +0000 (13:24 +0000)]
getrpkg: increase the timeout: there's a 45MB R package!

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@109 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoREADME: document some of the cran2deb commands.
blundellc [Sat, 13 Sep 2008 13:24:34 +0000 (13:24 +0000)]
README: document some of the cran2deb commands.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@108 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoupdate_cache: remove duplicate packages from available.
blundellc [Sat, 13 Sep 2008 13:24:26 +0000 (13:24 +0000)]
update_cache: remove duplicate packages from available.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@107 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agogetrpkg: invoke curl rather than using download.packages.
blundellc [Sat, 13 Sep 2008 13:24:18 +0000 (13:24 +0000)]
getrpkg: invoke curl rather than using download.packages.

curl has the options necessary to make a mass build possible with my
current unreliable internet connection. some tcp connections hang
indefinitely, which indefinitely halts any build. retrying works. R has
no suitable timeout mechanism.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@106 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild: do not compare deb_revision numbers when deciding whether to rebuild or not...
blundellc [Sat, 13 Sep 2008 13:24:11 +0000 (13:24 +0000)]
build: do not compare deb_revision numbers when deciding whether to rebuild or not. remove some unnecessary verbosity in generating debian/control.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@105 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild: make things a little more robust.
blundellc [Sat, 13 Sep 2008 13:24:04 +0000 (13:24 +0000)]
build: make things a little more robust.

turns out c(1,'lala') -> makes 1 a string. use list() instead. also
catch the exception when build_new_version fails.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@104 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agocache: use BioC and CRAN; too many interdependencies. always pick packages in CRAN...
blundellc [Sat, 13 Sep 2008 13:23:56 +0000 (13:23 +0000)]
cache: use BioC and CRAN; too many interdependencies. always pick packages in CRAN over those in BioC. add build depends for java on libgcj9-dev (jni)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@103 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomisc: never try to build base packages. revert from using tee for log_system -- it...
blundellc [Sat, 13 Sep 2008 13:23:49 +0000 (13:23 +0000)]
misc: never try to build base packages. revert from using tee for log_system -- it clobbers the exit status.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@102 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild: log system output, build if last build failed. don't build if last build succe...
blundellc [Sat, 13 Sep 2008 13:23:42 +0000 (13:23 +0000)]
build: log system output, build if last build failed. don't build if last build succeeded and nothing has changed.

in particular, it checks that the upstream version, the debian epoch,
and the database version have not changed.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@101 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoversion: increment revision when a new build is attempted and the previous build...
blundellc [Sat, 13 Sep 2008 13:23:35 +0000 (13:23 +0000)]
version: increment revision when a new build is attempted and the previous build was successful.

every successful build will have its own revision; code to be introduced
ensures that builds only occur when 'things change', hence revisions
correspond to successful builds of things significantly changing, except
the greatest revision, which may be a failed build.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@100 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodb: sql conformant quoting, use NULL not NA for missing values, allow build log overw...
blundellc [Sat, 13 Sep 2008 13:23:28 +0000 (13:23 +0000)]
db: sql conformant quoting, use NULL not NA for missing values, allow build log overwrite.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@99 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoversion: deal with bundles when generating a new build version.
blundellc [Sat, 13 Sep 2008 13:23:21 +0000 (13:23 +0000)]
version: deal with bundles when generating a new build version.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@98 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomisc: change default maintainer to avoid prior art, idem java alias
blundellc [Sat, 13 Sep 2008 13:23:14 +0000 (13:23 +0000)]
misc: change default maintainer to avoid prior art, idem java alias

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@97 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoexec: drop bioc, more verbose version mismatch error, switch hoc to awk (more portable)
blundellc [Sat, 13 Sep 2008 13:23:06 +0000 (13:23 +0000)]
exec: drop bioc, more verbose version mismatch error, switch hoc to awk (more portable)

some packages are in bioc and cran (e.g., graph). this confused cran2deb
as One True Package is expected. to solve this, we could filter for
common tables and take the highest version number. but who's to say
these aren't actually distinct packages? so for now, assume all cran
dependencies are satisfiable in cran (they aren't).

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@96 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agomisc fixes: update database fully rather than just licenses, initialise a variable...
blundellc [Sat, 13 Sep 2008 13:22:58 +0000 (13:22 +0000)]
misc fixes: update database fully rather than just licenses, initialise a variable in autobuild, correct some corruption(?!), don't include orig.tar.gz if the package revision > 1.

slightly worrying how the 5 changed to a 1.

R's error reporting is pretty foul. this missing extra_deps error
manifested itself 3-4 layers down the stack trace. R doesn't give a
stack trace either. not good for large software.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@95 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepends: don't fail prematurely on unavailable packages
blundellc [Sat, 13 Sep 2008 13:22:51 +0000 (13:22 +0000)]
depends: don't fail prematurely on unavailable packages

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@94 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodb: don't quote spaces, semi-colons and commas: it's weird.
blundellc [Sat, 13 Sep 2008 13:22:43 +0000 (13:22 +0000)]
db: don't quote spaces, semi-colons and commas: it's weird.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@93 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agoversion: use base epoch
blundellc [Sat, 13 Sep 2008 13:22:36 +0000 (13:22 +0000)]
version: use base epoch

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@92 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild: automatically version package builds, record results in build log, record...
blundellc [Sat, 13 Sep 2008 13:22:28 +0000 (13:22 +0000)]
build: automatically version package builds, record results in build log, record all cran2deb generated messages in log.

automatic version works as follows:
- if there is no previous build in the database, use R version with
epoch=0 (will probably change to base_epoch in the DB), revision=1.
- if there is a previous build, and the R version of that build is the
same as the R version of the to-be-built, then increment the revision
by one.
- otherwise use the previous epoch and revision=1 with the new R version.

TODO: grab the output from system()s into the log too.
TODO: whilst version changes make sense, the Debian revision number
probably creeps up a little bit too quickly. No point in versioning
failed builds or repeat builds where nothing changed.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@91 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild: refactor, add autobuild command to build outdated packages.
blundellc [Sat, 13 Sep 2008 13:22:20 +0000 (13:22 +0000)]
build: refactor, add autobuild command to build outdated packages.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@90 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodb: tracking builds & packages backend.
blundellc [Sat, 13 Sep 2008 13:22:11 +0000 (13:22 +0000)]
db: tracking builds & packages backend.

note: database needs to be completely recreated with this commit.

packages are flagged for build iff:
- there is no latest build
- the database (or cran2deb) has changed since the last build
- the debian epoch for cran2deb has changed since the last build
- the R version of the last build does not match that of the very
latest R package.
it should be easy to add further conditions in as this is all done with
one moderately-sized SQL SELECT.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@89 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepend: force SQLiteDF to depend upon sqlite. (needs the build depends)
blundellc [Sat, 13 Sep 2008 13:22:03 +0000 (13:22 +0000)]
depend: force SQLiteDF to depend upon sqlite. (needs the build depends)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@88 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodb: version the database.
blundellc [Sat, 13 Sep 2008 13:21:56 +0000 (13:21 +0000)]
db: version the database.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@87 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepends: add forced dependencies, separate run/build depends.
blundellc [Sat, 13 Sep 2008 13:21:48 +0000 (13:21 +0000)]
depends: add forced dependencies, separate run/build depends.

changes sufficient to make failures in rJava and RBGL external: openjdk
is not ready yet (latest crashes during configure), and
libboost-graph-dev 1.34.1-11 is not compatible with gcc 4.3 (see BioC
list archives).

also limit the frequency of pbuilder update and cache update.

note: database must be deleted and rebuilt with this patch.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@86 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agopbuilder: switch from lenny to unstable
blundellc [Sat, 13 Sep 2008 13:21:41 +0000 (13:21 +0000)]
pbuilder: switch from lenny to unstable

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@85 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agotweaks for bulk builds
blundellc [Sat, 13 Sep 2008 13:21:33 +0000 (13:21 +0000)]
tweaks for bulk builds

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@84 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agosysreq: typo header->harder
blundellc [Sat, 13 Sep 2008 13:21:26 +0000 (13:21 +0000)]
sysreq: typo header->harder

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@83 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobulk build modifications: regexp tweaks, license/sysreq override additions, drop...
blundellc [Sat, 13 Sep 2008 13:21:18 +0000 (13:21 +0000)]
bulk build modifications: regexp tweaks, license/sysreq override additions, drop bioc for now.

bioconductor packages appear to be much worse at using undeclared
systemrequirements (or maybe have a different base set they assume) so
drop for now.

current success rate is around 90% to 96%. most failures still due to
poorly formed License: fields (!) followed by undeclared system
requirements.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@82 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agocran2deb: use /var/cache/cran2deb as a permanent cache between installs.
blundellc [Sat, 13 Sep 2008 13:21:11 +0000 (13:21 +0000)]
cran2deb: use /var/cache/cran2deb as a permanent cache between installs.

Previously, when a new cran2deb was installed, cran2deb update would
re-generate the database and cache in their entirety, as well as lose
all previously generated .debs.  Instead they are stored outside the R
package heirarchy and so persist.

The cache is intended to contain everything that should be kept
in-memory for cran2deb (e.g., common data structures like the list of
all available packages), whilst the database is for all other data to be
stored on disk.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@81 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agosysreq: correct syntax. SQL uses % for *. oops.
blundellc [Sat, 13 Sep 2008 13:21:03 +0000 (13:21 +0000)]
sysreq: correct syntax. SQL uses % for *. oops.

also add some system requirements found during bulk build.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@80 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolicense: change syntax: accept licenses not packages. add view command for licenses.
blundellc [Sat, 13 Sep 2008 13:20:56 +0000 (13:20 +0000)]
license: change syntax: accept licenses not packages. add view command for licenses.

also includes some wild license rules from the current bulk build.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@79 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild_some: if there exists a previous list of packages in the current directory...
blundellc [Sat, 13 Sep 2008 13:20:49 +0000 (13:20 +0000)]
build_some: if there exists a previous list of packages in the current directory, use that.

useful for comparative bulk builds.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@78 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agobuild: check for a previous build earlier --- removes the need to download from CRAN...
blundellc [Sat, 13 Sep 2008 13:20:42 +0000 (13:20 +0000)]
build: check for a previous build earlier --- removes the need to download from CRAN to check.

note: requires the availability cache to be up to date.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@77 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolicense: split out some of the heuristics for reducing poorly formed license fields.
blundellc [Sat, 13 Sep 2008 13:20:35 +0000 (13:20 +0000)]
license: split out some of the heuristics for reducing poorly formed license fields.

in particular, do not remove numbers in just one step. it seems common
for people to use:
License: X11 (http://blahblah/dfgdfg/)
which will be reduce to just 'x' if these steps are not split.

Also separate license hashing into getting the license text and then
separately hashing via digest. (Useful for for the 'view' command about to
be added to cran2deb license.)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@76 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agosysreq: remove depth 2 nesting of brackets in comments.
blundellc [Sat, 13 Sep 2008 13:20:27 +0000 (13:20 +0000)]
sysreq: remove depth 2 nesting of brackets in comments.

perhaps should consider using some of the pcre operator here instead, if
it is common for nested brackets in comments. (does not appear to be so
far).

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@75 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agostyle: remove unnecessary imports (they're in DESCRIPTION)
blundellc [Sat, 13 Sep 2008 13:20:20 +0000 (13:20 +0000)]
style: remove unnecessary imports (they're in DESCRIPTION)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@74 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agolicense: hashes of freeform licenses are stored in the database and these hashes...
blundellc [Sat, 13 Sep 2008 13:20:12 +0000 (13:20 +0000)]
license: hashes of freeform licenses are stored in the database and these hashes used for auto-acceptance.

freeform licenses may be files, or may be the contents of the License:
field in the R DESCRIPTION.  such text is mapped to lower case and all
space characters are compressed and mapped to a single space.

a nicer interface for adding these freeform licenses is introduced.
after reviewing the license, its hash may be added as follows:

$ cran2deb license
license> add uroot gpl
(maps hash of whatever freeform license uroot has to gpl)
...
$ cran2deb build uroot
(success is assured!)

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@73 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agostyle: use la_foo_bar instead of la.foo.bar.
blundellc [Sat, 13 Sep 2008 13:20:05 +0000 (13:20 +0000)]
style: use la_foo_bar instead of la.foo.bar.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@72 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agor dependencies: use collapse instead of sep for pasting together disjunct of package...
blundellc [Sat, 13 Sep 2008 13:19:58 +0000 (13:19 +0000)]
r dependencies: use collapse instead of sep for pasting together disjunct of package names.

bug found during mass builds.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@71 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agocran2deb: fixes from first round of mass builds. no major problems so far...
blundellc [Sat, 13 Sep 2008 13:19:51 +0000 (13:19 +0000)]
cran2deb: fixes from first round of mass builds. no major problems so far...

most significant change: add a bundle and all it contains to the list of
possible reverse arc dependencies.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@70 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agocran2deb: small bug fixes.
blundellc [Sat, 13 Sep 2008 13:19:44 +0000 (13:19 +0000)]
cran2deb: small bug fixes.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@69 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

15 years agodepends: distinguish generated names of build/run-time as well as source/binary Debia...
blundellc [Sat, 13 Sep 2008 13:19:37 +0000 (13:19 +0000)]
depends: distinguish generated names of build/run-time as well as source/binary Debian packages.

This cleans up a few spurious uses of tolower(), special cases, and incorrect thinking.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@68 edb9625f-4e0d-4859-8d74-9fd3b1da38cb