Merge branch 'master' into 14669-java-sdk-v2

[arvados.git] / doc / Rakefile

diff --git a/doc/Rakefile b/doc/Rakefile
index 4ba2f1af8dacf22c9d3786694e7953fafcaf7fa2..9deca3a28cf8cc8c6911097aee68f01426d86177 100644 (file)
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -7,7 +7,7 @@ require "rubygems"
 require "colorize"
 
 task :generate => [ :realclean, 'sdk/python/arvados/index.html', 'sdk/R/arvados/index.html' ] do
-  vars = ['baseurl', 'arvados_api_host', 'arvados_workbench_host']
+  vars = ['baseurl', 'arvados_cluster_uuid', 'arvados_api_host', 'arvados_workbench_host']
   vars.each do |v|
     if ENV[v]
       website.config.h[v] = ENV[v]
@@ -29,6 +29,7 @@ file "sdk/R/arvados/index.html" do |t|
   `which R`
   if $? == 0
     tgt = Dir.pwd
+    Dir.mkdir("sdk/R")
     Dir.mkdir("sdk/R/arvados")
     docfiles = []
     Dir.chdir("../sdk/R/") do
@@ -53,7 +54,7 @@ navmenu: R
 title: "R SDK Overview"
 ...
 
-#{rd.read.gsub("```", "\n~~~\n").gsub(/^[ ]+/, "")}
+#{rd.read.gsub(/^```$/, "~~~").gsub(/^```(\w)$/, "~~~\\1")}
 EOF
               )
       end
@@ -99,8 +100,7 @@ end
 
 task :clean do
   rm_rf "sdk/python/arvados"
-  rm_rf "sdk/R/arvados"
-  rm_rf "../sdk/R/docs"
+  rm_rf "sdk/R"
 end
 
 require "zenweb/tasks"