Merging some minor things

.gitignore

@@ -33,4 +33,4 @@ hadoop/build.log
 .DS_Store
 /.idea
 .Rproj.user
-lib/resources/R/
+lib/resources/R/

Makefile

@@ -81,9 +81,9 @@ nightly_build_stuff:
 
 build:
 	@echo
-	@echo "PHASE: Building R packages..."
+	@echo "PHASE: Building R inner package..."
 	@echo
-	$(MAKE) -C R build PROJECT_VERSION=$(PROJECT_VERSION)
+	$(MAKE) -C R build_inner PROJECT_VERSION=$(PROJECT_VERSION)
 	@echo
 	@echo "PHASE: Creating ${BUILD_VERSION_JAVA_FILE}..."
 	@echo
@@ -93,6 +93,10 @@ build:
 	@echo
 	$(MAKE) build_h2o PROJECT_VERSION=$(PROJECT_VERSION)
 	@echo
+	@echo "PHASE: Building R outer package..."
+	@echo
+	$(MAKE) -C R build_outer PROJECT_VERSION=$(PROJECT_VERSION)
+	@echo
 	@echo "PHASE: Building hadoop driver..."
 	@echo
 	$(MAKE) -C hadoop build PROJECT_VERSION=$(PROJECT_VERSION)

R/Makefile

@@ -3,14 +3,27 @@ PROJECT_VERSION ?= 99.70
 
 PDFLATEX=$(shell which pdflatex)
 
-build:
-	sed 's/SUBST_PROJECT_VERSION/$(PROJECT_VERSION)/' DESCRIPTION.template > h2oRClient-package/DESCRIPTION
+build_outer:
+	sed 's/SUBST_PROJECT_VERSION/$(PROJECT_VERSION)/' h2o-DESCRIPTION.template > h2o-package/DESCRIPTION
+	sed 's/SUBST_PROJECT_VERSION/$(PROJECT_VERSION)/' h2o-package.template > h2o-package/man/h2o-package.Rd
+ifeq ($(PDFLATEX),)
+	@echo pdflatex not found, skipping pdf generation...
+else
+	R CMD Rd2pdf --force --output="h2o-package/h2o_package.pdf" --title="Package 'h2o'" --no-index --no-preview h2o-package/man 1> /dev/null
+endif
+	cp -f ../target/h2o.jar h2o-package/inst/java/h2o.jar
+	R CMD build h2o-package
+	mkdir -p ../target/R
+	cp -p README.txt ../target/R
+	mv h2o_$(PROJECT_VERSION).tar.gz ../target/R
+
+build_inner:
+	sed 's/SUBST_PROJECT_VERSION/$(PROJECT_VERSION)/' h2oRClient-DESCRIPTION.template > h2oRClient-package/DESCRIPTION
 	sed 's/SUBST_PROJECT_VERSION/$(PROJECT_VERSION)/' h2oRClient-package.template > h2oRClient-package/man/h2oRClient-package.Rd
 ifeq ($(PDFLATEX),)
 	@echo pdflatex not found, skipping pdf generation...
 else
 	R CMD Rd2pdf --force --output="h2oRClient-package/h2oRClient_package.pdf" --title="Package 'h2oRClient'" --no-index --no-preview h2oRClient-package/man 1> /dev/null
-	R CMD Rd2pdf --force --output="h2o-package/h2o_package.pdf" --title="Package 'h2o'" --no-index --no-preview h2o-package/man 1> /dev/null
 endif
 	R CMD build h2oRClient-package
 	echo h2oRClient_$(PROJECT_VERSION).tar.gz > info.txt
@@ -19,22 +32,19 @@ endif
 	mkdir -p ../r_pack_tmp/resources/R
 	cp -p info.txt ../r_pack_tmp/resources/R/info.txt
 	cp -p h2oRClient_$(PROJECT_VERSION).tar.gz ../r_pack_tmp/resources/R
-
 	# Add to resources directory
 	mkdir -p ../lib/resources/R
 	mv info.txt ../lib/resources/R/info.txt
 	mv h2oRClient_$(PROJECT_VERSION).tar.gz ../lib/resources/R	
 
-	R CMD build h2o-package
-	mkdir -p ../target/R
-	cp -p README.txt ../target/R
-	mv h2o_1.0.3.tar.gz ../target/R
-
 clean:
 	rm -f h2oRClient-package/DESCRIPTION
 	rm -f h2oRClient-package/h2oRClient_package.pdf
 	rm -f h2oRClient-package/man/h2oRClient-package.Rd
 	rm -f h2oRClient_*.tar.gz
 
+	rm -f h2o-package/DESCRIPTION
 	rm -f h2o-package/h2o_package.pdf
+	rm -f h2o-package/man/h2o-package.Rd
+	rm -f h2o-package/inst/java/h2o.jar
 	rm -f h2o_*.tar.gz

R/h2o-package/DESCRIPTION

@@ -1,12 +1,13 @@
 Package: h2o
 Type: Package
 Title: Installer for H2O R Interface
-Version: 1.0.3
+Version: 99.70
 Date: 2013-09-13
 Author: Anqi Fu
 Maintainer: Anqi Fu <[email protected]>
 Description: This is a wrapper that installs the package for running H2O via its REST API from within R.
 License: Apache-2
 Depends: R (>= 2.13.0)
 NeedsCompilation: no
+SystemRequirements: java
 URL: http://www.0xdata.com

R/h2o-package/NAMESPACE

@@ -1,4 +1,8 @@
-exportPattern("^[[:alpha:]]+")
-exportMethods(
-    "h2o.init"
-)
+exportPattern("^[[:alpha:]]+")
+exportMethods(
+    "h2o.init",
+    "h2o.shutdown"
+)
+exportClasses(
+	"H2OClient"
+}