From 93124de62c974f6aee142833bfe76c58c403a479 Mon Sep 17 00:00:00 2001 From: Gabe Becker Date: Fri, 27 Jul 2018 11:00:38 -0700 Subject: [PATCH] windows stuff. vbump --- DESCRIPTION | 2 +- R/makeWinBins.R | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 46a03cf..05977b4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: GRANBase Type: Package Title: Creating Continuously Integrated Package Repositories from Manifests -Version: 2.5.1.3 +Version: 2.5.1.4 Author: Gabriel Becker[aut,cre], Cory Barr [cre,ctb], Dinakar Kulkarni [aut,ctb] Maintainer: Gabriel Becker Copyright: Genentech Inc diff --git a/R/makeWinBins.R b/R/makeWinBins.R index c95ba52..5b2fbc3 100644 --- a/R/makeWinBins.R +++ b/R/makeWinBins.R @@ -18,8 +18,8 @@ makeWinBins <- function(repo, # Clean up the Windows binary builds directory updateArchive(repo, - repodest = windowsbindir, - archive = file.path(windowsbindir, "Archive"), + repodest = bindir, + archive = file.path(bindir, "Archive"), ext = "\\.zip$") # Make binary builds @@ -40,15 +40,15 @@ makeWinBins <- function(repo, "", basename(srcpkg)), ".zip") if (file.exists(file.path(virtualstore, binpkg))) { file.rename(from = file.path(virtualstore, binpkg), - to = file.path(windowsbindir, binpkg)) + to = file.path(bindir, binpkg)) } else if (file.exists(file.path(getwd(), binpkg))) { file.rename(from = file.path(getwd(), binpkg), - to = file.path(windowsbindir, binpkg)) + to = file.path(bindir, binpkg)) } else { message(getwd(), " is the working dir and no zips were created here") } }, pkgName = srcbuilds, mc.cores = cores) # Create PACKAGES files - write_PACKAGES(windowsbindir) + write_PACKAGES(bindir) }