remove git revision hack (use git's $Id$ equivalent). put archive symlink in /etc...

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

diff --git a/pkg/trunk/.gitattributes b/pkg/trunk/.gitattributes
new file mode 100644 (file)
index 0000000..de1c092
--- /dev/null
+++ b/pkg/trunk/.gitattributes
@@ -0,0 +1 @@
+R/zzz.R ident

diff --git a/pkg/trunk/R/zzz.R b/pkg/trunk/R/zzz.R
index 59afb30972847574e163b3646ef37320e32ffaca..86dbe1efebc594383349649587a7e7f1a680f29d 100644 (file)
--- a/pkg/trunk/R/zzz.R
+++ b/pkg/trunk/R/zzz.R
@@ -7,11 +7,9 @@
     global("pbuilder_config", '/etc/cran2deb/pbuilderrc')
     global("dput_config", '/etc/cran2deb/dput.cf')
     global("dinstall_config", '/etc/cran2deb/mini-dinstall.conf')
-    global("dinstall_archive", file.path(root,'var/archive'))
+    global("dinstall_archive", '/etc/cran2deb/archive'))
     global("r_depend_fields", c('Depends','Imports')) # Suggests, Enhances
-    # git_revision {
-    global("git_revision","6dfc157087112560aaa8a14902031df266f2e896")
-    # git_revision }
+    global("git_revision","$Id$")
     global("changesfile", function(srcname,version='*') {
         return(file.path(pbuilder_results
                         ,paste(srcname,'_',version,'_'

diff --git a/pkg/trunk/configure b/pkg/trunk/configure
deleted file mode 100755 (executable)
index 03aa5d9..0000000
--- a/pkg/trunk/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# stamp the source with the originating git revision.
-git_rev=$(git show --pretty'=oneline' 'HEAD' | head -n1 | cut -f1 -d' ')
-#git_r='assign("git_revision","'$git_rev'",envir=.GlobalEnv)'
-git_r='    global("git_revision","'$git_rev'")'
-
-awk -v "git_r=$git_r" '
-/# git_revision }/ {suppress=0}
-suppress == 0 {print}
-/# git_revision {/ {print git_r; suppress=1}
-' <R/zzz.R >R/zzz.R.new && \
-mv R/zzz.R.new R/zzz.R

diff --git a/pkg/trunk/inst/doc/README b/pkg/trunk/inst/doc/README
index 487103d250f692d101d98c6a959ed4e050f41db8..ff491cb0e2ff10dc9f369359608ee4f3f7e47d4b 100644 (file)
--- a/pkg/trunk/inst/doc/README
+++ b/pkg/trunk/inst/doc/README
@@ -14,16 +14,18 @@ To configure:
 
 Let ROOT be the value returned by running: cran2deb root
 
-2. ROOT/var/archive should be a symlink pointing to /var/www/cran2deb/
-    $ rm ROOT/var/archive
-    $ ln -s /var/www/cran2deb/ ROOT/var/archive
-3. create /etc/cran2deb
+2. create /etc/cran2deb
    a. copy ROOT/etc/* into /etc/cran2deb
-   b. modify OTHERMIRROR of /etc/cran2deb/pbuilderrc.in to point to your webserver
-4. cran2deb needs a persistent cache outside of R's control. therefore, create
+   b. /etc/cran2deb/archive should be a symlink pointing to /var/www/cran2deb/
+
+    $ ln -s /var/www/cran2deb/ /etc/cran2deb/archive
+
+   c. modify OTHERMIRROR of /etc/cran2deb/pbuilderrc.in to point to your webserver
+
+3. cran2deb needs a persistent cache outside of R's control. therefore, create
     /var/cache/cran2deb, writable by whichever user(s) will run cran2deb.
-5. run: cran2deb update
-6. Try building a simple package: cran2deb build zoo
+4. run: cran2deb update
+5. Try building a simple package: cran2deb build zoo
    (The result will be in /var/cache/cran2deb/results)