Commit d38b21ca authored by Mateusz Loskot's avatar Mateusz Loskot

Move directory /bin to /scripts

Move directory /bin/ci to /scripts/travis
parent 316885a3
......@@ -3,11 +3,9 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
language: cpp
# Several scripts hard code Precise and don't currently work in any other
# environment (e.g. the default Trusty).
# TODO: Switc to Trusty https://github.com/SOCI/soci/issues/574
dist: precise
language: cpp
sudo: required
......@@ -50,9 +48,9 @@ addons:
build_command: "make -j 4"
branch_pattern: coverity_scan
before_install: ./bin/ci/before_install.sh
before_script: ./bin/ci/before_script.sh
script: ./bin/ci/script.sh
before_install: ./scripts/travis/before_install.sh
before_script: ./scripts/travis/before_script.sh
script: ./scripts/travis/script.sh
notifications:
#email:
......
......@@ -32,7 +32,7 @@ Vagrant.configure(2) do |config|
"db2.sh"
]
scripts.each { |script|
db2.vm.provision :shell, privileged: false, :path => "bin/vagrant/" << script
db2.vm.provision :shell, privileged: false, :path => "scripts/vagrant/" << script
}
end
......@@ -62,7 +62,7 @@ Vagrant.configure(2) do |config|
"build.sh"
]
scripts.each { |script|
soci.vm.provision :shell, privileged: false, :path => "bin/vagrant/" << script
soci.vm.provision :shell, privileged: false, :path => "scripts/vagrant/" << script
}
end
end
......@@ -52,7 +52,7 @@ install:
7z x -y -oC:\projects\mingw\4.8.3\ $env:MINGW_ARCHIVE > $null
}
}
Import-Module C:\projects\soci\bin\windows\Get-ODBCList.ps1
Import-Module C:\projects\soci\scripts\windows\Get-ODBCList.ps1
Get-ODBCList
- git clone https://github.com/snikulov/sqlite.cmake.build.git C:\projects\sqlite\src
......@@ -83,7 +83,7 @@ before_build:
- set MYSQL_PWD=Password12!
- set USER=root
- mysql -e "create database soci_test;" --user=root
- sqlcmd -U sa -P Password12! -S (local)\SQL2014 -i C:\projects\soci\bin\windows\mssql_db_create.sql
- sqlcmd -U sa -P Password12! -S (local)\SQL2014 -i C:\projects\soci\scripts\windows\mssql_db_create.sql
- cmake .. -G"%PRJ_GEN%" -DCMAKE_BUILD_TYPE=%PRJ_CFG% -DCMAKE_INSTALL_PREFIX=C:\projects\sqlite\sqlite.%BDIR%
- cmake --build . --config %PRJ_CFG% --target install
......
......@@ -81,7 +81,7 @@ You can also execute the `build.h` script provided to run CMake and make
```
vagrant ssh soci
cd $SOCI_BUILD
/vagrant/bin/vagrant/build.sh
/vagrant/scripts/vagrant/build.sh
```
* Debug, only on VM `soci` with gdb.
......@@ -95,7 +95,7 @@ for complete list of commands.
### Environment variables
All variables available to the `vagrant` user on the VMs are defined in and sourced from `/vagrant/bin/vagrant/common.env`:
All variables available to the `vagrant` user on the VMs are defined in and sourced from `/vagrant/scripts/vagrant/common.env`:
* `SOCI_HOME` where SOCI master is cloned (`/vagrant` on VM `soci`)
* `SOCI_BUILD` where CMake generates build configuration (`/home/vagrant/soci-build` on VM `soci`)
......@@ -114,5 +114,5 @@ Note, those variables are also used by provision scripts to set up databases.
* Analyze `vagrant up` output.
* On Windows, prefer `vagrant ssh` from inside MinGW Shell where `ssh.exe` is available or
learn how to use Vagrant with PuTTY.
* If you modify any of `bin/vagrant/*.sh` scripts, **ensure** they have unified
* If you modify any of `scripts/vagrant/*.sh` scripts, **ensure** they have unified
end-of-line characters to `LF` only. Otherwise, provisioning steps may fail.
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 16126D3A3E5C1192
sudo add-apt-repository -y ppa:apt-fast/stable
......@@ -13,7 +13,7 @@ sudo apt-get install -qq -y apt-fast
sudo apt-fast update -qq -y
sudo apt-fast install -qq -y libboost-dev libboost-date-time-dev valgrind
before_install="${TRAVIS_BUILD_DIR}/bin/ci/before_install_${SOCI_TRAVIS_BACKEND}.sh"
before_install="${TRAVIS_BUILD_DIR}/scripts/travis/before_install_${SOCI_TRAVIS_BACKEND}.sh"
if [ -x ${before_install} ]; then
echo "Running ${before_install}"
${before_install}
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
sudo apt-get install -qq firebird2.5-super firebird2.5-dev
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
sudo apt-get install -qq \
tar bzip2 \
......
......@@ -9,12 +9,12 @@
# - Add fake swap support (backup /usr/bin/free manually anyway!)
# - Increase Oracle XE's PROCESSES parameter to value from range 100-200.
# Required to prevent random ORA-12520 errors while running tests.
#
#
# Modified by Peter Butkovic <butkovic@gmail.com> to enable i386 install on amd64 architecture (precise 64)
# based on: http://www.ubuntugeek.com/how-to-install-oracle-10g-xe-in-64-bit-ubuntu.html
#
#
# set -ex
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
#
# Utilities
......@@ -76,7 +76,7 @@ sudo apt-get autoremove -qq
mkdir /tmp/oracle_unpack
dpkg-deb -x /var/cache/apt/archives/oracle-xe-universal_10.2.0.1-1.1_i386.deb /tmp/oracle_unpack
cd /tmp/oracle_unpack
dpkg-deb --control /var/cache/apt/archives/oracle-xe-universal_10.2.0.1-1.1_i386.deb
dpkg-deb --control /var/cache/apt/archives/oracle-xe-universal_10.2.0.1-1.1_i386.deb
sed -i "s/,\ bc//g" /tmp/oracle_unpack/DEBIAN/control
mkdir /tmp/oracle_repack
dpkg -b /tmp/oracle_unpack /tmp/oracle_repack/oracle-xe-universal_fixed_10.2.0.1-1.1_i386.deb
......@@ -112,7 +112,7 @@ sqlplus -S -L sys/admin AS SYSDBA
sudo /etc/init.d/oracle-xe restart
# Set Oracle environment variables on login.
# NOTE, mloskot: On Travis CI, fails with Permission denied
# NOTE, mloskot: On Travis CI, fails with Permission denied
#sudo cat <<END >>/root/.bashrc
#. /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/oracle_env.sh
#END
......
......@@ -3,9 +3,9 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
before_script="${TRAVIS_BUILD_DIR}/bin/ci/before_script_${SOCI_TRAVIS_BACKEND}.sh"
before_script="${TRAVIS_BUILD_DIR}/scripts/travis/before_script_${SOCI_TRAVIS_BACKEND}.sh"
if [ -x ${before_script} ]; then
echo "Running ${before_script}"
${before_script}
......
......@@ -4,7 +4,7 @@
# Copyright (c) 2013 Brian R. Toonen <toonen@alcf.anl.gov>
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
sudo -u db2inst1 -i db2 "CREATE DATABASE SOCITEST"
sudo -u db2inst1 -i db2 "ACTIVATE DATABASE SOCITEST"
......@@ -3,7 +3,7 @@
#
# Mateusz Loskot <mateusz@loskot.net>, http://github.com/SOCI
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
isql-fb -z -q -i /dev/null # --version
echo 'CREATE DATABASE "LOCALHOST:/tmp/soci_test.fdb" PAGE_SIZE = 16384;' > /tmp/create_soci_test.sql
......
......@@ -3,7 +3,7 @@
#
# Mateusz Loskot <mateusz@loskot.net>, http://github.com/SOCI
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
mysql --version
mysql -e 'create database soci_test;'
......@@ -3,7 +3,7 @@
#
# Mateusz Loskot <mateusz@loskot.net>, http://github.com/SOCI
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
mysql --version
mysql -e 'create database soci_test;'
......
......@@ -3,7 +3,7 @@
#
# Mateusz Loskot <mateusz@loskot.net>, http://github.com/SOCI
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
psql --version
psql -c 'create database soci_test;' -U postgres
......@@ -4,7 +4,7 @@
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
# Copyright (c) 2015 Sergei Nikulov <sergey.nikulov@gmail.com>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
mysql --version
mysql -e 'create database soci_test;'
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
# prepare build directory
builddir="${TRAVIS_BUILD_DIR}/_build"
......@@ -11,6 +11,6 @@ mkdir -p ${builddir}
cd ${builddir}
# build and run tests
SCRIPT=${TRAVIS_BUILD_DIR}/bin/ci/script_${SOCI_TRAVIS_BACKEND}.sh
SCRIPT=${TRAVIS_BUILD_DIR}/scripts/travis/script_${SOCI_TRAVIS_BACKEND}.sh
echo "Running ${SCRIPT}"
${SCRIPT}
......@@ -4,7 +4,7 @@
# Copyright (c) 2013 Brian R. Toonen <toonen@alcf.anl.gov>
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
ODBC_TEST=${PWD}/../tests/odbc
if test ! -d ${ODBC_TEST}; then
......
......@@ -3,8 +3,8 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/bin/ci/oracle.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/oracle.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -3,7 +3,7 @@
#
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_BUILD_TYPE=Debug \
......
......@@ -4,7 +4,7 @@
# Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
# Copyright (c) 2015 Sergei Nikulov <sergey.nikulov@gmail.com>
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/scripts/travis/common.sh
cmake \
-DCMAKE_VERBOSE_MAKEFILE=ON \
......
......@@ -3,7 +3,7 @@
# Pre-installation
echo "Bootstrap: setting common environment in /etc/profile.d/vagrant-soci.sh"
sudo sh -c "cat /vagrant/bin/vagrant/common.env > /etc/profile.d/vagrant-soci.sh"
sudo sh -c "cat /vagrant/scripts/vagrant/common.env > /etc/profile.d/vagrant-soci.sh"
export DEBIAN_FRONTEND="noninteractive"
# Installation
# TODO: Switch to apt-fast when it is avaiable for Trusty
......
......@@ -2,7 +2,7 @@
# Part of Vagrant virtual development environments for SOCI
# Builds and tests SOCI from git master branch
source /vagrant/bin/vagrant/common.env
source /vagrant/scripts/vagrant/common.env
# Build SOCI in /home/vagrant on Linux filesystem,
# outside /vagrant which is VM shared directory.
......
......@@ -3,10 +3,10 @@
# Installs DB2 Express-C 9.7
# Pre-installation
source /vagrant/bin/vagrant/common.env
source /vagrant/scripts/vagrant/common.env
export DEBIAN_FRONTEND="noninteractive"
# Installation
/vagrant/bin/ci/before_install_db2.sh
/vagrant/scripts/travis/before_install_db2.sh
# Post-installation
## Let's be gentle to DB2 and try to not to recreate existing databases
echo "db2: checking if ${SOCI_USER} database exists"
......
......@@ -3,7 +3,7 @@
# Installs essentials and core dependencies
# Pre-installation
source /vagrant/bin/vagrant/common.env
source /vagrant/scripts/vagrant/common.env
export DEBIAN_FRONTEND="noninteractive"
# Trusty has CMake 2.8, we need CMake 3
sudo apt-get install software-properties-common
......
......@@ -3,7 +3,7 @@
# Installs PostgreSQL with 'soci' user and database
# Pre-installation
source /vagrant/bin/vagrant/common.env
source /vagrant/scripts/vagrant/common.env
export DEBIAN_FRONTEND="noninteractive"
# FIXME: these debconf lines should automate the Firebird config but do/may not :(
# However, keep them enabled to allow smooth(er) apt-get/dpkg operations.
......
......@@ -3,7 +3,7 @@
# Installs MySQL with 'soci' user and database
# Pre-installation
source /vagrant/bin/vagrant/common.env
source /vagrant/scripts/vagrant/common.env
export DEBIAN_FRONTEND="noninteractive"
sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password ${SOCI_PASS}"
sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again password ${SOCI_PASS}"
......
......@@ -3,7 +3,7 @@
# Installs PostgreSQL with 'soci' user and database
# Pre-installation
source /vagrant/bin/vagrant/common.env
source /vagrant/scripts/vagrant/common.env
export DEBIAN_FRONTEND="noninteractive"
# Installation
sudo apt-get -o Dpkg::Options::='--force-confnew' -y -q install \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment