Skip to content

Commit

Permalink
Update version to release 3.3.1 (#153)
Browse files Browse the repository at this point in the history
* Update version to release 3.3.1

* Sync 3_14 branch
  • Loading branch information
byrnHDF authored Aug 22, 2023
1 parent a983854 commit 51466c2
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 53 deletions.
47 changes: 10 additions & 37 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This workflow will build a Java project with Ant
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant

name: Java 1.14 CI
name: Java 3.3.1 CI

on:
workflow_dispatch:
# push:
# branches: [ "hdfview-3-1_14" ]
pull_request:
branches: [ "hdfview-3-1_14" ]
branches: [ "release/hdfview-3.3.1" ]

jobs:
get-base-names:
Expand All @@ -20,32 +20,13 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Get hdf4 release base name
# uses: robinraju/[email protected]
# with:
# repository: "HDFGroup/hdf4"
# tag: "snapshot"
# fileName: "last-file.txt"
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
version: 'tags/snapshot'
file: 'last-file.txt'

- name: Read base-name file
id: gethdf4base
run: echo "HDF4_NAME_BASE=$(cat last-file.txt)" >> $GITHUB_OUTPUT

- name: Get hdf5 release base name
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot-1.14'
file: 'last-file.txt'
run: echo "HDF4_NAME_BASE=hdf-4_2_16-2" >> $GITHUB_OUTPUT

- name: Read base-name file
id: gethdf5base
run: echo "HDF5_NAME_BASE=$(cat last-file.txt)" >> $GITHUB_OUTPUT
run: echo "HDF5_NAME_BASE=hdf5-1_14_2" >> $GITHUB_OUTPUT

build-linux:
runs-on: ubuntu-latest
Expand All @@ -65,9 +46,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
#version: 'tags/hdf-4_2_16-2'
#file: 'hdf-4_2_16-2-ubuntu-2204.tar.gz'
version: 'tags/snapshot'
version: 'tags/hdf-4_2_16-2'
file: '${{ needs.get-base-names.outputs.hdf4-name }}-ubuntu-2204.tar.gz'

- name: List files for the space (Linux)
Expand All @@ -94,9 +73,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
#version: 'tags/1.14.2'
#file: 'hdf5-1_14_2-ubuntu-2204.tar.gz'
version: 'tags/snapshot-1.14'
version: 'tags/hdf5-1_14_2'
file: '${{ needs.get-base-names.outputs.hdf5-name }}-ubuntu-2204.tar.gz'

- name: List files for the space (Linux)
Expand Down Expand Up @@ -140,7 +117,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: tgz-ubuntu-2204-binary
path: ${{ github.workspace }}/build/dist/HDFView-3.3.99-Linux-x86_64.tar.gz
path: ${{ github.workspace }}/build/dist/HDFView-3.3.1-Linux-x86_64.tar.gz
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`

- name: Test with Ant
Expand All @@ -167,9 +144,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf4'
#version: 'tags/hdf-4_2_16-2'
#file: 'hdf-4_2_16-2-win_vs2022.zip'
version: 'tags/snapshot'
version: 'tags/hdf-4_2_16-2'
file: '${{ needs.get-base-names.outputs.hdf4-name }}-win_vs2022.zip'

- name: Uncompress gh binary (Win)
Expand Down Expand Up @@ -206,9 +181,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
#version: 'tags/1.14.2'
#file: 'hdf5-1_14_2-win_vs2022.zip'
version: 'tags/snapshot-1.14'
version: 'tags/hdf5-1_14_2'
file: '${{ needs.get-base-names.outputs.hdf5-name }}-win_vs2022.zip'

- name: Uncompress gh binary (Win)
Expand Down Expand Up @@ -264,7 +237,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: zip-win-2022-binary
path: ${{ github.workspace }}/build/dist/HDFView-3.3.99-win64.zip
path: ${{ github.workspace }}/build/dist/HDFView-3.3.1-win64.zip
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`

- name: Test with Ant
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=hdf-view-3.3.99
VERSION=hdf-view-3.3.1
6 changes: 3 additions & 3 deletions docs/Build_HDFView.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ For example,

#hdf.lib.dir = ${env.HDFLIBS}/lib
#hdf5.lib.dir = ${env.HDF5LIBS}/lib
hdf.lib.dir = /<MYPATH>/HDF_Group/HDF/4.2.X/lib
hdf5.lib.dir = /<MYPATH>/HDF_Group/HDF5/1.14.X/lib
hdf.lib.dir = /<MYPATH>/HDF_Group/HDF/4.2.16/lib
hdf5.lib.dir = /<MYPATH>/HDF_Group/HDF5/1.14.2/lib

From the top HDFView source code directory run: /<path to ANT executable>/ant run

From the top HDFView source code directory run: /<path to ANT executable>/ant binaryPackage

Go into the build/dist directory that gets created to find the HDFView distribution.
For example, HDFView-3.3.0-Linux_64.tar.gz.
For example, HDFView-3.3.1-Linux_64.tar.gz.

Uncompress the HDFView binary and bring up HDFView by executing the bin/HDFView command.

2 changes: 1 addition & 1 deletion docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The current HDFView products can be downloaded at:

HDF Libraries
=============================================================================
This release was built and tested with HDF 4.2.x and HDF5 1.14.x.
This release was built and tested with HDF 4.2.16 and HDF5 1.14.2.

Windows ONLY: HDFView built with VS 2015 will require that
the Visual C++ Redistributable Packages be installed on your machine.
Expand Down
2 changes: 1 addition & 1 deletion docs/WorkingDirectory.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The following locations are involved in where the working directory for a file s
A. The initial working directory as described above.
B. The directory used to load a file specified as an argument on the command line invocation of HDFView.
java ... hdf.view.HDFView startDir=some_location "ARGS"
C. A location saved in the HDFView property file, .hdfview3.3.99 in the user home directory.
C. A location saved in the HDFView property file, .hdfview3.3.1 in the user home directory.
work.dir=dir_path
This is property is only set by using the "User Options" dialog.
D. The last directory used to load a file using the HDFView file search dialog.
Expand Down
16 changes: 8 additions & 8 deletions lib/macosx/distribution.plist
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-gui-script minSpecVersion="1">
<pkg-ref id="org.hdfgroup.HDFView-3.3.99"/>
<product id="org.hdfgroup.HDFView-3.3.99" version="3.3.99"/>
<title>HDFView-3.3.99</title>
<pkg-ref id="org.hdfgroup.HDFView-3.3.1"/>
<product id="org.hdfgroup.HDFView-3.3.1" version="3.3.1"/>
<title>HDFView-3.3.1</title>
<options customize="never" require-scripts="false" hostArchitectures="x86_64"/>
<choices-outline>
<line choice="default">
<line choice="org.hdfgroup.HDFView-3.3.99"/>
<line choice="org.hdfgroup.HDFView-3.3.1"/>
</line>
</choices-outline>
<choice id="default" title="HDFView-3.3.99" versStr="3.3.99"/>
<choice id="org.hdfgroup.HDFView-3.3.99" title="HDFView-3.3.99" visible="false">
<pkg-ref id="org.hdfgroup.HDFView-3.3.99"/>
<choice id="default" title="HDFView-3.3.1" versStr="3.3.1"/>
<choice id="org.hdfgroup.HDFView-3.3.1" title="HDFView-3.3.1" visible="false">
<pkg-ref id="org.hdfgroup.HDFView-3.3.1"/>
</choice>
<pkg-ref id="org.hdfgroup.HDFView-3.3.99" version="3.3.99" onConclusion="none">org.hdfgroup.HDFView-3.3.99.pkg</pkg-ref>
<pkg-ref id="org.hdfgroup.HDFView-3.3.1" version="3.3.1" onConclusion="none">org.hdfgroup.HDFView-3.3.1.pkg</pkg-ref>
</installer-gui-script>
4 changes: 2 additions & 2 deletions package_files/macosx/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.3.99</string>
<string>3.3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>CFBundleVersion</key>
<string>3.3.99</string>
<string>3.3.1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2006 by The HDF Group</string>
<key>NSHighResolutionCapable</key>
Expand Down

0 comments on commit 51466c2

Please sign in to comment.