Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
10年前
差异永不过期
清除
导出
分享
解释
2 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
58 行
全部复制
8 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
63 行
全部复制
# 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)
复制
已复制
复制
已复制
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)
复制
已复制
复制
已复制
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 ()
已保存差异
原始文本
打开文件
# 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 ()
更改后文本
打开文件
# 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 ()
查找差异