This is an automated email from the ASF dual-hosted git repository.

junchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 9bdc6783 Install (#145)
9bdc6783 is described below

commit 9bdc6783219db301bc4ab8f171965cb9181a10d5
Author: cjcchen <[email protected]>
AuthorDate: Sun Jun 23 16:10:12 2024 +0800

    Install (#145)
    
    * add non-root install
    
    * rm unused file
    
    * add
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * update install
    
    * Update README.md
    
    * Update README.md
    
    * add non-root install
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * Update DISCLAIMER-WIP
    
    * Update DISCLAIMER-WIP
    
    * Update LICENSE
    
    * Update LICENSE
    
    * add license
    
    ---------
    
    Co-authored-by: Ubuntu <[email protected]>
    Co-authored-by: Ubuntu <[email protected]>
---
 .bazelrc                             |  2 +-
 .licenserc.yaml                      |  1 +
 DISCLAIMER-WIP                       | 26 ++++-----------------
 INSTALL/README.md                    | 44 ++++++++++++++++++++++++++++++++++++
 INSTALL/bazel/install_bazel.sh       | 27 ++++++++++++++++++++++
 INSTALL/protobuf/install_protobuf.sh | 20 ++++++++++++++++
 LICENSE                              | 28 +++++++++++++++--------
 README.md                            |  1 +
 8 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 99c69f64..0566a7c9 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,4 +1,4 @@
 build --cxxopt='-std=c++17' --copt=-O3 --jobs=40 
-build --action_env=PYTHON_BIN_PATH="/usr/bin/python3.10"
+#build --action_env=PYTHON_BIN_PATH="/usr/bin/python3.10"
 #build --action_env=PYTHON_LIB_PATH="/usr/include/python3.10"
 
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 3320b7a5..1e93356e 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -8,6 +8,7 @@ header:
     - 'licenses'
     - '**/*.md'
     - 'LICENSE'
+    - 'DISCLAIMER-WIP'
     - 'NOTICE'
     - '.*'
     - '.**/**'
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
index f1a3759e..1050a031 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -14,25 +14,9 @@ For example, releases may have incomplete or un-reviewed 
licensing conditions.
 What follows is a list of known issues the project is currently aware of
 (note that this list, by definition, is likely to be incomplete):
 
-1. The source code is distributed under the Apache License, Version 2.0. 
-However, building ResilientDB requires using some transitive libraries:
-* Under BSD-3-Clause License:
-glog-0.5.0, leveldb-1.23, gtest-1.13.0, and gflag-2.2.2
+If you are planning to incorporate this work into your product/project, please
+be aware that you will need to conduct a thorough licensing review to determine
+the overall implications of including this work. For the current status of this
+project through the Apache Incubator visit:
+https://incubator.apache.org/projects/annotator.html
 
-* Under MIT licenses:
-eEVM (https://github.com/microsoft/eEVM)
-
-* hereby disclaims copyright to the source code:
-protobuf-3.10.0 (https://github.com/protocolbuffers/protobuf),
-snappy-1.1.9 (https://github.com/google/snappy),
-zlib-1.2.11 (https://github.com/madler/zlib),
-pybind-2.11.1 (https://github.com/pybind/pybind11_bazel),
-nlohmann_json-3.9.1 (https://github.com/nlohmann/json),
-CrowCpp-1.0-5 (https://github.com/CrowCpp/Crow),
-Asio-1-26-0 (https://github.com/chriskohlhoff/asio),
-Prometheus-cpp-1.0.1 (https://github.com/jupp0r/prometheus-cpp),
-Cryptopp-8-7-0 (https://github.com/weidai11/cryptopp)
-
-If you are planning to incorporate this work into your product/project,
-please be aware that you will need to conduct a thorough licensing review
-to determine the overall implications of including this work.
diff --git a/INSTALL/README.md b/INSTALL/README.md
new file mode 100755
index 00000000..6ab68a4c
--- /dev/null
+++ b/INSTALL/README.md
@@ -0,0 +1,44 @@
+
+# Prerequire 
+python3.10
+
+pip
+
+```
+sudo apt update
+sudo apt-get install python3.10-dev -y
+sudo apt-get install python3-dev -y
+sudo apt-get install python3-pip -y
+```
+
+# Install Protobuf
+```
+cd protobuf
+./install_protobuf.sh
+```
+
+# Install Bazel
+```
+cd bazel
+wget 
https://github.com/bazelbuild/bazelisk/releases/download/v1.8.1/bazelisk-darwin-amd64
+chmod +x bazelisk-darwin-amd64
+mkdir -p bin
+mv bazelisk-darwin-amd64 bin/bazel
+
+bin/bazel --version
+echo "export PATH="$PATH:$PWD/bin"" >> ~/.bashrc
+. ~/.bashrc
+```
+or
+```
+cd bazel
+./install_bazel.sh
+echo "export PATH="$PATH:$PWD/bin"" >> ~/.bashrc
+. ~/.bashrc
+```
+
+
+test bazel
+```
+bazel --version
+```
diff --git a/INSTALL/bazel/install_bazel.sh b/INSTALL/bazel/install_bazel.sh
new file mode 100755
index 00000000..499de820
--- /dev/null
+++ b/INSTALL/bazel/install_bazel.sh
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+wget wget 
https://github.com/bazelbuild/bazelisk/releases/download/v1.8.1/bazelisk-linux-amd64
+chmod +x bazelisk-linux-amd64
+mkdir -p bin
+mv bazelisk-linux-amd64 bin/bazel
+
+bin/bazel --version
+echo "export PATH="$PATH:$PWD/bin"" >> ~/.bashrc
+. ~/.bashrc
diff --git a/INSTALL/protobuf/install_protobuf.sh 
b/INSTALL/protobuf/install_protobuf.sh
new file mode 100755
index 00000000..66edc5ac
--- /dev/null
+++ b/INSTALL/protobuf/install_protobuf.sh
@@ -0,0 +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.
+#
+
+pip install protobuf
diff --git a/LICENSE b/LICENSE
index c0075472..ddd1efa0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -214,8 +214,6 @@ Apache-2.0 licenses
 The following components are provided under the Apache-2.0 License. See 
project link for details.
 The text of each license is the standard Apache 2.0 license.
 
-* bazelbuild (https://github.com/bazelbuild/)
-* rules_boost (https://github.com/nelhage/rules_boost)
 * absl (https://github.com/abseil/abseil-cpp)
 
 ================================================================
@@ -225,6 +223,9 @@ The following components are provided under the MIT 
License. See project link fo
 The text of each license is also included in licenses/LICENSE-[project].txt
 
 * eEVM-118a9355d023748318a318bc07fc79063f015a94 
(https://github.com/microsoft/eEVM)
+* nlohmann_json-3.9.1 (https://github.com/nlohmann/json)
+* Prometheus-cpp (https://github.com/jupp0r/prometheus-cpp)
+
 
 ================================================================
 BSD-3-Clause licenses
@@ -237,6 +238,20 @@ The text of each license is also included in 
licenses/LICENSE-[project].txt.
 * leveldb-1.23 (https://github.com/google/leveldb)
 * gtest-1.13.0 (https://github.com/google/googletest)
 * gflag-2.2.2 (https://github.com/gflags/gflags)
+* protobuf-3.10.0 (https://github.com/protocolbuffers/protobuf)
+* snappy-1.1.9 (https://github.com/google/snappy)
+* pybind-2.11.1 (https://github.com/pybind/pybind11_bazel)
+* CrowCpp-1.0-5 (https://github.com/CrowCpp/Crow)
+
+
+================================================================
+Boost Software License 1.0
+================================================================
+The following components are placed in the Boost Software License.
+See project link for details: http://www.boost.org/users/license.html
+
+* Cryptopp-8-7-0 (https://github.com/weidai11/cryptopp)
+
 
 ================================================================
 Public Domain
@@ -245,13 +260,6 @@ The following components are placed in the public domain.
 The author hereby disclaims copyright to this source code.
 See project link for details.
 
-* protobuf-3.10.0 (https://github.com/protocolbuffers/protobuf)
-* snappy-1.1.9 (https://github.com/google/snappy)
 * zlib-1.2.11 (https://github.com/madler/zlib)
-* pybind-2.11.1 (https://github.com/pybind/pybind11_bazel)
-* nlohmann_json-3.9.1 (https://github.com/nlohmann/json)
-* CrowCpp-1.0-5 (https://github.com/CrowCpp/Crow)
 * Asio-1-26-0 (https://github.com/chriskohlhoff/asio)
-* Prometheus-cpp (https://github.com/jupp0r/prometheus-cpp)
-* Cryptopp-8-7-0 (https://github.com/weidai11/cryptopp)
-@ civetweb-1.15 (https://github.com/civetweb/civetweb)
+* civetweb-1.15 (https://github.com/civetweb/civetweb)
diff --git a/README.md b/README.md
index 2543f1cd..9bae516d 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,7 @@ Install dependencies:
 
     ./INSTALL.sh
 
+For non-root users, see 
[INSTALL/README.md](https://github.com/apache/incubator-resilientdb/blob/install/INSTALL/README.md)
 
 Run ResilientDB (Providing a Key-Value Service):
 

Reply via email to