Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade version version for new branch #338

Merged
merged 1 commit into from
Oct 3, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ant-app.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hdfview ci runs
name: hdfview 1_16 app ci runs

# Triggers the workflow on a call from another workflow
on:
@@ -20,7 +20,7 @@ on:
description: 'The version name of the binaries'
type: string
required: false
default: HDFView-99.99.99
default: HDFView-3.4.99
file_base:
description: "The common base name of the source tarballs"
required: true
@@ -153,7 +153,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'

- name: Uncompress gh binary (Win)
@@ -370,7 +370,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'

- name: List files for the space (Linux)
@@ -562,7 +562,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: '${{ inputs.name_hdf5 }}-macos14_clang.tar.gz'

- name: List files for the space (mac)
10 changes: 5 additions & 5 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hdfview ci runs
name: hdfview 1_16 ci runs

# Triggers the workflow on a call from another workflow
on:
@@ -20,7 +20,7 @@ on:
description: 'The version name of the binaries'
type: string
required: false
default: HDFView-99.99.99
default: HDFView-3.4.99
file_base:
description: "The common base name of the source tarballs"
required: true
@@ -153,7 +153,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: '${{ inputs.name_hdf5 }}-win-vs2022_cl.zip'

- name: Uncompress gh binary (Win)
@@ -362,7 +362,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: '${{ inputs.name_hdf5 }}-ubuntu-2204_gcc.tar.gz'

- name: List files for the space (Linux)
@@ -546,7 +546,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: '${{ inputs.name_hdf5 }}-macos14_clang.tar.gz'

- name: List files for the space (mac)
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: clang-format Check
name: clang-format 1_16 Check
on:
pull_request:
permissions:
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-fix.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
#
# which you will need to set to "Read and write permissions"
#
name: clang-format Commit Changes
name: clang-format 1_16 Commit Changes
on:
workflow_dispatch:
push:
18 changes: 9 additions & 9 deletions .github/workflows/daily-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hdfview daily build
name: hdfview 1_16 daily build

# Triggers the workflow on a schedule or on demand
# Triggered on pull request or on demand
on:
workflow_dispatch:
inputs:
@@ -9,8 +9,8 @@ on:
type: string
required: false
default: check
schedule:
- cron: "5 0 * * *"
pull_request:
branches: [ "hdfview-3-1_16" ]

permissions:
contents: read
@@ -30,7 +30,7 @@ jobs:
- name: Get hdfview release base name
uses: dsaltares/fetch-gh-release-asset@master
with:
version: 'tags/HDFView-99.99.99'
version: 'tags/HDFView-3.4.99'
file: 'last-file.txt'
continue-on-error: true

@@ -55,7 +55,7 @@ jobs:
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: 'HDFGroup/hdf5'
version: 'tags/snapshot'
version: 'tags/snapshot-1.16'
file: 'last-file.txt'

- name: Read base-name file
@@ -69,7 +69,7 @@ jobs:
- name: Read inputs
id: getinputs
run: |
echo "INPUTS_IGNORE=${{ github.event.inputs.use_ignore }}" >> $GITHUB_OUTPUT
echo "INPUTS_IGNORE=${{ inputs.use_ignore }}" >> $GITHUB_OUTPUT

- run: echo "use_ignore is ${{ steps.getinputs.outputs.INPUTS_IGNORE }}."

@@ -132,7 +132,7 @@ jobs:
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
file_branch: ${{ needs.call-workflow-tarball.outputs.file_branch }}
file_sha: ${{ needs.call-workflow-tarball.outputs.file_sha }}
use_tag: HDFView-99.99.99
use_tag: HDFView-3.4.99
use_environ: snapshots
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) }}

@@ -143,7 +143,7 @@ jobs:
uses: ./.github/workflows/remove-files.yml
with:
file_base: ${{ needs.get-base-names.outputs.hdfview-name }}
use_tag: HDFView-99.99.99
use_tag: HDFView-3.4.99
use_environ: snapshots
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) && (needs.get-base-names.outputs.hdfview-name != needs.call-workflow-tarball.outputs.file_base) }}

45 changes: 0 additions & 45 deletions .github/workflows/publish-branch.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hdfview publishrelease
name: hdfview 1.16 publishrelease

# Triggers the workflow on demand
on:
4 changes: 2 additions & 2 deletions .github/workflows/release-files.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hdfview release-files
name: hdfview 1_16 release-files

# Triggers the workflow on a call from another workflow
on:
@@ -8,7 +8,7 @@ on:
description: 'Release version tag'
type: string
required: false
default: HDFView-99.99.99
default: HDFView-3.4.99
use_environ:
description: 'Environment to locate files'
type: string
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hdfview release build
name: hdfview 1_16 release build

# Triggers the workflow on demand
on:
@@ -18,12 +18,12 @@ on:
description: 'HDF5 Release version tag'
type: string
required: false
default: snapshot
default: snapshot-1.16
name_tag5:
description: 'HDF5 Release version base name'
type: string
required: false
default: snapshot
default: hdf5-1.16

permissions:
contents: read
2 changes: 1 addition & 1 deletion .github/workflows/remove-files.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
description: 'Release version tag'
type: string
required: false
default: HDFView-99.99.99
default: HDFView-3.4.99
use_environ:
description: 'Environment to locate files'
type: string
2 changes: 1 addition & 1 deletion .github/workflows/tarball.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hdfview tarball
name: hdfview 1_16 tarball

# Triggers the workflow on a call from another workflow
on:
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=HDFView-99.99.99
VERSION=HDFView-3.4.99
4 changes: 2 additions & 2 deletions docs/Build_HDFView.txt
Original file line number Diff line number Diff line change
@@ -38,14 +38,14 @@ For example,
#hdf.lib.dir = ${env.HDFLIBS}/lib
#hdf5.lib.dir = ${env.HDF5LIBS}/lib
hdf.lib.dir = /<MYPATH>/HDF_Group/HDF/4.3.X/lib
hdf5.lib.dir = /<MYPATH>/HDF_Group/HDF5/1.15.X/lib
hdf5.lib.dir = /<MYPATH>/HDF_Group/HDF5/1.16.X/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-99.99.99-Linux_64.tar.gz.
For example, HDFView-3.4.99-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
@@ -4,7 +4,7 @@ The current HDFView products can be downloaded at:

HDF Libraries
=============================================================================
This release was built and tested with HDF 4.3.x and HDF5 1.15.x.
This release was built and tested with HDF 4.3.x and HDF5 1.16.x.


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

HDF Libraries
=============================================================================
This release was built and tested with HDF 4.3.x and HDF5 1.15.x.
This release was built and tested with HDF 4.3.x and HDF5 1.16.x.


JDK
2 changes: 1 addition & 1 deletion docs/WorkingDirectory.txt
Original file line number Diff line number Diff line change
@@ -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, .hdfview99.99.99 in the user home directory.
C. A location saved in the HDFView property file, .hdfview3.4.99 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.
4 changes: 2 additions & 2 deletions package_files/macosx/Info.plist
Original file line number Diff line number Diff line change
@@ -21,14 +21,14 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>99.99.99</string>
<string>3.4.99</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>99.99.99</string>
<string>3.4.99</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2006 by The HDF Group</string>
<key>NSHighResolutionCapable</key>
52 changes: 0 additions & 52 deletions src/org.hdfgroup.hdfview/hdf/view/ViewProperties.java
Original file line number Diff line number Diff line change
@@ -1611,36 +1611,6 @@ public void load() throws IOException
}
}
}

// load srb account
// log.trace("load user properties: srb account");
// propVal = null;
// String srbaccount[] = new String[7];
// (int i = 0; i < MAX_RECENT_FILES; i++) {
// (null == (srbaccount[0] = getString("srbaccount" + i + ".host")))
// continue;
//
// (null == (srbaccount[1] = getString("srbaccount" + i + ".port")))
// continue;
//
// (null == (srbaccount[2] = getString("srbaccount" + i + ".user")))
// continue;
//
// (null == (srbaccount[3] = getString("srbaccount" + i + ".password")))
// continue;
//
// (null == (srbaccount[4] = getString("srbaccount" + i + ".home")))
// continue;
//
// (null == (srbaccount[5] = getString("srbaccount" + i + ".domain")))
// continue;
//
// (null == (srbaccount[6] = getString("srbaccount" + i + ".resource")))
// continue;
//
// srbAccountList.add(srbaccount);
// srbaccount = new String[7];
// }
}

/**
@@ -1740,28 +1710,6 @@ else if (isReadSWMR)
setValue("palette.file" + i, theFile);
}

// save srb account
// log.trace("save user properties: srb account");
// String srbaccount[] = null;
// size = srbAccountList.size();
// minSize = Math.min(size, MAX_RECENT_FILES);
// (int i = 0; i < minSize; i++) {
// srbaccount = srbAccountList.get(i);
// ((srbaccount[0] != null) && (srbaccount[1] != null) && (srbaccount[2] !=
// null)
// && (srbaccount[3] != null) && (srbaccount[4] != null) && (srbaccount[5] !=
// null)
// && (srbaccount[6] != null)) {
// setValue("srbaccount" + i + ".host", srbaccount[0]);
// setValue("srbaccount" + i + ".port", srbaccount[1]);
// setValue("srbaccount" + i + ".user", srbaccount[2]);
// setValue("srbaccount" + i + ".password", srbaccount[3]);
// setValue("srbaccount" + i + ".home", srbaccount[4]);
// setValue("srbaccount" + i + ".domain", srbaccount[5]);
// setValue("srbaccount" + i + ".resource", srbaccount[6]);
// }
// }

// save default modules
log.trace("save user properties: default modules");
String moduleName = moduleListTreeView.get(0);
Loading