addressing PR comments

pull/3/head
PrajwalaNagaraj 2020-10-14 17:00:11 -04:00
parent 43b05bde41
commit 40313b8bcf
2 changed files with 33 additions and 23 deletions

View File

@ -45,7 +45,7 @@ fi
git clone https://github.com/EdgeVPNio/evio.git git clone https://github.com/EdgeVPNio/evio.git
if [[ "$target_os" == "ubuntu" ]]; then if [[ "$target_os" == "ubuntu" ]]; then
git clone -b debian-x64 --single-branch https://github.com/EdgeVPNio/external.git git clone -b debian-x64 --single-branch https://github.com/EdgeVPNio/external.git
elif [[ "$target_os" == "ubuntu" ]]; then elif [[ "$target_os" == "raspberry-pi" ]]; then
git clone -b debian-arm --single-branch https://github.com/EdgeVPNio/external.git git clone -b debian-arm --single-branch https://github.com/EdgeVPNio/external.git
fi fi
#Todo: add git clone cmd for different OS #Todo: add git clone cmd for different OS

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
# Adds the include headers @ out/$platform/external directory
helpFunction() helpFunction()
{ {
echo "" echo ""
@ -37,34 +38,43 @@ elif [[ "$target_os" == "raspberry-pi" ]]; then
platform="debian-arm" platform="debian-arm"
fi fi
mkdir -p out/$platform/external/include
#getting the required include files and folders from webrtc-checkout #getting the required include files and folders from webrtc-checkout
# folders required: absl,api,base,call,common_video,logging,media,modules,p2p,pc,system_wrappers,rtc_base,build,common_types.h, jni.h, logging_buildflags.h # folders required: absl,api,base,call,common_video,logging,media,modules,p2p,pc,system_wrappers,rtc_base,build,common_types.h, jni.h, logging_buildflags.h
# Script to be run at workspace containing webrtc-checkout # Script to be run at workspace containing webrtc-checkout
mkdir -p out/$platform/external/include/webrtc # WORKSPACE_BASE='pwd'
cp -r webrtc-checkout/src/third_party/abseil-cpp/absl out/$platform/external/include
cp -r webrtc-checkout/src/api out/$platform/external/include/webrtc #parameter: $1: src directory, $2: dest directory
cp -r webrtc-checkout/src/base out/$platform/external/include/webrtc #Copies the header files recursively from source webrtc to external/include
cp -r webrtc-checkout/src/call out/$platform/external/include/webrtc copyHeaders()
cp -r webrtc-checkout/src/common_video out/$platform/external/include/webrtc {
cp -r webrtc-checkout/src/logging/rtc_event_log out/$platform/external/include/webrtc #enable -v if verbose is required
cp -r webrtc-checkout/src/media out/$platform/external/include/webrtc mkdir -p $2
cp -r webrtc-checkout/src/modules out/$platform/external/include/webrtc rsync -am --include='*.h' -f 'hide,! */' $1 $2
cp -r webrtc-checkout/src/p2p out/$platform/external/include/webrtc }
cp -r webrtc-checkout/src/pc out/$platform/external/include/webrtc
cp -r webrtc-checkout/src/system_wrappers out/$platform/external/include/webrtc #mkdir -p out/$platform/external/include/webrtc
cp -r webrtc-checkout/src/rtc_base out/$platform/external/include/webrtc copyHeaders webrtc-checkout/src/third_party/abseil-cpp/absl out/$platform/external/include
cp -r webrtc-checkout/src/third_party/jsoncpp/source/include/json out/$platform/external/include copyHeaders webrtc-checkout/src/third_party/abseil-cpp/absl out/$platform/external/include
cp webrtc-checkout/src/third_party/jsoncpp/generated/version.h out/$platform/external/include/json copyHeaders webrtc-checkout/src/api out/$platform/external/include/webrtc
cp webrtc-checkout/src/common_types.h out/$platform/external/include/webrtc copyHeaders webrtc-checkout/src/base out/$platform/external/include/webrtc
cp webrtc-checkout/src/third_party/ffmpeg/libavcodec/jni.h out/$platform/external/include/webrtc copyHeaders webrtc-checkout/src/call out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/common_video out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/logging/rtc_event_log out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/media out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/modules out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/p2p out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/pc out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/system_wrappers out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/rtc_base out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/third_party/jsoncpp/source/include/json out/$platform/external/include
copyHeaders webrtc-checkout/src/third_party/jsoncpp/generated/version.h out/$platform/external/include/json
copyHeaders webrtc-checkout/src/common_types.h out/$platform/external/include/webrtc
copyHeaders webrtc-checkout/src/third_party/ffmpeg/libavcodec/jni.h out/$platform/external/include/webrtc
#files other than *.h
mkdir -p out/$platform/external/include/libc++ mkdir -p out/$platform/external/include/libc++
mkdir -p out/$platform/external/include/libc++abi mkdir -p out/$platform/external/include/libc++abi
cp -r webrtc-checkout/src/buildtools/third_party/libc++/trunk/include out/$platform/external/include/libc++ cp -r webrtc-checkout/src/buildtools/third_party/libc++/trunk/include out/$platform/external/include/libc++
cp -r webrtc-checkout/src/buildtools/third_party/libc++abi/trunk/include out/$platform/external/include/libc++abi cp -r webrtc-checkout/src/buildtools/third_party/libc++abi/trunk/include out/$platform/external/include/libc++abi
#command to remove all files other than *.h
cd out/$platform/external/include
find . -type f ! -name '*.h' -delete
#mkdir -p /external/include/build && cp webrtc-checkout/src/build/build_config.h "$_" #mkdir -p /external/include/build && cp webrtc-checkout/src/build/build_config.h "$_"
#cp webrtc-checkout/src/build/buildflag.h /external/include/build #cp webrtc-checkout/src/build/buildflag.h /external/include/build