Skip to content
Permalink
Browse files
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 <eburghardt@pivotal.io>
Co-authored-by: Mike Martell <mmartell@pivotal.io>
Co-authored-by: Jacob Barrett <jbarrett@pivotal.io>
  • Loading branch information
4 people committed Dec 5, 2018
1 parent 32d71d1 commit ae8c6b2500ee8ffb600e5a295c053e9b2ac880ee
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 73 deletions.
@@ -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
@@ -3,6 +3,7 @@
.*\.clang-tidy$
.*\.gitignore$
.*\.ratignore$

.*md$
.*json$
.*deprecated_xml_instructions.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}")

@@ -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
};
}
}
}
}
Binary file not shown.

This file was deleted.

@@ -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
)

0 comments on commit ae8c6b2

Please sign in to comment.