[magics] 08/23: Undo broken terralib patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jun 24 09:33:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository magics.
commit 9bde77d5288f09974ab57d3f9e27df7b1917c665
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun May 17 03:50:52 2015 +0100
Undo broken terralib patch
---
debian/patches/terralib.patch | 263 ------------------------------------------
1 file changed, 263 deletions(-)
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index af3d3cb..5b53e2f 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -17,266 +17,3 @@ Index: magics++-2.24.4/CMakeLists.txt
${Boost_INCLUDE_DIRS} )
if( MAGICS_ODB )
-Index: magics++-2.24.4/src/CMakeLists.txt
-===================================================================
---- magics++-2.24.4.orig/src/CMakeLists.txt
-+++ magics++-2.24.4/src/CMakeLists.txt
-@@ -1,257 +1,4 @@
--###############################################################################
--
--configure_file( magics_config.h.in magics_config.h )
--configure_file( magics.pc.in magics.pc @ONLY )
--
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/magics_config.h DESTINATION ${INSTALL_INCLUDE_DIR})
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/magics.pc DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
--
--###############################################################################
--
--
--function( add_metview_definition_file )
--
-- set( single_value_args ACTION BASENAME FILE )
-- cmake_parse_arguments( _p "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
--
-- add_custom_command(
-- OUTPUT ${_p_BASENAME}Def ${_p_BASENAME}Rules
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xml2mv.py ${CMAKE_CURRENT_SOURCE_DIR} ${_p_FILE} ${_p_BASENAME}Def ${_p_ACTION} ${_p_BASENAME}Rules
-- DEPENDS ${_p_FILE}
-- )
--
--
-- add_custom_target( ${_p_BASENAME} ALL DEPENDS ${_p_BASENAME}Def)
-- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_p_BASENAME}Def ${CMAKE_CURRENT_BINARY_DIR}/${_p_BASENAME}Rules DESTINATION ${INSTALL_DATA_DIR}/../magics/metview)
--
--endfunction(add_metview_definition_file)
--
--add_subdirectory( params )
--
--
--
--foreach( file ${magics_xmls} )
--
-- get_filename_component( path ${file} PATH )
-- get_filename_component( basefile ${file} NAME_WE )
--
-- set( ouputfiles ${path}/${basefile}Attributes.h ${path}/${basefile}Attributes.cc )
--
-- # generate the code
-- add_custom_command(
-- OUTPUT ${ouputfiles}
-- COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xml2cc_new.pl ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/params nosubdir
-- DEPENDS ${file}
-- )
--
-- set_source_files_properties( ${basefile}Attributes.h GENERATED )
-- set_source_files_properties( ${basefile}Attributes.cc GENERATED )
--
-- list( APPEND magics_params_srcs ${ouputfiles} )
--
--endforeach()
--
--if ( metview )
--
--
-- foreach( file ${metview_xmls} )
-- get_filename_component( path ${file} PATH )
-- get_filename_component( basefile ${file} NAME_WE )
--
-- set( metviewfiles ${path}/${basefile}Wrapper.h ${path}/${basefile}Wrapper.cc )
--
--
-- # generate the code
-- add_custom_command(
-- OUTPUT ${metviewfiles}
-- COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xml2mv.pl ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/params nosubdir
-- DEPENDS ${file}
-- )
--
-- set_source_files_properties( ${basefile}Wrapper.h GENERATED )
-- set_source_files_properties( ${basefile}Wrapper.cc GENERATED )
-- list( APPEND metview_wrappers_srcs ${metviewfiles} )
-- endforeach()
--
-- if(qt)
-- SET(qt_drivers_HEADERS drivers/MgQ/MgQPlotScene.h)
-- QT4_WRAP_CPP(qt_drivers_HEADERS_MOC ${qt_drivers_HEADERS})
-- list( APPEND drivers_srcs drivers/MgQ/MgQPlotScene.cc ${qt_drivers_HEADERS_MOC})
-- endif()
--
--endif()
--
--
--
--
--
--
--
--add_custom_target( magics_params DEPENDS ${magics_params_srcs} )
--add_custom_target( mv_params DEPENDS ${metview_wrappers_srcs} )
--###############################################################################
--
--add_subdirectory( common )
--add_subdirectory( basic )
--add_subdirectory( web )
--add_subdirectory( visualisers )
--add_subdirectory( drivers )
--add_subdirectory( decoders )
--add_subdirectory( terralib )
--add_subdirectory( eckit_readers )
--
--if( metview )
-- add_subdirectory( libMagWrapper )
--endif()
--
--if( MAGICS_ODB )
-- add_subdirectory( oda )
--endif()
--
--include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/common )
--
--ecbuild_add_library( TARGET MagPlusShared
-- DEPENDS magics_params
-- SOURCES
-- magics.h
-- ${magics_params_srcs}
-- ${common_srcs}
-- ${basic_srcs}
-- ${web_srcs}
-- ${visualisers_srcs}
-- ${eckit_srcs}
-- ${drivers_srcs}
-- ${qt_srcs}
-- ${decoders_srcs}
-- ${terralib_srcs}
-- ${odb_srcs}
-- TEMPLATES
-- ${common_templates}
-- DEFINITIONS
-- ${MAGICS_EXTRA_DEFINITIONS} MAGICS_EXCEPTION=on
-- LIBS
-- ${MAGICS_EXTRA_LIBRARIES}
-- TYPE SHARED
-- )
--
--ecbuild_add_library( TARGET MagPlusSingleShared
-- SOURCES MagicsSingle.cc
-- LIBS MagPlusShared
-- TYPE SHARED)
--
--ecbuild_add_library(TARGET MagPlusDoubleShared
-- LIBS MagPlusShared
-- SOURCES MagicsDouble.cc
-- TYPE SHARED)
--
--SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus")
--SET_TARGET_PROPERTIES(MagPlusDoubleShared PROPERTIES OUTPUT_NAME "MagPlusDouble")
--SET_TARGET_PROPERTIES(MagPlusSingleShared PROPERTIES OUTPUT_NAME "MagPlusSingle")
--
--
--
--
--if ( ENABLE_STATIC_LIBRARY )
--ecbuild_add_library( TARGET MagPlusStatic
-- DEPENDS magics_params
-- SOURCES
-- magics.h
-- ${magics_params_srcs}
-- ${common_srcs}
-- ${basic_srcs}
-- ${web_srcs}
-- ${visualisers_srcs}
-- ${eckit_srcs}
-- ${drivers_srcs}
-- ${qt_srcs}
-- ${decoders_srcs}
-- ${terralib_srcs}
-- ${odb_srcs}
-- TEMPLATES
-- ${common_templates}
-- DEFINITIONS
-- ${MAGICS_EXTRA_DEFINITIONS}
-- LIBS
-- ${MAGICS_EXTRA_LIBRARIES}
-- TYPE STATIC
-- )
--ecbuild_add_library( TARGET MagPlusSingleStatic
-- SOURCES MagicsSingle.cc
-- INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/common
-- TYPE SHARED)
--
--ecbuild_add_library(TARGET MagPlusDoubleStatic
-- SOURCES MagicsDouble.cc
-- INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/common
-- TYPE SHARED)
--
-- SET_TARGET_PROPERTIES(MagPlusStatic PROPERTIES OUTPUT_NAME "MagPlus")
-- SET_TARGET_PROPERTIES(MagPlusDoubleStatic PROPERTIES OUTPUT_NAME "MagPlusDouble")
-- SET_TARGET_PROPERTIES(MagPlusSingleStatic PROPERTIES OUTPUT_NAME "MagPlusSingle")
--
--endif()
--
--if( metview )
-- include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${CMAKE_CURRENT_BINARY_DIR}/params
-- ${CMAKE_CURRENT_SOURCE_DIR}/common
-- ${CMAKE_CURRENT_SOURCE_DIR}/basic
-- ${CMAKE_CURRENT_SOURCE_DIR}/web
-- ${CMAKE_CURRENT_SOURCE_DIR}/visualisers
-- ${CMAKE_CURRENT_SOURCE_DIR}/drivers
-- ${CMAKE_CURRENT_SOURCE_DIR}/decoders
-- ${CMAKE_CURRENT_SOURCE_DIR}/terralib
-- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/kernel
-- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/utils
-- ${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
--
-- ecbuild_add_library( TARGET MagWrapper
-- DEPENDS mv_params magics_params
-- SOURCES
-- magics.h
-- ${metview_srcs}
-- ${metview_wrappers_srcs}
-- DEFINITIONS
-- ${MAGICS_EXTRA_DEFINITIONS}
-- LIBS
-- ${MAGICS_EXTRA_LIBRARIES}
-- TYPE STATIC
-- )
-- list( APPEND attributes_include
-- OutputHandlerAttributes.h
-- FortranRootSceneNodeAttributes.h
-- BinningObjectAttributes.h
-- GribDecoderAttributes.h
-- DateGribLoopStepAttributes.h
-- GribLoopAttributes.h
-- GeoRectangularProjectionAttributes.h
-- LegendVisitorAttributes.h
-- XmlRootNodeAttributes.h
-- WrepRootNodeAttributes.h
-- QtDriverAttributes.h
-- ContinuousLegendMethodAttributes.h
-- HistogramLegendMethodAttributes.h
-- XmlBasicNodeAttributes.h
-- ImagePlottingAttributes.h
-- LookupTableModeAttributes.h
-- FixedTableModeAttributes.h
--
-- )
-- install( FILES magics.h DESTINATION ${INSTALL_INCLUDE_DIR})
-- install( FILES terralib/kernel/TeProjection.h
-- terralib/kernel/TeCoord2D.h
-- terralib/kernel/TeDefines.h
-- terralib/kernel/TePrecision.h
-- terralib/kernel/TeSingleton.h
-- terralib/kernel/TeDatum.h
-- terralib/kernel/TeUtils.h
-- terralib/kernel/TeProgress.h
-- terralib/kernel/TeProgressBase.h
--
--
-- DESTINATION ${INSTALL_INCLUDE_DIR})
-- install( FILES VectorOfPointers.h DESTINATION ${INSTALL_INCLUDE_DIR})
-+install( FILES VectorOfPointers.h DESTINATION ${INSTALL_INCLUDE_DIR})
- foreach( file ${attributes_include} )
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/params/${file} DESTINATION ${INSTALL_INCLUDE_DIR})
- endforeach()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list