[Liblas-commits] hg: 2 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Aug 23 13:40:24 EDT 2010
changeset ba489d947393 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=ba489d947393
summary: turn off broken osgeo4w stuff for now
changeset 4a33cd46649b in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4a33cd46649b
summary: merge
diffstat:
.hgignore | 2 -
CMakeLists.txt | 62 +-
ChangeLog | 1103 ---------------------------
apps/CMakeLists.txt | 17 +-
apps/bigtest.cpp | 20 +-
apps/las2las2.cpp | 13 +-
apps/lasindex_test.cpp | 546 +++++++++++++
apps/laskernel.cpp | 170 ++++
apps/laskernel.hpp | 8 +
apps/oci_util.cpp | 2 +-
doc/compilation.txt | 3 +
include/liblas/detail/index/indexcell.hpp | 49 +-
include/liblas/detail/index/indexoutput.hpp | 8 +-
include/liblas/lasfilter.hpp | 2 +-
include/liblas/lasheader.hpp | 11 +-
include/liblas/lasindex.hpp | 259 +++++-
include/liblas/laspoint.hpp | 9 +
include/liblas/lasspatialreference.hpp | 11 +-
include/liblas/lasvariablerecord.hpp | 3 +
m4/ax_boost_base.m4 | 221 -----
m4/ax_lib_oracle_oci.m4 | 331 --------
m4/check_zlib.m4 | 129 ---
src/detail/index/indexcell.cpp | 4 -
src/detail/index/indexoutput.cpp | 36 +-
src/detail/reader/point.cpp | 8 +-
src/lascolor.cpp | 6 -
src/lasheader.cpp | 179 ++++
src/lasindex.cpp | 366 ++++++--
src/laspoint.cpp | 83 ++
src/lasspatialreference.cpp | 110 ++-
src/lasvariablerecord.cpp | 12 +
31 files changed, 1756 insertions(+), 2027 deletions(-)
diffs (truncated from 4905 to 300 lines):
diff -r 9c65794516cf -r 4a33cd46649b .hgignore
--- a/.hgignore Wed Aug 18 12:51:09 2010 -0600
+++ b/.hgignore Mon Aug 23 11:39:50 2010 -0600
@@ -1,14 +1,12 @@
syntax: glob
*~
*.bak
-*.bz2
*.dll
*.dll.manifest
*.embed.manifest
*.exe
*.exe.manifest
*.exp
-*.gz
*.idb
*.ilk
*.intermediate.manifest
diff -r 9c65794516cf -r 4a33cd46649b CMakeLists.txt
--- a/CMakeLists.txt Wed Aug 18 12:51:09 2010 -0600
+++ b/CMakeLists.txt Mon Aug 23 11:39:50 2010 -0600
@@ -8,11 +8,6 @@
# libLAS general settings
project(libLAS)
-# Version information
-SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "6")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
if(WIN32)
# Name of C++ library
set(LIBLAS_LIB_NAME liblas)
@@ -119,8 +114,8 @@
# Search for dependencies
# Boost C++ Libraries support - required
-message(STATUS "Searching for Boost 1.38+ - done")
-find_package(Boost 1.38 COMPONENTS program_options REQUIRED)
+message(STATUS "Searching for Boost 1.41+ - done")
+find_package(Boost 1.41 COMPONENTS program_options REQUIRED)
if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
@@ -154,15 +149,15 @@
# Confirm required API is available
include(CheckFunctionExists)
set(CMAKE_REQUIRED_LIBRARIES ${GEOTIFF_LIBRARY})
- check_function_exists(ST_Create HAVE_ST_CREATE)
+# check_function_exists(ST_Create HAVE_ST_CREATE)
- if(NOT HAVE_ST_CREATE)
- set(GEOTIFF_FOUND) # Reset to NOT found for GeoTIFF
- message(FATAL_ERROR "GeoTIFF support requires libgeotiff 1.2.5 or newer.")
- else()
+# if(NOT HAVE_ST_CREATE)
+# set(GEOTIFF_FOUND) # Reset to NOT found for GeoTIFF
+# message(FATAL_ERROR "GeoTIFF support requires libgeotiff 1.2.5 or newer.")
+# else()
include_directories(${GEOTIFF_INCLUDE_DIR})
add_definitions(-DHAVE_LIBGEOTIFF=1)
- endif()
+# endif()
endif()
# Determine libTIFF availability, required
@@ -260,7 +255,7 @@
###############################################################################
# Installation commands
-install(FILES AUTHORS ChangeLog COPYING INSTALL LICENSE.txt README.txt
+install(FILES AUTHORS COPYING INSTALL LICENSE.txt README.txt
DESTINATION ${LIBLAS_DATA_DIR}/doc)
###############################################################################
@@ -294,7 +289,40 @@
endif()
endif()
-if (WIN32)
- include(BuildOSGeo4W)
-endif(WIN32)
+#if (WIN32)
+# include(BuildOSGeo4W)
+#endif(WIN32)
+
+
+# Version information
+SET(CPACK_PACKAGE_VERSION_MAJOR "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "6")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
+
+SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+
+
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+ "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/data/TO_core_last_zoom.las")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".hg")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "README")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "HOWTORELEASE.txt")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "CPackConfig.cmake")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "schemas")
+
+
+include(CPack)
+
+
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
\ No newline at end of file
diff -r 9c65794516cf -r 4a33cd46649b ChangeLog
--- a/ChangeLog Wed Aug 18 12:51:09 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1103 +0,0 @@
-FIXME: The log is way behind the reality. Are we going to maintain it? --mloskot
-
-
-2009-03-25 16:58 hobu
-
- * trunk/nmake.opt: tweak some comments
-
-2009-03-25 16:52 hobu
-
- * trunk/configure.ac: name our dist target to liblas-src and ensure
- that the .bz2 file is made with 'make dist'
-
-2009-03-25 11:22 mloskot
-
- * trunk: Updated svn:ignore property.
-
-2009-03-25 11:21 mloskot
-
- * trunk/build/msvc90, trunk/build/msvc90/las2las,
- trunk/build/msvc90/las2txt, trunk/build/msvc90/lasdiff,
- trunk/build/msvc90/lasinfo, trunk/build/msvc90/lasmerge,
- trunk/build/msvc90/liblas_c_dll, trunk/build/msvc90/liblas_lib,
- trunk/build/msvc90/liblas_test, trunk/build/msvc90/txt2las: Updated
- svn:ignore property.
-
-2009-03-25 11:14 mloskot
-
- * trunk/apps/makefile.vc, trunk/nmake.opt: nmake.opt: Added support of
- EXT_NMAKE_OPT for building libLAS with NMAKE (Ticket #117).
- Improved detection of GDAL_HOME and GEOTIFF_HOME - check if
- directories exist. Added auto-magical determination of version of
- Visual C++ compiler based on NMAKE version (see WARNING in
- NMAKE).
-
-2009-03-25 09:56 mloskot
-
- * trunk/nmake.opt: Fixed LF to CRLF in nmake.opt.
-
-2009-03-25 09:43 mloskot
-
- * trunk/src: Updated svn:ignore property for src.
-
-2009-03-23 09:47 mloskot
-
- * trunk/build/msvc90/liblas_lib/liblas_lib.vcproj: build/msvc90:
- updated project files after renaming classes LASSRS and LASVLR."
-
-2009-03-22 20:13 hobu
-
- * trunk/include/liblas/lascolor.hpp, trunk/src/lascolor.cpp: fix #116,
- LASColor has no == operation
-
-2009-03-22 20:12 hobu
-
- * trunk/include/liblas/capi/liblas.h, trunk/src/las_c_api.cpp: Fix
- #115, add Get/SetPointSourceId to C API
-
-2009-03-20 21:16 mloskot
-
- * trunk/src/makefile.vc: Renamed class LASVLR to LASVariableRecord in
- src/makefile.vc (Ticket #114).
-
-2009-03-20 20:59 mloskot
-
- * trunk/src/Makefile.am: Renamed class LASVLR to LASVariableRecord in
- src/Makefile.am (Ticket 14). The C API has not been touched.
-
-2009-03-20 20:55 mloskot
-
- * trunk/build/msvc80/liblas_dll/liblas_dll.vcproj,
- trunk/build/msvc80/liblas_lib/liblas_lib.vcproj,
- trunk/build/msvc80/liblas_test/liblas_test.vcproj,
- trunk/build/msvc90/liblas_dll/liblas_dll.vcproj,
- trunk/build/msvc90/liblas_lib/liblas_lib.vcproj,
- trunk/build/msvc90/liblas_test/liblas_test.vcproj,
- trunk/include/Makefile.am, trunk/include/liblas/lasheader.hpp,
- trunk/include/liblas/lasreader.hpp,
- trunk/include/liblas/lasrecordheader.hpp,
- trunk/include/liblas/lasspatialreference.hpp,
- trunk/include/liblas/lasvariablerecord.hpp, trunk/src/CMakeLists.txt,
- trunk/src/detail/reader.cpp, trunk/src/detail/reader10.cpp,
- trunk/src/detail/reader11.cpp, trunk/src/detail/reader12.cpp,
- trunk/src/detail/writer.cpp, trunk/src/las_c_api.cpp,
- trunk/src/lasheader.cpp, trunk/src/lasrecordheader.cpp,
- trunk/src/lasspatialreference.cpp, trunk/src/lasvariablerecord.cpp,
- trunk/test/unit/CMakeLists.txt, trunk/test/unit/Makefile.am,
- trunk/test/unit/lasrecordheader_test.cpp,
- trunk/test/unit/lasvariablerecord_test.cpp: Renamed class LASVLR to
- LASVariableRecord (Ticket #114). The C API has not been touched.
-
-2009-03-20 20:42 mloskot
-
- * trunk/test/unit/Makefile.am: Renamed class LASSRS to
- LASSpatialReference in test/unit/Makefile.am (Ticket #113).
-
-2009-03-20 20:35 mloskot
-
- * trunk/build/msvc80/liblas_lib/liblas_lib.vcproj,
- trunk/build/msvc80/liblas_test/liblas_test.vcproj,
- trunk/build/msvc90/liblas_lib/liblas_lib.vcproj,
- trunk/include/Makefile.am, trunk/include/liblas/detail/fwd.hpp,
- trunk/include/liblas/detail/reader.hpp,
- trunk/include/liblas/detail/writer.hpp,
- trunk/include/liblas/lasheader.hpp,
- trunk/include/liblas/lasreader.hpp,
- trunk/include/liblas/lasspatialreference.hpp,
- trunk/include/liblas/lassrs.hpp, trunk/include/liblas/laswriter.hpp,
- trunk/src/CMakeLists.txt, trunk/src/Makefile.am,
- trunk/src/detail/reader.cpp, trunk/src/detail/writer.cpp,
- trunk/src/las_c_api.cpp, trunk/src/lasheader.cpp,
- trunk/src/lasreader.cpp, trunk/src/lasspatialreference.cpp,
- trunk/src/lassrs.cpp, trunk/src/laswriter.cpp, trunk/src/makefile.vc,
- trunk/test/unit/lasheader_test.cpp,
- trunk/test/unit/lasspatialreference_test.cpp,
- trunk/test/unit/lassrs_test.cpp: Renamed class LASSRS to
- LASSpatialReference (Ticket #113). The C API has not been
- touched.
-
-2009-03-20 18:02 hobu
-
- * trunk/configure.ac, trunk/include/liblas/capi/las_version.h,
- trunk/nmake.opt, trunk/python/setup.py: increment versions in prep
- for 1.2.0b3
-
-2009-03-20 17:19 hobu
-
- * trunk/python/tests/Header.txt: try to fix date test again
-
-2009-03-20 16:59 hobu
-
- * trunk/python/tests/SRS.txt, trunk/python/tests/VLR.txt: Guards for
- when we have no HAVE_LIBGEOTIFF
-
-2009-03-20 16:59 hobu
-
- * trunk/python/tests/File.txt: Make sure that void functions return
- None for ctype or we'll get unexpected jtrunk back
-
-2009-03-20 16:57 hobu
-
- * trunk/python/liblas/core.py: Make sure that void functions return
- None for ctype or we'll get unexpected jtrunk back
-
-2009-03-20 16:50 hobu
-
- * trunk/python/liblas/core.py: don't know where LASReader_Destroy
- went
-
-2009-03-20 16:25 hobu
-
- * trunk/src/las_c_api.cpp: We use #ifdef _WIN32 instead of #ifdef
- WIN32 for strncasecmp
-
-2009-03-20 01:31 mloskot
-
- * trunk/include/liblas/detail/reader.hpp,
- trunk/include/liblas/lasreader.hpp, trunk/src/detail/reader.cpp,
- trunk/src/detail/reader10.cpp, trunk/src/detail/reader11.cpp,
- trunk/src/detail/reader12.cpp, trunk/src/lasreader.cpp: Fixed
- weakness of MakePIMPL by reverting changes applied as r984 and
- bringing m_pimpl back to constness. There is no need to re-create
- internal reader object and reassign it to m_pimpl, because reader
- state can be correctly reset by simple call of LASReader::Init.
- This fix is also related to Ticket #85. All 87 test cases pass.
-
-2009-03-20 01:27 mloskot
-
- * trunk/test/unit/lasreader_iterator_test.cpp: Fixed LF.
-
-2009-03-20 00:45 mloskot
-
- * trunk/build/msvc80/liblas_lib/liblas_lib.vcproj,
- trunk/build/msvc80/liblas_test/liblas_test.vcproj: Updated
- build/msvc80 adding new files. Use $(SolutionDir) macro in unit
- test runner, instead of relative path.
-
More information about the Liblas-commits
mailing list