Merge pull request HDFGroup#167 in HDFVIEW/hdfview from ~BYRN/hdfview_adb:release/hdfview-3.0 to release/hdfview-3.0

* commit 'c1a1e4beb7764aa20b786d80c1b00cea1c25e0bc':
  Correct OSX packaging
  Add OSX support to OSX package
  Initial creation of release branch

Author: jhendersonHDF

VERSION

@@ -1 +1 @@
-VERSION=hdf-view-3.99
+VERSION=hdf-view-3.0

build.xml

@@ -714,6 +714,7 @@
     <!-- Windows-specific README.txt replacements -->
     <replace file="${dist.dir}/README.txt" token="@BINARY_PLATFORM@" value="Windows win-${os.arch}" />
     <replace file="${dist.dir}/README.txt" token="@BINARY_FILE@" value="${ant.project.name}-${app.version}.msi       - ${ant.project.name} Installer" />
+    <replace file="${dist.dir}/README.txt" token="@JAVAMOD_TEXT@" value="This can be modified by changing JAVABIN in ${ant.project.name}${file.separator}${app.version}.0${file.separator}hdfview.bat" />
     <replace file="${dist.dir}/README.txt" token="@EXECUTABLE@" value="hdfview.bat" />
     <replace file="${dist.dir}/README.txt" token="@INSTALL_TYPE@" value="Running" />
     <replace file="${dist.dir}/README.txt" token="@INSTALL_PREFIX_HEADER@" value="To install ${ant.project.name} for Windows:${line.separator}" />
@@ -725,6 +726,7 @@
     <!-- Unix-specific README.txt replacements -->
     <replace file="${dist.dir}/README.txt" token="@BINARY_PLATFORM@" value="${uname.os} ${uname.version}" />
     <replace file="${dist.dir}/README.txt" token="@BINARY_FILE@" value="${ant.project.name}-${app.version}.0-${uname.os}.sh - ${ant.project.name} Installer" />
+    <replace file="${dist.dir}/README.txt" token="@JAVAMOD_TEXT@" value="This can be modified by changing JAVABIN in ${ant.project.name}${file.separator}${app.version}.0${file.separator}hdfview.sh" />
     <replace file="${dist.dir}/README.txt" token="@EXECUTABLE@" value="hdfview.sh" />
     <replace file="${dist.dir}/README.txt" token="@INSTALL_TYPE@" value="Installation" />
     <replace file="${dist.dir}/README.txt" token="@INSTALL_PREFIX_HEADER@" value="To install ${ant.project.name} for ${uname.os}, copy ${ant.project.name}-${app.version}.0-${uname.os}.sh to where you want${line.separator}to install ${ant.project.name} and:${line.separator}" />
@@ -734,7 +736,13 @@
 
   <target name="createMacREADME" depends="createREADME">
     <!-- Mac-specific README.txt replacements -->
-    <replace file="${dist.dir}/README.txt" token="@BINARY_PLATFORM@" value="Mac OS X Darwin ${mac.uname}" />
+    <replace file="${dist.dir}/README.txt" token="@BINARY_PLATFORM@" value="Mac OS X Darwin ${uname.version}" />
+    <replace file="${dist.dir}/README.txt" token="@BINARY_FILE@" value="${ant.project.name}-${app.version}.dmg - ${ant.project.name} Installer" />
+    <replace file="${dist.dir}/README.txt" token="@JAVAMOD_TEXT@" value="" />
+    <replace file="${dist.dir}/README.txt" token="@INSTALL_TYPE@" value="" />
+    <replace file="${dist.dir}/README.txt" token="@INSTALL_PREFIX_HEADER@" value="To install ${ant.project.name} for ${uname.os}:" />
+    <replace file="${dist.dir}/README.txt" token="@INSTALL_OR_RUN_FILE@" value="${ant.project.name}-${app.version}.dmg" />
+    <replace file="${dist.dir}/README.txt" token="@OPTIONAL_STEP@" value="" />
   </target>
 
   <target name="deploy" depends="deployWindows, deployUnix, deployMac"
@@ -955,7 +963,11 @@
       <fileset dir="${basedir}" includes="COPYING" />
     </copy>
 
-    <exec executable="uname" outputproperty="mac.uname">
+    <exec executable="uname" outputproperty="uname.os">
+      <arg value="-s" />
+    </exec>
+
+    <exec executable="uname" outputproperty="uname.version">
       <arg value="-r" />
     </exec>
 
@@ -1005,6 +1017,15 @@
       <arg value="install" />
       <arg value="${ant.project.name}-${app.version}.dmg" />
     </exec>
+
+    <!-- Compress everything into one tar.gz file -->
+    <tar destfile="${dist.dir}/${ant.project.name}-${app.version}-${uname.os}-${uname.version}.tar.gz" compression="gzip">
+      <tarfileset dir="${dist.dir}" filemode="755">
+        <include name="COPYING.txt" />
+        <include name="README.txt" />
+        <include name="${ant.project.name}-${app.version}.dmg" />
+      </tarfileset>
+    </tar>
   </target>
 
   <target name="packageSource" depends="packageSourceWindows, packageSourceUnix"

docs/Build_HDFView.txt

@@ -45,7 +45,7 @@ From the top HDFView source code directory run: /<path to ANT executable>/ant ru
 From the top HDFView source code directory run: /<path to ANT executable>/ant package
 
 Go into the build/dist directory that gets created to find the HDFView distribution.
-For example, HDFView-3.0.0-Linux_64.tar.gz.
+For example, HDFView-3.0-Linux_64.tar.gz.
 
 Uncompress the HDFView binary and bring up HDFView by executing the shell script or batch file included.
 

lib/macosx/distribution.plist

@@ -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.99"/>
-    <product id="org.hdfgroup.HDFView-3.99" version="3.99"/>
-    <title>HDFView-3.99</title>
+    <pkg-ref id="org.hdfgroup.HDFView-3.0"/>
+    <product id="org.hdfgroup.HDFView-3.0" version="3.0"/>
+    <title>HDFView-3.0</title>
     <options customize="never" require-scripts="false" hostArchitectures="x86_64"/>
     <choices-outline>
         <line choice="default">
-            <line choice="org.hdfgroup.HDFView-3.99"/>
+            <line choice="org.hdfgroup.HDFView-3.0"/>
         </line>
     </choices-outline>
-    <choice id="default" title="HDFView-3.99" versStr="3.99"/>
-    <choice id="org.hdfgroup.HDFView-3.99" title="HDFView-3.99" visible="false">
-        <pkg-ref id="org.hdfgroup.HDFView-3.99"/>
+    <choice id="default" title="HDFView-3.0" versStr="3.0"/>
+    <choice id="org.hdfgroup.HDFView-3.0" title="HDFView-3.0" visible="false">
+        <pkg-ref id="org.hdfgroup.HDFView-3.0"/>
     </choice>
-    <pkg-ref id="org.hdfgroup.HDFView-3.99" version="3.99.99" onConclusion="none">org.hdfgroup.HDFView-3.99.pkg</pkg-ref>
+    <pkg-ref id="org.hdfgroup.HDFView-3.0" version="3.0" onConclusion="none">org.hdfgroup.HDFView-3.0.pkg</pkg-ref>
 </installer-gui-script>

package_files/README.txt.in

@@ -13,7 +13,7 @@ It was built with the following options:
 
 ===========================================================================
 Note: By default @HDFJAVA_PACKAGE_NAME@ runs on the included Java JRE @JRE_VERSION@.
-     This can be modified by changing JAVABIN in @HDFJAVA_PACKAGE_NAME@@FILE_SEP@@HDFVIEW_PACKAGE_VERSION_STRING@@FILE_SEP@@EXECUTABLE@
+      @JAVAMOD_TEXT@
 ===========================================================================
 
 The contents of this directory are: