Merge pull request #19 from rodlie/master

1.2.0

Author: rodlie

.travis.yml

@@ -1,19 +1,13 @@
+sudo: required
 language: cpp
 compiler: g++
-dist: xenial
-sudo: required
-
-before_install:
-  - sudo apt remove --purge imagemagick imagemagick-common
-  - sudo apt-get update
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+    - os: osx
+      osx_image: xcode8
 
-install:
-  - sudo apt-get install cmake tree qtbase5-dev libpng-dev libjpeg-dev liblcms2-dev libtiff-dev libbz2-dev zlib1g-dev liblzma-dev
-  - sudo apt-get install scons autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool
-  - sudo apt-get install libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make
-  - sudo apt-get install openssl p7zip-full patch perl pkg-config python ruby sed unzip wget xz-utils wine
-  - sudo apt-get install libfreetype6-dev libfontconfig1-dev
-  
 script:
   - sh res/travis.sh
 

CMakeLists.txt

@@ -57,6 +57,10 @@ set(COMPANY "Cyan")
 set(COPYRIGHT "Copyright Ole-Andre Rodlie, INRIA. All rights reserved.")
 set(IDENTIFIER "net.fxarena.cyan")
 
+if(CMAKE_BUILD_TYPE MATCHES RELEASE)
+    add_definitions(-DQT_NO_DEBUG_OUTPUT)
+endif()
+
 if(APPLE)
     set(ICON_FILE ${RESOURCE_FOLDER}/${PROJECT_NAME}.icns)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")

cyan.pro

@@ -59,8 +59,18 @@ TEMPLATE = app
 CONFIG += c++11
 QT_CONFIG -= no-pkg-config
 CONFIG += link_pkgconfig
-PKGCONFIG += lcms2 ImageMagick++
-LIBS += `pkg-config --libs --static ImageMagick++`
+PKGCONFIG += lcms2
+MAGICK_CONFIG = ImageMagick++
+!isEmpty(MAGICK): MAGICK_CONFIG = $${MAGICK}
+PKG_CONFIG_BIN = pkg-config
+!isEmpty(CUSTOM_PKG_CONFIG): PKG_CONFIG_BIN = $${CUSTOM_PKG_CONFIG}
+
+PKGCONFIG += $${MAGICK_CONFIG}
+LIBS += `$${PKG_CONFIG_BIN} --libs --static $${MAGICK_CONFIG}`
+
+isEmpty(PREFIX): PREFIX = /usr/local
+isEmpty(DOCDIR): DOCDIR = $$PREFIX/share/doc
+isEmpty(MANDIR): MANDIR = $$PREFIX/share/man
 
 DEFINES += CYAN_VERSION=\"\\\"$${VERSION}$${VERSION_TYPE}\\\"\"
 DEFINES += CYAN_GIT=\"\\\"$${GIT}\\\"\"
@@ -69,10 +79,55 @@ QMAKE_TARGET_PRODUCT = "$${TARGET}"
 QMAKE_TARGET_DESCRIPTION = "$${TARGET}"
 QMAKE_TARGET_COPYRIGHT = "Copyright Ole-Andre Rodlie, INRIA"
 
+CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
+
+unix:!mac {
+    target.path = $${PREFIX}/bin
+    target_desktop.path = $${PREFIX}/share/applications
+    target_desktop.files = res/cyan.desktop
+    target_docs.path = $${DOCDIR}/$${TARGET}-$${VERSION}
+    target_docs.files = LICENSE
+    INSTALLS += target target_desktop target_docs
+
+    icon16.files = res/hicolor/16x16/apps/cyan.png
+    icon16.path = $${PREFIX}/share/icons/hicolor/16x16/apps
+    icon20.files = res/hicolor/20x20/apps/cyan.png
+    icon20.path = $${PREFIX}/share/icons/hicolor/20x20/apps
+    icon22.files = res/hicolor/22x22/apps/cyan.png
+    icon22.path = $${PREFIX}/share/icons/hicolor/22x22/apps
+    icon24.files = res/hicolor/24x24/apps/cyan.png
+    icon24.path = $${PREFIX}/share/icons/hicolor/24x24/apps
+    icon32.files = res/hicolor/32x32/apps/cyan.png
+    icon32.path = $${PREFIX}/share/icons/hicolor/32x32/apps
+    icon48.files = res/hicolor/48x48/apps/cyan.png
+    icon48.path = $${PREFIX}/share/icons/hicolor/48x48/apps
+    icon64.files = res/hicolor/64x64/apps/cyan.png
+    icon64.path = $${PREFIX}/share/icons/hicolor/64x64/apps
+    icon72.files = res/hicolor/72x72/apps/cyan.png
+    icon72.path = $${PREFIX}/share/icons/hicolor/72x72/apps
+    icon96.files = res/hicolor/96x96/apps/cyan.png
+    icon96.path = $${PREFIX}/share/icons/hicolor/96x96/apps
+    icon128.files = res/hicolor/128x128/apps/cyan.png
+    icon128.path = $${PREFIX}/share/icons/hicolor/128x128/apps
+    icon160.files = res/hicolor/160x160/apps/cyan.png
+    icon160.path = $${PREFIX}/share/icons/hicolor/160x160/apps
+    icon192.files = res/hicolor/192x192/apps/cyan.png
+    icon192.path = $${PREFIX}/share/icons/hicolor/192x192/apps
+    icon256.files = res/hicolor/256x256/apps/cyan.png
+    icon256.path = $${PREFIX}/share/icons/hicolor/256x256/apps
+    icon512.files = res/hicolor/512x512/apps/cyan.png
+    icon512.path = $${PREFIX}/share/icons/hicolor/512x512/apps
+
+    INSTALLS += icon16 icon20 icon22 \
+                icon24 icon32 icon48 \
+                icon64 icon72 icon96 \
+                icon128 icon160 icon192 \
+                icon256 icon512
+}
 mac {
     ICON = res/Cyan.icns
     QMAKE_INFO_PLIST = res/Info.plist
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
     QMAKE_CXXFLAGS += -fopenmp
     QMAKE_LFLAGS += -fopenmp
 }

docs/ChangeLog

@@ -1,4 +1,4 @@
-## 1.2.0 - TBA
+## 1.2.0 - 20181203
 
  * Major "behind-the-scene" changes
  * Improved performance

docs/README.md

@@ -19,12 +19,11 @@ Cyan is an open source cross-platform image viewer and converter, designed for [
 
 # Requirements
 
- * 4GB RAM (+)
- * Microsoft Windows 7 x64 (+)
- * Apple Mac OS X Lion 10.7 (+)
- * Linux/FreeBSD (source-only)
+ * [![Download for Windows](https://github.com/rodlie/cyan/raw/master/docs/images/download_for_windows.png)](https://github.com/rodlie/cyan/releases/latest) Microsoft Windows 7/8/10 x64
+ * [![Download for Mac](https://github.com/rodlie/cyan/raw/master/docs/images/download_for_mac.png)](https://github.com/rodlie/cyan/releases/latest) Apple Mac OS X 10.10-10.14
+ * [![Download for Linux](https://github.com/rodlie/cyan/raw/master/docs/images/download_for_linux.png)](https://github.com/rodlie/cyan/releases/latest) GNU/Linux x86_64 (glibc 2.23+/libgcc 5.4+)
 
- Recommended requirements and additional files:
+## Recommended
 
  * A bitmap editor
    * [GIMP](https://www.gimp.org)

docs/_config.yml

@@ -1,5 +1,5 @@
 theme: jekyll-theme-minimal
 title: Cyan
-description: Open Source prepress image viewer and converter
+description: Open source prepress image viewer and converter
 logo: https://github.com/rodlie/cyan/raw/master/res/hicolor/256x256/apps/cyan.png
-show_downloads: true
+show_downloads: false

docs/_layouts/default.html

@@ -18,7 +18,8 @@
           <img src="{{site.logo | relative_url}}" alt="Logo" />
         {% endif %}
 
-        <a target="_blank" href="https://sourceforge.net/projects/prepress/files/latest/download"><img alt="Download Cyan" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a>
+        <!-- <a target="_blank" href="https://sourceforge.net/projects/prepress/files/latest/download"><img alt="Download Cyan" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a> -->
+        <a target="_blank" href="https://github.com/rodlie/cyan/releases/latest"><img alt="Download Cyan" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a>
 
         {% if site.show_downloads %}
         <ul class="downloads">

docs/cyan.html

@@ -105,7 +105,7 @@ <h1 id="open-source">Open Source</h1>
 _3RDPARTY_
 </p>
 
-<p align="justify">The source repository is hosted on <a href="https://github.com/rodlie/cyan">Github</a> and the binaries are hosted on <a href="https://sourceforge.net/projects/prepress">Sourceforge</a>. <a href="https://travis-ci.org/">Travis CI</a> is used to build and deploy the binaries.</p>
+<p align="justify">Hosted on <a href="https://github.com/rodlie/cyan">Github</a> and <a href="https://sourceforge.net/projects/prepress">Sourceforge</a>. <a href="https://travis-ci.org/">Travis CI</a> is used to build and deploy the binaries.</p>
 
 <p></p>