Browse Source

Merge install and uninstall scripts for mac and linux

Fixing-travis-yml
BinHong Lee 7 years ago
parent
commit
7ebe6d0516
5 changed files with 16 additions and 18 deletions
  1. +6
    -4
      .travis.yml
  2. +6
    -2
      install.sh
  3. +0
    -5
      mac_install.sh
  4. +0
    -6
      mac_uninstall.sh
  5. +4
    -1
      uninstall.sh

+ 6
- 4
.travis.yml View File

@@ -19,10 +19,12 @@ matrix:
- MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"

before_install:
- sudo apt-get update
- eval "${MATRIX_EVAL}"
install: ./install.sh
script: ant test
after_script: ./uninstall.sh
install:
- ./install.sh
script:
- ant test
after_script:
- ./uninstall.sh
after_success:
- bash <(curl -s https://codecov.io/bash)

+ 6
- 2
install.sh View File

@@ -1,5 +1,9 @@
sudo apt-get update
sudo apt-get install libjsoncpp-dev
if [ $kernel == "Darwin" ]; then
brew install jsoncpp
else
sudo apt-get update
sudo apt-get install libjsoncpp-dev

cp lib/anttasks.jar ~
pushd ~
jar xf anttasks.jar


+ 0
- 5
mac_install.sh View File

@@ -1,5 +0,0 @@
brew install jsoncpp
cp lib/anttasks.jar ~
pushd ~
jar xf anttasks.jar
pushd -0

+ 0
- 6
mac_uninstall.sh View File

@@ -1,6 +0,0 @@
brew uninstall jsoncpp
cd ../
echo "Deleting project files"
rm -rf TicketingSystem
echo "Removing additional installed library"
rm -rf ~/anttasks.jar

+ 4
- 1
uninstall.sh View File

@@ -1,4 +1,7 @@
sudo apt-get remove --purge libjsoncpp-dev
if [ $kernel == "Darwin" ]; then
sudo apt-get remove --purge libjsoncpp-dev
else
brew uninstall jsoncpp
cd ../
echo "Deleting project files"
rm -rf TicketingSystem


Loading…
Cancel
Save