[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 3eb3e1ff77a9 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=3eb3e1ff77a9
summary: post-install scripts to set environment for liblas when packaged for osgeo4w

changeset cf13eebe068b in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=cf13eebe068b
summary: liblas C API is now called liblas_c.dll

diffstat:

 cmake/modules/BuildOSGeo4W.cmake |  12 ++++++++----
 liblas-osgeo4w-init.bat          |   2 +-
 liblas-osgeo4w-postinstall.bat   |   1 +
 liblas-osgeo4w-start.bat.tmpl    |   5 +++++
 python/liblas/core.py            |   2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diffs (86 lines):

diff -r 4e981203ec39 -r cf13eebe068b cmake/modules/BuildOSGeo4W.cmake
--- a/cmake/modules/BuildOSGeo4W.cmake	Tue Oct 26 21:28:13 2010 -0600
+++ b/cmake/modules/BuildOSGeo4W.cmake	Wed Oct 27 09:47:37 2010 -0600
@@ -9,6 +9,7 @@
 set(OSGEO4W_LIB_DIR ${OSGEO4W_DIR}/lib)
 set(OSGEO4W_ETC_DIR ${OSGEO4W_DIR}/etc)
 set(OSGEO4W_ETC_INI_DIR ${OSGEO4W_DIR}/etc/ini)
+set(OSGEO4W_ETC_POSTINSTALL_DIR ${OSGEO4W_DIR}/etc/postinstall)
 set(OSGEO4W_LIB_BIN_DIR ${OSGEO4W_DIR}/lib/bin)
 set(OSGEO4W_BIN_DIR ${OSGEO4W_DIR}/bin)
 set(OSGEO4W_DEVEL_DIR ${OSGEO4W_DIR}/devel)
@@ -25,6 +26,7 @@
     ${OSGEO4W_DIR}
     ${OSGEO4W_ETC_DIR}
     ${OSGEO4W_ETC_INI_DIR}
+    ${OSGEO4W_ETC_POSTINSTALL_DIR}
     ${OSGEO4W_LIB_DIR}
     ${OSGEO4W_LIB_BIN_DIR}
     ${OSGEO4W_DEVEL_DIR}
@@ -104,7 +106,7 @@
     
     add_custom_command(
         TARGET tar
-        COMMAND ${CMAKE_COMMAND} -E chdir ${source} cmake -E tar czf  ${destination} ${base_paths}
+        COMMAND ${CMAKE_COMMAND} -E chdir ${source} cmake -E tar cjf  ${destination} ${base_paths}
     )
 
 
@@ -113,7 +115,9 @@
 make_directories()
 copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/*.exe ${OSGEO4W_BIN_DIR}/  )
 copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/liblas_c.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 )
 
 copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/liblas.lib ${OSGEO4W_DEVEL_LIB_DIR}/  )
 copy_files(${LIBLAS_BUILD_OUTPUT_DIRECTORY}/liblas_c.lib ${OSGEO4W_DEVEL_LIB_DIR}/  )
@@ -122,9 +126,9 @@
 copy_directory(./include/liblas/ ${OSGEO4W_DEVEL_INCLUDE_LIBLAS_DIR}/  )
 copy_files(./python/liblas/*.py ${OSGEO4W_PYTHON_DIR}/  )
 
-tar_directories(${OSGEO4W_DIR} ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/liblas-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${OSGEO4W_UPSTREAM_RELEASE}.tar.gz "bin/;etc/")
-tar_directories(${OSGEO4W_DIR} ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/liblas-python-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${OSGEO4W_UPSTREAM_RELEASE}.tar.gz apps)
-tar_directories(${OSGEO4W_DIR} ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/liblas-devel-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${OSGEO4W_UPSTREAM_RELEASE}.tar.gz devel)
+tar_directories(${OSGEO4W_DIR} ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/liblas-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${OSGEO4W_UPSTREAM_RELEASE}.tar.bz2 "bin/;etc/")
+tar_directories(${OSGEO4W_DIR} ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/liblas-python-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${OSGEO4W_UPSTREAM_RELEASE}.tar.bz2 apps)
+tar_directories(${OSGEO4W_DIR}/devel ${libLAS_SOURCE_DIR}/${OSGEO4W_PACKAGES}/liblas-devel-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${OSGEO4W_UPSTREAM_RELEASE}.tar.bz2 "lib/;include")
 
 
 add_custom_target(osgeo4w
diff -r 4e981203ec39 -r cf13eebe068b liblas-osgeo4w-init.bat
--- a/liblas-osgeo4w-init.bat	Tue Oct 26 21:28:13 2010 -0600
+++ b/liblas-osgeo4w-init.bat	Wed Oct 27 09:47:37 2010 -0600
@@ -1,3 +1,3 @@
 SET GDAL_DATA=%OSGEO4W_ROOT%\apps\gdal-dev\share\gdal
 SET PYTHONPATH=%OSGEO4W_ROOT%\apps\gdal-dev\pymod;%PYTHONPATH%
-PATH=%OSGEO4W_ROOT%\apps\gdal-dev\bin;%PATH%
+PATH=%OSGEO4W_ROOT%\apps\gdal-dev\bin;%OSGEO4W_ROOT%\bin;%PATH%
diff -r 4e981203ec39 -r cf13eebe068b liblas-osgeo4w-postinstall.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liblas-osgeo4w-postinstall.bat	Wed Oct 27 09:47:37 2010 -0600
@@ -0,0 +1,1 @@
+textreplace -std -t bin/liblas.bat
\ No newline at end of file
diff -r 4e981203ec39 -r cf13eebe068b liblas-osgeo4w-start.bat.tmpl
--- a/liblas-osgeo4w-start.bat.tmpl	Tue Oct 26 21:28:13 2010 -0600
+++ b/liblas-osgeo4w-start.bat.tmpl	Wed Oct 27 09:47:37 2010 -0600
@@ -0,0 +1,5 @@
+ at echo off
+SET OSGEO4W_ROOT=@osgeo4w@
+call "%OSGEO4W_ROOT%\etc\ini\liblas.bat"
+start "libLAS OSGeo4W Shell"
+ at echo on
diff -r 4e981203ec39 -r cf13eebe068b python/liblas/core.py
--- a/python/liblas/core.py	Tue Oct 26 21:28:13 2010 -0600
+++ b/python/liblas/core.py	Wed Oct 27 09:47:37 2010 -0600
@@ -128,7 +128,7 @@
 if os.name == 'nt':
 # stolen from Shapely
 # http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/shapely/geos.py
-    lib_name = 'liblas1.dll'
+    lib_name = 'liblas_c.dll'
     try:
         local_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
         original_path = os.environ['PATH']