Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,27 @@ before_install:
- sudo sh src/other_builds/OS_notes.linux_ubuntu_12_64
# install packages needed for testing
- sudo apt-get install xvfb xauth libgl1-mesa-dri mesa-utils tcsh libjpeg-progs
# for Debian pkg build testing
- bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh)
- sudo sed -i -e 's,#deb-src,deb-src,g' /etc/apt/sources.list.d/neurodebian.sources.list
- sudo apt-get update -q
- sudo apt-get install quilt
- sudo apt-get build-dep afni
install:
- cd src
- cp other_builds/Makefile.$FLAVOR Makefile
- make vastness
# In Debian branch we will build the package which will run tests etc
# - cd src
# - cp other_builds/Makefile.$FLAVOR Makefile
# - make vastness
script:
- export PATH=$PATH:$PWD/$FLAVOR # to gain access to built binaries
- mkdir ../testing; cd ../testing # from here will run tests
- cmake -DAFNI_BUILD_TESTS:BOOL=ON ..
- ctest
- QUILT_PATCHES=debian/patches quilt push -a
- dpkg-buildpackage -uc -us -rfakeroot -b
# some additional depends
- sudo apt-get install gifsicle
- sudo dpkg -i ../*.deb
- source /etc/afni/afni.sh
# - export PATH=$PATH:$PWD/$FLAVOR # to gain access to built binaries
# - mkdir ../testing; cd ../testing # from here will run tests
# - cmake -DAFNI_BUILD_TESTS:BOOL=ON ..
# - ctest
# Smoke tests for some additional commands
- 3dinfo
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
afni (16.2.07~dfsg.1-3) neurodebian; urgency=medium

* BF for amd64 precise -- explicitly specify -fPIC for CFLAGS

-- Yaroslav Halchenko <[email protected]> Wed, 31 Aug 2016 08:21:05 -0400

afni (16.2.07~dfsg.1-2) neurodebian; urgency=medium

* install lib_fat_plot_sel.py lib_vars_object.py lib_fat_Rfactor.py libraries
Expand Down
21 changes: 14 additions & 7 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

srcpkg = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Source:' | cut -d ' ' -f 2,2)
debver = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Version:' | cut -d ' ' -f 2,2)
debdis = $(shell lsb_release -c -s)

# this figures out the last merge point from 'upstream' into the Debian branch and
# then described this commit relative to the last release tag (AFNI_...)
Expand All @@ -26,6 +27,13 @@ DEB_BUILD_HARDENING_FORTIFY := 0
# get install locations for matlab packages
include /usr/share/matlab/debian/defs.make

# what are we doing this for
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# where to perform the general build
DEB_BUILDDIR = "build-$(DEB_BUILD_GNU_TYPE)"
# where to build the static corelibs
DEB_BUILDDIR_STATIC = "build-$(DEB_BUILD_GNU_TYPE)-static"

# filter-out below are to get a set of uniq (not already listed)
# options to avoid cmdline clutter. -fPIE -pie are manually filtered out
# to prevent FTBFS on wheezy/jessie with gcc 4.7 which can't handle having
Expand All @@ -39,15 +47,14 @@ export LDFLAGS
# appended after -Wall
DPKGCFLAGS = $(shell dpkg-buildflags --get CFLAGS) -Wno-unused
CFLAGS = $(filter-out $(DPKGCFLAGS) -fPIE, $(HARDENING_CFLAGS)) $(DPKGCFLAGS)
# workaround for precise amd64
ifeq ($(debdis),precise)
ifeq ($(DEB_BUILD_GNU_TYPE),x86_64-linux-gnu)
CFLAGS += -fPIC
endif
endif
export CFLAGS

# what are we doing this for
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# where to perform the general build
DEB_BUILDDIR = "build-$(DEB_BUILD_GNU_TYPE)"
# where to build the static corelibs
DEB_BUILDDIR_STATIC = "build-$(DEB_BUILD_GNU_TYPE)-static"

# Provide details on tests which fail
export CTEST_OUTPUT_ON_FAILURE=1

Expand Down
1 change: 1 addition & 0 deletions debian/source/options
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extend-diff-ignore = "\.travis.yml"