[Liblas-commits] hg: 3 new changesets

liblas-commits at liblas.org liblas-commits at liblas.org
Thu May 20 08:44:56 EDT 2010


changeset 02b0cb83e697 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=02b0cb83e697
summary: typo

changeset 0469b8533fd2 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=0469b8533fd2
summary: add TransformI prototype

changeset 422eaffeb92c in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=422eaffeb92c
summary: more doc work

diffstat:

 doc/_templates/indexsidebar.html   |    2 +-
 doc/base/index.txt                 |   21 --
 doc/compilation.txt                |  268 ++++++++++++++++--------------------
 doc/conf.py                        |    3 +-
 doc/development/buildbot.txt       |  147 ++++++++++++++++++++
 doc/docs.txt                       |   15 +-
 doc/download.txt                   |    6 +-
 doc/images/ccmake-osx-start.png    |    0 
 doc/images/cmake-gui-osx-start.png |    0 
 doc/index.txt                      |    3 -
 doc/python.txt                     |  155 +++++++++++++++++++++
 doc/python/classes.txt             |  155 ---------------------
 doc/python/index.txt               |   16 --
 include/liblas/liblas.hpp          |    8 +
 src/lasfilter.cpp                  |    2 +-
 15 files changed, 445 insertions(+), 356 deletions(-)

diffs (truncated from 955 to 300 lines):

diff -r 5586d2510818 -r 422eaffeb92c doc/_templates/indexsidebar.html
--- a/doc/_templates/indexsidebar.html	Tue May 18 14:22:39 2010 -0500
+++ b/doc/_templates/indexsidebar.html	Thu May 20 07:44:44 2010 -0500
@@ -14,6 +14,6 @@
 </p>
 
 <p>
-    <script type="text/javascript" src="http://www.ohloh.net/p/10742/widgets/project_partner_badge.js"></script>
+<script type="text/javascript" src="http://www.ohloh.net/p/10742/widgets/project_thin_badge.js"></script>
 </p>
 
diff -r 5586d2510818 -r 422eaffeb92c doc/base/index.txt
--- a/doc/base/index.txt	Tue May 18 14:22:39 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-.. raw:: pdf
-
-    PageBreak
-    
-.. _cppapi: 
-
-****************************************************************
-  C++ Library Reference
-****************************************************************
-
-some text 
-
-.. doxygenindex::
-   :project: liblas
-   :path: /Users/hobu/hg/liblas-cmake/doc/api/xml/index.xml
-
-.. doxygenclass:: liblas::Color
-    :project: liblas
-
-
-some more text 
\ No newline at end of file
diff -r 5586d2510818 -r 422eaffeb92c doc/compilation.txt
--- a/doc/compilation.txt	Tue May 18 14:22:39 2010 -0500
+++ b/doc/compilation.txt	Thu May 20 07:44:44 2010 -0500
@@ -8,38 +8,136 @@
     :depth: 3
     :backlinks: top
 
-   
-   
-   
-CMake
-------------------------------------------------------------------------------
+
 
 :Author: Mateusz Loskot
 :Contact: mateusz at loskot dot net
+:Author: Howard Butler
+:Contact: hobu.inc at gmail dot com
 
-This article describes how to use `CMake`_ tool to build and install libLAS as
-well as run unit tests.
+As of libLAS 1.6, `CMake`_ 2.8.1+ is the prescribed tool for building 
+libLAS from source as well as running unit tests. `CMake`_ is a cross-platform 
+build system that provides a number of benefits, and its usage ensures a 
+single, up-to-date build system for all libLAS-supported operating systems 
+and compiler platforms.  
 
-The CMake build configuration is available from the libLAS repository, in
-branch `main`.
+Like a combination of autoconf/autotools, except that it actually works on
+Windows (and works without eye-stabbing pain in general), `CMake`_ is somewhat
+of a meta-building tool. It can be used to generate MSVC project files, GNU
+Makefiles, NMake files for MSVC, XCode projects on Mac OS X, and Eclipse
+projects (as well as many others).  This functionality allows the libLAS project 
+to avoid maintaining these build options by hand and target a single configuration
+and build platform.
 
-Building libLAS using CMake on Unix
+This tutorial will describe how to build libLAS using CMake on both a 
+Unix platform and a Windows platform.  
+
+
+* Get the source code.  See :ref:`source` for how to obtain the latest 
+  development version or visit :ref:`download` to get the latest released 
+  version.
+
+* Prepare a build directory.  CMake allows you to generate different builders
+  for a project, and in this example, we are going to generate both "Unix Makefiles" 
+  and "Xcode" builders for libLAS on Mac OS X.
+
+::
+    
+    $ cd liblas
+    $ mkdir makefiles
+    
+
+CMake with "Unix Makefiles"
 ..............................................................................
 
-* Check out source code
+* Configure the basic core library for the "Unix Makefiles" target:
 
 ::
 
-    $ hg clone http://hg.liblas.org/main/
+    $ cmake -G "Unix Makefiles" ../
+    -- The C compiler identification is GNU
+    -- The CXX compiler identification is GNU
+    -- Checking whether C compiler has -isysroot
+    -- Checking whether C compiler has -isysroot - yes
+    -- Check for working C compiler: /usr/bin/gcc
+    -- Check for working C compiler: /usr/bin/gcc -- works
+    -- Detecting C compiler ABI info
+    -- Detecting C compiler ABI info - done
+    -- Checking whether CXX compiler has -isysroot
+    -- Checking whether CXX compiler has -isysroot - yes
+    -- Check for working CXX compiler: /usr/bin/c++
+    -- Check for working CXX compiler: /usr/bin/c++ -- works
+    -- Detecting CXX compiler ABI info
+    -- Detecting CXX compiler ABI info - done
+    -- Enable libLAS utilities to build - done
+    -- Configuring done
+    -- Generating done
+    -- Build files have been written to: /Users/hobu/hg/liblas-cmake/makefiles
 
-* Prepare build directory, possibly out of source tree
+* Run `make`
 
 ::
 
-    $ mkdir build
-    $ cd build
+    $ make
+    -- Enable libLAS utilities to build - done
+    -- Configuring done
+    -- Generating done
+    -- Build files have been written to: /Users/hobu/hg/liblas-cmake/makefiles
+    Scanning dependencies of target las
+    [  3%] Building CXX object src/CMakeFiles/las.dir/lasclassification.cpp.o
+    ...
+    [ 60%] Building CXX object src/CMakeFiles/las.dir/detail/writer/writer.cpp.o
+    Linking CXX static library ../bin/Debug/liblas.a
+    [ 60%] Built target las
+    Scanning dependencies of target las_c
+    [ 63%] Building CXX object src/CMakeFiles/las_c.dir/las_c_api.cpp.o
+    Linking CXX shared library ../bin/Debug/liblas_c.dylib
+    [ 63%] Built target las_c
+    Scanning dependencies of target las2las
+    ...
+    [100%] Built target txt2las
 
-* Configure basic core library only
+* Run 'ccmake ../' for the `Curses`_ interface or 'cmake-gui ../' for a 
+  GUI version.  
+
+  
+.. figure:: ./images/ccmake-osx-start.png
+    :alt: Running CCMake in OS X
+
+.. figure:: ./images/cmake-gui-osx-start.png
+    :alt: Running cmake-gui in OS X
+
+CMake using XCode
+..............................................................................
+
+::
+    $ cd liblas
+    $ mkdir xcode
+    $ cd xcode/
+
+::
+
+    $ cmake -G "Xcode" ..
+    -- The C compiler identification is GNU
+    -- The CXX compiler identification is GNU
+    -- Checking whether C compiler has -isysroot
+    -- Checking whether C compiler has -isysroot - yes
+    -- Check for working C compiler: /usr/bin/gcc
+    -- Check for working C compiler: /usr/bin/gcc -- works
+    -- Detecting C compiler ABI info
+    -- Detecting C compiler ABI info - done
+    -- Checking whether CXX compiler has -isysroot
+    -- Checking whether CXX compiler has -isysroot - yes
+    -- Check for working CXX compiler: /usr/bin/g++
+    -- Check for working CXX compiler: /usr/bin/g++ -- works
+    -- Detecting CXX compiler ABI info
+    -- Detecting CXX compiler ABI info - done
+    -- Enable libLAS utilities to build - done
+    -- Configuring done
+    -- Generating done
+    -- Build files have been written to: /Users/hobu/hg/liblas-cmake/xcode
+
+
 
 ::
 
@@ -89,143 +187,7 @@
 
     $ make
 
-Building libLAS and running unit tests using CMake on Unix
-..............................................................................
 
-Users are encourage to run libLAS unit tests and submit test results to
-dedicated `CDash`_ - utility dashboard hosted by the http://cdash.org website:
-
-* `libLAS CDash`_
-
-The CDash is another tool liblAS uses to perform `continuous integration`_
-during development process.
-
-.. note::
-    In order to enable `CTest`_ support it is required to use `CMake 2.8.0+`_
-    version (it is Beta currently).
-
-* Configure libLAS core library with unit tests and CTest enabled
-
-::
-
-    $ cmake ../main -DWITH_TESTS=ON -DENABLE_CTEST=ON
-    -- The C compiler identification is GNU
-    -- The CXX compiler identification is GNU
-    -- Check for working C compiler: /usr/bin/gcc
-    -- Check for working C compiler: /usr/bin/gcc -- works
-    -- Detecting C compiler ABI info
-    -- Detecting C compiler ABI info - done
-    -- Check for working CXX compiler: /usr/bin/c++
-    -- Check for working CXX compiler: /usr/bin/c++ -- works
-    -- Detecting CXX compiler ABI info
-    -- Detecting CXX compiler ABI info - done
-    -- Enable libLAS utilities to build - done
-    -- Enable libLAS unit tests to build - done
-    -- Enable CTest to support submissions of results to CDash at http://cdash.org
-    -- Enable CTest to support submissions of results to CDash at http://cdash.org - done
-    -- Configuring done
-    -- Generating done
-    -- Build files have been written to: /home/mloskot/dev/liblas/_hg/build
-
-
-
-* Inspect available targets
-
-::
-
-    $ make help
-    The following are some of the valid targets for this Makefile:
-    ... all (the default if no target is provided)
-    ... clean
-    ... depend
-    ... Continuous
-    ... ContinuousBuild
-    ... ContinuousConfigure
-    ... ContinuousCoverage
-    ... ContinuousMemCheck
-    ... ContinuousStart
-    ... ContinuousSubmit
-    ... ContinuousTest
-    ... ContinuousUpdate
-    ... Experimental
-    ... ExperimentalBuild
-    ... ExperimentalConfigure
-    ... ExperimentalCoverage
-    ... ExperimentalMemCheck
-    ... ExperimentalStart
-    ... ExperimentalSubmit
-    ... ExperimentalTest
-    ... ExperimentalUpdate
-    ... Nightly
-    ... NightlyBuild
-    ... NightlyConfigure
-    ... NightlyCoverage
-    ... NightlyMemCheck
-    ... NightlyMemoryCheck
-    ... NightlyStart
-    ... NightlySubmit
-    ... NightlyTest
-    ... NightlyUpdate
-    ... edit_cache
-    ... install
-    ... install/local
-    ... install/strip
-    ... list_install_components
-    ... rebuild_cache
-    ... test
-    ... las
-    ... las_c
-    ... las2las
-    ... las2txt
-    ... lasinfo
-    ... lasmerge
-    ... txt2las
-    ... liblas_test
-
-
-* Run `Continuous` target
-
-::
-
-    mloskot at dog:~/dev/liblas/_hg/build$ make Continuous
-       Site: dog
-       Build name: Linux-c++
-    Create new tag: 20091025-0003 - Continuous
-    Updating the repository


More information about the Liblas-commits mailing list