X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fbuild.R;h=7c4f617b0d46d9d300acc897d1faf47f99c9c911;hb=c48d582b7c5d15d1a57c56f7ff81b8f4168f282f;hp=74479fb9173c78db5c0f6b5033192a89fc76e31a;hpb=729f83a15e4e2194b48613d2097aba6aaace8a59;p=cran2deb.git

diff --git a/trunk/R/build.R b/trunk/R/build.R
index 74479fb..7c4f617 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=', '))
-        build_debian(pkg)
-
-        # 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!')
-        }
+	#if (debug) notice(paste("build_debian(",pkg,") invoked\n",sep=""))
+        build_debian_srcpkg(pkg)
+	#if (debug) notice(paste("build_debian(",pkg,") completed.\n",sep=""))
 
-        # 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='')))
 
-            Sys.sleep(1)
-        }
-        if (!upload_success) {
-            warn('upload took too long; continuing as normal (some builds may fail temporarily)')
-        }
+        # upload the package
+#	notice("Package upload")
+##         ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local' ,changesfile(pkg$srcname,pkg$debversion))
+
+### 	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)
@@ -107,27 +122,46 @@ 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_srcpkg <- function(pkg) {
+#    wd <- getwd()
+    #notice(paste("Now in path ",wd,"\n",sep=""))
+#    setwd(pkg$path)
+    
+    notice('building Debian source package',pkg$debname,paste('(',pkg$debversion,')',sep=''),'in',getwd(),'...')
+
+    cmd = paste('dpkg-source','-b',pkg$path)
+    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);
+}
+
 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='')
-                 ,'...')
+    
+    notice('building Debian package',pkg$debname,paste('(',pkg$debversion,')',sep=''),'in',getwd(),'...')
 
     cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
     if (version_revision(pkg$debversion) > 2) {
         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);
 }