Please also test the associated Wiki additions that are related to some of the changes in the code.
This PR is a merge of the beta1-release branch into a branch (beta1-beginning) that represents where this branch stemmed from. This branch stemmed from just before the work to address issues #510 & #511, which are a part of master, but which have a critical issue: #563. This branch only exists to aid code review. Once changes are approved, they will be merged to master and the beta1 release files will be made available on the download page.
These changes mainly accomplish these goals:
Provide a mac dmg download with a good default amount of memory that can be edited and an app with an icon.
Provide a windows msi download with a start menu entry that has an icon and opens the jar using the default amount of memory for the system.
Provide a deb & rpm download with a start menu icon and a script with an environment variable that allows the user to set a higher amount of memory.
Catch out of memory errors and prompt the user to automatically restart with more memory (or link to instructions on how to change the default memory).
Update the keyboard shortcuts window.
Note that the gradle plugin used for all 4 builds is different... because very difficult issues were encountered in every scenario.
Please test the gradle build on VMs (if you have them for each necessary system). The gradle commands used are:
#Mac:
gradle createDmg
#To install, double-click the dmg & drag to /Application
#To run: double-click the app
#Windows (tested on windows 10):
gradle msi
#To install, double-click the msi & follow onscreen instructions
#To run: click the treeview entry in the start menu
#Debian:
gradle buildDeb
#To install: `sudo dpkg -i *.deb`
#To run: either `treeview3` or click the treeview3 icon in the start menu
#RedHat:
gradle buildRpm
#To install: `sudo rpm -ivh *.rpm`
#To run: either `treeview3` or click the treeview3 icon in the start menu
'I copied these changes from branch "issue540-windows10_distro", but I removed the new "compile 'commons-io:commons-io:2.5'" line because that was related to the newest changes Chris made that was after the beta1-release branch.
Files checked in: build.gradle
Copied from the "issue540-windows10_distro" branch.
Files checked in: gradle.properties
Added a way to set the java executable icon in the windows taskbar.
Attempt to get the java executable icon to get set properly on windows.
First attempt failed.
The previous change from .icns to .png worked, but the image quality in the windows taskbar was low, so I am changing thr icon to a larger version to see how it looks.
Added a conditional setting of the application icon based on OS.
Changed com.apple.eawt.Application because it failed compliation on windows.
Had to remove the com.apple.eawt stuff due to compilation issues on other systems.
Changed macSetup to osSetup.
Changed to an image format for the windows taskbar icon that might look better.
Windows didn't like the ico file I tried to use to get a better icon image.
Moved the gradle.properties file to ~/.gradle.
Attempted to make package naming consistent across platforms.
Files checked in: build.gradle
Architecture was being included in the package name for debian, so this is an attempt to see if setting it to an empty string eliminates that.
Files checked in: build.gradle
Turned off JRE bundling for the dmg and streamlined the package name for deb & rpm builds.
Files checked in: build.gradle
Formatting consistency enforcement.
Files checked in: build.gradle
Version must start with a number for linux/nebula.ospackage, so can't use hash.
Files checked in: build.gradle
Removing bundling of the JRE from the msi.
Files checked in: build.gradle
gradle msi complained about treating the hash as a version ID.
Files checked in: build.gradle
Still trying to appease gradle msi's concept of a version.
Files checked in: build.gradle
gradle msi is extremely strict about version format.
Files checked in: build.gradle
Did I mention that gradle msi is extremely strict about version format?
Files checked in: build.gradle
The msi is adding dashes of its own accord. There doesn't seem to be a way to change that, so I had to change the underscores back to dashes so that the alias would work automatically.
Files checked in: build.gradle
Moved all.
Files checked in: build.gradle
An attempt to set -Xmx to the java executable.
Files checked in: build.gradle
gradle msi doesn't like creating an alias along with java -Xmx in it.
Files checked in: build.gradle
Added a setting for the mac app bundle to set the max memory at 4g.
Files checked in: build.gradle
Deleted unused files that had code to handle out of memory errors.
Removed dead link.
Added the ability to offer the option to restart with more memory upon encountering an out of memory error.
2 scenarios are supported: during data load and during export.
Updated the out of memory url for the instructions on how to deal with memory issues.
README update for beta1 & opengl property turned on.
Updated download link.
Added security steps to the install procedure for mac.
An attempt to create a .bat startup script containing an xmx flag for the java executable.
Escaped backslashes.
Corrected variable declaration.
Put batch file name in quotes.
Attempts to create launcher scripts.
Attempting to have scripts end up in the correct folder after msi run.
This actually works now. gradle will deposit the vbs and bat scripts inside the TreeView3 app dir on Windows such that when the user clicks the shortcut in the start menu, the vbs script is run.
I thought this was committed already, so I don't know what was committed last time. These build.gradle script changes work and should have been in the last commit. Read prior log entry for details.
Added a .desktop file to the linux builds. ...with an icon.
Weird graphics behavior in the latest ubuntu install. Seeing if it's the opengl thing.
I discovered that on Ubuntu, if the user doesn't have opengl configured/installed, setting the opengl flag to true causes graphical issues. So I have removed it and will add documentation on how to enable it.
README.md edited online with Bitbucket
Added all the keyboard shortcuts and mouse & button modifiers to the shortcuts dialog.
Also added the ability to cose the window via command-w.
Had to change the structure of the window because the existing method would have grown the height of the window off the screen.
SUBMISSION DATE: 4/30/2018
ISSUE NUMBER(S): #540, #545, #479, #541,
BRANCH: https://bitbucket.org/TreeView3Dev/treeview3/branch/beta1-release#diff
TEST JAR: https://bitbucket.org/TreeView3Dev/treeview3/downloads/tv3_b1rel.jar
LEVEL OF EFFORT: medium
DESCRIPTION OF CHANGES:
Please also test the associated Wiki additions that are related to some of the changes in the code.
This PR is a merge of the beta1-release branch into a branch (beta1-beginning) that represents where this branch stemmed from. This branch stemmed from just before the work to address issues #510 & #511, which are a part of master, but which have a critical issue: #563. This branch only exists to aid code review. Once changes are approved, they will be merged to master and the beta1 release files will be made available on the download page.
These changes mainly accomplish these goals:
Provide a mac dmg download with a good default amount of memory that can be edited and an app with an icon.
Provide a windows msi download with a start menu entry that has an icon and opens the jar using the default amount of memory for the system.
Provide a deb & rpm download with a start menu icon and a script with an environment variable that allows the user to set a higher amount of memory.
Catch out of memory errors and prompt the user to automatically restart with more memory (or link to instructions on how to change the default memory).
Update the keyboard shortcuts window.
Note that the gradle plugin used for all 4 builds is different... because very difficult issues were encountered in every scenario.
Please test the gradle build on VMs (if you have them for each necessary system). The gradle commands used are:
#Mac: gradle createDmg #To install, double-click the dmg & drag to /Application #To run: double-click the app #Windows (tested on windows 10): gradle msi #To install, double-click the msi & follow onscreen instructions #To run: click the treeview entry in the start menu #Debian: gradle buildDeb #To install: `sudo dpkg -i *.deb` #To run: either `treeview3` or click the treeview3 icon in the start menu #RedHat: gradle buildRpm #To install: `sudo rpm -ivh *.rpm` #To run: either `treeview3` or click the treeview3 icon in the start menu'I copied these changes from branch "issue540-windows10_distro", but I removed the new "compile 'commons-io:commons-io:2.5'" line because that was related to the newest changes Chris made that was after the beta1-release branch.
Files checked in: build.gradle
Copied from the "issue540-windows10_distro" branch.
Files checked in: gradle.properties
Added a way to set the java executable icon in the windows taskbar.
Attempt to get the java executable icon to get set properly on windows.
First attempt failed.
The previous change from .icns to .png worked, but the image quality in the windows taskbar was low, so I am changing thr icon to a larger version to see how it looks.
Added a conditional setting of the application icon based on OS.
Changed com.apple.eawt.Application because it failed compliation on windows.
Had to remove the com.apple.eawt stuff due to compilation issues on other systems.
Changed macSetup to osSetup.
Changed to an image format for the windows taskbar icon that might look better.
Windows didn't like the ico file I tried to use to get a better icon image.
Moved the gradle.properties file to ~/.gradle.
Attempted to make package naming consistent across platforms.
Files checked in: build.gradle
Architecture was being included in the package name for debian, so this is an attempt to see if setting it to an empty string eliminates that.
Files checked in: build.gradle
Turned off JRE bundling for the dmg and streamlined the package name for deb & rpm builds.
Files checked in: build.gradle
Formatting consistency enforcement.
Files checked in: build.gradle
Version must start with a number for linux/nebula.ospackage, so can't use hash.
Files checked in: build.gradle
Removing bundling of the JRE from the msi.
Files checked in: build.gradle
gradle msi complained about treating the hash as a version ID.
Files checked in: build.gradle
Still trying to appease gradle msi's concept of a version.
Files checked in: build.gradle
gradle msi is extremely strict about version format.
Files checked in: build.gradle
Did I mention that gradle msi is extremely strict about version format?
Files checked in: build.gradle
The msi is adding dashes of its own accord. There doesn't seem to be a way to change that, so I had to change the underscores back to dashes so that the alias would work automatically.
Files checked in: build.gradle
Moved all.
Files checked in: build.gradle
An attempt to set -Xmx to the java executable.
Files checked in: build.gradle
gradle msi doesn't like creating an alias along with java -Xmx in it.
Files checked in: build.gradle
Added a setting for the mac app bundle to set the max memory at 4g.
Files checked in: build.gradle
Deleted unused files that had code to handle out of memory errors.
Removed dead link.
Added the ability to offer the option to restart with more memory upon encountering an out of memory error.
2 scenarios are supported: during data load and during export.
Updated the out of memory url for the instructions on how to deal with memory issues.
README update for beta1 & opengl property turned on.
Updated download link.
Added security steps to the install procedure for mac.
An attempt to create a .bat startup script containing an xmx flag for the java executable.
Escaped backslashes.
Corrected variable declaration.
Put batch file name in quotes.
Attempts to create launcher scripts.
Attempting to have scripts end up in the correct folder after msi run.
This actually works now. gradle will deposit the vbs and bat scripts inside the TreeView3 app dir on Windows such that when the user clicks the shortcut in the start menu, the vbs script is run.
I thought this was committed already, so I don't know what was committed last time. These build.gradle script changes work and should have been in the last commit. Read prior log entry for details.
Added a .desktop file to the linux builds. ...with an icon.
Weird graphics behavior in the latest ubuntu install. Seeing if it's the opengl thing.
I discovered that on Ubuntu, if the user doesn't have opengl configured/installed, setting the opengl flag to true causes graphical issues. So I have removed it and will add documentation on how to enable it.
README.md edited online with Bitbucket
Added all the keyboard shortcuts and mouse & button modifiers to the shortcuts dialog.
Also added the ability to cose the window via command-w.
Had to change the structure of the window because the existing method would have grown the height of the window off the screen.