From f42afd73619966862b089740fbfffd7905d1e6fe Mon Sep 17 00:00:00 2001 From: ranke Date: Mon, 28 Jul 2014 10:33:13 +0000 Subject: Address platform dependence of tests/pyrithione.R git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@102 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc --- GNUmakefile | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index dfc1b7b..64aa9d4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,7 @@ PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION) PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION) PKGSRC := $(shell basename $(PWD)) +TGZ := ../$(PKGNAME)_$(PKGVERS).tar.gz # Specify the directory holding R binaries. To use an alternate R build (say a # pre-prelease version) use `make RBIN=/path/to/other/R/` or `export RBIN=...` @@ -8,31 +9,6 @@ PKGSRC := $(shell basename $(PWD)) # containing the first instance of R on the PATH. RBIN ?= $(shell dirname "`which R`") -.PHONY: help - -help: - @echo "\nExecute development tasks for $(PKGNAME)\n" - @echo "Usage: \`make \` where is one of:" - @echo "" - @echo "Development Tasks" - @echo "-----------------" - @echo " build Create the package" - @echo " check Invoke build and then check the package" - @echo " install Invoke build and then install the result" - @echo "" - @echo "Packaging Tasks" - @echo "---------------" - @echo " release Give some reminders" - @echo "" - @echo "Using R in: $(RBIN)" - @echo "Set the RBIN environment variable to change this." - @echo "" - - -#------------------------------------------------------------------------------ -# Development Tasks -#------------------------------------------------------------------------------ - build: cd ..;\ "$(RBIN)/R" CMD build $(PKGSRC) @@ -44,3 +20,9 @@ install: build check: build cd ..;\ "$(RBIN)/R" CMD check --as-cran $(PKGNAME)_$(PKGVERS).tar.gz + +winbuilder: build + @echo "Uploading to R-release on win-builder" + curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-release/ + @echo "Uploading to R-devel on win-builder" + curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/ -- cgit v1.2.1