-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release re…
…vision (#13584) * [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision * Fix license path for fastrtps and remove bin with static build for kd-soap
- Loading branch information
Showing
17 changed files
with
183 additions
and
245 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| Source: fastrtps | ||
| Version: 1.5.0-3 | ||
| Version: 2.0.1 | ||
| Homepage: https://www.eprosima.com/ | ||
| Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. | ||
| Build-Depends: openssl, asio, tinyxml2 | ||
| Build-Depends: openssl, asio, tinyxml2, fastcdr, foonathan-memory |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: graphite2 | ||
| Version: 1.3.13 | ||
| Version: 1.3.14 | ||
| Homepage: https://github.com/silnrsi/graphite | ||
| Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world. | ||
| Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| Source: inja | ||
| Version: 2.1.0-1 | ||
| Build-Depends: nlohmann-json | ||
| Version: 3.0.0 | ||
| Homepage: https://github.com/pantor/inja | ||
| Description: Inja - A Template Engine for Modern C++ | ||
| Build-Depends: nlohmann-json |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,81 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 0418d4a..ac8f0f2 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -2,6 +2,8 @@ | ||
| cmake_minimum_required(VERSION 2.8.7) | ||
| project(jsonnet C CXX) | ||
|
|
||
| +add_definitions(-D_CRT_SECURE_NO_WARNINGS) | ||
| + | ||
| include(ExternalProject) | ||
| include(GNUInstallDirs) | ||
|
|
||
| @@ -89,6 +91,7 @@ else() | ||
| endif() | ||
|
|
||
| # Compiler flags. | ||
| +if (0) | ||
| if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR | ||
| ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") | ||
| set(OPT "-O3") | ||
| @@ -98,6 +101,7 @@ else() | ||
| # TODO: Windows support. | ||
| message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported") | ||
| endif() | ||
| +endif() | ||
|
|
||
| # Look for libraries in global output path. | ||
| link_directories(${GLOBAL_OUTPUT_PATH}) | ||
| diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt | ||
| index c032f02..d80d2a0 100644 | ||
| --- a/cmd/CMakeLists.txt | ||
| +++ b/cmd/CMakeLists.txt | ||
| @@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS) | ||
| add_dependencies(jsonnetfmt libjsonnet_for_binaries) | ||
| target_link_libraries(jsonnetfmt libjsonnet_for_binaries) | ||
|
|
||
| - install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| + install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) | ||
| endif() | ||
| diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt | ||
| index 60fdcb1..82fb7c2 100644 | ||
| --- a/core/CMakeLists.txt | ||
| +++ b/core/CMakeLists.txt | ||
| @@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE | ||
| string_utils.cpp | ||
| vm.cpp) | ||
|
|
||
| -add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) | ||
| +add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) | ||
| add_dependencies(libjsonnet md5 stdlib) | ||
| target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) | ||
|
|
||
| @@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet | ||
| PUBLIC_HEADER "${LIB_HEADER}") | ||
| install(TARGETS libjsonnet | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| + ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") | ||
|
|
||
| if (BUILD_STATIC_LIBS) | ||
| diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt | ||
| index a481d9f..0dc3ab6 100644 | ||
| --- a/stdlib/CMakeLists.txt | ||
| +++ b/stdlib/CMakeLists.txt | ||
| @@ -2,6 +2,7 @@ | ||
|
|
||
| add_executable(to_c_array to_c_array.cpp) | ||
|
|
||
| +if (0) | ||
| # Custom command that will only build stdlib when it changes. | ||
| add_custom_command( | ||
| OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h | ||
| @@ -13,3 +14,4 @@ add_custom_command( | ||
| # Standard library build target that libjsonnet can depend on. | ||
| add_custom_target(stdlib ALL | ||
| DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) | ||
| +endif() | ||
| \ No newline at end of file | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 385ea82..ebd12b6 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -2,6 +2,8 @@ | ||
| cmake_minimum_required(VERSION 2.8.7) | ||
| project(jsonnet C CXX) | ||
|
|
||
| +add_definitions(-D_CRT_SECURE_NO_WARNINGS) | ||
| + | ||
| include(ExternalProject) | ||
| include(GNUInstallDirs) | ||
|
|
||
| @@ -33,6 +35,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) | ||
| set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) | ||
|
|
||
| # Compiler flags. | ||
| +if (0) | ||
| if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR | ||
| ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") | ||
| set(OPT "-O3") | ||
| @@ -42,7 +45,7 @@ else() | ||
| # TODO: Windows support. | ||
| message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported") | ||
| endif() | ||
| - | ||
| +endif() | ||
| set(CMAKE_CXX_STANDARD 11) | ||
|
|
||
|
|
||
| diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt | ||
| index c032f02..d80d2a0 100644 | ||
| --- a/cmd/CMakeLists.txt | ||
| +++ b/cmd/CMakeLists.txt | ||
| @@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS) | ||
| add_dependencies(jsonnetfmt libjsonnet_for_binaries) | ||
| target_link_libraries(jsonnetfmt libjsonnet_for_binaries) | ||
|
|
||
| - install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| + install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) | ||
| endif() | ||
| diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt | ||
| index d277872..bbf67f7 100644 | ||
| --- a/core/CMakeLists.txt | ||
| +++ b/core/CMakeLists.txt | ||
| @@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE | ||
| string_utils.cpp | ||
| vm.cpp) | ||
|
|
||
| -add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) | ||
| +add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) | ||
| add_dependencies(libjsonnet md5 stdlib) | ||
| target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) | ||
|
|
||
| @@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet | ||
| PUBLIC_HEADER "${LIB_HEADER}") | ||
| install(TARGETS libjsonnet | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| + ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") | ||
|
|
||
| if (BUILD_STATIC_LIBS) | ||
| diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt | ||
| index a481d9f..2f58d2f 100644 | ||
| --- a/stdlib/CMakeLists.txt | ||
| +++ b/stdlib/CMakeLists.txt | ||
| @@ -2,6 +2,7 @@ | ||
|
|
||
| add_executable(to_c_array to_c_array.cpp) | ||
|
|
||
| +if(0) | ||
| # Custom command that will only build stdlib when it changes. | ||
| add_custom_command( | ||
| OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h | ||
| @@ -13,3 +14,4 @@ add_custom_command( | ||
| # Standard library build target that libjsonnet can depend on. | ||
| add_custom_target(stdlib ALL | ||
| DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) | ||
| +endif() | ||
| \ No newline at end of file |
Oops, something went wrong.