You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2018/11/01 23:51:28 UTC
[geode-native] branch feature_GEODE-5968 created (now 76c3510)
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a change to branch feature_GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode-native.git.
at 76c3510 GEODE-5968: Corrected license and reference issues
This branch includes the following new commits:
new 76c3510 GEODE-5968: Corrected license and reference issues
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode-native] 01/01: GEODE-5968: Corrected license and reference
issues
Posted by ec...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch feature_GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 76c35106f32966f2b52af4f054e03dc899c89ca9
Author: Ernest Burghardt <eb...@pivotal.io>
AuthorDate: Thu Nov 1 16:50:15 2018 -0700
GEODE-5968: Corrected license and reference issues
---
.ratignore | 2 +
clicache/src/native_shared_ptr.hpp | 19 ++++-
docs/api/unix_index.html | 2 +-
docs/api/win_index.html | 3 +-
templates/security/CMakeLists.txt.forInstall | 101 +++++++++++++--------------
5 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/.ratignore b/.ratignore
index 7da9249..c3db593 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,7 +1,9 @@
# text files
.*\.clang-format$
.*\.clang-tidy$
+.*\.cpackignore$
.*\.gitignore$
+.*\.lcovrc$
.*\.ratignore$
.*md$
.*json$
diff --git a/clicache/src/native_shared_ptr.hpp b/clicache/src/native_shared_ptr.hpp
index ed1f539..c488b9c 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,4 +1,21 @@
-#pragma once
+/*
+ * 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
#include "begin_native.hpp"
diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html
index 464ba6e..61aac13 100755
--- a/docs/api/unix_index.html
+++ b/docs/api/unix_index.html
@@ -32,7 +32,7 @@ limitations under the License.
Apache Geode Native Client Documentation</H1>
</b></FONT>
<p>
-Access documentation at <a href="http://docs-gemfire-nativeclient-develop.cfapps.io" target="_blank"><b>Pivotal GemFire Native Client Documentation</b></a>.
+Access documentation at <a href="http://geode.apache.org/docs/" target="_blank"><b>Apache Geode Native Documentation</b></a>.
NOTE: this is a temporary location until we are ready to host the docs at geode.apache.org.
</p>
diff --git a/docs/api/win_index.html b/docs/api/win_index.html
index d01f19d..941b08c 100755
--- a/docs/api/win_index.html
+++ b/docs/api/win_index.html
@@ -31,8 +31,7 @@ limitations under the License.
<FONT size=6><b>
Apache Geode Native Client Documentation</H1>
</b></FONT>
-<p>
-Access documentation at <a href="http://docs-gemfire-nativeclient-develop.cfapps.io" target="_blank"><b>Pivotal GemFire Native Client Documentation</b></a>.
+<p>Access documentation at <a href="http://geode.apache.org/docs/" target="_blank"><b>Apache Geode Native Documentation</b></a>.
NOTE: this is a temporary location until we are ready to host the docs at geode.apache.org.
</p>
diff --git a/templates/security/CMakeLists.txt.forInstall b/templates/security/CMakeLists.txt.forInstall
index 8369d4e..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -1,54 +1,51 @@
-#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
+# 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
+# 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.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
+)