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 d08e798 commit 0f472e37a63fd915dbc5877aa3c73e5c479c3579
Showing 7 changed files with 25 additions and 35 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
@@ -5,6 +5,7 @@
.*\.gitignore$
.*\.lcovrc$
.*\.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}")

@@ -15,7 +15,7 @@
* limitations under the License.
*/

#pragma once
#pragma once


#include "begin_native.hpp"
@@ -56,4 +56,4 @@ namespace Apache
};
}
}
}
}
Binary file not shown.

This file was deleted.

@@ -17,7 +17,7 @@
cmake_minimum_required(VERSION 3.4)
project(templates.security)

find_package(OpenSSL 1.0.2 REQUIRED)
find_package(OpenSSL 1.1.0 REQUIRED)

file(GLOB_RECURSE SOURCES "*.cpp")

@@ -28,13 +28,14 @@ generate_export_header(securityImpl)

target_include_directories(securityImpl
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
$<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 ()
else()
get_filename_component(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
endif()

@@ -46,6 +47,6 @@ target_link_libraries(securityImpl
)

install(TARGETS securityImpl
RUNTIME DESTINATION ${GEODE_NATIVE_HOME}/bin
LIBRARY DESTINATION ${GEODE_NATIVE_HOME}/lib
RUNTIME DESTINATION ${GEODE_NATIVE_HOME} /bin
LIBRARY DESTINATION ${GEODE_NATIVE_HOME} /lib
)

0 comments on commit 0f472e3

Please sign in to comment.