2
0
Эх сурвалжийг харах

Remove Linux RUNME.sh script

This is outdated and doesn't seem necessary to properly set up gRPC in a Linux environment. I also updated the LINUX.md readme to reflect this change, and tested the new flow on a Linux machine.
Michael Rebello 7 жил өмнө
parent
commit
5dfda653d6
2 өөрчлөгдсөн 9 нэмэгдсэн , 37 устгасан
  1. 9 7
      LINUX.md
  2. 0 30
      third_party/RUNME.sh

+ 9 - 7
LINUX.md

@@ -38,6 +38,7 @@ Start a docker instance with the following command:
     ln -s swift-3.0.2-RELEASE-ubuntu16.04 swift
 
 ## Add Swift to your path
+
     # add swift to your path by adding this to your .bashrc
     export PATH=/root/swift/usr/bin:$PATH
 
@@ -50,21 +51,23 @@ Start a docker instance with the following command:
     git config --global user.name "<your name>"
 
 ## Fetch and build grpc
+
     git clone https://github.com/grpc/grpc-swift
-    cd grpc-swift
-    cd third_party
-    sh RUNME.sh
+    cd grpc-swift/third_party
+    git clone https://github.com/grpc/grpc.git
     cd grpc
     git submodule update --init
     make
     make install
 
 ## Build the Echo sample
+
     cd
     cd grpc-swift/Examples/Echo/PackageManager
     make
 
-## Run the test client and server 
+## Run the test client and server
+
     # start the server
     .build/debug/Echo serve &
     # run the client to test each Echo API
@@ -72,15 +75,14 @@ Start a docker instance with the following command:
     .build/debug/Echo expand
     .build/debug/Echo collect
     .build/debug/Echo update
-	
 
 ## To test the plugin
+
     # build and install protoc
     cd
-    cd grpc-swift/third_party/grpc/third_party/protobuf 
+    cd grpc-swift/third_party/grpc/third_party/protobuf
     make install
     # build and test the plugin
     cd
     cd grpc-swift/Plugin
     make test
-

+ 0 - 30
third_party/RUNME.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2017, gRPC Authors All rights reserved.
-#
-# Licensed 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.
-#
-printf "\033c"
-read -p "Would you like to download swift-protobuf / grpc [y/N]" CONDITION;
-if [ "$CONDITION" == "y" ] ; then
-    read -p "Use last known stable swift-protobuf - 1.0.2 ? or  latest master ? [S/l]  " CONDITION;
-    if [ "$CONDITION" == "l" ] ; then
-        git clone https://github.com/apple/swift-protobuf.git
-    else
-        git clone -b 1.0.2 https://github.com/apple/swift-protobuf.git
-    fi
-    git clone https://github.com/grpc/grpc.git
-    cd grpc
-    # this step is slow and only needed to rebuild the vendored Sources/BoringSSL code.
-    #git submodule update --init
-fi