Skip to content

Commit

Permalink
Now builds Mac install kit. Needed to rename LGPL to LGPL.txt as
Browse files Browse the repository at this point in the history
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
  • Loading branch information
FreddieAkeroyd authored and Freddie Akeroyd committed May 6, 2012
1 parent eeb35ff commit 21b46ed
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See LGPL
See LGPL.txt
9 changes: 6 additions & 3 deletions CPackOptions.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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")
Expand All @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion manual/license.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 21b46ed

Please sign in to comment.