Commit 599a641b authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.1.1+dfsg

parent 5d6aec54

.clang-format

0 → 100644
+14 −0
Original line number Diff line number Diff line 
BasedOnStyle:  Google

BreakBeforeBraces: Mozilla



AllowShortLoopsOnASingleLine: false

AccessModifierOffset: -4

BreakConstructorInitializersBeforeComma: true

ColumnLimit: 100

IndentWidth: 4

PointerAlignment: Left

DerivePointerAlignment: false

TabWidth: 4



ReflowComments: false  # protect ASCII art in comments

KeepEmptyLinesAtTheStartOfBlocks: true

.gitignore

+6 −1
Original line number Diff line number Diff line 
make/Config.mk

*.o

*.d

build/

build*/

.project

.cproject

.settings
@@ -9,3 +9,8 @@ ConsensusCore.xcodeproj 
*~

bin/

obj/

/.p4config



# Meson WrapDB stuff

subprojects/packagecache/

subprojects/googletest*

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ include make/Defs.mk 
all: lib



lib:

	${MAKE} -f make/Cpp.mk

	${MAKE} -f make/Cpp.mk -j8



#

# SWIG targets

README.md

+4 −0
Original line number Diff line number Diff line
@@ -36,3 +36,7 @@ client tools to use the ``libConsensusCore.so``, the library needs to 
be copied to the bin/{Debug,Release} directory for every assembly that

transitively depends on ConsensusCore and creates an executable.  You

can do this using a pre-build rule.



DISCLAIMER

----------

THIS WEBSITE AND CONTENT AND ALL SITE-RELATED SERVICES, INCLUDING ANY DATA, ARE PROVIDED "AS IS," WITH ALL FAULTS, WITH NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, NON-INFRINGEMENT OR FITNESS FOR A PARTICULAR PURPOSE. YOU ASSUME TOTAL RESPONSIBILITY AND RISK FOR YOUR USE OF THIS SITE, ALL SITE-RELATED SERVICES, AND ANY THIRD PARTY WEBSITES OR APPLICATIONS. NO ORAL OR WRITTEN INFORMATION OR ADVICE SHALL CREATE A WARRANTY OF ANY KIND. ANY REFERENCES TO SPECIFIC PRODUCTS OR SERVICES ON THE WEBSITES DO NOT CONSTITUTE OR IMPLY A RECOMMENDATION OR ENDORSEMENT BY PACIFIC BIOSCIENCES.

bamboo_build.sh

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -vex



################

# DEPENDENCIES #

################



## Load modules

type module >& /dev/null || . /mnt/software/Modules/current/init/bash



module purge



module load meson

module load ninja



module load gcc

module load ccache



module load boost



module load gtest

module load python/2

module load swig





BOOST_ROOT="${BOOST_ROOT%/include}"

# unset these variables to have meson discover all

# boost-dependent variables from BOOST_ROOT alone

unset BOOST_INCLUDEDIR

unset BOOST_LIBRARYDIR



export CXX="ccache g++"

export CCACHE_BASEDIR="${PWD}"



if [[ $USER == bamboo ]]; then

  export CCACHE_DIR=/mnt/secondary/Share/tmp/bamboo.${bamboo_shortPlanKey}.ccachedir

  export CCACHE_TEMPDIR=/scratch/bamboo.ccache_tempdir

fi



export ENABLED_TESTS="true"



source scripts/ci/setup.sh

source scripts/ci/build.sh

source scripts/ci/test.sh