Skip to content

Commit

Permalink
Final tidy ups of mac kit (remove packaged .svn files). Refs #175.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.nexusformat.org/code/trunk@1247 ff5d1e40-2be0-497f-93bd-dc18237bd3c7
  • Loading branch information
FreddieAkeroyd authored and Freddie Akeroyd committed Apr 21, 2009
1 parent 0f460b3 commit 2bd924a
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ SUBDIRS=include src bindings applications test scripts examples doc $(CONTRIB)

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
# a "make distcheck"
Expand Down
5 changes: 5 additions & 0 deletions configure_mingw_kit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
#
# this is just for building the mingw nexus kit on my machine
#
env am_cv_python_pythondir='${prefix}/lib/python' am_cv_python_pyexecdir='${prefix}/lib/python' ./configure --prefix=/c/nxinstall --with-python=/c/Python25 --with-java-home=/c/mingw
6 changes: 5 additions & 1 deletion macosx_install_kit/ReadMe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ NeXus is a common data format for neutron, x-ray, and muon science. It is being

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
11 changes: 11 additions & 0 deletions macosx_install_kit/Resources/English.lproj/License.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
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
Version 2.1, February 1999
Expand Down
3 changes: 3 additions & 0 deletions macosx_install_kit/Resources/English.lproj/Welcome.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
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
in /usr/local/include and /usr/local/lib, documentation and
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
2 changes: 2 additions & 0 deletions macosx_install_kit/bin/makepkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ target="$PACKAGE.pkg/Contents"
echo "creating $target"
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
echo "Purging .DS_Store files from install files (requires root) ..."
Expand Down
1 change: 1 addition & 0 deletions macosx_install_kit/build_mac_kit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ env CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $arch_flags" \
--disable-dependency-tracking
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

Expand Down

0 comments on commit 2bd924a

Please sign in to comment.