Skip to content

Commit f039a28

Browse files
FreddieAkeroydFreddie Akeroyd
FreddieAkeroyd
authored and
Freddie Akeroyd
committed
Tidy up names and enable component install in TGZ and ZIP
Also update some eol svn properties refs nexusformat#221 git-svn-id: https://svn.nexusformat.org/definitions/trunk@1074 e2afd93b-eb5f-4fc1-b239-527b97798288
1 parent 3d79636 commit f039a28

File tree

6 files changed

+488
-475
lines changed

6 files changed

+488
-475
lines changed

‎CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,17 @@
2626
#
2727
#
2828
#====================================================================
29+
30+
# we need 2.8.8 for correct component install with CPACK for archives
2931
if(WIN32)
30-
cmake_minimum_required (VERSION 2.8.7)
32+
cmake_minimum_required (VERSION 2.8.8)
3133
else()
32-
cmake_minimum_required (VERSION 2.8.3)
33-
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove this line when CMake >= 2.8.4 is required
34+
cmake_minimum_required (VERSION 2.8.8)
35+
if (${CMAKE_VERSION} VERSION_LESS 2.8.4)
36+
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove this line when CMake >= 2.8.4 is required
37+
endif()
3438
endif()
39+
3540
project(NeXusDefinitions)
3641

3742
# include NXDL release number information

‎CPackOptions.cmake.in

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,14 @@ if (${CPACK_GENERATOR} STREQUAL "RPM")
5252
# set(CPACK_RPM_PACKAGE_DEBUG TRUE)
5353
endif()
5454
if (${CPACK_GENERATOR} STREQUAL "TGZ")
55+
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY ON)
56+
set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY ON)
57+
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
5558
endif()
5659
if (${CPACK_GENERATOR} STREQUAL "ZIP")
60+
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY ON)
61+
set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY ON)
62+
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
5763
endif()
5864

5965
set(CPACK_TGZ_COMPONENT_INSTALL ON)
@@ -76,7 +82,7 @@ set(CPACK_RPM_PACKAGE_URL "http://www.nexusformat.org/")
7682
#CPACK_PACKAGING_INSTALL_PREFIX
7783
#CPACK_PACKAGE_INSTALL_DIRECTORY "definitions ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}"
7884

79-
set (CPACK_DEBIAN_PACKAGE_NAME "nexus-definitions")
85+
set (CPACK_DEBIAN_PACKAGE_NAME "nexus")
8086
set (CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all")
8187
set (CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
8288
set (CPACK_DEBIAN_PACKAGE_HOMEPAGE"http://www.nexusformat.org/")
@@ -88,7 +94,7 @@ set (CPACK_PACKAGE_VERSION_PATCH "0")
8894
set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
8995
set (CPACK_PACKAGE_DESCRIPTION_FILE "@CMAKE_SOURCE_DIR@/package/description.txt")
9096
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeXus NXDL class definitions and manual, http://www.nexusformat.org/")
91-
set (CPACK_PACKAGE_FILE_NAME "nexus-definitions-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
97+
set (CPACK_PACKAGE_FILE_NAME "nexus-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
9298
set (CPACK_PACKAGE_INSTALL_DIRECTORY "NeXus Data Format")
9399
set (CPACK_RESOURCE_FILE_LICENSE "@CMAKE_SOURCE_DIR@/COPYING")
94100
set (CPACK_RESOURCE_FILE_README "@CMAKE_SOURCE_DIR/package/README.txt")
@@ -120,7 +126,7 @@ endif(WIN32)
120126
#set (CPACK_OUTPUT_CONFIG_FILE)
121127
#set (CPACK_PACKAGE_EXECUTABLES)
122128
#set (CPACK_STRIP_FILES)
123-
set (CPACK_SOURCE_PACKAGE_FILE_NAME "nexus-definitions-source-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
129+
set (CPACK_SOURCE_PACKAGE_FILE_NAME "nexus-source-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
124130
#set (CPACK_SOURCE_STRIP_FILES)
125131
#set (CPACK_SOURCE_GENERATOR)
126132
#set (CPACK_SOURCE_OUTPUT_CONFIG_FILE)

‎README renamed to ‎README.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ utils/ various tools used in the definitions tree
1818
www/ launch (home) page of NeXus WWW site
1919
xslt/ various transformations
2020

21+
See README.cmake.txt for building instructions
22+
2123
--
2224
$Id$
2325

‎base_classes/NXparameters.nxdl.xml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl" ?>
3-
<!--
4-
# NeXus - Neutron and X-ray Common Data Format
5-
#
6-
# Copyright (C) 2008-2012 NeXus International Advisory Committee (NIAC)
7-
#
8-
# This library is free software; you can redistribute it and/or
9-
# modify it under the terms of the GNU Lesser General Public
10-
# License as published by the Free Software Foundation; either
11-
# version 3 of the License, or (at your option) any later version.
12-
#
13-
# This library is distributed in the hope that it will be useful,
14-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16-
# Lesser General Public License for more details.
17-
#
18-
# You should have received a copy of the GNU Lesser General Public
19-
# License along with this library; if not, write to the Free Software
20-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21-
#
22-
# For further information, see http://www.nexusformat.org
23-
24-
########### SVN repository information ###################
25-
# $Date$
26-
# $Author$
27-
# $Revision$
28-
# $HeadURL$
29-
# $Id$
30-
########### SVN repository information ###################
31-
-->
32-
<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
33-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34-
xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
35-
name="NXparameters"
36-
version="1.0"
37-
svnid="$Id$"
38-
type="group" extends="NXobject">
39-
<doc>Container for parameters, usually used in processing or analysis.</doc>
40-
<field name="term" minOccurs="0" maxOccurs="unbounded" type="NX_CHAR">
41-
<!-- maxOccurs="unbounded" is intended but is not allowed by current syntax -->
42-
<doc>A parameter (also known as a term) that is used in or results from processing.</doc>
43-
<attribute name="units"/>
44-
</field>
45-
</definition>
46-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?xml-stylesheet type="text/xsl" href="nxdlformat.xsl" ?>
3+
<!--
4+
# NeXus - Neutron and X-ray Common Data Format
5+
#
6+
# Copyright (C) 2008-2012 NeXus International Advisory Committee (NIAC)
7+
#
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 3 of the License, or (at your option) any later version.
12+
#
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
17+
#
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21+
#
22+
# For further information, see http://www.nexusformat.org
23+
24+
########### SVN repository information ###################
25+
# $Date$
26+
# $Author$
27+
# $Revision$
28+
# $HeadURL$
29+
# $Id$
30+
########### SVN repository information ###################
31+
-->
32+
<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
33+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34+
xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
35+
name="NXparameters"
36+
version="1.0"
37+
svnid="$Id$"
38+
type="group" extends="NXobject">
39+
<doc>Container for parameters, usually used in processing or analysis.</doc>
40+
<field name="term" minOccurs="0" maxOccurs="unbounded" type="NX_CHAR">
41+
<!-- maxOccurs="unbounded" is intended but is not allowed by current syntax -->
42+
<doc>A parameter (also known as a term) that is used in or results from processing.</doc>
43+
<attribute name="units"/>
44+
</field>
45+
</definition>
46+

0 commit comments

Comments
 (0)