New upstream version 3.1+dfsg (c52ec75e) · Commits · Debian Med / bali-phy

.appveyor.yml

+11 −17

Original line number	Diff line number	Diff line
		@@ -4,25 +4,19 @@ environment:
		matrix:
		- MSYSTEM: MINGW64
		PATH: C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%
		- MSYSTEM: MINGW32
		PATH: C:\msys64\usr\bin;C:\msys64\mingw32\bin;C:\Windows\System32;C:\Windows;%PATH%

		install:
		# update mysy2
		- C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors"
		- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy"
		- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex"
		- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S git"

		before_build:
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER && mkdir build"
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh"
		# update msys2
		- bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors"
		- bash -lc "pacman --noconfirm -Sy"
		- bash -lc "pacman --noconfirm -S mingw-w64-x86_64-ninja"
		- bash -lc "pacman --noconfirm -S mingw-w64-x86_64-python3-pip"
		- bash -lc "pip3 install meson"

		build_script:
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && ../configure --prefix=C:/bali-phy"
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && make -j3 install"
		- bash -lc "cd C:/ && tar -zcf bali-phy.tgz bali-phy/"
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER/ && git submodule update --init"
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER/ && meson.py build --prefix=$APPVEYOR_BUILD_FOLDER/local"
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && ninja install
		# - bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && ninja test"


		test_script:
		- bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && make install"
		# - bash -lc "cd $APPVEYOR_BUILD_FOLDER/build && make check"

.gitignore

+1 −14

Original line number	Diff line number	Diff line
		Makefile.in
		config.guess*
		config.sub*
		config.h.in
		aclocal.m4
		compile
		configure
		depcomp
		install-sh
		missing
		autom4te.cache
		*~
		doc/html
		doc/latex
		\#*#
		ltmain.sh
		m4/*.m4
		*.orig

.travis.yml

+46 −33

Original line number	Diff line number	Diff line
		sudo: required
		cache: apt
		# addons:
		# apt:
		# sources:
		# - ubuntu-toolchain-r-test
		# packages:
		# - g++-5
		# - g++-6
		# - g++-7
		# env:
		# matrix:
		# - CXX=g++-5
		# - CXX=g++-6
		# - CXX=g++-7
		language: cpp

		matrix:
		include:
		- os: linux
		dist: trusty
		compiler: g++
		env: CXX_COMPILER=g++-5
		addons:
		apt:
		sources:
		- ubuntu-toolchain-r-test
		packages:
		- g++-5
		- pandoc
		- os: linux
		dist: trusty
		env: CXX_COMPILER=g++-6
		addons:
		apt:
		sources:
		- ubuntu-toolchain-r-test
		packages:
		- g++-6
		- pandoc
		- os: linux
		dist: trusty
		env: CXX_COMPILER=g++-7
		addons:
		apt:
		sources:
		- ubuntu-toolchain-r-test
		packages:
		- g++-7
		- pandoc
		- os: linux
		dist: trusty
		compiler: clang++
		addons:
		apt:
		sources:
		- ubuntu-toolchain-r-test
		packages:
		- g++-7
		- pandoc
		- os: osx
		osx_image: xcode9.2
		- os: osx
		osx_image: xcode8.3
		- os: osx
		osx_image: xcode7.3
		- os: osx
		osx_image: xcode6.4

		language: C++

		before_install:
		- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
		sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
		sudo apt-get update -y -qq;
		sudo apt-get install -y g++-5;
		sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90;
		sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90;
		fi

		install:
		- sh bootstrap.sh
		- mkdir bali-phy-build
		# We need to re-export CC and CXX here, because travis exports CXX=g++ or clang++ AFTER we set CXX.
		- if [ -n "${C_COMPILER}" ]; then export CC="${C_COMPILER}"; fi
		- if [ -n "${CXX_COMPILER}" ]; then export CXX="${CXX_COMPILER}"; fi
		- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install meson; fi
		- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip && unzip -q ninja-linux.zip -d ~/bin && pyenv local 3.6 && pip3 install meson; fi

		script:
		- cd bali-phy-build
		- ../configure --prefix=$HOME/local
		- make -j3 install
		- make check
		- meson build --prefix=$HOME/bali-phy
		- ninja -C build test
		- ninja -C build install

		env:
		global:
		- secure: ZWEqJt9rWuQQ0uJYx1ZDKASbe1lNOq8dLxfGzRq6ItWZ7v42iFik7WQzQNRcHskfkLnpX48+3iGz8+M6QFIY+y9KKk3hgsR+zEW/kZSlBxA+VSIOP2lV3Z5zBlnO3m0WoLTrDABBfHRFGqjU2JcM2tXLc6TyislMV5Y20edJgNWLNajGdei7+7A48UBSPq1hIA0fU2LZAScdy2TxcbpL8x/aAmE5T1IRBewjXK1x4CARmLJYXZfJDeCUpif2VoApEGwCOqXQtTKrBpJbUQ+sYi+JHCGh3oDFoHmuFJeEM7HrUOJBOI8k5A7wRq/+JESGIa2UObdHu1GZDVxj22YRRSSzQTEy9QyTnFTdYbkkcG83wwZ/57EOAhKA1TqwEDj8Hhux/oQAkR/S27iQ2vCvUtx5wlzX4L2KhinHhVVW7EPs6NQLc8FiRHjAzSaEmLph8UXlSxa+2Yx/+wyQXH3SmJi4r470r5F/orVhZBkw2k7CPhg7YfBPFDODkg+QMIk60hiVE6n/ToeTOCTxti0Lfajq6pzl+KFs/pungbnwZqx8neVGkpE0Z5Lhgr1KV/W17/AxKC62+BIGTRSQXpCxignVXbWqvzLCGCgSxiJ7Y+uphS1UV5lz1EAPTqnPkcxe+1MV64vAe8zMvug4Mb2DsV9QjIvjot1X+FlyzHWhMpc=

CONTRIBUTING.md

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		# Contributing to BAli-Phy

		We are excited to see what you will contribute!

		## Patches

		Patches should be sent through a github PR ("pull request"). This causes the CI tests to run for the patch.

		See the [Developer's Guide](http://www.bali-phy.org/developer.html) for information how to modify bali-phy.
		No newline at end of file

README.md

+7 −29

Original line number	Diff line number	Diff line
		[![Build Status](https://www.travis-ci.org/bredelings/BAli-Phy.svg?branch=master
		)](https://www.travis-ci.org/bredelings/BAli-Phy)
		[![Appveyor](https://ci.appveyor.com/api/projects/status/q68hnnoelqqvwsy2?svg=true)](https://ci.appveyor.com/project/bredelings/bali-phy)

		Install
		-------
		@@ -14,6 +15,7 @@ Documentation
		* [http://bali-phy.org/](http://bali-phy.org/)
		* [Manual](http://bali-phy.org/README.xhtml)
		* [Tutorial](http://bali-phy.org/Tutorial3.html)
		* [Developer's Guide](http://bali-phy.org/developer.html)

		The Manual describes [how to install](http://bali-phy.org/README.xhtml#installation) bali-phy in detail. Simplified instructions are below.

		@@ -32,12 +34,9 @@ If you build with meson and ninja, you need
		* python3
		* ninja

		If you build with autotools, you need
		* autoconf
		* automake
		* libtool
		You need meson version >= 0.45 to build bali-phy.

		Build with meson (fastest)
		Build with meson
		----------------
		```bash
		sudo apt-get install g++ libcairo2-dev ninja-build python3
		@@ -51,32 +50,11 @@ python3 -m venv meson
		source meson/bin/activate
		pip3 install meson

		meson build --prefix=$HOME/Applications/bali-phy # Two warnings about 'export_dynamic' are OK.
		cd build
		ninja install
		meson build --prefix=$HOME/Applications/bali-phy
		ninja -C install
		ninja -C test
		```

		Build with autotools (slower)
		-------------------

		```bash
		sudo apt-get install g++ libcairo2-dev autoconf automake libtool

		git clone https://github.com/bredelings/BAli-Phy.git
		cd BAli-Phy/
		git submodule update --init

		./bootstrap.sh
		mkdir build
		cd build
		../configure --prefix=$HOME/Applications/bali-phy/
		make
		make check
		make install
		```

		Additional options to `configure` can be revealed by supplying the `--help` flag.

		Adding bali-phy to your `$PATH`
		------------------------------