From 21b46ed1cb16912ae6b9650cb76e233509fc4548 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Sun, 6 May 2012 11:56:08 +0000
Subject: [PATCH] Now builds Mac install kit. Needed to rename LGPL to LGPL.txt
 as resource files must have an extension on Mac. Refs #221

git-svn-id: https://svn.nexusformat.org/definitions/trunk@1080 e2afd93b-eb5f-4fc1-b239-527b97798288
---
 CMakeLists.txt        | 4 ++--
 COPYING               | 2 +-
 CPackOptions.cmake.in | 9 ++++++---
 LGPL => LGPL.txt      | 0
 README.txt            | 2 +-
 manual/license.xml    | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)
 rename LGPL => LGPL.txt (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9061c93e4..0dd192bdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ add_subdirectory (manual)
 foreach(F ${XSD_FILES})
     INSTALL(FILES ${CMAKE_BINARY_DIR}/dist/${F} DESTINATION ${NEXUS_DEFINITIONS} COMPONENT definitions)
 endforeach()
-INSTALL(FILES LGPL DESTINATION ${NEXUS_DEFINITIONS} COMPONENT definitions)
+INSTALL(FILES LGPL.txt DESTINATION ${NEXUS_DEFINITIONS} COMPONENT definitions)
 
 #
 # set CPack packaging options
@@ -151,7 +151,7 @@ if(WIN32)
     set (CPACK_GENERATOR ${CPACK_GENERATOR};ZIP;NSIS)
     set (CPACK_SOURCE_GENERATOR ${CPACK_SOURCE_GENERATOR};ZIP) 
 elseif(APPLE)
-    set (CPACK_GENERATOR ${CPACK_GENERATOR};PackageMaker;Bundle)
+    set (CPACK_GENERATOR ${CPACK_GENERATOR};PackageMaker)
 elseif(CYGWIN)
     set (CPACK_GENERATOR ${CPACK_GENERATOR};CygwinBinary)
 #    set (CPACK_SOURCE_GENERATOR ${CPACK_SOURCE_GENERATOR};CygwinSource) 
diff --git a/COPYING b/COPYING
index a2e60ce87..8deff7dac 100644
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-See LGPL
+See LGPL.txt
diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in
index 2234baa20..5f0a11035 100644
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -64,7 +64,7 @@ if (${CPACK_GENERATOR} STREQUAL "RPM")
 #    set (CPACK_RPM_PACKAGE_REQUIRES "python >= 2.5.0, cmake >= 2.8")
 #    set (CPACK_RPM_PACKAGE_PROVIDES "")
     set(CPACK_RPM_COMPONENT_INSTALL ON)
-    set(CPACK_RPM_PACKAGE_LICENSE "LGPL")
+    set(CPACK_RPM_PACKAGE_LICENSE "LGPL.txt")
     set(CPACK_RPM_PACKAGE_URL "http://www.nexusformat.org/")
 #    set(CPACK_RPM_CHANGELOG_FILE "")
 endif()
@@ -84,6 +84,9 @@ if (${CPACK_GENERATOR} STREQUAL "CygwinBinary")
     set(CPACK_CYGWIN_PATCH_NUMBER 1)
 endif()
 if (${CPACK_GENERATOR} STREQUAL "PackageMaker")
+#    set(CPACK_MONOLITHIC_INSTALL ON)
+    # 10.4 is "Tiger", component based install needs 10.4 and above
+    set(CPACK_OSX_PACKAGE_VERSION 10.4) 
 endif()
 if (${CPACK_GENERATOR} STREQUAL "Bundle")
 endif()
@@ -95,7 +98,7 @@ set (CPACK_PACKAGE_VERSION_MAJOR "3")
 set (CPACK_PACKAGE_VERSION_MINOR "1")
 set (CPACK_PACKAGE_VERSION_PATCH "0")
 set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_RESOURCE_FILE_LICENSE "@CMAKE_SOURCE_DIR@/LGPL")
+set (CPACK_RESOURCE_FILE_LICENSE "@CMAKE_SOURCE_DIR@/LGPL.txt")
 set (CPACK_RESOURCE_FILE_README "@CMAKE_SOURCE_DIR@/package/README.txt")
 set (CPACK_RESOURCE_FILE_WELCOME "@CMAKE_SOURCE_DIR@/package/WELCOME.txt")
 set (CPACK_PACKAGE_ICON "@CMAKE_SOURCE_DIR@/package/nexus.ico")
@@ -110,7 +113,7 @@ set (CPACK_PACKAGE_INSTALL_DIRECTORY "NeXus Definitions")
 
 # we do not have any absolute paths, so do not need DESTDIR
 SET(CPACK_SET_DESTDIR "OFF")
-SET(CPACK_PACKAGE_RELOCATABLE TRUE)
+SET(CPACK_PACKAGE_RELOCATABLE "true")
 
 if (${CPACK_GENERATOR} STREQUAL "NSIS")
     ### NSIS component installs seem to trigger download option at the moment, so set monolithic install and a full package name until we can figure out why
diff --git a/LGPL b/LGPL.txt
similarity index 100%
rename from LGPL
rename to LGPL.txt
diff --git a/README.txt b/README.txt
index 5644bef12..bf0fcef49 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 These are the components that define the structure of NeXus data files in the development directory.
 
 BASE.xsd		      used to validate NeXus data files, defines NXroot
-LGPL			      one proposed license model
+LGPL.txt		      one proposed license model
 NeXus.xsd		      used to validate NeXus data files
 README.txt  		      this file
 applications/		      NXDL files for applications and instrument defs
diff --git a/manual/license.xml b/manual/license.xml
index c5cc66632..e52cc60cd 100644
--- a/manual/license.xml
+++ b/manual/license.xml
@@ -24,7 +24,7 @@
          <primary>License</primary>
          <secondary>LGPL</secondary>
       </indexterm>
-      <programlisting><xi:include href="../LGPL" parse="text"/></programlisting>
+      <programlisting><xi:include href="../LGPL.txt" parse="text"/></programlisting>
    </section>
 
 </appendix>