This is an automated email from the ASF dual-hosted git repository. igodwin pushed a commit to branch release/1.8 in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/release/1.8 by this push: new ae8c6b2 GEODE-6139: Fix problems reported by rat in source release (#413) ae8c6b2 is described below commit ae8c6b2500ee8ffb600e5a295c053e9b2ac880ee Author: Blake Bender <ekalbred...@hotmail.com> AuthorDate: Wed Dec 5 08:21:13 2018 -0800 GEODE-6139: Fix problems reported by rat in source release (#413) * GEODE-6139: Fix problems reported by rat in source release - Add missing license headers to a couple of files - Tell rat to ignore some trivial config files - Remove stray tmp file - Fix cmake file that was badly reformatted - Fix incorrect assumption in CMakeLists.txt - .gitignore files use globbing, not regex, so they can't be read into cpack ignore directly Co-authored-by: Ernest Burghardt <eburgha...@pivotal.io> Co-authored-by: Mike Martell <mmart...@pivotal.io> Co-authored-by: Jacob Barrett <jbarr...@pivotal.io> --- .cpackignore | 17 +++- .ratignore | 1 + CMakeLists.txt | 4 +- clicache/src/native_shared_ptr.hpp | 19 ++++- clicache/test/native_shared_ptrTests.cpp | Bin 12434 -> 6008 bytes .../serialization/dotnet-serialization/t.tmp | 23 ------ templates/security/CMakeLists.txt.forInstall | 86 ++++++++++----------- 7 files changed, 77 insertions(+), 73 deletions(-) diff --git a/.cpackignore b/.cpackignore index 5b3f03d..7881528 100644 --- a/.cpackignore +++ b/.cpackignore @@ -1,3 +1,16 @@ -/.git/ -/.DS_Store +/\.git/ +/\.DS_Store +/build-.*/ + +/build/ +/\.settings/ +/\.cproject +/\.project +/\.idea/ +\.vs/ +\.vscode/ + +/examples/dotnet/.*/bin/ +/examples/dotnet/.*/obj/ +\.ruby-version diff --git a/.ratignore b/.ratignore index 7da9249..108dbb7 100644 --- a/.ratignore +++ b/.ratignore @@ -3,6 +3,7 @@ .*\.clang-tidy$ .*\.gitignore$ .*\.ratignore$ + .*md$ .*json$ .*deprecated_xml_instructions.txt$ diff --git a/CMakeLists.txt b/CMakeLists.txt index ecd902d..4b34ca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,10 +122,8 @@ set(CPACK_PACKAGE_CHECKSUM "SHA512") # leave out .git and a couple other items we want in the repository but not in # the release. Everything gets concatenated into a ';' separated list for # cpack. -file(READ ".gitignore" IGNORED_PARTIAL) -set(IGNORED_FULL ${IGNORED_PARTIAL}) file(READ ".cpackignore" IGNORED_PARTIAL) -string(CONCAT IGNORED_FULL ${IGNORED_FULL} ${IGNORED_PARTIAL}) +set(IGNORED_FULL ${IGNORED_PARTIAL}) string(REGEX REPLACE "\n" ";" IGNORED_FULL "${IGNORED_FULL}") string(REGEX REPLACE " " "" IGNORED_FULL "${IGNORED_FULL}") diff --git a/clicache/src/native_shared_ptr.hpp b/clicache/src/native_shared_ptr.hpp index ed1f539..e01cbe3 100644 --- a/clicache/src/native_shared_ptr.hpp +++ b/clicache/src/native_shared_ptr.hpp @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #pragma once @@ -39,4 +56,4 @@ namespace Apache }; } } -} \ No newline at end of file +} diff --git a/clicache/test/native_shared_ptrTests.cpp b/clicache/test/native_shared_ptrTests.cpp index 46bb70d..59e7b9d 100644 Binary files a/clicache/test/native_shared_ptrTests.cpp and b/clicache/test/native_shared_ptrTests.cpp differ diff --git a/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp b/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp deleted file mode 100644 index a2b297b..0000000 --- a/docs/geode-native-docs/serialization/dotnet-serialization/t.tmp +++ /dev/null @@ -1,23 +0,0 @@ -./ -../ -custom-class-igfserializable.html.md.erb -dotnet-data-serialization-options.html.md.erb -dotnet-data-serialization.html.md.erb -dotnet-data-serialization.html.md.erb~ -dotnet-pdx-autoserializer.html.md.erb -dotnet-pdx-serialization-features.html.md.erb -dotnet-pdx-serialization.html.md.erb -extending-pdx-autoserializer.html.md.erb -how-igfserializable-works.html.md.erb -implementing-igfserializable.html.md.erb -mapping-dotnet-domain-type-names.html.md.erb -mapping-dotnet-domain-type-names.html.md.erb~ -programming-ipdxinstance.html.md.erb -registering-the-type.html.md.erb -serializable-types.html.md.erb -serialize-using-igfserializable.html.md.erb -serialize-using-ipdxserializable.html.md.erb -serializing-domain-objects.html.md.erb -t.tmp -using-ipdxinstancefactory.html.md.erb -using-ipdxinstancefactory.html.md.erb~ diff --git a/templates/security/CMakeLists.txt.forInstall b/templates/security/CMakeLists.txt.forInstall index 8369d4e..91cfd16 100644 --- a/templates/security/CMakeLists.txt.forInstall +++ b/templates/security/CMakeLists.txt.forInstall @@ -8,47 +8,45 @@ # #http: // www.apache.org/licenses/LICENSE-2.0 # -#Unless required by applicable law or agreed to in writing, software -#distributed under the License is distributed on an "AS IS" BASIS, -#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -#See the License for the specific language governing permissions and -#limitations under the License. - -cmake_minimum_required(VERSION 3.4) project(templates.security) - - find_package(OpenSSL 1.0.2 REQUIRED) - - file(GLOB_RECURSE SOURCES "*.cpp") - - add_library(securityImpl SHARED ${SOURCES}) - - include(GenerateExportHeader) generate_export_header( - securityImpl) - - target_include_directories( - securityImpl PUBLIC - $<BUILD_INTERFACE : ${CMAKE_CURRENT_BINARY_DIR}>) - - include_directories(${NATIVECLIENT_INCLUDE_DIR}) - - if (${WIN32}) set(GEODE_NATIVE_CACHE - "${NATIVECLIENT_LIBRARIES}/" - "apache-geode${CMAKE_IMPORT_" - "LIBRARY_SUFFIX}") else() - get_filename_component( - GEODE_NATIVE_CACHE - "${NATIVECLIENT_LIBRARIES}/" - "${CMAKE_SHARED_LIBRARY_PREFIX}apache-" - "geode${CMAKE_SHARED_LIBRARY_" - "SUFFIX}" ABSOLUTE) endif() - - target_link_libraries(securityImpl PUBLIC ${ - GEODE_NATIVE_CACHE} OpenSSL::Crypto - OpenSSL::SSL) - - install(TARGETS securityImpl RUNTIME - DESTINATION ${ - GEODE_NATIVE_HOME} / - bin LIBRARY DESTINATION ${ - GEODE_NATIVE_HOME} / - lib) +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.4) +project(templates.security) + +find_package(OpenSSL 1.1.0 REQUIRED) + +file(GLOB_RECURSE SOURCES "*.cpp") + +add_library(securityImpl SHARED ${SOURCES}) + +include(GenerateExportHeader) +generate_export_header(securityImpl) + +target_include_directories(securityImpl + PUBLIC + $<BUILD_INTERFACE : ${CMAKE_CURRENT_BINARY_DIR}> +) + +include_directories(${NATIVECLIENT_INCLUDE_DIR}) + +if (${WIN32}) + set(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}") +else() + get_filename_component(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE) +endif() + +target_link_libraries(securityImpl + PUBLIC + ${GEODE_NATIVE_CACHE} + OpenSSL::Crypto + OpenSSL::SSL +) + +install(TARGETS securityImpl + RUNTIME DESTINATION ${GEODE_NATIVE_HOME} /bin + LIBRARY DESTINATION ${GEODE_NATIVE_HOME} /lib +)