Simplified helper scripts.

Fix possible shell incompatibility introduced in last commit.
master
baztian 2017-03-08 11:40:06 +01:00
parent 1cd46e1311
commit 9e1cf4fbad
5 changed files with 4 additions and 53 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e
[ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || "${TRAVIS_BUILD_DIR}/ci/before_install_nonjython.sh" [ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || "${TRAVIS_BUILD_DIR}/ci/before_install_nonjython.sh"

View File

@ -1,10 +1,8 @@
#!/bin/bash #!/bin/sh
set -e set -e
JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh $JYTHON) JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh $JYTHON)
java -jar ${JYTHON_JAR} -s -d $HOME/jython java -jar ${JYTHON_JAR} -s -d $HOME/jython
$HOME/jython/bin/jython -m ensurepip
$HOME/jython/bin/pip install virtualenv $HOME/jython/bin/pip install virtualenv
$HOME/jython/bin/virtualenv $HOME/myvirtualenv $HOME/jython/bin/virtualenv $HOME/myvirtualenv

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e
ln -s $VIRTUAL_ENV $HOME/myvirtualenv ln -s $VIRTUAL_ENV $HOME/myvirtualenv

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -e
ARTIFACT_SPEC=$1 ARTIFACT_SPEC=$1
GROUP_ID=${ARTIFACT_SPEC%%:*} GROUP_ID=${ARTIFACT_SPEC%%:*}

View File

@ -1,48 +0,0 @@
#!/bin/bash
set -e
export BACKEND=hsqldb
#export JYTHON=org.python:jython-installer:2.5.3
export JYTHON=org.python:jython-installer:2.7.0
jip install $JYTHON
_JIP_HOME=$HOME/.jip
export HOME=`mktemp -d`
export TRAVIS_BUILD_DIR=$HOME/baztian/jaydebeapi
git clone "$(git rev-parse --show-toplevel)" $TRAVIS_BUILD_DIR
mkdir -p $TRAVIS_BUILD_DIR
cp -r "$(git rev-parse --show-toplevel)"/* $TRAVIS_BUILD_DIR
cd $TRAVIS_BUILD_DIR
mkdir -p $HOME/.jip/cache/org.python/
cp -r $_JIP_HOME/cache/org.python/jython-installer* $HOME/.jip/cache/org.python/
virtualenv $HOME/orig
source $HOME/orig/bin/activate
pip install --upgrade virtualenv
virtualenv $HOME/new
source $HOME/new/bin/activate
# required as new virtualenv doesn't have pip installed virtualenv
pip install --upgrade virtualenv
$TRAVIS_BUILD_DIR/ci/before_install_jython.sh
source $HOME/myvirtualenv/bin/activate
[ -x requirements.txt ] && pip install -r requirements.txt
pip install jip==0.7
pip install -e .
pip install -r test-requirements.txt
jip install org.xerial:sqlite-jdbc:3.7.2
jip install org.hsqldb:hsqldb:1.8.0.10
export CLASSPATH=$VIRTUAL_ENV/javalib/*
python test/testsuite.py test_integration.HsqldbTest
echo Remove ${HOME}?
read
rm -r $HOME