Changeset 1248

Timestamp:

21/04/09 19:17:39 (3 years ago)

Author:

Freddie Akeroyd

Message:

merge changes r1245:r1247 from trunk. Refs #115

Location:

branches/4.2

Files:

• Makefile.am (modified) (1 diff)
• configure_mingw_kit (copied) (copied from trunk/configure_mingw_kit)
• macosx_install_kit/ReadMe.txt (modified) (1 diff)
• macosx_install_kit/Resources/English.lproj/License.txt (modified) (1 diff)
• macosx_install_kit/Resources/English.lproj/Welcome.txt (modified) (2 diffs)
• macosx_install_kit/bin/makepkg.sh (modified) (3 diffs)
• macosx_install_kit/build_mac_kit.sh (modified) (1 diff)

branches/4.2/Makefile.am

@@ -39 +39 @@
 EXTRA_DIST=build_rules.am nexus_spec.in nexus.spec autoversion.sh \
                 build_rpm.in README.cygwin README.WIN32 README.macosx \
-                README.MinGW make_mingw_links SConstruct nexus_scons_utils.py
+                README.MinGW make_mingw_links SConstruct nexus_scons_utils.py \
+                configure_mingw_kit
 
 # Add any flags here that you want passed to configure when you do 

branches/4.2/macosx_install_kit/ReadMe.txt

@@ -3 +3 @@
 This package provides libraries for interacting with NeXus files, with bindings for C, C++, Fortran, Python, Java and IDL.
 
-For more information see http://www.nexusformat.org/
+NeXus is distributed under the LGPL licence; this binary is linked to 
+other packages that have different, but compatible, licences. For more
+information see the files in /usr/local/share/nexus
+  
+For futher information on NeXus see http://www.nexusformat.org/
 
 To begin the install, just double click on NeXus.pkg

branches/4.2/macosx_install_kit/Resources/English.lproj/License.txt

@@ +1 @@
+License Information
+-------------------
+
+The NeXus library and utilities are distributed under the terms on the GNU Lesser General Public License (LGPL) - see the enclosed COPYING_NeXus.txt file or http://www.opensource.org/licenses/lgpl-license.php for further details. The NeXus library is linked statically against several other libraries and these are detailed below. All licence files are installed in /usr/local/share/nexus
+
+* Michael Sweet's Mini-XML parsing library (http://www.easysw.com/~mike/mxml/) which is also governed by the LGPL.
+
+* HDF4 libraries developed at the National Center for Supercomputing Applications (NCSA) at the University of Illinois at Urbana-Champaign (http://hdf.ncsa.uiuc.edu/). Their distribution is covered by the license detailed in the enclosed COPYING_hdf4.txt file and at ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/unpacked/COPYING 
+
+* HDF5 library developed at the National Center for Supercomputing Applications (NCSA) at the University of Illinois at Urbana-Champaign (http://hdf.ncsa.uiuc.edu/). Distribution is covered by the license detailed in the enclosed COPYING_hdf5.txt file and at ftp://ftp.ncsa.uiuc.edu/HDF/HDF5/current/src/unpacked/COPYING 
+
 
                   GNU LESSER GENERAL PUBLIC LICENSE

branches/4.2/macosx_install_kit/Resources/English.lproj/Welcome.txt

@@ -1 +1 @@
 This installer will guide you through the steps necessary to 
 install the NeXus API for Mac OS 10.4 or higher on your machine. 
+This version is able to access HDF4, HDF5 and XML NeXus files.
 
 NeXus file utilities will be placed in /usr/local/bin, libraries 
@@ -6 +7 @@
 examples in /usr/local/share and python bindings 
 in /Library/Python/2.5/site-packages.
+
+Licence information will be placed in /usr/local/share/nexus

branches/4.2/macosx_install_kit/bin/makepkg.sh

@@ -27 +27 @@
   InfoString="$VERSION$RELEASE, (C) $YEAR $COPYRIGHT"
                        Package info
-  BackgroundAlignment="center left right top bottom (top|bottom)(left|right)"
-  BackgroundScaling="none proportional tofit"
-                       Backround picture details if Resource/background exists
-  AuthorizationAction="(Admin|Root|No)Authorization"
-                       Required authorization
-  RestartAction="NoRestart RecommendedRestart RequiredRestart Shutdown RequiredLogout"
-                       Require restart?
+  MajorVersion="VERSION up to the first dot"
+  MinorVersion="VERSION after the last dot"
+                       Major.Minor version number integers
+  BackgroundAlignment="center"
+                       Alignment of background picture, which should be one of
+                       center left right top bottom (top|bottom)(left|right)
+  BackgroundScaling="tofit"
+                       Scaling of background picture, which should be one of
+                       none proportional tofit
+  AuthorizationAction="NoAuthorization"
+                       Required authorization, which should be one of
+                       (Admin|Root|No)Authorization
+  RestartAction="NoRestart"
+                       Require restart?  Should be one of NoRestart Shutdown
+                       RecommendedRestart RequiredRestart RequiredLogout
   DefaultLocation="/"  Default location
   Relocatable=false    true if package is relocatable
@@ -45 +53 @@
   UpdateInstalledLanguages=false
                        true if only install resources for the current languages
+  AllowBackRev=false   true if old versions can replace new
 
 === Installed Files ===
@@ -141 +150 @@
 mkdir -p "$target"
 cp -Rpv $RESOURCES "$target/Resources"
+echo "Purging .svn directories from $target"
+find -d "$target" -type d -name ".svn" -exec rm -fr "{}" \; -print
 
 # Purge .DS_STORE; protect against spaces if filename

branches/4.2/macosx_install_kit/build_mac_kit.sh

@@ -21 +21 @@
 make
 make install DESTDIR=`pwd`/macosx_install_kit/package_root
+cp InstallerBits/Licences/*.txt macosx_install_kit/package_root/usr/local/share/nexus
 
 cd macosx_install_kit