Revision: 39133
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39133
Author: blendix
Date: 2011-08-07 12:01:24 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Cycles: remove docs from svn, moved to wiki.
Modified Paths:
--------------
branches/cycles/intern/cycles/CMakeLists.txt
branches/cycles/intern/cycles/doc/CMakeLists.txt
Removed Paths:
-------------
branches/cycles/intern/cycles/doc/generate.py
branches/cycles/intern/cycles/doc/index.html
branches/cycles/intern/cycles/doc/reference/
branches/cycles/intern/cycles/doc/style/
branches/cycles/intern/cycles/doc/templates/
Modified: branches/cycles/intern/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/CMakeLists.txt 2011-08-07 11:54:58 UTC
(rev 39132)
+++ branches/cycles/intern/cycles/CMakeLists.txt 2011-08-07 12:01:24 UTC
(rev 39133)
@@ -12,7 +12,6 @@
OPTION(WITH_CYCLES_PARTIO "Build with Partio point cloud support (unfinished)"
OFF)
OPTION(WITH_CYCLES_NETWORK "Build with network rendering support (unfinished)"
OFF)
OPTION(WITH_CYCLES_MULTI "Build with network rendering support (unfinished)"
OFF)
-OPTION(WITH_CYCLES_DOCS "Build html documentation" OFF)
OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF)
# Flags
Modified: branches/cycles/intern/cycles/doc/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/doc/CMakeLists.txt 2011-08-07 11:54:58 UTC
(rev 39132)
+++ branches/cycles/intern/cycles/doc/CMakeLists.txt 2011-08-07 12:01:24 UTC
(rev 39133)
@@ -1,79 +1,3 @@
INSTALL(DIRECTORY license DESTINATION ${CYCLES_INSTALL_PATH}/cycles PATTERN
".svn" EXCLUDE)
-SET(doc_sources
- index.html
-
- reference/camera.html
- reference/curve.html
- reference/devices.html
- reference/film.html
- reference/index.html
- reference/integrator.html
- reference/interactive.html
- reference/lamp.html
- reference/mesh.html
- reference/motion_blur.html
- reference/particle.html
- reference/subdivision.html
- reference/world.html
-
- reference/material/displacement.html
- reference/material/index.html
- reference/material/surface.html
- reference/material/volume.html
-
- reference/shader/background.html
- reference/shader/bsdf.html
- reference/shader/color_operations.html
- reference/shader/custom.html
- reference/shader/emission.html
- reference/shader/image_textures.html
- reference/shader/index.html
- reference/shader/input.html
- reference/shader/output.html
- reference/shader/procedural_textures.html
- reference/shader/vector_operations.html
- reference/shader/volume.html
- reference/shader/volume_textures.html)
-
-SET(doc_extra
- reference/camera_ortho.svg
- reference/camera_persp.svg
- reference/material/material.svg
- reference/shader/bsdf.svg
- style/style.css)
-
-SET(doc_templates
- templates/footer.html
- templates/header.html
- templates/nodes.html
- templates/reference.html)
-
-IF(WITH_CYCLES_DOCS)
- MACRO(install_doc_file source_file html_file)
- GET_FILENAME_COMPONENT(subdir ${source_file} PATH)
- INSTALL(
- FILES ${html_file}
- DESTINATION ${CYCLES_INSTALL_PATH}/cycles/doc/${subdir})
- ENDMACRO()
-
- FOREACH(_file ${doc_sources})
- SET(source_file ${_file})
- SET(html_file ${CMAKE_CURRENT_BINARY_DIR}/${_file})
- ADD_CUSTOM_COMMAND(
- OUTPUT ${html_file}
- COMMAND python generate.py ${source_file} ${html_file}
${CYCLES_VERSION}
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${source_file} ${doc_templates} generate.py)
- LIST(APPEND html_files ${html_file})
- install_doc_file(${source_file} ${html_file})
- ENDFOREACH()
-
- FOREACH(_file ${doc_extra})
- install_doc_file(${_file} ${_file})
- ENDFOREACH()
-
- ADD_CUSTOM_TARGET(cycles_doc ALL DEPENDS ${html_files})
-ENDIF()
-
Deleted: branches/cycles/intern/cycles/doc/generate.py
===================================================================
--- branches/cycles/intern/cycles/doc/generate.py 2011-08-07 11:54:58 UTC
(rev 39132)
+++ branches/cycles/intern/cycles/doc/generate.py 2011-08-07 12:01:24 UTC
(rev 39133)
@@ -1,74 +0,0 @@
-
-import os
-import string
-import subprocess
-import sys
-
-# paths
-from_file = sys.argv[1]
-to_file = sys.argv[2]
-dirs = os.path.dirname(from_file).split('/')
-
-if len(string.join(dirs)) == 0:
- base = '.'
-else:
- base = string.join(['..']*len(dirs), '/')
-
-# version
-def get_version():
- proc = subprocess.Popen(['svnversion'], stdout=subprocess.PIPE)
- out, err = proc.communicate()
- return out
-
-version = get_version()
-
-# html processing
-def process(base, title, str):
- str = string.replace(str, "@base", base)
- str = string.replace(str, "@title", title)
- str = string.replace(str, "@index", "/index.html")
- str = string.replace(str, "@html", ".html")
- str = string.replace(str, "@version", version)
- return str
-
-# templates
-header = open("templates/header.html", "r").read()
-ref = open("templates/reference.html", "r").read()
-index = open("templates/index.html", "r").read()
-nodes = open("templates/nodes.html", "r").read()
-footer = open("templates/footer.html", "r").read()
-
-# read input file
-content = open(from_file).readlines()
-
-# create output file
-dir = os.path.dirname(to_file)
-if not os.path.exists(dir):
- os.makedirs(dir)
-
-f = open(to_file, "w")
-
-# title
-title = "Cycles"
-if len(content) and content[0].startswith("@title "):
- title += " - " + content[0][len("@title "):]
- content = content[1:]
-
-# header
-f.write(process(base, title, header))
-
-# secondary header
-if from_file.startswith("reference"):
- f.write(process(base, title, ref))
- if from_file.startswith("reference/shader"):
- f.write(process(base, title, nodes))
-else:
- f.write(process(base, title, index))
-
-# contents
-for line in content:
- f.write(process(base, title, line))
-
-# footer
-f.write(process(base, title, footer))
-
Deleted: branches/cycles/intern/cycles/doc/index.html
===================================================================
--- branches/cycles/intern/cycles/doc/index.html 2011-08-07 11:54:58 UTC
(rev 39132)
+++ branches/cycles/intern/cycles/doc/index.html 2011-08-07 12:01:24 UTC
(rev 39133)
@@ -1,9 +0,0 @@
-
-<center>
-<br/>
-<br/>
-<span style="font-size: 1.5em;"><a
href="@base/reference@index">Reference</a></span><br/>
-<br/>
-<br/>
-</center>
-
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
