[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset dbe94c446e4e in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=dbe94c446e4e
summary: dumb version grabbing from CMakeLists.txt file

changeset 98adc5fafb38 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=98adc5fafb38
summary: clean up warnings

diffstat:

 doc/conf.py    |  31 +++++++++++++++++++++++++++++--
 doc/docs.txt   |   4 +---
 doc/python.txt |   6 ++----
 3 files changed, 32 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r 9e9a4789f7d2 -r 98adc5fafb38 doc/conf.py
--- a/doc/conf.py	Thu Sep 30 09:16:42 2010 -0500
+++ b/doc/conf.py	Thu Sep 30 09:37:12 2010 -0500
@@ -51,9 +51,36 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.6.0'
+
+def read_version(filename):
+    # oh yes, this is brittle
+    data = open(filename).readlines()
+    major = 'CPACK_PACKAGE_VERSION_MAJOR'
+    minor = 'CPACK_PACKAGE_VERSION_MINOR'
+    patch = 'CPACK_PACKAGE_VERSION_PATCH'
+    
+    for line in data:
+        if str(major) in line:
+            line = line.replace('SET('+major+' ', '')
+            line = line.replace(')','')
+            line = line.replace('"','')
+            major = int(line)
+        if str(minor) in line:
+            line = line.replace('SET('+minor+' ', '')
+            line = line.replace(')','')
+            line = line.replace('"','')
+            minor = int(line)
+        if str(patch) in line:
+            line = line.replace('SET('+patch+' ', '')
+            line = line.replace(')','')
+            line = line.replace('"','')
+            patch = int(line)    
+    return '%d.%d.%d'%(major, minor, patch)
+    
+version = read_version('../CMakeLists.txt')
+
 # The full version, including alpha/beta/rc tags.
-release = '1.6.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -r 9e9a4789f7d2 -r 98adc5fafb38 doc/docs.txt
--- a/doc/docs.txt	Thu Sep 30 09:16:42 2010 -0500
+++ b/doc/docs.txt	Thu Sep 30 09:37:12 2010 -0500
@@ -8,9 +8,7 @@
     The entire documentation is also available as a single
     `PDF document <./pdf/libLAS.pdf>`__ |image|  and `ePub document <./libLAS.epub>`__
 
-.. include:: ./include/docnav.inc
-
-.. |image| image:: ./../_static/pdf.png
+.. |image| image:: ./_static/pdf.png
    :height: 15
    :width: 15
    :alt: PDF icon
diff -r 9e9a4789f7d2 -r 98adc5fafb38 doc/python.txt
--- a/doc/python.txt	Thu Sep 30 09:16:42 2010 -0500
+++ b/doc/python.txt	Thu Sep 30 09:37:12 2010 -0500
@@ -81,7 +81,7 @@
                 header_length,
                 data_offset,
                 num_vlrs,
-                format,
+                schema,
                 data_format_id,
                 count, __len__, set_count,
                 return_count,
@@ -111,9 +111,7 @@
                 user_data,
                 point_source_id,
                 color,
-                data,
-                descale,
-                scale
+                data
                 
 
 =============================================