Commit ff48318e authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.31.1+dfsg

parent 07b8965e

.gitignore

+12 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ Makefile.Debug 
.qmake.stash

*.xcodeproj/



# Windows generated files

*.obj

**/Win32/Debug/*

ugene.VC.db

ugene.VC.VC.opendb



# Generated ugene shell launcher

/ugene
@@ -44,3 +50,9 @@ ugene.pro.user 


# CLion build dir

cmake-build-*



# Qt generated

**/GeneratedFiles/*



# NGS taxonomy and databases

data/ngs_classification
 
 No newline at end of file

.gitmodules

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
	path = src/libs_3rdparty/QSpec

	url = https://github.com/ugeneunipro/QSpec.git

	branch = ugene

	ignore = dirty
 
 No newline at end of file

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ install: 
  - sudo apt-get update -qq

  - sudo apt-get install qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev libqt5svg5-dev

  - sudo apt-get install qt5-default qttools5-dev-tools qtscript5-dev

  - sudo apt-get install libxtst-dev libprocps3-dev

  - sudo apt-get install libxtst-dev



script:

  - qmake ugene.pro CONFIG+=x64 UGENE_EXCLUDE_LIST_ENABLED=1 UGENE_USE_BUNDLED_ZLIB=0

CMakeLists.txt

+5 −5
Original line number Diff line number Diff line
@@ -5,18 +5,18 @@ 
#   * add Qt5_DIR variable to File->Settings->Build,Execution,Deployment->CMake pointing to valid QT dir.

#   * add UGENE_TRANSLATION_FILE environment variable to the RUN configuration and point it to *.qm file produced by qmake build



cmake_minimum_required(VERSION 3.4)

cmake_minimum_required(VERSION 3.9)

project(ugene)



#set(CMAKE_VERBOSE_MAKEFILE ON)



set(UGENE_VERSION 1.25.0-dev)

set(UGENE_VERSION 1.29.0-dev)

set(UGENE_VER_MAJOR 1)

set(UGENE_VER_MINOR 25)

set(UGENE_VER_MINOR 29)

set(UGENE_VER_PATCH 0)



set(UGENE_MIN_VERSION_SQLITE 1.13.0)

set(UGENE_MIN_VERSION_MYSQL 1.16.0)

set(UGENE_MIN_VERSION_SQLITE 1.25.0)

set(UGENE_MIN_VERSION_MYSQL 1.25.0)



add_definitions(

        -DUGENE_VERSION=${UGENE_VERSION}

README.md

+3 −5
Original line number Diff line number Diff line
@@ -6,14 +6,12 @@ 


Make sure the Qt (>= 5.2.1 and < 5.6) development libraries are installed:



* Ubuntu 16.04: `sudo apt-get install qt5-default qttools5-dev-tools qtscript5-dev libqt5svg5-dev libqt5webkit5-dev libprocps4-dev`

* Ubuntu 14.04: `sudo apt-get install qt5-default qttools5-dev-tools qtscript5-dev libqt5svg5-dev libqt5webkit5-dev libprocps3-dev`

* Ubuntu >=14.04: `sudo apt-get install qt5-default qttools5-dev-tools qtscript5-dev libqt5svg5-dev libqt5webkit5-dev`

* Ubuntu 12.04:

    * Download and install Qt 5.5.1: www.qt.io/download-open-source/

    * Set the system variable: export PATH=$PATH:~/Qt5.5.1/5.5/gcc_64/bin

    * `sudo apt-get install g++ libgl1-mesa-dev libproc-dev libglu1-mesa-dev`

    * `sudo ln -s /usr/lib/libproc.so /usr/lib/libprocps.so`

* Fedora:       `sudo yum install qt5-qtscript-devel qt5-qtbase-devel qt5-qtsvg-devel qt5-linguist qt5-qtwebkit-devel gcc-c++ redhat-rpm-config procps-ng-devel mesa-libGLU-devel`

    * `sudo apt-get install g++ libgl1-mesa-dev libglu1-mesa-dev`

* Fedora:       `sudo yum install qt5-qtscript-devel qt5-qtbase-devel qt5-qtsvg-devel qt5-linguist qt5-qtwebkit-devel gcc-c++ redhat-rpm-config mesa-libGLU-devel`

* Arch Linux:   `sudo pacman -S qt`

* Mac OS X: download from Qt official site (http://www.qt.io/download/)

* Windows: download from Qt official site (http://www.qt.io/download/)