X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fbuild.R;h=967c68ae7a08ce52334a62e8957d24f35ffc752b;hb=3ba98e7ab3d2ba1f6463224d9ed8e5c1c41b3673;hp=ad3892ad1124c9fa6c8f07e0955b5e73e30fe60a;hpb=d71a9f7db60107a98b1e30fd0e886766169cdf8e;p=cran2deb.git

diff --git a/trunk/R/build.R b/trunk/R/build.R
index ad3892a..967c68a 100644
--- a/trunk/R/build.R
+++ b/trunk/R/build.R
@@ -1,5 +1,5 @@
 
-build <- function(name,extra_deps,force=F) {
+build <- function(name,extra_deps,force=F,do_cleanup=T) {
     # can't, and hence don't need to, build base packages
     if (name %in% base_pkgs) {
         return(T)
@@ -10,7 +10,7 @@ build <- function(name,extra_deps,force=F) {
     # obtain the Debian version-to-be
     version <- try(new_build_version(name))
     if (inherits(version,'try-error')) {
-        error('failed to build',name)
+        error('failed to build in new_build_version: ',name)
         return(NULL)
     }
 
@@ -21,7 +21,9 @@ build <- function(name,extra_deps,force=F) {
         }
 
         if (name %in% db_blacklist_packages()) {
-            fail('package',name,'is blacklisted. consult database for reason.')
+            #fail('package',name,'is blacklisted. consult database for reason.')
+            notice('package',name,'is blacklisted. consult database for reason.')
+            return(NULL)
         }
 
         pkg <- prepare_new_debian(prepare_pkg(dir,name),extra_deps)
@@ -33,32 +35,45 @@ build <- function(name,extra_deps,force=F) {
         file.remove(Sys.glob(file.path(pbuilder_results,'*.upload')))
 
         notice('R dependencies:',paste(pkg$depends$r,collapse=', '))
+	#if (debug) notice(paste("build_debian(",pkg,") invoked\n",sep=""))
         build_debian(pkg)
+	#if (debug) notice(paste("build_debian(",pkg,") completed.\n",sep=""))
 
-        # upload the package
-        ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local'
-                    ,changesfile(pkg$srcname,pkg$debversion))
-        if (ret != 0) {
-            fail('upload failed!')
-        }
 
-        # wait for mini-dinstall to get to work
-        upload_success = FALSE
-        for (i in seq(1,60)) {
-            if (file.exists(file.path(dinstall_archive,'testing','source',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))) {
-                upload_success = TRUE
-                break
-            }
-            warn(i,'/60: does not exist',file.path(dinstall_archive,which_system,'testing','source',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))
+        # upload the package
+	notice("Package upload")
+##         ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local' ,changesfile(pkg$srcname,pkg$debversion))
 
-            Sys.sleep(1)
-        }
-        if (!upload_success) {
-            warn('upload took too long; continuing as normal (some builds may fail temporarily)')
-        }
+	cmd = paste('umask 002; cd /var/www/cran2deb/rep && reprepro -b . include testing', changesfile(pkg$srcname,pkg$debversion),sep=" ")
+        #if (verbose) notice('Executing: ',cmd)
+        ret = log_system(cmd)
+        if (ret != 0) {
+            #fail('upload failed!')
+	    notice("Upload failed, ignored.")
+        } else {
+	    notice("Upload successful.")
+	}
+##         # wait for mini-dinstall to get to work
+##         upload_success = FALSE
+##         for (i in seq(1,12)) {
+##             if (file.exists(file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))) {
+##                 upload_success = TRUE
+##                 break
+##             }
+##             warn(i,'/12: does not exist',file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))
+
+##             Sys.sleep(5)
+##         }
+##         if (!upload_success) {
+##             warn('upload took too long; continuing as normal (some builds may fail temporarily)')
+##         }
         return(pkg$debversion)
     })())
-    cleanup(dir)
+    if (do_cleanup) {
+        cleanup(dir)
+    } else {
+        notice('output is in',dir,'. you must clean this up yourself.')
+    }
     if (is.null(result)) {
         # nothing was done so escape asap.
         return(result)
@@ -90,7 +105,7 @@ needs_build <- function(name,version) {
         notice('rebuilding',name,': no build record or previous build failed')
         return(T)
     }
-    # see if it has already been built
+    # see if it has already been built *and* successfully uploaded
     srcname <- pkgname_as_debian(name,binary=F)
     debname <- pkgname_as_debian(name,binary=T)
     if (file.exists(changesfile(srcname, version))) {
@@ -107,16 +122,20 @@ needs_build <- function(name,version) {
     if (build$db_version != db_get_version()) {
         notice('rebuilding',name,': new db version',build$db_version,'(old) vs',db_get_version(),'(new)')
     }
+    notice(paste("Now deleting ",debname,", ",srcname,".\n",sep=""))
     rm(debname,srcname)
     return(T)
 }
 
 build_debian <- function(pkg) {
     wd <- getwd()
+    #notice(paste("Now in path ",wd,"\n",sep=""))
     setwd(pkg$path)
+    
     notice('building Debian package'
                  ,pkg$debname
                  ,paste('(',pkg$debversion,')',sep='')
+                 ,'in',getwd(),
                  ,'...')
 
     cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
@@ -124,10 +143,12 @@ build_debian <- function(pkg) {
         cmd = paste(cmd,'--debbuildopts','-sd')
         notice('build should exclude original source')
     }
+    notice(paste("Executing '",cmd,"' from directory '",getwd(),"'.\n",sep=""))
     ret = log_system(cmd)
     setwd(wd)
     if (ret != 0) {
         fail('Failed to build package.')
     }
+    return(ret);
 }