Comparar texto

Encuentra la diferencia entre dos archivos de texto

Editor live

Ocultar sin cambios

Sin ajuste de línea

Vista

Nivel de detalle

Resaltado de sintaxis

Diffchecker Desktop La forma más segura de usar Diffchecker. ¡Obtén la app de Diffchecker Desktop: tus diffs nunca salen de tu computadora!Obtener Desktop

Untitled diff

Creado hace 10 añosEl diff nunca expira

2 eliminaciones

Líneas
Total
Eliminado

Caracteres
Total
Eliminado

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

58 líneas

8 adiciones

Líneas
Total
Añadido

Caracteres
Total
Añadido

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

63 líneas

# This file is part of rasdaman community.

# Rasdaman community is free software: you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation, either version 3 of the License, or

# (at your option) any later version.

# Rasdaman community is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License

# along with rasdaman community. If not, see <http://www.gnu.org/licenses/>.

# rasdaman GmbH.

# For more information please see <http://www.rasdaman.org>

# or contact Peter Baumann via <baumann@rasdaman.com>.

###################################################################

if (ENABLE_JAVA)

find_package(Maven REQUIRED)

# This variable will be used in the to configure the pom files.

set(SECORE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})

configure_file(secore-core/pom.xml.in "${CMAKE_CURRENT_SOURCE_DIR}/secore-core/pom.xml" @ONLY)

configure_file(secore-web/pom.xml.in "${CMAKE_CURRENT_SOURCE_DIR}/secore-web/pom.xml" @ONLY)

if (GENERATE_DOCS)

add_custom_target(secore_doc ALL

COMMAND ${MAVEN_EXECUTABLE} javadoc:javadoc 2>&1 > /dev/null || exit 0

WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

VERBATIM)

install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/site/apidocs/"

DESTINATION "${SHARE_DATA_DIR}/doc/doc-secore"

PATTERN "*.sh" EXCLUDE)

endif(GENERATE_DOCS)

add_custom_target(secore ALL

add_custom_command(

OUTPUT "${SECORE_TARGET_DIR}/def.war"

COMMAND ${MAVEN_EXECUTABLE} package

WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

VERBATIM)

install(DIRECTORY DESTINATION "${WAR_DIR}/secoredb"

add_custom_target(

secore ALL

DEPENDS "${SECORE_TARGET_DIR}/def.war")

install(DIRECTORY DESTINATION "${WAR_DIR}/secoredb"

DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ

GROUP_EXECUTE GROUP_WRITE GROUP_READ

WORLD_EXECUTE WORLD_WRITE WORLD_READ)

install(FILES "${SECORE_TARGET_DIR}/def.war"

DESTINATION ${WAR_DIR})

endif ()

Diferencias guardadas

Texto original

Abrir archivo

# This file is part of rasdaman community.
#
# Rasdaman community is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Rasdaman community is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with rasdaman community.  If not, see <http://www.gnu.org/licenses/>.
#
# Copyright 2003-2016 Peter Baumann /
# rasdaman GmbH.
#
# For more information please see <http://www.rasdaman.org>
# or contact Peter Baumann via <baumann@rasdaman.com>.
#
###################################################################

if (ENABLE_JAVA)
    
    find_package(Maven REQUIRED)

# This variable will be used in the to configure the pom files.
    set(SECORE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})

configure_file(secore-core/pom.xml.in "${CMAKE_CURRENT_SOURCE_DIR}/secore-core/pom.xml" @ONLY)
    configure_file(secore-web/pom.xml.in "${CMAKE_CURRENT_SOURCE_DIR}/secore-web/pom.xml" @ONLY)

if (GENERATE_DOCS)
        add_custom_target(secore_doc ALL
            COMMAND ${MAVEN_EXECUTABLE} javadoc:javadoc 2>&1 > /dev/null || exit 0
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
            VERBATIM)

install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/site/apidocs/"
            DESTINATION "${SHARE_DATA_DIR}/doc/doc-secore"
            PATTERN "*.sh" EXCLUDE)

endif(GENERATE_DOCS)

add_custom_target(secore ALL
            COMMAND ${MAVEN_EXECUTABLE} package
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
            VERBATIM)

install(DIRECTORY DESTINATION "${WAR_DIR}/secoredb"
		DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ 
		 GROUP_EXECUTE GROUP_WRITE GROUP_READ 
		 WORLD_EXECUTE WORLD_WRITE WORLD_READ)

install(FILES "${SECORE_TARGET_DIR}/def.war"
        DESTINATION ${WAR_DIR})
endif ()

Texto modificado