saret/rpc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #63 from open-amt-cloud-toolkit/feat_update_vcpkg

Browse Source 
feat: Update docs and scripts for Windows and Ubuntu.
This commit is contained in:
mpvats-intel
2021-08-27 06:41:31 -07:00
committed by GitHub
parent ed5480c7d1 2a460e90dc
commit a9b8d8e5f8
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_all.yml vendored
View File

@@ -24,7 +24,7 @@ jobs:
- name: Create Build Dir - name: Create Build Dir
run: mkdir build run: mkdir build
- name: Clone - name: Clone
run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
- name: Build VCPKG - name: Build VCPKG
run: cd vcpkg && bootstrap-vcpkg.bat run: cd vcpkg && bootstrap-vcpkg.bat
shell: cmd shell: cmd
@@ -71,7 +71,7 @@ jobs:
- name: Create Build Dir - name: Create Build Dir
run: mkdir build run: mkdir build
- name: Clone - name: Clone
run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
- name: Build VCPKG - name: Build VCPKG
run: cd vcpkg && ./bootstrap-vcpkg.sh run: cd vcpkg && ./bootstrap-vcpkg.sh
shell: bash shell: bash

4
.github/workflows/ci.yml vendored
View File

@@ -21,7 +21,7 @@ jobs:
- name: Create Build Dir - name: Create Build Dir
run: mkdir build run: mkdir build
- name: Clone - name: Clone
run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
- name: Build VCPKG - name: Build VCPKG
run: cd vcpkg && bootstrap-vcpkg.bat run: cd vcpkg && bootstrap-vcpkg.bat
shell: cmd shell: cmd
@@ -54,7 +54,7 @@ jobs:
- name: Create Build Dir - name: Create Build Dir
run: mkdir build run: mkdir build
- name: Clone - name: Clone
run: git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git run: git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
- name: Build VCPKG - name: Build VCPKG
run: cd vcpkg && ./bootstrap-vcpkg.sh run: cd vcpkg && ./bootstrap-vcpkg.sh
shell: bash shell: bash

4
Build.md
View File

@@ -25,7 +25,7 @@ sudo apt install git cmake build-essential curl zip unzip tar pkg-config
Open a Terminal window. Open a Terminal window.
``` ```
git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
cd vcpkg cd vcpkg
./bootstrap-vcpkg.sh ./bootstrap-vcpkg.sh
./vcpkg install cpprestsdk[websockets] ./vcpkg install cpprestsdk[websockets]
@@ -68,7 +68,7 @@ Steps below are for Windows 10 and Visual Studio 2019 Professional.
Open an x64 Native Tools Command Prompt for Visual Studio 2019. Open an x64 Native Tools Command Prompt for Visual Studio 2019.
``` ```
git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
cd vcpkg cd vcpkg
bootstrap-vcpkg.bat bootstrap-vcpkg.bat
vcpkg install cpprestsdk[websockets]:x64-windows-static vcpkg install cpprestsdk[websockets]:x64-windows-static

2
CentOS7.md
View File

@@ -50,7 +50,7 @@ export PATH=/home/user/Downloads/git:$PATH
Using a Terminal window with the PATH and devtoolset enabled per the Dependencies. Using a Terminal window with the PATH and devtoolset enabled per the Dependencies.
``` ```
git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
cd vcpkg cd vcpkg
./bootstrap-vcpkg.sh ./bootstrap-vcpkg.sh
./vcpkg install cpprestsdk[websockets] ./vcpkg install cpprestsdk[websockets]

2
CentOS8.md
View File

@@ -28,7 +28,7 @@ sudo yum install cmake
Using a Terminal window with the PATH and devtoolset enabled per the Dependencies. Using a Terminal window with the PATH and devtoolset enabled per the Dependencies.
``` ```
git clone -b 2020.11-1 https://github.com/microsoft/vcpkg.git git clone -b 2021.05.12 https://github.com/microsoft/vcpkg.git
cd vcpkg cd vcpkg
./bootstrap-vcpkg.sh ./bootstrap-vcpkg.sh
./vcpkg install cpprestsdk[websockets] ./vcpkg install cpprestsdk[websockets]

2
Dockerfile
View File

@@ -15,7 +15,7 @@ RUN \
RUN git clone https://github.com/open-amt-cloud-toolkit/rpc.git RUN git clone https://github.com/open-amt-cloud-toolkit/rpc.git
WORKDIR /rpc WORKDIR /rpc
RUN mkdir -p build RUN mkdir -p build
RUN git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git RUN git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
RUN cd vcpkg && ./bootstrap-vcpkg.sh RUN cd vcpkg && ./bootstrap-vcpkg.sh
RUN ./vcpkg/vcpkg install cpprestsdk[websockets] RUN ./vcpkg/vcpkg install cpprestsdk[websockets]

2
scripts/jenkins-pre-build.cmd
View File

@@ -15,7 +15,7 @@ set VCPKG_DIR=C:\opt\vcpkg-source
cd %VCPKG_DIR% cd %VCPKG_DIR%
REM build vcpkg REM build vcpkg
git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git
cd vcpkg cd vcpkg
cmd /c bootstrap-vcpkg.bat cmd /c bootstrap-vcpkg.bat

2
scripts/jenkins-pre-build.sh
View File

@@ -12,7 +12,7 @@ apt install git cmake build-essential curl zip unzip tar pkg-config -y
#cd "$BASE_DIR"/rpc #cd "$BASE_DIR"/rpc
## build vcpkg ## build vcpkg
git -C vcpkg pull || git clone --branch 2020.11-1 https://github.com/microsoft/vcpkg.git vcpkg git -C vcpkg pull || git clone --branch 2021.05.12 https://github.com/microsoft/vcpkg.git vcpkg
cd vcpkg cd vcpkg
./bootstrap-vcpkg.sh ./bootstrap-vcpkg.sh