Commit ef599644 authored by Daniel Lee's avatar Daniel Lee 🐐
Browse files

Merge branch 'development' into 'main'

2.8.1 release

See merge request sepdssme/PublicDecompWT!7
parents a98ebb04 e5c11940
......@@ -2,6 +2,13 @@
The versioning of PublicDecompWT follows [Semantic Versioning](https://semver.org/) from version 2.06.
This changelog uses [keep a changelog](https://keepachangelog.com/en/1.0.0/) as its template.
## [2.8.1] - 2021-10-22
### Added
- Conda package for windows
### Fixed
- Remove mentions of cygwin from README
## [2.8.0] - 2021-07-14
### Added
- Support for build with Native Tools for VS (32 and 64 bit).
......
......@@ -3,7 +3,7 @@ description: Decompress XRIT files
license_spdx: Apache-2.0
copyright: EUMETSAT
version: 2.7.1
version: 2.8.1
home_url: http://www.eumetsat.int/website/home/Data/DataDelivery/SupportSoftwareandTools/index.html
# Whenever the EUMETSAT copyright and license is not specified inside
......@@ -30,4 +30,4 @@ about_resource: ./DISE/DISE.dsp
about_resource: ./DISE/DISE.plg
about_resource: ./DISE/Makefile
about_resource: ./DISE/DISE.opt
about_resource: ./xRITDecompress/Makefile
\ No newline at end of file
about_resource: ./xRITDecompress/Makefile
......@@ -5,7 +5,7 @@ Note that it only decompresses compressed XRIT files.
It includes a decoder for JPEG, WT and T4.
# Build instructions
## Linux, Solaris and Windows with Cygwin or Native Tools
## Linux, Solaris and Windows with Native Tools for VS
### Required software
- GNU-GCC (`g++`, tested with version 4.2.x or previous version 3.x)
- GNU-make (`make`, tested with version 3.79.1)
......@@ -23,6 +23,18 @@ The compiled image will be stored in the `xRITDecompress` directory (image name
- To clean, navigate into PublicDecompWT folder and run "nmake /f makefile.vc clean"
The procedure has been tested with Visual Studio Community 2019
### Build the conda package
- It is possible to build the conda package for Linux and Windows (64 bit)
- Prerequisites:
- both platforms: `conda` and `conda-build` must be installed
- Windows: Visual Studio Community 2019 must be installed
- Navigate to the `conda` folder in PublicDecompWT and execute:
`conda build .`
## Windows and Cygwin
The source code is reported to be compilable with cygwin64, but the feature is not supported officially
# Usage
You can specify:
......@@ -37,14 +49,12 @@ Alternatively you can invoke the program with just the XRIT input file name:
```bash
$ xRITDecompress $XRITFilename
```
In Windows the program must be invoked with the `.exe` extension, i.e.
```bash
$ xRITDecompress.exe $XRITFilename
```
The output is the decompressed XRITFile in the current directory (same file name without extension `C`).
# Testing
Under Linux/Unix/Cygwin you can run `make testDx` to verify the software works correctly.
\ No newline at end of file
Under Linux/Unix you can run `make testDx` to verify the software works correctly.
echo on
xcopy /E PublicDecompWTMakefiles PublicDecompWT
call "C:\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
nmake /f makefile.vc MSVC_VER=1910
nmake /f makefile.vc MSVC_VER=1910 dll
IF "%GDAL_DRIVER_PATH%"=="" SET GDAL_DRIVER_PATH=%PREFIX%\Library\lib\gdalplugins
IF not exist %GDAL_DRIVER_PATH% mkdir %GDAL_DRIVER_PATH%
copy gdal_MSG.dll %GDAL_DRIVER_PATH%
set ACTIVATE_DIR=%PREFIX%\etc\conda\activate.d
set DEACTIVATE_DIR=%PREFIX%\etc\conda\deactivate.d
IF not exist %ACTIVATE_DIR% mkdir %ACTIVATE_DIR%
IF not exist %DEACTIVATE_DIR% mkdir %DEACTIVATE_DIR%
copy %RECIPE_DIR%\install_msg_gdal_driver_lib.bat %ACTIVATE_DIR%\install_msg_gdal_driver_lib.bat
copy %RECIPE_DIR%\uninstall_msg_gdal_driver_lib.bat %DEACTIVATE_DIR%\uninstall_msg_gdal_driver_lib.bat
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
nmake /f makefile.vc /e install DEST_DIR=$(PREFIX)
package:
name: public-decomp-wt
version: 2.8.0
version: 2.8.1
source:
- path: ../
......@@ -11,6 +11,7 @@ build:
requirements:
build:
- cmake # [win]
- make # [not win]
- pkg-config >=0.21 # [not win]
- {{ compiler('c') }} # [not win]
- {{ compiler('cxx') }} # [not win]
......@@ -26,5 +27,5 @@ about:
license_family: APACHE
license_file: {{SRC_DIR}}/LICENSE
summary: The PublicDecompWT tool can be build in Windows, Linux and Solaris. Note that it only decompresses compressed XRIT files. It includes a decoder for JPEG, WT and T4.
description: The PublicDecompWT tool source code can be build in Windows, Linux and Solaris; however the conda package public-decomp-wt is only for Linux. Note that it only decompresses compressed XRIT files. It includes a decoder for JPEG, WT and T4.
description: The PublicDecompWT tool source code can be build in Windows, Linux and Solaris; however the conda package public-decomp-wt is only for Linux and Windows. Note that it only decompresses compressed XRIT files. It includes a decoder for JPEG, WT and T4.
......@@ -44,3 +44,7 @@ clean_xRITDecompress: clean_comp
clean: clean_xRITDecompress
-del *.obj
install: _xRITDecompress
mkdir $(DEST_DIR)\Scripts
copy xRITDecompress\xRITDecompress.exe $(DEST_DIR)\Scripts\
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment