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

diff --git a/trunk/R/build.R b/trunk/R/build.R
index 967c68a..1839e01 100644
--- a/trunk/R/build.R
+++ b/trunk/R/build.R
@@ -36,23 +36,23 @@ build <- function(name,extra_deps,force=F,do_cleanup=T) {
 
         notice('R dependencies:',paste(pkg$depends$r,collapse=', '))
 	#if (debug) notice(paste("build_debian(",pkg,") invoked\n",sep=""))
-        build_debian(pkg)
+        build_debian_srcpkg(pkg)
 	#if (debug) notice(paste("build_debian(",pkg,") completed.\n",sep=""))
 
 
         # upload the package
-	notice("Package upload")
+#	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.")
-	}
+### 	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)) {
@@ -127,23 +127,36 @@ needs_build <- function(name,version) {
     return(T)
 }
 
+build_debian_srcpkg <- function(pkg) {
+    wd <- getwd()
+    #notice(paste("Now in path ",wd,"\n",sep=""))
+    setwd(pbuilder_results)
+   
+    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);
+ls}
+
 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(),
-                 ,'...')
+    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=""))
+    notice(paste("Executing ",'"',cmd,'"'," from directory '",getwd(),"'.\n",sep=""))
     ret = log_system(cmd)
     setwd(wd)
     if (ret != 0) {