[Zorba-coders] [Merge] lp:~zorba-coders/zorba/corrected_project_TAG_HTML_module into lp:zorba/html-module

2013-07-12 Thread Sorin Marian Nasoi
Sorin Marian Nasoi has proposed merging 
lp:~zorba-coders/zorba/corrected_project_TAG_HTML_module into 
lp:zorba/html-module.

Commit message:
- updated project TAG

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/corrected_project_TAG_HTML_module/+merge/174348
-- 
https://code.launchpad.net/~zorba-coders/zorba/corrected_project_TAG_HTML_module/+merge/174348
Your team Zorba Coders is subscribed to branch lp:zorba/html-module.
-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp


[Zorba-coders] [Merge] lp:~zorba-coders/zorba/corrected_project_TAG_HTML_module into lp:zorba

2013-07-12 Thread Sorin Marian Nasoi
Sorin Marian Nasoi has proposed merging 
lp:~zorba-coders/zorba/corrected_project_TAG_HTML_module into lp:zorba.

Commit message:
- corrected @project TAG

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/corrected_project_TAG_HTML_module/+merge/174346
-- 
https://code.launchpad.net/~zorba-coders/zorba/corrected_project_TAG_HTML_module/+merge/174346
Your team Zorba Coders is subscribed to branch lp:zorba.
=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +
+++ CMakeLists.txt	2013-07-12 07:41:39 +
@@ -0,0 +1,38 @@
+# Copyright 2006-2010 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+PROJECT (zorba_html_module)
+ENABLE_TESTING ()
+INCLUDE (CTest)
+
+IF (WIN32)
+  # On Windows we use proxy modules that try to guess first the location
+  # of the required third party libraries. This will search in order in:
+  # 1. the path pointed by ZORBA_THIRD_PARTY_REQUIREMENTS
+  # 2. the Program Files directory available on the users computer
+  # 3. the PATH environment variable
+  # The logic is implemented by the macros in the ProxyFindModule.cmake module.
+  LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules/Windows")
+ENDIF (WIN32)
+LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
+
+FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+MESSAGE(STATUS "Zorba_USE_FILE ${Zorba_USE_FILE}")
+INCLUDE ("${Zorba_USE_FILE}")
+
+ADD_SUBDIRECTORY("src")
+
+DONE_DECLARING_ZORBA_URIS()

=== renamed file 'CMakeLists.txt' => 'CMakeLists.txt.moved'
=== added directory 'cmake_modules'
=== renamed directory 'cmake_modules' => 'cmake_modules.moved'
=== added file 'cmake_modules/FindLibTidy.cmake'
--- cmake_modules/FindLibTidy.cmake	1970-01-01 00:00:00 +
+++ cmake_modules/FindLibTidy.cmake	2013-07-12 07:41:39 +
@@ -0,0 +1,60 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# - Try to find the HTML Tidy lib
+#
+#  LIBTIDY_FOUND- true if LIBTIDY was found
+#  LIBTIDY_INCLUDE_DIRS - Directory to include to get LIBTIDY headers
+# Note: always include LIBTIDY headers as e.g.,
+# tidy/tidy.h
+#  LIBTIDY_LIBRARIES- Libraries to link against for the LIBTIDY
+#
+
+
+IF (LIBTIDY_INCLUDE_DIR)
+  SET(LibTidy_FIND_QUIETLY TRUE)
+ENDIF (LIBTIDY_INCLUDE_DIR)
+
+# Look for the header file.
+FIND_PATH(LIBTIDY_INCLUDE_DIR tidy.h PATH_SUFFIXES tidy)
+MARK_AS_ADVANCED(LIBTIDY_INCLUDE_DIR)
+
+# Look for the library.
+# FIND_LIBRARY(LIBTIDY_LIBRARY NAMES tidy PATHS ${LIBTIDY_LIBRARIES})
+FIND_LIBRARY(LIBTIDY_LIBRARY NAMES tidy)
+MARK_AS_ADVANCED(LIBTIDY_LIBRARY)
+
+# INCLUDE(FindPackageHandleStandardArgs)
+# only available in cmake > 2.6
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBTIDY DEFAULT_MSG LIBTIDY_INCLUDE_DIR LIBTIDY_LIBRARY)
+#IF (LIBTIDY_FOUND)
+#  SET(LIBTIDY_LIBRARIES ${LIBTIDY_LIBRARY})
+#  SET(LIBTIDY_INCLUDE_DIRS ${LIBTIDY_INCLUDE_DIR})
+#ELSE (LIBTIDY_FOUND)
+#  SET(LIBTIDY_LIBRARIES)
+#  SET(LIBTIDY_INCLUDE_DIRS)
+#ENDIF (LIBTIDY_FOUND)
+IF (LIBTIDY_INCLUDE_DIR AND LIBTIDY_LIBRARY)
+  SET(LIBTIDY_FOUND 1)
+  SET(LIBTIDY_LIBRARIES ${LIBTIDY_LIBRARY})
+  SET(LIBTIDY_INCLUDE_DIRS ${LIBTIDY_INCLUDE_DIR})
+  IF(NOT LibTidy_FIND_QUIETLY)
+MESSAGE(STATUS "Found libtidy library  : " ${LIBTIDY_LIBRARY})
+MESSAGE(STATUS "Found libtidy include path : " ${LIBTIDY_INCLUDE_DIR})
+  ENDIF(NOT LibTidy_FIND_QUIETLY)
+ELSE (LIBTIDY_INCLUDE_DIR AND LIBTIDY_LIBRARY)
+  SET(LIBTIDY_FOUND 0)
+  SET(LIBTIDY_LIBRARIES)
+  SET(LIBTIDY_INCLUDE_DIRS)
+ENDIF (LIBTIDY_INCLUDE_DIR AND LIBTIDY_LIBRARY)

=== added directory 'cmake_modules/Windows'
=== added file 'cmake_modules/Windows/FindJansson.cmake'
--- cmake_modules/Windows/FindJansson.cmake	1970-01-01 00:00:00 +
+++ cmake_modules/Windows/FindJansson.cmake	2013-07-12 07:41:39