Merge branch 'master' into openjpeg-2.1

5 files changed, 62 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index d53145f3..fbbcdf39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,10 @@ matrix:
   include:
     - os: osx
       compiler: clang
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_DEPLOY=1
     - os: linux
       compiler: gcc
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_DEPLOY=1
     - os: linux
       compiler: gcc
       env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
@@ -65,3 +65,19 @@ install:
 script:
   - ./tools/travis-ci/run.sh
   - ./tools/travis-ci/abi-check.sh
+
+before_deploy:
+  - export OPJ_RELEASE_PKG_FILE=$(ls *.zip)
+  - echo "deploying $OPJ_RELEASE_PKG_FILE to GitHub releases"
+
+deploy:
+  provider: releases
+  api_key:
+    secure: Npi13uOffALCVNwea4p4q8v85Lo/WsRqaeZQcWrAkt8MxRnfvWQtmnuwmHnVB6Cig+T1lVUHrklOaJIApIb6nkGq3CS/9bD8+SCS2NEdAAP/QYWnBi0ubWXVMRyDLypmwRpzLNSZ0xLYGFUl2PjieZYKRcz1dd/J7S+FnXhPtdjXweq0FS63zTcMe7ggjfmzSOWUCEFmMjZPaM0Be+3PweieCO1dxlHuy7ugCkx2S7d+5hNsicIhQmTADjqtJAkHoMhYqu6/yLFxhjO/+f938PATFULdODTvjCsUwdN/ySWi1Oj4uPAntfytZP7H6YrzLh8dS73QCsdkhhDJIgJskHIBSbRyyEVUnOvQgD9VaBVGHtc1KtZQTwc41OUO3BGPHl97s3oX6bqWqo/L53dB3TPHGx+1+2HL/F0zaDZuHhAKMkPwe8LFPMPB/ur65zXMHjnWb2ZTVVdoIvkbQ7nu8ApI60ejxocYBsEyAuC2CPXU2ki4jdEhm0E1hIziWNE9/LTuM17ziQuJ6WpXOSMrfP4o5aVDmLp5ZGBSocrspOksgyI9XogHaO/r+Y6N3exy+giObFfMHkZVUpsKrKmtOJ7TC1Vg5HsYGlWW8RN8dkJV47bUXm9K4sMos9eYMUt/czykPAs+132cogpII3QxXpFZQqZg6SEPVfOiyqQzTUI=
+  file_glob: true
+  file: "${OPJ_RELEASE_PKG_FILE}"
+  skip_cleanup: true
+  on:
+    repo: uclouvain/openjpeg
+    tags: true
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f3753ff..9b187a13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ include_regular_expression("^.*$")
 # OPENJPEG version number, useful for packaging and doxygen doc:
 set(OPENJPEG_VERSION_MAJOR 2)
 set(OPENJPEG_VERSION_MINOR 1)
-set(OPENJPEG_VERSION_BUILD 0)
+set(OPENJPEG_VERSION_BUILD 1)
 set(OPENJPEG_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
 set(PACKAGE_VERSION
@@ -52,6 +52,7 @@ set(PACKAGE_VERSION
 #   2.0   |  6
 #   2.0.1 |  6
 #   2.1   |  7
+#   2.1.1 |  7
 # above is the recommendation by the OPJ team. If you really need to override this default,
 # you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
 # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
diff --git a/NEWS b/NEWS
index 1a6aaa07..6185109b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,14 @@
 
-OpenJPEG NEWS - user visible changes
-====================================
+OpenJPEG NEWS
+=============
 
-Changes from OpenJPEG 2.0.0 to OpenJPEG 2.X.X
-----------------------------------------------
+OpenJPEG 2.1.1
+--------------
+* Huge amount of critical bugfixes
+
+
+OpenJPEG 2.1.0
+--------------
 
 New Features:
 
@@ -42,8 +47,8 @@ Misc:
 	* Huge amount of bug fixes. See CHANGES for details.
 
 
-Changes from OpenJPEG 1.5.x to OpenJPEG 2.0.0
-----------------------------------------------
+OpenJPEG 2.0.0
+--------------
 
 New Features:
 
diff --git a/appveyor.yml b/appveyor.yml
index d5cc1620..9492f040 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,14 +2,16 @@ version: 2.1.1.{build}
 branches:
   except:
   - coverity_scan
-skip_tags: true
+skip_tags: false
 clone_depth: 50
 environment:
   matrix:
   - OPJ_CI_ARCH: x86
     OPJ_CI_VSCOMNTOOLS: $(VS140COMNTOOLS)
+    OPJ_CI_DEPLOY: 1
   - OPJ_CI_ARCH: x64
     OPJ_CI_VSCOMNTOOLS: $(VS140COMNTOOLS)
+    OPJ_CI_DEPLOY: 1
   - OPJ_CI_ARCH: x86
     OPJ_CI_VSCOMNTOOLS: $(VS100COMNTOOLS)
 install:
@@ -20,4 +22,17 @@ build_script:
 
     bash ./tools/travis-ci/run.sh
 test: off
-deploy: off
+#before_deploy:
+#- cmd: c:\cygwin\bin\bash ./tools/travis-ci/before_deploy.sh
+deploy:
+  release: openjpeg-$(appveyor_repo_tag_name)
+  description: 'OpenJPEG $(appveyor_repo_tag_name) has been released'
+  provider: GitHub
+  auth_token:
+    secure: Huk03f1heCD/HMyA+4ZeVmICdmKn9rPxK5p8/KxzgL+FtJDHlqcllcCrtN9bDxRH # your encrypted token from GitHub
+  artifact: /.*\.zip/            # upload all zip packages to release assets
+  draft: true
+  prerelease: false
+  on:
+    branch: openjpeg-*
+    appveyor_repo_tag: true        # deploy on tag push only
diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh
index e8c5a281..ceaa14d0 100755
--- a/tools/travis-ci/run.sh
+++ b/tools/travis-ci/run.sh
@@ -272,4 +272,18 @@ New/unknown test failure found!!!
 	fi
 fi
 
+echo "OPJ_CI_DEPLOY: ${OPJ_CI_DEPLOY:-}"
+echo "TRAVIS_TAG: ${TRAVIS_TAG:-}"
+echo "APPVEYOR_REPO_TAG: ${APPVEYOR_REPO_TAG:-}"
+echo "APPVEYOR_REPO_TAG_NAME: ${APPVEYOR_REPO_TAG_NAME:-}"
+if [ "${OPJ_CI_DEPLOY:-}" == "1" ]; then
+	if [ "${TRAVIS_TAG:-}" != "" ]; then
+		cpack -G ZIP -P "OpenJPEG-${TRAVIS_TAG}-${OPJ_BUILDNAME_TEST}.zip"
+	fi
+	if [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then
+		cpack -G ZIP -P "OpenJPEG-${APPVEYOR_REPO_TAG_NAME}-${OPJ_BUILDNAME_TEST}.zip"
+		appveyor PushArtifact "OpenJPEG-${APPVEYOR_REPO_TAG_NAME}-${OPJ_BUILDNAME_TEST}.zip"
+	fi
+fi
+
 exit ${OPJ_CI_RESULT}