Commit 83347c0a authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.5.1

parent 37e45806

.gitattributes

0 → 100644
+43 −0
Original line number Diff line number Diff line 
# Set the deifault behavior, in case people don't have core.autocrlf set.

*        text=auto



# Explicitly declare text files you want to always be normalized and converted

# to native line endings on checkout.



# C/C++

*.c      text

*.cpp    text

*.cxx    text

*.cc     text

*.h      text

*.hpp    text



# Python

*.py     text



# Object Pascal

*.pas    text



# Markdown

*.md     text



# CMake

*.cmake  text



# Data

*.xml    text

*.dat    text



# Misc Windows files

*.def    text

*.txt    text

*.bat    text



# Doxygen

*.doxy   text



# Installer scripts (Inno?)

*.iss    text



# RoadRunner custom

*.rrtest text

.travis.yml

+8 −6
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ before_install: 
  # install dependencies

  - sudo apt-get -y install cmake swig python-dev python-numpy llvm-3.5-dev



  - mkdir ~/install



  # install roadrunner dependencies via apt:

  - sudo sh -c 'echo "\n\ndeb http://cdn.rawgit.com/sys-bio/roadrunner-debs/master ./ \n\n" >> /etc/apt/sources.list'

  - sudo cat /etc/apt/sources.list

  - sudo apt-get update -qq

  - sudo apt-get -y --force-yes install libroadrunner-deps-dev

  - mkdir ~/debs

  - cd ~/debs

  - wget http://cdn.rawgit.com/sys-bio/roadrunner-debs/b8288d2f3e9623ad0f13ff8a1aa97fabf481413a/libroadrunner-deps_1.5_amd64.deb

  - sudo dpkg -i libroadrunner-deps_1.5_amd64.deb

  - sudo cp /usr/local/include/rr-libstruct/* /usr/local/include

  - sudo cp /usr/local/include/clapack/* /usr/local/include



  - mkdir ~/install



  - echo "TRAVIS_BUILD_DIR $TRAVIS_BUILD_DIR"

  # build roadrunner:

CMakeLists.txt

+5 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ project(rr) 
# source files expose library version information



set(ROADRUNNER_VERSION_MAJOR 1)

set(ROADRUNNER_VERSION_MINOR 4)

set(ROADRUNNER_VERSION_PATCH 8)

set(ROADRUNNER_VERSION_MINOR 5)

set(ROADRUNNER_VERSION_PATCH 1)



set(ROADRUNNER_VERSION "${ROADRUNNER_VERSION_MAJOR}.${ROADRUNNER_VERSION_MINOR}.${ROADRUNNER_VERSION_PATCH}")
@@ -208,7 +208,7 @@ else() 
endif()



find_library(LIBSBML_LIBRARY sbml libsbml HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib)

find_library(LIBSBML_STATIC_LIBRARY sbml-static libsbml-static HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib)

find_library(LIBSBML_STATIC_LIBRARY sbml-static libsbml-static HINTS ${THIRD_PARTY_INSTALL_FOLDER}/lib ${THIRD_PARTY_INSTALL_FOLDER}/lib64)

find_path(LIBSBML_INCLUDE_DIR sbml/SBMLTypes.h HINTS ${THIRD_PARTY_INSTALL_FOLDER}/include)



# find libSBML deps
@@ -241,6 +241,7 @@ if (${BUILD_LLVM}) 
        ${LIBRARY_OUTPUT_PATH}

        ${THIRD_PARTY_FOLDER}/dependencies/libsbml/lib

        ${THIRD_PARTY_INSTALL_FOLDER}/lib

        ${THIRD_PARTY_INSTALL_FOLDER}/lib64

        ${LLVM_LIBRARY_DIRS}

    )

else()
@@ -248,6 +249,7 @@ else() 
        ${LIBRARY_OUTPUT_PATH}

        ${THIRD_PARTY_FOLDER}/dependencies/libsbml/lib

        ${THIRD_PARTY_INSTALL_FOLDER}/lib

        ${THIRD_PARTY_INSTALL_FOLDER}/lib64

    )

endif (${BUILD_LLVM})

LICENSE.txt

+1 −1
Original line number Diff line number Diff line 
Licensing and Distribution Terms for RoadRunner

 * Copyright (C) 2012-2013

 * Copyright (C) 2012-2018

 *   University of Washington, Seattle, WA, USA

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

README.md

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
[![GitHub version](https://badge.fury.io/gh/sys-bio%2Froadrunner.svg)](http://badge.fury.io/gh/sys-bio%2Froadrunner)

[![Build Status](https://travis-ci.org/sys-bio/roadrunner.svg?branch=develop)](https://travis-ci.org/sys-bio/roadrunner)



Copyright 2013-2016

Copyright 2013-2018



E. T. Somogyi <sup>1</sup>, J. K. Medley <sup>3</sup>, M. T. Karlsson <sup>2</sup>, M. Swat <sup>1</sup>, M. Galdzicki <sup>3</sup>, K. Choi <sup>3</sup>, W. Copeland <sup>3</sup> and H. M. Sauro <sup>3</sup>