Skip to content

Commit 95f0199

Browse files
committed
profile.xml : Enable targets explicitly, add travis etc. updates
1 parent 32d4bf2 commit 95f0199

19 files changed

+825
-1
lines changed

.gitignore

+44-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# This is a skeleton created by zproject.
2+
# You can add hand-written code here.
13
save.xml
24
# Object files
35
*.o
@@ -19,13 +21,19 @@ save.xml
1921
*.lo
2022

2123
# Executables
22-
src/glar_selftest
24+
src/glar150_selftest
2325
src/glard
26+
src/glar_selftest
2427
*.exe
2528
*.out
2629
*.app
2730
core
2831

32+
# Distcheck workspace and archives
33+
glar150-0.0.0/
34+
glar150-0.0.0.tar.gz
35+
glar150-0.0.0.zip
36+
2937
# Man pages
3038
doc/*.1
3139
doc/*.3
@@ -58,9 +66,29 @@ CMakeCache.txt
5866
CMakeFiles/
5967
CTestTestfile.cmake
6068
cmake_install.cmake
69+
compile_commands.json
70+
DartConfiguration.tcl
6171
install_manifest.txt
6272
Testing/
6373

74+
# Repositories downloaded by CI integration scripts
75+
libzmq/
76+
czmq/
77+
zyre/
78+
79+
# Travis build area
80+
tmp/
81+
82+
# Valgrind files
83+
callgrind*
84+
vgcore*
85+
86+
# Vagrant files
87+
.vagrant
88+
89+
# CLion / PyCharm
90+
.idea
91+
6492
# GYP files
6593
project.Makefile
6694
*.target.mk
@@ -81,6 +109,21 @@ src/app/jni/output
81109
# Python build directory
82110
build/
83111

112+
# MSVC build directories
113+
obj/
114+
bin/
115+
*.tlog
116+
117+
# Qt
118+
*pro.user
119+
moc_*
120+
build-*
121+
bindings/qt/selftest/selftest
122+
84123
# Temporary files
85124
*.swp
125+
*.bak
126+
.test*
127+
128+
# editor backups
86129
*~

.travis.yml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Travis CI script
2+
# This is a skeleton created by zproject.
3+
# You can add hand-written code here.
4+
5+
language: c
6+
7+
cache: ccache
8+
9+
os:
10+
- linux
11+
12+
sudo: false
13+
14+
services:
15+
- docker
16+
17+
# Set CI_TIME=true to enable build-step profiling in Travis
18+
# Set CI_TRACE=true to enable shell script tracing in Travis
19+
# Set CI_CONFIG_QUIET=true to enable "configure --quiet" (only report stderr)
20+
env:
21+
global:
22+
- CI_TIME=false
23+
- CI_TRACE=false
24+
- CI_CONFIG_QUIET=true
25+
matrix:
26+
- BUILD_TYPE=default
27+
- BUILD_TYPE=default-Werror
28+
- BUILD_TYPE=cmake
29+
# - BUILD_TYPE=android
30+
# - BUILD_TYPE=check-py
31+
32+
matrix:
33+
include:
34+
- env: BUILD_TYPE=valgrind
35+
os: linux
36+
dist: trusty
37+
sudo: required
38+
addons:
39+
apt:
40+
packages:
41+
- valgrind
42+
43+
addons:
44+
sources:
45+
- sourceline: 'deb http://download.opensuse.org/repositories/home:/zeromq:/git-draft/xUbuntu_12.04/ ./'
46+
key_url: 'http://download.opensuse.org/repositories/home:/zeromq:/git-draft/xUbuntu_12.04/Release.key'
47+
apt:
48+
packages:
49+
- asciidoc
50+
- xmlto
51+
- libzmq3-dev
52+
- libczmq-dev
53+
- libzyre-dev
54+
55+
before_install:
56+
- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils valgrind ; fi
57+
58+
# Hand off to generated script for each BUILD_TYPE
59+
script: ./ci_build.sh
60+
before_deploy: . ./ci_deploy.sh
61+
deploy:
62+
provider: releases
63+
api_key:
64+
# To encrypt your access token run: `travis encrypt -r user/repo`
65+
secure: <encrypted github access token>
66+
file_glob: true
67+
file: ${GLAR150_DEPLOYMENT}
68+
skip_cleanup: true
69+
on:
70+
branch: master
71+
tags: true
72+
condition: $TRAVIS_OS_NAME =~ (linux) && $BUILD_TYPE =~ (default)

builds/check_zproject/ci_build.sh

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/usr/bin/env bash
2+
set -ex
3+
4+
# NOTE: This script is not standalone, it is included from project root
5+
# ci_build.sh script, which sets some envvars (like REPO_DIR below).
6+
[ -n "${REPO_DIR-}" ] || exit 1
7+
8+
# Verify all required dependencies with repos can be checked out
9+
cd "$REPO_DIR/.."
10+
git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git libzmq
11+
git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
12+
git clone --quiet --depth 1 https://github.com/zeromq/zyre.git zyre
13+
cd -
14+
15+
if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list zproject >/dev/null 2>&1) || \
16+
(command -v brew >/dev/null 2>&1 && brew ls --versions zproject >/dev/null 2>&1)); then
17+
cd "$REPO_DIR/.."
18+
git clone --quiet --depth 1 https://github.com/zeromq/zproject zproject
19+
cd zproject
20+
PATH="`pwd`:$PATH"
21+
fi
22+
23+
if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list generator-scripting-language >/dev/null 2>&1) || \
24+
(command -v brew >/dev/null 2>&1 && brew ls --versions gsl >/dev/null 2>&1)); then
25+
cd "$REPO_DIR/.."
26+
git clone https://github.com/imatix/gsl.git gsl
27+
cd gsl/src
28+
make
29+
PATH="`pwd`:$PATH"
30+
fi
31+
export PATH
32+
33+
# Verify that zproject template is up-to-date with files it can overwrite
34+
# As we will overwrite this script file make sure bash loads the
35+
# next lines into memory before executing
36+
# http://stackoverflow.com/questions/21096478/overwrite-executing-bash-script-files
37+
{
38+
cd "$REPO_DIR"
39+
gsl project.xml
40+
41+
# keep an eye on git version used by CI
42+
git --version
43+
if [[ $(git --no-pager diff -w) ]]; then
44+
git --no-pager diff -w
45+
echo "There are diffs between current code and code generated by zproject!"
46+
exit 1
47+
fi
48+
if [[ $(git status -s) ]]; then
49+
git status -s
50+
echo "zproject generated new files!"
51+
exit 1
52+
fi
53+
exit 0
54+
}

builds/check_zproto/ci_build.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
set -ex
3+
4+
# NOTE: This script is not standalone, it is included from project root
5+
# ci_build.sh script, which sets some envvars (like REPO_DIR below).
6+
[ -n "${REPO_DIR-}" ] || exit 1
7+
8+
docker run -e GSL_BUILD_DIR=/code/src -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q glar_node.xml
9+
docker run -e GSL_BUILD_DIR=/code/src -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q glar_panel.xml
10+
11+
# keep an eye on git version used by CI
12+
git --version
13+
if [[ $(git --no-pager diff -w api/*) ]]; then
14+
git --no-pager diff -w api/*
15+
echo "There are diffs between current code and code generated by zproto!"
16+
exit 1
17+
fi
18+
if [[ $(git status -s api) ]]; then
19+
git status -s api
20+
echo "zproto generated new files!"
21+
exit 1
22+
fi

0 commit comments

Comments
 (0)