This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libkml.
commit f050f8175304c7155205695ae043fa0120f1744b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jul 26 18:37:09 2015 +0200
Imported Upstream version 1.3.0~r864+git20150726-3f3f37f
---
.travis.yml | 2 +
CMakeLists.txt | 72 ++++++++-----
cmake/.#FindMiniZip.cmake | 1 -
cmake/FindMiniZip.cmake | 28 ++---
cmake/FindUriParser.cmake | 30 +++---
cmake/ImportBoost.cmake | 7 --
cmake/ImportEXPAT.cmake | 9 --
cmake/ImportGoogleTest.cmake | 8 --
cmake/ImportMinizip.cmake | 8 --
cmake/ImportUriParser.cmake | 8 --
cmake/ImportZLIB.cmake | 9 --
cmake/LibKMLHelper.cmake | 12 +--
cmake/pycompile.py | 3 +
examples/engine/Makefile.am | 106 ------------------
examples/java/run.sh | 2 +
examples/wxregionator/Makefile.am | 10 --
examples/wxviewer/Makefile.am | 8 --
libkml.sln | 50 ---------
src/CMakeLists.txt | 2 +-
src/kml/CMakeLists.txt | 2 +-
src/kml/base/CMakeLists.txt | 9 +-
src/swig/CMakeLists.txt | 95 ++++++++++++++++
src/swig/Makefile.am | 132 -----------------------
src/swig/java/Makefile.am | 2 -
src/swig/kmlbase.i | 19 ++--
src/swig/kmldom.i | 19 ++--
src/swig/{kmlelements.i => libkml_kmlelements.i} | 0
src/swig/python/Makefile.am | 2 -
testdata/Makefile.am | 3 -
testdata/atom/Makefile.am | 8 --
testdata/balloon/Makefile.am | 2 -
testdata/csv/Makefile.am | 10 --
testdata/deprecated/Makefile.am | 2 -
testdata/gdata/Makefile.am | 7 --
testdata/gmaps/Makefile.am | 2 -
testdata/gpx/Makefile.am | 2 -
testdata/gx/Makefile.am | 3 -
testdata/kml/Makefile.am | 27 -----
testdata/kmz/Makefile.am | 26 -----
testdata/kmz/files/Makefile.am | 5 -
testdata/kmz/kmzfiles/Makefile.am | 2 -
testdata/kmz/rumsey/Makefile.am | 1 -
testdata/kmz/rumsey/imagery/Makefile.am | 1 -
testdata/kmz/rumsey/kml/Makefile.am | 4 -
testdata/links/Makefile.am | 2 -
testdata/style/Makefile.am | 33 ------
testdata/style/weather/Makefile.am | 14 ---
testdata/update/Makefile.am | 21 ----
testdata/xal/Makefile.am | 2 -
testdata/xsd/Makefile.am | 2 -
tests/CMakeLists.txt | 2 +-
tests/swig/CMakeLists.txt | 19 ++++
{src => tests}/swig/KmlBaseTest.java | 0
{src => tests}/swig/kmlbase_test.py | 0
{src => tests}/swig/kmldom_test.py | 0
{src => tests}/swig/kmlengine_test.py | 0
xcode/LibKML/Makefile.am | 5 -
xcode/Makefile.am | 2 -
58 files changed, 232 insertions(+), 630 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e981361..5aa78a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,7 @@ compiler:
before_script:
- mkdir build
- cd build
+ - sudo apt-get update -qq
+ - sudo apt-get install swig python-dev
script: cmake -DCMAKE_INSTALL_PREFIX=../../install .. && make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a20d1b..acd50fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,16 +11,16 @@ option(BUILD_EXAMPLES "Build examples." OFF)
option(INSTALL_EXAMPLES "Install examples sources and executables" OFF)
option(BUILD_SHARED_LIBS "Build shared libs." ON)
-option(BUILD_SWIG "Build swig bindings" OFF)
-option(BUILD_SWIG_PYTHON "Build python bindings" OFF)
-option(BUILD_SWIG_JAVA "Build java bindings" OFF)
+option(WITH_SWIG "Build all swig bindings" ON)
+option(WITH_PYTHON "Build python bindings" ON)
+option(WITH_JAVA "Build java bindings" ON)
set(LIBKML_DATA_DIR ${CMAKE_SOURCE_DIR}/testdata CACHE "Directory containing
test data" PATH)
#AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti
#AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti
-DGTEST_HAS_RTTI=0
if(CMAKE_COMPILER_IS_GNUCXX)
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wall -Wextra -Wno-unused-parameter
-pedantic -fno-rtti")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter
-pedantic -fno-rtti")
set(TEST_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-rtti
-DGTEST_HAS_RTTI=0")
endif()
@@ -28,11 +28,33 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(HAVE_SYSTEM_ZLIB CACHE INTERNAL FALSE)
-set(HAVE_SYSTEM_MINIZIP CACHE INTERNAL FALSE)
-set(HAVE_SYSTEM_EXPAT CACHE INTERNAL FALSE)
-set(HAVE_SYSTEM_BOOST CACHE INTERNAL FALSE)
-set(HAVE_SYSTEM_URIPARSER CACHE INTERNAL FALSE)
+if(NOT DEFINED BIN_INSTALL_DIR)
+ set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
+endif(NOT DEFINED BIN_INSTALL_DIR)
+if(NOT DEFINED LIB_INSTALL_DIR)
+ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+endif(NOT DEFINED LIB_INSTALL_DIR)
+if(NOT DEFINED DATA_INSTALL_DIR)
+ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share")
+endif(NOT DEFINED DATA_INSTALL_DIR)
+if(NOT DEFINED INCLUDE_INSTALL_DIR)
+ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/kml")
+endif(NOT DEFINED INCLUDE_INSTALL_DIR)
+if(NOT DEFINED MAN_INSTALL_DIR)
+ set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man")
+endif(NOT DEFINED MAN_INSTALL_DIR)
+if(NOT DEFINED RESOURCE_INSTALL_DIR)
+ set(RESOURCE_INSTALL_DIR
"${DATA_INSTALL_DIR}/libkml${VERSION_MAJOR}/resource/")
+endif(NOT DEFINED RESOURCE_INSTALL_DIR)
+if(NOT DEFINED LOCALE_INSTALL_DIR)
+ set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
+endif(NOT DEFINED LOCALE_INSTALL_DIR)
+if(NOT DEFINED PYTHON_INSTALL_DIR)
+ set(PYTHON_INSTALL_DIR "${LIB_INSTALL_DIR}/python")
+endif(NOT DEFINED PYTHON_INSTALL_DIR)
+if(NOT DEFINED JAVA_INSTALL_DIR)
+ set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java")
+endif(NOT DEFINED JAVA_INSTALL_DIR)
# Path to additional CMake modules
set(CMAKE_MODULE_PATH
@@ -41,8 +63,6 @@ set(CMAKE_MODULE_PATH
include(LibKMLHelper)
-set(KMLBASE_DEPENDS)
-
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
@@ -50,23 +70,23 @@ endif()
include(ExternalProject)
if(NOT INSTALL_DIR)
- set(INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+ set(INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE "install directory " PATH)
endif()
-set(KMLBASE_LINK_LIBS)
-set(KMLBASE_DEPENDS)
-set(MINIZIP_DEPENDS)
+set(KMLBASE_LINK_LIBS "" CACHE INTERNAL "KMLBASE_LINK_LIBS")
+set(KMLBASE_DEPENDS "" CACHE INTERNAL "KMLBASE_DEPENDS")
+set(MINIZIP_DEPENDS "" CACHE INTERNAL "MINIZIP_DEPENDS")
-include(ImportEXPAT)
-if(HAVE_SYSTEM_EXPAT)
+find_package(EXPAT)
+if(EXPAT_FOUND)
include_directories(${EXPAT_INCLUDE_DIR})
else()
include(External_expat)
list(APPEND KMLBASE_DEPENDS EXPAT)
endif()
-include(ImportZLIB)
-if(HAVE_SYSTEM_ZLIB)
+find_package(ZLIB 1.2.8)
+if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR})
else()
include(External_zlib)
@@ -74,24 +94,24 @@ else()
list(APPEND MINIZIP_DEPENDS ZLIB)
endif()
-include(ImportMinizip)
-if(HAVE_SYSTEM_MINIZIP)
+find_package(MiniZip)
+if(MINIZIP_FOUND)
include_directories(${MINIZIP_INCLUDE_DIR})
else()
include(External_minizip)
list(APPEND KMLBASE_DEPENDS MINIZIP)
endif()
-include(ImportUriParser)
-if(HAVE_SYSTEM_URIPARSER)
+find_package(UriParser)
+if(URIPARSER_FOUND)
include_directories(${URIPARSER_INCLUDE_DIR})
else()
include(External_uriparser)
list(APPEND KMLBASE_DEPENDS URIPARSER)
endif()
-include(ImportBoost)
-if(HAVE_SYSTEM_BOOST)
+find_package(Boost)
+if(Boost_FOUND)
message(STATUS "Found Boost: ${Boost_VERSION}")
else()
include(External_boost)
@@ -112,7 +132,7 @@ add_subdirectory(src)
if(BUILD_TESTING)
enable_testing()
- include(ImportGoogleTest)
+ find_package(GoogleTest REQUIRED)
include_directories(${GTEST_INCLUDE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/tests)
add_definitions("-DDATADIR=\"${LIBKML_DATA_DIR}\"")
diff --git a/cmake/.#FindMiniZip.cmake b/cmake/.#FindMiniZip.cmake
deleted file mode 120000
index d334906..0000000
--- a/cmake/.#FindMiniZip.cmake
+++ /dev/null
@@ -1 +0,0 @@
-rashad@heisenbug.21398:1415096103
\ No newline at end of file
diff --git a/cmake/FindMiniZip.cmake b/cmake/FindMiniZip.cmake
index 44ee152..12b1a75 100644
--- a/cmake/FindMiniZip.cmake
+++ b/cmake/FindMiniZip.cmake
@@ -7,32 +7,26 @@
if (MINIZIP_INCLUDE_DIR)
- #check cache
+ #check cache
set(MINIZIP_FIND_QUIETLY TRUE)
endif ()
if (NOT MINIZIP_INCLUDE_DIR)
find_path(MINIZIP_INCLUDE_DIR NAMES unzip.h zip.h PATH_SUFFIXES minizip)
- set(MINIZIP_INCLUDE_DIR ${MINIZIP_INCLUDE_DIR}/minizip CACHE PATH "MiniZip
includes")
endif ()
find_library(MINIZIP_LIBRARY NAMES minizip)
-if (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY)
- set(MINIZIP_FOUND TRUE)
-endif ()
-
-if (MINIZIP_FOUND)
- if (NOT MINIZIP_FIND_QUIETLY)
- message(STATUS "Found MiniZip: ${MINIZIP_LIBRARY}")
- endif ()
-else ()
- if (MINIZIP_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find MiniZip")
- else ()
- message(STATUS "Could NOT find MiniZip")
- endif ()
-endif ()
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( MINIZIP DEFAULT_MSG MINIZIP_LIBRARY
MINIZIP_INCLUDE_DIR )
+mark_as_advanced( MINIZIP_INCLUDE_DIR MINIZIP_LIBRARY )
+if(MINIZIP_FOUND)
+ set(MINIZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIR})
+ set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARY})
+else()
+ set(MINIZIP_INCLUDE_DIRS)
+ set(MINIZIP_LIBRARIES)
+endif()
diff --git a/cmake/FindUriParser.cmake b/cmake/FindUriParser.cmake
index b995378..83b30b3 100644
--- a/cmake/FindUriParser.cmake
+++ b/cmake/FindUriParser.cmake
@@ -6,32 +6,26 @@
# URIPARSER_FOUND - TRUE if UriParser is found
if (URIPARSER_INCLUDE_DIR)
- #check cache
+ #check cache
set(URIPARSER_FIND_QUIETLY TRUE)
endif ()
if (NOT URIPARSER_INCLUDE_DIR)
- find_path(URIPARSER_INCLUDE_DIR NAMES Uri.h UriBase.h PATH_SUFFIXES
uriparser)
- set(URIPARSER_INCLUDE_DIR ${URIPARSER_INCLUDE_DIR}/uriparser CACHE PATH
"UriParser includes")
+ find_path(URIPARSER_INCLUDE_DIR NAMES uriparser/Uri.h uriparser/UriBase.h )
endif ()
find_library(URIPARSER_LIBRARY NAMES uriparser)
-if (URIPARSER_INCLUDE_DIR AND URIPARSER_LIBRARY)
- set(URIPARSER_FOUND TRUE)
-endif ()
-
-if (URIPARSER_FOUND)
- if (NOT URIPARSER_FIND_QUIETLY)
- message(STATUS "Found UriParser: ${URIPARSER_LIBRARY}")
- endif ()
-else ()
- if (URIPARSER_FIND_REQUIRED)
- message(FATAL_ERROR "Could not find UriParser library")
- else ()
- message(STATUS "Could not find UriParser library")
- endif ()
-endif ()
+include( FindPackageHandleStandardArgs )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( URIPARSER DEFAULT_MSG URIPARSER_LIBRARY
URIPARSER_INCLUDE_DIR )
+mark_as_advanced( URIPARSER_INCLUDE_DIR URIPARSER_LIBRARY )
+if(URIPARSER_FOUND)
+ set(URIPARSER_INCLUDE_DIRS ${URIPARSER_INCLUDE_DIR})
+ set(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY})
+else()
+ set(URIPARSER_INCLUDE_DIRS)
+ set(URIPARSER_LIBRARIES)
+endif()
diff --git a/cmake/ImportBoost.cmake b/cmake/ImportBoost.cmake
deleted file mode 100644
index 4e20765..0000000
--- a/cmake/ImportBoost.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-find_package(Boost)
-mark_as_advanced(Boost_DIR)
-if(Boost_FOUND)
- set(HAVE_SYSTEM_BOOST TRUE)
-else()
- set(HAVE_SYSTEM_BOOST FALSE)
-endif()
\ No newline at end of file
diff --git a/cmake/ImportEXPAT.cmake b/cmake/ImportEXPAT.cmake
deleted file mode 100644
index a0e767c..0000000
--- a/cmake/ImportEXPAT.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-find_package(EXPAT)
-mark_as_advanced(EXPAT_INCLUDE_DIR)
-mark_as_advanced(EXPAT_LIBRARY)
-if(EXPAT_FOUND)
- set(HAVE_SYSTEM_EXPAT TRUE)
- set(EXPAT_LIBRARY ${EXPAT_LIBRARIES})
-else()
- set(HAVE_SYSTEM_EXPAT FALSE)
-endif()
\ No newline at end of file
diff --git a/cmake/ImportGoogleTest.cmake b/cmake/ImportGoogleTest.cmake
deleted file mode 100644
index f05c8a0..0000000
--- a/cmake/ImportGoogleTest.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_package(GoogleTest REQUIRED)
-mark_as_advanced(GTEST_INCLUDE_DIR)
-mark_as_advanced(GTEST_LIBRARY)
-if(GTEST_FOUND)
- set(HAVE_SYSTEM_GTEST TRUE)
-else()
- set(HAVE_SYSTEM_GTEST FALSE)
-endif()
\ No newline at end of file
diff --git a/cmake/ImportMinizip.cmake b/cmake/ImportMinizip.cmake
deleted file mode 100644
index 1384f17..0000000
--- a/cmake/ImportMinizip.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_package(MiniZip)
-mark_as_advanced(MINIZIP_INCLUDE_DIR)
-mark_as_advanced(MINIZIP_LIBRARY)
-if(MINIZIP_FOUND)
- set(HAVE_SYSTEM_MINIZIP TRUE)
-else()
- set(HAVE_SYSTEM_MINIZIP FALSE)
-endif()
\ No newline at end of file
diff --git a/cmake/ImportUriParser.cmake b/cmake/ImportUriParser.cmake
deleted file mode 100644
index 7fd5a1d..0000000
--- a/cmake/ImportUriParser.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-find_package(UriParser)
-mark_as_advanced(URIPARSER_INCLUDE_DIR)
-mark_as_advanced(URIPARSER_LIBRARY)
-if(URIPARSER_FOUND)
- set(HAVE_SYSTEM_URIPARSER TRUE)
-else()
- set(HAVE_SYSTEM_URIPARSER FALSE)
-endif()
\ No newline at end of file
diff --git a/cmake/ImportZLIB.cmake b/cmake/ImportZLIB.cmake
deleted file mode 100644
index c038652..0000000
--- a/cmake/ImportZLIB.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-find_package(ZLIB 1.2.8)
-mark_as_advanced(ZLIB_INCLUDE_DIR)
-mark_as_advanced(ZLIB_LIBRARY)
-if(ZLIB_FOUND)
- set(HAVE_SYSTEM_ZLIB TRUE)
- set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
-else()
- set(HAVE_SYSTEM_ZLIB FALSE)
-endif()
\ No newline at end of file
diff --git a/cmake/LibKMLHelper.cmake b/cmake/LibKMLHelper.cmake
index 408de40..f99ae5f 100644
--- a/cmake/LibKMLHelper.cmake
+++ b/cmake/LibKMLHelper.cmake
@@ -14,14 +14,14 @@ macro(build_target)
if(VERSION_STRING)
set_target_properties(${LIB_NAME} PROPERTIES
VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
- SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
+ SOVERSION "${VERSION_MAJOR}")
endif()
string(LENGTH ${LIB_NAME} ${LIB_NAME}_LEN)
MATH(EXPR ${LIB_NAME}_END "${${LIB_NAME}_LEN} - 3")
string(SUBSTRING ${LIB_NAME} 3 ${${LIB_NAME}_END} ${LIB_NAME}_INCLUDE_DIR)
install(
FILES ${LIB_INCS}
- DESTINATION include/${${LIB_NAME}_INCLUDE_DIR})
+ DESTINATION ${INCLUDE_INSTALL_DIR}/${${LIB_NAME}_INCLUDE_DIR})
install_target(${LIB_NAME})
@@ -29,9 +29,9 @@ endmacro(build_target)
macro(install_target _target)
install(TARGETS ${_target}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
endmacro(install_target)
function(build_test)
@@ -63,4 +63,4 @@ macro(include_project_vars _project _lib)
endif(WIN32)
set(${_project}_LIBRARY "${INSTALL_DIR}/lib/${_lib}${_suffix}" )
include_directories(${${_project}_INCLUDE_DIR})
-endmacro()
\ No newline at end of file
+endmacro()
diff --git a/cmake/pycompile.py b/cmake/pycompile.py
new file mode 100755
index 0000000..e57eac4
--- /dev/null
+++ b/cmake/pycompile.py
@@ -0,0 +1,3 @@
+import compileall
+from sys import argv
+compileall.compile_file(argv[1])
diff --git a/examples/engine/Makefile.am b/examples/engine/Makefile.am
deleted file mode 100644
index e5f9fa0..0000000
--- a/examples/engine/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1
-
-if GCC
-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-endif
-
-noinst_PROGRAMS = \
- balloonwalker change clone csv2kml csvinfo import inlinestyles kmlfile \
- kml2kmz kmzchecklinks oldschema parsebig printstyle splitstyles \
- streamkml
-
-balloonwalker_SOURCES = balloonwalker.cc
-balloonwalker_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-clone_SOURCES = clone.cc
-clone_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-csv2kml_SOURCES = csv2kml.cc
-csv2kml_LDADD = \
- $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-csvinfo_SOURCES = csvinfo.cc
-csvinfo_LDADD = \
- $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-import_SOURCES = import.cc
-import_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-inlinestyles_SOURCES = inlinestyles.cc
-inlinestyles_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-kmlfile_SOURCES = kmlfile.cc
-kmlfile_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-kml2kmz_SOURCES = kml2kmz.cc
-kml2kmz_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-kmzchecklinks_SOURCES = kmzchecklinks.cc
-kmzchecklinks_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-oldschema_SOURCES = oldschema.cc
-oldschema_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-parsebig_SOURCES = parsebig.cc
-parsebig_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-printstyle_SOURCES = printstyle.cc
-printstyle_LDADD = \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-change_SOURCES = change.cc
-change_LDADD = \
- $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-splitstyles_SOURCES = splitstyles.cc
-splitstyles_LDADD = \
- $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-streamkml_SOURCES = streamkml.cc
-streamkml_LDADD = \
- $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
diff --git a/examples/java/run.sh b/examples/java/run.sh
index 71e9664..607c8b4 100755
--- a/examples/java/run.sh
+++ b/examples/java/run.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
# The relative path to the directory that holds the build shared libraries.
BUILT_LIB_DIR=../../build/src/swig/.libs
echo "=== setting shared library path to built libraries dir: $BUILT_LIB_DIR"
diff --git a/examples/wxregionator/Makefile.am
b/examples/wxregionator/Makefile.am
deleted file mode 100644
index 49d2244..0000000
--- a/examples/wxregionator/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-EXTRA_DIST = \
- README \
- Regionator-Info.plist \
- main.cc \
- main.h \
- wxregionator.cc \
- wxregionator.h \
- wxregionator.sln \
- wxregionator.vcproj \
- wxregionator.xcodeproj/project.pbxproj
diff --git a/examples/wxviewer/Makefile.am b/examples/wxviewer/Makefile.am
deleted file mode 100644
index 648cea6..0000000
--- a/examples/wxviewer/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST = \
- icon_file.xpm \
- icon_folder_closed.xpm \
- icon_folder_opened.xpm \
- wxviewer-Info.plist \
- wxviewer.cc \
- wxviewer.h \
- wxviewer.xcodeproj/project.pbxproj
diff --git a/libkml.sln b/libkml.sln
deleted file mode 100644
index a23d014..0000000
--- a/libkml.sln
+++ /dev/null
@@ -1,50 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkmldom",
"src\libkmldom.vcproj", "{19484FD7-58B0-44DA-89CE-EADF0CF39E04}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkmlengine",
"src\libkmlengine.vcproj", "{C7D291C3-46EC-441C-B7F1-911FD32CE185}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkmlregionator",
"src\libkmlregionator.vcproj", "{2A7D7DC5-8AB2-4B4F-848A-2A81226F2BC2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkmlconvenience",
"src\libkmlconvenience.vcproj", "{5E53C538-7B22-41FF-84AF-F08F0C019E7B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkmlbase",
"src\libkmlbase.vcproj", "{DA5DEA8E-4DF5-4B36-BF1E-4760104149F0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkmlxsd",
"src\libkmlxsd.vcproj", "{D5CD9019-3AC4-4223-82B2-E3A44A443395}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {19484FD7-58B0-44DA-89CE-EADF0CF39E04}.Debug|Win32.ActiveCfg =
Debug|Win32
- {19484FD7-58B0-44DA-89CE-EADF0CF39E04}.Debug|Win32.Build.0 =
Debug|Win32
- {19484FD7-58B0-44DA-89CE-EADF0CF39E04}.Release|Win32.ActiveCfg
= Release|Win32
- {19484FD7-58B0-44DA-89CE-EADF0CF39E04}.Release|Win32.Build.0 =
Release|Win32
- {C7D291C3-46EC-441C-B7F1-911FD32CE185}.Debug|Win32.ActiveCfg =
Debug|Win32
- {C7D291C3-46EC-441C-B7F1-911FD32CE185}.Debug|Win32.Build.0 =
Debug|Win32
- {C7D291C3-46EC-441C-B7F1-911FD32CE185}.Release|Win32.ActiveCfg
= Release|Win32
- {C7D291C3-46EC-441C-B7F1-911FD32CE185}.Release|Win32.Build.0 =
Release|Win32
- {2A7D7DC5-8AB2-4B4F-848A-2A81226F2BC2}.Debug|Win32.ActiveCfg =
Debug|Win32
- {2A7D7DC5-8AB2-4B4F-848A-2A81226F2BC2}.Debug|Win32.Build.0 =
Debug|Win32
- {2A7D7DC5-8AB2-4B4F-848A-2A81226F2BC2}.Release|Win32.ActiveCfg
= Release|Win32
- {2A7D7DC5-8AB2-4B4F-848A-2A81226F2BC2}.Release|Win32.Build.0 =
Release|Win32
- {5E53C538-7B22-41FF-84AF-F08F0C019E7B}.Debug|Win32.ActiveCfg =
Debug|Win32
- {5E53C538-7B22-41FF-84AF-F08F0C019E7B}.Debug|Win32.Build.0 =
Debug|Win32
- {5E53C538-7B22-41FF-84AF-F08F0C019E7B}.Release|Win32.ActiveCfg
= Release|Win32
- {5E53C538-7B22-41FF-84AF-F08F0C019E7B}.Release|Win32.Build.0 =
Release|Win32
- {DA5DEA8E-4DF5-4B36-BF1E-4760104149F0}.Debug|Win32.ActiveCfg =
Debug|Win32
- {DA5DEA8E-4DF5-4B36-BF1E-4760104149F0}.Debug|Win32.Build.0 =
Debug|Win32
- {DA5DEA8E-4DF5-4B36-BF1E-4760104149F0}.Release|Win32.ActiveCfg
= Release|Win32
- {DA5DEA8E-4DF5-4B36-BF1E-4760104149F0}.Release|Win32.Build.0 =
Release|Win32
- {D5CD9019-3AC4-4223-82B2-E3A44A443395}.Debug|Win32.ActiveCfg =
Debug|Win32
- {D5CD9019-3AC4-4223-82B2-E3A44A443395}.Debug|Win32.Build.0 =
Debug|Win32
- {D5CD9019-3AC4-4223-82B2-E3A44A443395}.Release|Win32.ActiveCfg
= Release|Win32
- {D5CD9019-3AC4-4223-82B2-E3A44A443395}.Release|Win32.Build.0 =
Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c754ab..7d5ed43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
add_subdirectory(kml)
-if(BUILD_SWIG)
+if(WITH_SWIG)
add_subdirectory(swig)
endif()
\ No newline at end of file
diff --git a/src/kml/CMakeLists.txt b/src/kml/CMakeLists.txt
index 16d1f2f..7393f89 100644
--- a/src/kml/CMakeLists.txt
+++ b/src/kml/CMakeLists.txt
@@ -7,5 +7,5 @@ add_subdirectory(regionator)
install( FILES dom.h engine.h
- DESTINATION include/kml
+ DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Development)
diff --git a/src/kml/base/CMakeLists.txt b/src/kml/base/CMakeLists.txt
index fdd6c18..3788b20 100644
--- a/src/kml/base/CMakeLists.txt
+++ b/src/kml/base/CMakeLists.txt
@@ -9,7 +9,14 @@ file(GLOB SRCS "*.cc"
contrib/minizip/unzip.c
contrib/minizip/iomem_simple.c)
-list(REMOVE_ITEM SRCS "${CMAKE_CURRENT_SOURCE_DIR}/file_posix.cc")
+if(WIN32)
+ list(REMOVE_ITEM SRCS "${CMAKE_CURRENT_SOURCE_DIR}/file_posix.cc")
+else()
+ list(REMOVE_ITEM SRCS "${CMAKE_CURRENT_SOURCE_DIR}/file_win32.cc")
+endif()
+
+#supress W-long-long
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/zip_file.cc
COMPILE_FLAGS "-Wno-long-long")
file(GLOB INCS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
new file mode 100644
index 0000000..2d5d327
--- /dev/null
+++ b/src/swig/CMakeLists.txt
@@ -0,0 +1,95 @@
+find_package(SWIG REQUIRED)
+include(${SWIG_USE_FILE})
+
+if(WITH_PYTHON)
+ find_package(PythonLibs REQUIRED)
+ if(NOT PYTHONLIBS_FOUND)
+ message(FATAL_ERROR "Python Libraries not found.")
+ endif()
+
+ find_package(PythonInterp REQUIRED)
+
+ include_directories(${PYTHON_INCLUDE_PATH})
+
+ # execute_process(COMMAND
+ # python -c "from distutils.sysconfig import get_python_lib; print
get_python_lib(True)"
+ # OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
+ # OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+ file(GLOB IFILES "kml*.i")
+ foreach(INTERFACE_FILE ${IFILES})
+ get_filename_component(MODULE_NAME ${INTERFACE_FILE} NAME_WE)
+ set_source_files_properties(${INTERFACE_FILE} PROPERTIES CPLUSPLUS ON )
+ set_source_files_properties(${INTERFACE_FILE} PROPERTIES CMAKE_SWIG_FLAGS
"-includeall -DSWIGPYTHON")
+ set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}PYTHON_wrap.cxx COMPILE_FLAGS
"-Wno-long-long" )
+ swig_add_module(${MODULE_NAME} python ${INTERFACE_FILE})
+ swig_link_libraries(${MODULE_NAME} kmlbase kmlengine kmldom
${PYTHON_LIBRARIES})
+ add_custom_command(
+ TARGET _${MODULE_NAME}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E echo "Byte-compiling ${MODULE_NAME}.py"
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/pycompile.py
${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.py
+ DEPENDS kmlbase kmlengine kmldom)
+
+ install(TARGETS
+ _${MODULE_NAME}
+ DESTINATION ${PYTHON_INSTALL_DIR})
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.py
+ ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.pyc
+ DESTINATION ${PYTHON_INSTALL_DIR})
+
+ endforeach()
+
+endif(WITH_PYTHON)
+
+if(WITH_JAVA)
+ find_package(Java REQUIRED)
+ find_package(JNI REQUIRED)
+ mark_as_advanced(JAVA_HOME)
+
+ include_directories(${JAVA_INCLUDE_PATH}
+ ${JNI_INCLUDE_DIRS})
+ include_directories ( ${JAVA_INCLUDE_PATH} ${JNI_INCLUDE_DIRS} )
+
+ # Make sure the nested directory structure exists
+ set(JAVA_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/com/google/libkml)
+ set(JAVA_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build)
+ if(NOT EXISTS "${JAVA_SOURCE_DIRECTORY}")
+ file(MAKE_DIRECTORY ${JAVA_SOURCE_DIRECTORY})
+ endif()
+ if(NOT EXISTS "${JAVA_BINARY_DIRECTORY}")
+ file(MAKE_DIRECTORY ${JAVA_BINARY_DIRECTORY})
+ endif()
+ # java_package_dir = com/googlecode/libkml
+ file(GLOB IFILES "kml*.i")
+ set(LIBKML_JAVA_PACKAGE "com.googlecode.libkml")
+ set(CMAKE_SWIG_OUTDIR ${JAVA_SOURCE_DIRECTORY})
+ set(CMAKE_SWIG_FLAGS -package "${LIBKML_JAVA_PACKAGE}"
${CMAKE_SWIG_GLOBAL_FLAGS})
+
+ foreach(INTERFACE_FILE ${IFILES})
+ get_filename_component(MODULE_NAME ${INTERFACE_FILE} NAME_WE)
+ set_source_files_properties(${INTERFACE_FILE} PROPERTIES CPLUSPLUS ON)
+ set_source_files_properties(${INTERFACE_FILE} PROPERTIES CMAKE_SWIG_FLAGS
"-includeall -DSWIGJAVA")
+ set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}JAVA_wrap.cxx COMPILE_FLAGS "-w")
+ swig_add_module(${MODULE_NAME}_java java ${INTERFACE_FILE})
+ swig_link_libraries(${MODULE_NAME}_java kmlbase kmlengine kmldom)
+ endforeach()
+
+ add_custom_target(LibKML_jar ALL DEPENDS LibKML.jar)
+
+ add_custom_command(
+ OUTPUT LibKML.jar
+ COMMENT "Creating jar file..."
+ COMMAND ${Java_JAVAC_EXECUTABLE} -d ${JAVA_BINARY_DIRECTORY}
${JAVA_SOURCE_DIRECTORY}/*.java
+ COMMAND ${Java_JAR_EXECUTABLE} cf ${CMAKE_CURRENT_BINARY_DIR}/LibKML.jar
-C ${JAVA_BINARY_DIRECTORY} com
+ DEPENDS LibKML_jar kmlbase_java kmldom_java kmlengine_java kmlengine
kmlbase kmldom)
+
+ # Get the location of the extension directory
+ string(REGEX REPLACE "include" "jre/lib/ext" JAVA_EXTENSION_DIR
${JAVA_INCLUDE_PATH})
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibKML.jar
+ DESTINATION ${JAVA_INSTALL_DIR})
+
+endif(WITH_JAVA)
diff --git a/src/swig/Makefile.am b/src/swig/Makefile.am
deleted file mode 100644
index d5ab282..0000000
--- a/src/swig/Makefile.am
+++ /dev/null
@@ -1,132 +0,0 @@
-SUBDIRS = java python
-
-AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1 \
- -I$(top_srcdir)/third_party/uriparser-0.7.5/include
-
-COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
-pkglib_LTLIBRARIES=
-
-if WITH_SWIG
-if WITH_JAVA
-pkglib_LTLIBRARIES += libkmlbase_swig_java.la
-pkglib_LTLIBRARIES += libkmldom_swig_java.la
-pkglib_LTLIBRARIES += libkmlengine_swig_java.la
-endif
-if WITH_PYTHON
-pkglib_LTLIBRARIES += libkmlbase_swig_python.la
-pkglib_LTLIBRARIES += libkmldom_swig_python.la
-pkglib_LTLIBRARIES += libkmlengine_swig_python.la
-endif
-endif
-
-java_package_dir = com/googlecode/libkml
-
-libkmlbase_swig_java_la_SOURCES = kmlbase_java.cc
-libkmlbase_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR)
-I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
-libkmlbase_swig_java_la_LIBADD = $(COMMONLIBS)
-kmlbase_java.cc: kmlbase.i
- mkdir -p $(java_package_dir)
- $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmlbase_java.cc \
- -package com.googlecode.libkml \
- -outdir $(java_package_dir) $(top_srcdir)/src/swig/kmlbase.i
-
-libkmlbase_swig_python_la_SOURCES = kmlbase_python.cc kmlbase.py
-libkmlbase_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
-libkmlbase_swig_python_la_LIBADD = $(COMMONLIBS)
-libkmlbase_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
-kmlbase_python.cc: kmlbase.i
- $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmlbase_python.cc \
- $(top_srcdir)/src/swig/kmlbase.i
-
-libkmldom_swig_java_la_SOURCES = kmldom_java.cc
-libkmldom_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR)
-I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
-libkmldom_swig_java_la_LIBADD = $(COMMONLIBS)
-kmldom_java.cc: kmldom.i
- mkdir -p $(java_package_dir)
- $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmldom_java.cc \
- -package com.googlecode.libkml \
- -outdir $(java_package_dir) $(top_srcdir)/src/swig/kmldom.i
-
-libkmldom_swig_python_la_SOURCES = kmldom_python.cc kmldom.py
-libkmldom_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
-libkmldom_swig_python_la_LIBADD = $(COMMONLIBS)
-libkmldom_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
-kmldom_python.cc: kmldom.i
- $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmldom_python.cc \
- $(top_srcdir)/src/swig/kmldom.i
-
-libkmlengine_swig_java_la_SOURCES = kmlengine_java.cc
-libkmlengine_swig_java_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(JAVA_INCLUDE_DIR)
-I$(JAVA_INCLUDE_DIR)/$(PLATFORM)
-libkmlengine_swig_java_la_LIBADD = $(COMMONLIBS)
-kmlengine_java.cc: kmlengine.i
- mkdir -p $(java_package_dir)
- $(SWIG) -c++ $(AM_CPPFLAGS) -java -o kmlengine_java.cc \
- -package com.googlecode.libkml \
- -outdir $(java_package_dir) $(top_srcdir)/src/swig/kmlengine.i
-
-libkmlengine_swig_python_la_SOURCES = kmlengine_python.cc kmlengine.py
-libkmlengine_swig_python_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
-libkmlengine_swig_python_la_LIBADD = $(COMMONLIBS)
-libkmlengine_swig_python_la_LDFLAGS = -dynamiclib -python -lexpat
-kmlengine_python.cc: kmlengine.i
- $(SWIG) -c++ $(AM_CPPFLAGS) -python -o kmlengine_python.cc \
- $(top_srcdir)/src/swig/kmlengine.i
-
-if WITH_SWIG
-if WITH_PYTHON
-pythonext_DATA = _kmlbase.so kmlbase.py _kmldom.so kmldom.py _kmlengine.so
kmlengine.py
-_kmlbase.so:
- cp $(top_builddir)/src/swig/.libs/libkmlbase_swig_python.$(SHLIBSUFFIX)
_kmlbase.so
-kmlbase.py:
- cp $(top_srcdir)/src/swig/kmlbase.py kmlbase.py
-_kmldom.so:
- cp $(top_builddir)/src/swig/.libs/libkmldom_swig_python.$(SHLIBSUFFIX)
_kmldom.so
-kmldom.py:
- cp $(top_srcdir)/src/swig/kmldom.py kmldom.py
-_kmlengine.so:
- cp
$(top_builddir)/src/swig/.libs/libkmlengine_swig_python.$(SHLIBSUFFIX)
_kmlengine.so
-kmlengine.py:
- cp $(top_srcdir)/src/swig/kmlengine.py kmlengine.py
-
-pythonextdir = $(PYTHON_SITE_PACKAGES_DIR)
-endif
-if WITH_JAVA
-javadir = $(datadir)/java
-java_DATA = LibKML.jar
-# TODO: shared libs need to be bundled in jar?
-LibKML.jar: kmlbase_java.cc kmldom_java.cc kmlengine_java.cc
- $(JAVAC) $(java_package_dir)/*.java
- $(JAR) cf LibKML.jar $(java_package_dir)/*.class
-
-# This copies the Java archive file into the tarball when 'make dist' is
called:
-dist-hook: LibKML.jar
- cp -p -v $(top_builddir)/src/swig/LibKML.jar $(distdir)/
-
-endif
-clean-local:
- -rm -f kmlbase_java.cc kmldom_java.cc kmlengine_java.cc \
- LibKML.jar $(java_package_dir)/* \
- kmlbase_python.cc kmldom_python.cc kmlengine_python.cc \
- kmlbase.py kmldom.py kmlengine.py \
- _kmlbase.so _kmldom.so _kmlengine.so
-endif
-
-EXTRA_DIST = \
- libkml_intrusive_ptr.i \
- kmlbase.i \
- kmlbase_test.py \
- kmldom.i \
- kmldom_test.py \
- kmlelements.i \
- kmlengine.i \
- kmlengine_test.py
-
-# The Python library on both Linux and OS X has to be called _kmldom.so. As
-# above, we accomplish this with a _DATA directive that copies the file. Since
-# there is an inherit dependency, we have to disable parallel builds in this
-# file, otherwise 'make -j3' or similar is likely to hit the race condition.
-.NOTPARALLEL:
diff --git a/src/swig/java/Makefile.am b/src/swig/java/Makefile.am
deleted file mode 100644
index 2e86fc4..0000000
--- a/src/swig/java/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- libkml_boost_intrusive_ptr.i
diff --git a/src/swig/kmlbase.i b/src/swig/kmlbase.i
index f9bdcbf..d1a27a7 100644
--- a/src/swig/kmlbase.i
+++ b/src/swig/kmlbase.i
@@ -1,9 +1,9 @@
// Copyright 2008, Google Inc. All rights reserved.
//
-// Redistribution and use in source and binary forms, with or without
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
-// 1. Redistributions of source code must retain the above copyright notice,
+// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
notice,
// this list of conditions and the following disclaimer in the
documentation
@@ -13,19 +13,21 @@
// specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// This is the SWIG interface file for the KML Base module.
// This was developed with SWIG version 1.3.35.
+//%rename(__set__) *::operator=;
+//%rename(__getitem__) *::operator[];
%module kmlbase
// Include the headers needed to build kmlengine_wrap.cc.
@@ -52,6 +54,8 @@
%apply std::string* OUTPUT { std::string* output_value };
%apply std::string* OUTPUT { std::string* output_key };
+
+
typedef long time_t;
namespace kmlbase {
@@ -64,6 +68,8 @@ class Attributes {
void SetString(const std::string& attr_name, const std::string& attr_val);
};
+%rename(Color32_op_equal) Color32::operator==;
+
class Color32 {
public:
Color32();
@@ -88,6 +94,7 @@ class Color32 {
unsigned char g, unsigned char r);
void set_color_argb(uint32_t color_argb);
bool operator==(const Color32& color) const;
+
// TODO: other operator overrides.
};
diff --git a/src/swig/kmldom.i b/src/swig/kmldom.i
index e4b326e..96a85d0 100644
--- a/src/swig/kmldom.i
+++ b/src/swig/kmldom.i
@@ -1,9 +1,9 @@
// Copyright 2008, Google Inc. All rights reserved.
//
-// Redistribution and use in source and binary forms, with or without
+// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
-// 1. Redistributions of source code must retain the above copyright notice,
+// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
notice,
// this list of conditions and the following disclaimer in the
documentation
@@ -13,14 +13,14 @@
// specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// This is the SWIG interface file for the KML DOM.
@@ -33,6 +33,7 @@
// Include the headers needed to build kmldom_wrap.cc.
%{
#include "kml/dom.h"
+#include "kml/dom/xsd.h"
%}
// Tell SWIG about boost::intrusive_ptr and the inheritance hierarchy
@@ -176,7 +177,11 @@ SWIG_INTRUSIVE_PTR_DERIVED(GxWait, kmldom::GxTourPrimitive,
// Tell SWIG about C++ Standard Library std::string.
%include "std_string.i"
+
+%include "kml/dom/xsd.h"
+
// Tell SWIG about the kmldom type ids (Type_Placemark, etc).
+
%include "kml/dom/kml22.h"
// Tell SWIG about the intrusive_ptr typedefs.
@@ -249,7 +254,7 @@ public:
void clear_yunits();
};
-%include "kmlelements.i"
+%include "libkml_kmlelements.i"
%nodefaultctor KmlFactory;
class KmlFactory {
diff --git a/src/swig/kmlelements.i b/src/swig/libkml_kmlelements.i
similarity index 100%
rename from src/swig/kmlelements.i
rename to src/swig/libkml_kmlelements.i
diff --git a/src/swig/python/Makefile.am b/src/swig/python/Makefile.am
deleted file mode 100644
index 2e86fc4..0000000
--- a/src/swig/python/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- libkml_boost_intrusive_ptr.i
diff --git a/testdata/Makefile.am b/testdata/Makefile.am
deleted file mode 100644
index 95e18fd..0000000
--- a/testdata/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = \
- atom balloon csv deprecated gdata gmaps gpx gx kml kmz links style
update \
- xal xsd
diff --git a/testdata/atom/Makefile.am b/testdata/atom/Makefile.am
deleted file mode 100644
index 83f008b..0000000
--- a/testdata/atom/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST = \
- atom-all-a.kml \
- atom-all.kml \
- atom-author-ns.kml \
- atom-author.kml \
- entry-faulkner.atom \
- georss-gml.xml \
- georss-simple-point.xml
diff --git a/testdata/balloon/Makefile.am b/testdata/balloon/Makefile.am
deleted file mode 100644
index aa394c9..0000000
--- a/testdata/balloon/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- all-balloons.kml
diff --git a/testdata/csv/Makefile.am b/testdata/csv/Makefile.am
deleted file mode 100644
index 85f1622..0000000
--- a/testdata/csv/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-EXTRA_DIST = \
- README \
- crnl.csv \
- colleges.csv \
- gnis-ak-first-101.csv \
- hello.csv \
- lincoln-park-gc.csv \
- lincoln-park-gc-errors.csv \
- quotes.csv \
- test.csv
diff --git a/testdata/deprecated/Makefile.am b/testdata/deprecated/Makefile.am
deleted file mode 100644
index 22f2a21..0000000
--- a/testdata/deprecated/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- deprecated.kml
diff --git a/testdata/gdata/Makefile.am b/testdata/gdata/Makefile.am
deleted file mode 100644
index 06e2c02..0000000
--- a/testdata/gdata/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST = \
- doclist-metafeed.xml \
- feed0.xml \
- feed1.xml \
- feed2.xml \
- picasaweb-album-feed.xml \
- picasaweb-metafeed.xml
diff --git a/testdata/gmaps/Makefile.am b/testdata/gmaps/Makefile.am
deleted file mode 100644
index 4f39f09..0000000
--- a/testdata/gmaps/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = create-map-result.xml metafeed.xml feature-feed.xml \
- gsheet-list-feed.xml gsheet-metafeed.xml gsheet-worksheet-feed.xml
diff --git a/testdata/gpx/Makefile.am b/testdata/gpx/Makefile.am
deleted file mode 100644
index 790fa36..0000000
--- a/testdata/gpx/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- trkpts.gpx
diff --git a/testdata/gx/Makefile.am b/testdata/gx/Makefile.am
deleted file mode 100644
index e8e5ae9..0000000
--- a/testdata/gx/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = \
- all-gx-altitudemodes.kml all-gx-altitudemodes-golden.kml \
- all-gx.kml all-gx-golden.kml
diff --git a/testdata/kml/Makefile.am b/testdata/kml/Makefile.am
deleted file mode 100644
index 8c49d12..0000000
--- a/testdata/kml/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-EXTRA_DIST = \
- 100_nested_folders.kml \
- 101_nested_elements.kml \
- 101_nested_folders.kml \
- all-altitudemodes-golden.kml \
- all-altitudemodes.kml \
- all-arrays-golden.kml \
- all-arrays.kml \
- all-itemicon-states-golden.kml \
- all-itemicon-states-input.kml \
- all-unknown-attrs-golden.kml \
- all-unknown-attrs-input.kml \
- all-unknown-golden.kml \
- all-unknown-input.kml \
- badcoords-golden.kml \
- badcoords.kml \
- billion.kml \
- ge-point.kml \
- gnis-ak-first-101.kml \
- golf-style.kml \
- invalid_descriptions.kml \
- kmlsamples.kml \
- model-macky.kml \
- old_schema_example.kml \
- outline_space.kml \
- photooverlay-zermatt.kml \
- schemadata.kml
diff --git a/testdata/kmz/Makefile.am b/testdata/kmz/Makefile.am
deleted file mode 100644
index 9d07e17..0000000
--- a/testdata/kmz/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = files kmzfiles rumsey
-EXTRA_DIST = \
- bad-pk-data.kmz \
- bad-too-large.kmz \
- bad.kmz \
- balloon-image-rel.kmz \
- camels.kml \
- doc.kml \
- doc.kmz \
- dummy.png \
- dummy2.png \
- hier.kmz \
- model-macky.kmz \
- multikml-doc.kmz \
- multikml-nodoc.kmz \
- nokml.kmz \
- outside.kml \
- overflow_bad_offset.kmz \
- overflow_corrupted_stack.kmz \
- overflow_unzOpenCurrentFile.kmz \
- overflow_unzReadCurrentFile.kmz \
- radar-animation.kmz \
- screenoverlay-continents.kmz \
- zermatt-photo.kmz \
- zermatt-photo-bad.kmz
-
diff --git a/testdata/kmz/files/Makefile.am b/testdata/kmz/files/Makefile.am
deleted file mode 100644
index 2564242..0000000
--- a/testdata/kmz/files/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
- camelblack200.png \
- camelbrown200.png \
- camelcolor200.png \
- camera_mode.png
diff --git a/testdata/kmz/kmzfiles/Makefile.am
b/testdata/kmz/kmzfiles/Makefile.am
deleted file mode 100644
index cb389fe..0000000
--- a/testdata/kmz/kmzfiles/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- dummy.kml
diff --git a/testdata/kmz/rumsey/Makefile.am b/testdata/kmz/rumsey/Makefile.am
deleted file mode 100644
index 2d6783e..0000000
--- a/testdata/kmz/rumsey/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = imagery kml
diff --git a/testdata/kmz/rumsey/imagery/Makefile.am
b/testdata/kmz/rumsey/imagery/Makefile.am
deleted file mode 100644
index 34639c1..0000000
--- a/testdata/kmz/rumsey/imagery/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = 01_4.png 01_8.png
diff --git a/testdata/kmz/rumsey/kml/Makefile.am
b/testdata/kmz/rumsey/kml/Makefile.am
deleted file mode 100644
index 07c09a5..0000000
--- a/testdata/kmz/rumsey/kml/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
- lc01.kmz \
- 010.kmz \
- 012.kmz
diff --git a/testdata/links/Makefile.am b/testdata/links/Makefile.am
deleted file mode 100644
index e06cb98..0000000
--- a/testdata/links/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- alllinks.kml
diff --git a/testdata/style/Makefile.am b/testdata/style/Makefile.am
deleted file mode 100644
index bcf5c26..0000000
--- a/testdata/style/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-SUBDIRS = weather
-EXTRA_DIST = \
- allstyles-f0-highlight-check.kml \
- allstyles-f0-normal-check.kml \
- allstyles.kml \
- dup-id.kml \
- dup-id-normal-check.kml \
- empty-style-check.kml \
- ge-point-inline-style-check.kml \
- iconstyle.kml \
- inline-style-f0-check.kml \
- inline-style.kml \
- inline-stylemap-pm0-highlight-check.kml \
- inline-stylemap-pm0-normal-check.kml \
- inline-stylemap.kml \
- kmlsamples-inline-style-check.kml \
- nesting.kml \
- remote-styleurl-document-check.kml \
- remote-styleurl-folder-check.kml \
- remote-styleurl-groundoverlay-check.kml \
- remote-styleurl-placemark-inline-check.kml \
- remote-styleurl-placemark-style-both-check.kml \
- remote-styleurl-screenoverlay-check.kml \
- remote-styleurl.kml \
- remote-styleurl.kmz \
- shared-stylemap-pm0-highlight-check.kml \
- shared-stylemap-pm0-normal-check.kml \
- shared-stylemap.kml \
- simple-pm0-check.kml \
- simple-pm0-style.kml \
- simple.kml \
- style-with-unknown-elements.kml \
- style-with-unknown-elements-jb-check.kml
diff --git a/testdata/style/weather/Makefile.am
b/testdata/style/weather/Makefile.am
deleted file mode 100644
index 1e32992..0000000
--- a/testdata/style/weather/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-EXTRA_DIST = \
- point-sarnen-abs.kml \
- point-sarnen-green.kml \
- point-sarnen.kml \
- points-puntas-ARSC0046-check.kml \
- points-puntas-ARSC0133-check.kml \
- points-puntas-CIXX0017-check.kml \
- points-puntas.kml \
- points-puntas.kmz \
- style.kml \
- styles_new.kml \
- styles_new.kmz \
- weather-jpgs.kmz \
- weather-pngs.kmz
diff --git a/testdata/update/Makefile.am b/testdata/update/Makefile.am
deleted file mode 100644
index b0bc72c..0000000
--- a/testdata/update/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST = \
- california.kml \
- california-change-linestring.kml \
- california-change-linestring-check.kml \
- california-delete-ad.kml \
- california-delete-ad-check.kml \
- change-california-a.kml \
- change-california-a-check.kml \
- change-placemark-geometry.kml \
- change-placemark-geometry-check.kml \
- change-placemark-geometry2x.kml \
- change-placemark-geometry2x-check.kml \
- change-placemark-styleurl.kml \
- change-placemark-styleurl-check.kml \
- kmlsamples-change-many.kml \
- kmlsamples-change-many-check.kml \
- kmlsamples-delete-many.kml \
- kmlsamples-delete-many-check.kml \
- kmlsamples-multi-update.kml \
- kmlsamples-multi-update-check.kml \
- placemark.kml
diff --git a/testdata/xal/Makefile.am b/testdata/xal/Makefile.am
deleted file mode 100644
index eeb5d05..0000000
--- a/testdata/xal/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- gaddr.kml
diff --git a/testdata/xsd/Makefile.am b/testdata/xsd/Makefile.am
deleted file mode 100644
index 956c98b..0000000
--- a/testdata/xsd/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
- kml21.xsd
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ecfcaae..6d8c978 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
add_subdirectory(kml)
-if(BUILD_SWIG)
+if(WITH_SWIG)
add_subdirectory(swig)
endif()
\ No newline at end of file
diff --git a/tests/swig/CMakeLists.txt b/tests/swig/CMakeLists.txt
new file mode 100644
index 0000000..52e398e
--- /dev/null
+++ b/tests/swig/CMakeLists.txt
@@ -0,0 +1,19 @@
+if(WITH_PYTHON)
+add_test(NAME test_python_kmlbase
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kmlbase_test.py)
+
+add_test(NAME test_python_kmldom
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kmldom_test.py)
+
+add_test(NAME test_python_kmlengine
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kmlengine_test.py)
+endif()
+
+if(WITH_JAVA)
+add_test( NAME test_java_kmlbase
+ COMMAND
+ ${Java_JAVA_EXECUTABLE}
+ -cp
"${CMAKE_JAVA_INCLUDE_PATH}${PATH_SEPARATOR}${CMAKE_BINARY_DIR}/src/swig/LibKML.jar;${CMAKE_CURRENT_BINARY_DIR}"
+ KmlBaseTest )
+
+endif()
\ No newline at end of file
diff --git a/src/swig/KmlBaseTest.java b/tests/swig/KmlBaseTest.java
similarity index 100%
rename from src/swig/KmlBaseTest.java
rename to tests/swig/KmlBaseTest.java
diff --git a/src/swig/kmlbase_test.py b/tests/swig/kmlbase_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from src/swig/kmlbase_test.py
rename to tests/swig/kmlbase_test.py
diff --git a/src/swig/kmldom_test.py b/tests/swig/kmldom_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from src/swig/kmldom_test.py
rename to tests/swig/kmldom_test.py
diff --git a/src/swig/kmlengine_test.py b/tests/swig/kmlengine_test.py
old mode 100755
new mode 100644
similarity index 100%
rename from src/swig/kmlengine_test.py
rename to tests/swig/kmlengine_test.py
diff --git a/xcode/LibKML/Makefile.am b/xcode/LibKML/Makefile.am
deleted file mode 100644
index 3292195..0000000
--- a/xcode/LibKML/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
- LibKML-Info.plist \
- LibKML.h \
- README \
- LibKML.xcodeproj/project.pbxproj
diff --git a/xcode/Makefile.am b/xcode/Makefile.am
deleted file mode 100644
index a7dfdad..0000000
--- a/xcode/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = LibKML
-
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libkml.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
