テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 10 年前差分は期限切れになりません

2 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

58 行

8 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

63 行

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

保存された差分

原文

ファイルを開く

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

変更されたテキスト