Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Comparing sensitive data, confidential files or internal emails?

Most legal and privacy policies prohibit uploading sensitive data online. Diffchecker Desktop ensures your confidential information never leaves your computer. Work offline and compare documents securely.

Download Diffchecker Desktop Learn more

Untitled diff

Created 8 years agoDiff never expires

2 removals

58 lines

8 additions

63 lines

# 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 ()

Saved diffs

Original text

Open file

# 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 ()

Changed text