diff options
author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-01-15 12:08:51 -0800 |
---|---|---|
committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-01-15 12:08:51 -0800 |
commit | cd1521cfdb3c9dd2bf8ced8907afbbbf33893804 (patch) | |
tree | 76fce28a2fca3fcfbbc3a7f4c7b0fe82cfc695c7 /docs/_plugins | |
parent | 1638fcb0dce296da22ffc90127d5148a8fab745e (diff) | |
parent | cb867e9ffb2c5e3d65d50c222fcce3631b94e4dd (diff) | |
download | spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.tar.gz spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.tar.bz2 spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.zip |
Merge branch 'master' into streaming
Conflicts:
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
docs/_layouts/global.html
docs/index.md
run
Diffstat (limited to 'docs/_plugins')
-rw-r--r-- | docs/_plugins/copy_api_dirs.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index 7654511eeb..e400dec619 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -28,3 +28,20 @@ if ENV['SKIP_SCALADOC'] != '1' cp_r(source + "/.", dest) end end + +if ENV['SKIP_EPYDOC'] != '1' + puts "Moving to python directory and building epydoc." + cd("../python") + puts `epydoc --config epydoc.conf` + + puts "Moving back into docs dir." + cd("../docs") + + puts "echo making directory pyspark" + mkdir_p "pyspark" + + puts "cp -r ../python/docs/. api/pyspark" + cp_r("../python/docs/.", "api/pyspark") + + cd("..") +end |