mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

More cleaning up, consistency

Browse source
This commit is contained in:
Bryan Thornbury 2015-10-22 10:23:47 -07:00
parent 6f877ab516
commit ba82768ba7
4 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package_tool/setup/build_setup.sh
View file

@ -1,15 +1,15 @@
install_dependencies(){ install_dependencies(){
# Add LLdb 3.6 package source # Add LLdb 3.6 package source
echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
#Install Deps #Install Deps
apt-get update apt-get update
apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev
} }
setup(){ setup(){
install_dependencies install_dependencies
} }
setup setup

19
package_tool/setup/test_setup.sh
View file

@ -1,17 +1,22 @@
install_dependencies(){ install_dependencies(){
apt-get update # Add LLdb 3.6 package source
apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev clang-3.6 echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
#Install Deps
apt-get update
apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev
} }
install_bats(){ install_bats(){
git clone https://github.com/sstephenson/bats.git git clone https://github.com/sstephenson/bats.git
cd bats cd bats
./install.sh /usr/local ./install.sh /usr/local
} }
setup(){ setup(){
install_dependencies install_dependencies
install_bats install_bats
} }
setup setup

4
scripts/package-debian.sh
View file

@ -64,10 +64,6 @@ test_debian_package(){
popd popd
bats $PACKAGE_OUTPUT_DIR/test_package.bats bats $PACKAGE_OUTPUT_DIR/test_package.bats
# if [[ -d "$PACKAGE_OUTPUT_DIR/integration_tests" ]]; then
# bats
# fi
} }
execute execute

8
scripts/windows_dockerbuild.sh
View file

@ -13,7 +13,8 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
# This function is necessary to bypass POSIX Path Conversion in Git Bash
# http://www.mingw.org/wiki/Posix_path_conversion
_convert_path(){ _convert_path(){
local path=$1 local path=$1
path=$( echo "$path" | sed -r 's/[\/]+/\\/g') path=$( echo "$path" | sed -r 's/[\/]+/\\/g')
@ -36,7 +37,7 @@ execute(){
check_prereqs check_prereqs
echo "Setting up VM..." echo "Setting up VM..."
create_or_start_vm #>> /dev/null 2>&1 create_or_start_vm
echo "Copying code from Host to VM" echo "Copying code from Host to VM"
eval $(docker-machine env --shell bash $VM_NAME) eval $(docker-machine env --shell bash $VM_NAME)
@ -60,7 +61,6 @@ check_prereqs(){
exit 1 exit 1
fi fi
#TODO: check virtualbox?
} }
create_or_start_vm(){ create_or_start_vm(){
@ -95,7 +95,7 @@ copy_results_from_vm(){
mkdir $T_RESULTS_DIR mkdir $T_RESULTS_DIR
docker-machine ssh $VM_NAME "sudo chmod -R a+rx $VM_CODE_DIR" docker-machine ssh $VM_NAME "sudo chmod -R a+rx $VM_CODE_DIR"
docker-machine scp -r $VM_NAME:$VM_CODE_DIR/artifacts $REPO_ROOT #>> /dev/null 2>&1 docker-machine scp -r $VM_NAME:$VM_CODE_DIR/artifacts $REPO_ROOT >> /dev/null 2>&1
} }
execute execute