[Liblas-commits] hg: 3 new changesets

[liblas-commits at liblas.org]

changeset cf1ce10a0b8b in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=cf1ce10a0b8b
summary: bump versions in prep for b3 release

changeset 28a3758158f8 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=28a3758158f8
summary: copy liblas_kernel.dll into OSGeo4W bin dir

changeset 82e6ece4d9fe in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=82e6ece4d9fe
summary: add 2010 as an option

diffstat:

 CMakeLists.txt                    |  8 ++++----
 cmake/modules/BuildOSGeo4W.cmake  |  2 ++
 hobu-config.bat                   |  7 ++++---
 include/liblas/capi/las_version.h |  6 +++---
 python/setup.py                   |  4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diffs (109 lines):

diff -r 4bf2a228da87 -r 82e6ece4d9fe CMakeLists.txt
--- a/CMakeLists.txt	Fri Nov 19 12:46:35 2010 -0800
+++ b/CMakeLists.txt	Sat Nov 20 15:08:17 2010 -0600
@@ -332,7 +332,7 @@
 # Version information
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
-SET(CPACK_PACKAGE_VERSION_PATCH "0b2")
+SET(CPACK_PACKAGE_VERSION_PATCH "0b3")
 SET(OSGEO4W_UPSTREAM_RELEASE "1")
 
 SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
@@ -364,6 +364,6 @@
 
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
-#if (WIN32)
-#    include(BuildOSGeo4W)
-#endif(WIN32)
+if (WIN32)
+    include(BuildOSGeo4W)
+endif(WIN32)
diff -r 4bf2a228da87 -r 82e6ece4d9fe cmake/modules/BuildOSGeo4W.cmake
--- a/cmake/modules/BuildOSGeo4W.cmake	Fri Nov 19 12:46:35 2010 -0800
+++ b/cmake/modules/BuildOSGeo4W.cmake	Sat Nov 20 15:08:17 2010 -0600
@@ -129,6 +129,8 @@
 
 copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/liblas_c.dll ${OSGEO4W_BIN_DIR}/  )
 copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/liblas.dll ${OSGEO4W_BIN_DIR}/  )
+copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/liblas_kernel.dll ${OSGEO4W_BIN_DIR}/  )
+
 copy_files(${libLAS_SOURCE_DIR}/liblas-osgeo4w-start.bat.tmpl ${OSGEO4W_BIN_DIR}/liblas.bat.tmpl )
 copy_files(${libLAS_SOURCE_DIR}/liblas-osgeo4w-init.bat ${OSGEO4W_ETC_INI_DIR}/liblas.bat )
 copy_files(${libLAS_SOURCE_DIR}/liblas-osgeo4w-postinstall.bat ${OSGEO4W_ETC_POSTINSTALL_DIR}/liblas.bat )
diff -r 4bf2a228da87 -r 82e6ece4d9fe hobu-config.bat
--- a/hobu-config.bat	Fri Nov 19 12:46:35 2010 -0800
+++ b/hobu-config.bat	Sat Nov 20 15:08:17 2010 -0600
@@ -2,13 +2,14 @@
 
 set G="NMake Makefiles"
 REM set G="Visual Studio 9 2008"
+REM set G="Visual Studio 2010"
 set LIBLAS=D:\liblas
 set OSGEO4W=C:\OSGeo4W
 set BOOST=D:\boost\boost_1_44
 set ORACLE_HOME=%OSGEO4W%
 REM set BUILD_TYPE=RelWithDebInfo
-set BUILD_TYPE=Debug
-REM set BUILD_TYPE=Release
+REM set BUILD_TYPE=Debug
+set BUILD_TYPE=Release
 
 set PATH=%OSGEO4W%\apps\gdal-dev\bin;%OSGEO4W%\bin;%PATH%
 
@@ -26,5 +27,5 @@
     -DORACLE_INCLUDE_DIR=%ORACLE_HOME%\include ^
     -DORACLE_OCI_LIBRARY=%ORACLE_HOME%\lib\oci.lib ^
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-    -DCMAKE_VERBOSE_MAKEFILE=OFF ^
+    -DCMAKE_VERBOSE_MAKEFILE=ON ^
     %LIBLAS%
\ No newline at end of file
diff -r 4bf2a228da87 -r 82e6ece4d9fe include/liblas/capi/las_version.h
--- a/include/liblas/capi/las_version.h	Fri Nov 19 12:46:35 2010 -0800
+++ b/include/liblas/capi/las_version.h	Sat Nov 20 15:08:17 2010 -0600
@@ -45,7 +45,7 @@
 #ifndef LIBLAS_VERSION_MAJOR
 #define LIBLAS_VERSION_MAJOR    1
 #define LIBLAS_VERSION_MINOR    6
-#define LIBLAS_VERSION_REV      0b2
+#define LIBLAS_VERSION_REV      0b3
 #define LIBLAS_VERSION_BUILD    0
 #endif
 
@@ -54,11 +54,11 @@
 #endif
 
 #ifndef LIBLAS_RELEASE_DATE
-#define LIBLAS_RELEASE_DATE     20101105
+#define LIBLAS_RELEASE_DATE     20101122
 #endif
 
 #ifndef LIBLAS_RELEASE_NAME
-#define LIBLAS_RELEASE_NAME     "1.6.0b2"
+#define LIBLAS_RELEASE_NAME     "1.6.0b3"
 #endif
 
 #endif /* LAS_VERSION_H_INCLUDED */
diff -r 4bf2a228da87 -r 82e6ece4d9fe python/setup.py
--- a/python/setup.py	Fri Nov 19 12:46:35 2010 -0800
+++ b/python/setup.py	Sat Nov 20 15:08:17 2010 -0600
@@ -10,7 +10,7 @@
 from sys import version_info
 
 try:
-    readme = file('../README','rb').read()
+    readme = file('../doc/index.txt','rb').read()
 except:
     readme = ''
 
@@ -18,7 +18,7 @@
 
 import os
 
-version = '1.6.0b2'
+version = '1.6.0b3'
 
 scripts =['scripts/oci2las.py']