Diff
checker
Text
Text
Images
Documents
Excel
Folders
Legal
Enterprise
Desktop
Pricing
Sign in
Download Diffchecker Desktop
Compare text
Find the difference between two text files
Tools
History
Real-time editor
Hide unchanged lines
Disable line wrap
Layout
Split
Unified
Diff precision
Smart
Word
Char
Syntax highlighting
Choose syntax
Ignore
Transform text
Go to first change
Edit input
Diffchecker Desktop
The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!
Get Desktop
Untitled diff
Created
10 years ago
Diff never expires
Clear
Export
Share
Explain
2 removals
Lines
Total
Removed
Characters
Total
Removed
To continue using this feature, upgrade to
Diff
checker
Pro
View Pricing
58 lines
Copy
8 additions
Lines
Total
Added
Characters
Total
Added
To continue using this feature, upgrade to
Diff
checker
Pro
View Pricing
63 lines
Copy
# This file is part of rasdaman community.
# This file is part of rasdaman community.
#
#
# Rasdaman community is free software: you can redistribute it and/or modify
# 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
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# (at your option) any later version.
#
#
# Rasdaman community is distributed in the hope that it will be useful,
# Rasdaman community is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU General Public License
# along with rasdaman community. If not, see <http://www.gnu.org/licenses/>.
# along with rasdaman community. If not, see <http://www.gnu.org/licenses/>.
#
#
# Copyright 2003-2016 Peter Baumann /
# Copyright 2003-2016 Peter Baumann /
# rasdaman GmbH.
# rasdaman GmbH.
#
#
# For more information please see <http://www.rasdaman.org>
# For more information please see <http://www.rasdaman.org>
# or contact Peter Baumann via <baumann@rasdaman.com>.
# or contact Peter Baumann via <baumann@rasdaman.com>.
#
#
###################################################################
###################################################################
if (ENABLE_JAVA)
if (ENABLE_JAVA)
find_package(Maven REQUIRED)
find_package(Maven REQUIRED)
# This variable will be used in the to configure the pom files.
# This variable will be used in the to configure the pom files.
set(SECORE_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR})
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-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)
configure_file(secore-web/pom.xml.in "${CMAKE_CURRENT_SOURCE_DIR}/secore-web/pom.xml" @ONLY)
if (GENERATE_DOCS)
if (GENERATE_DOCS)
add_custom_target(secore_doc ALL
add_custom_target(secore_doc ALL
COMMAND ${MAVEN_EXECUTABLE} javadoc:javadoc 2>&1 > /dev/null || exit 0
COMMAND ${MAVEN_EXECUTABLE} javadoc:javadoc 2>&1 > /dev/null || exit 0
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM)
VERBATIM)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/site/apidocs/"
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/site/apidocs/"
DESTINATION "${SHARE_DATA_DIR}/doc/doc-secore"
DESTINATION "${SHARE_DATA_DIR}/doc/doc-secore"
PATTERN "*.sh" EXCLUDE)
PATTERN "*.sh" EXCLUDE)
endif(GENERATE_DOCS)
endif(GENERATE_DOCS)
Copy
Copied
Copy
Copied
add_custom_
target(secore ALL
add_custom_
command(
OUTPUT "${SECORE_TARGET_DIR}/def.war"
COMMAND ${MAVEN_EXECUTABLE} package
COMMAND ${MAVEN_EXECUTABLE} package
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM)
VERBATIM)
Copy
Copied
Copy
Copied
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
DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_WRITE GROUP_READ
GROUP_EXECUTE GROUP_WRITE GROUP_READ
WORLD_EXECUTE WORLD_WRITE WORLD_READ)
WORLD_EXECUTE WORLD_WRITE WORLD_READ)
install(FILES "${SECORE_TARGET_DIR}/def.war"
install(FILES "${SECORE_TARGET_DIR}/def.war"
DESTINATION ${WAR_DIR})
DESTINATION ${WAR_DIR})
endif ()
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
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_command( OUTPUT "${SECORE_TARGET_DIR}/def.war" COMMAND ${MAVEN_EXECUTABLE} package WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM) 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 ()
Find difference