Skip to content

Commit 90bcf92

Browse files
willendwillend
authored
Merge pull request #1787 from McStasMcXtrace/cmake-deb-fix-1783
PR for cmake deb fix (#1783)
2 parents 603b57f + ab3df08 commit 90bcf92

File tree

31 files changed

+216
-159
lines changed

31 files changed

+216
-159
lines changed

‎buildscripts/build_debs_mcstas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ rm -rf build
6464
mkdir build
6565
cd build
6666
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DMCPL_ENABLE_CPACK=ON
67-
make
67+
make -j10
6868
cpack -G DEB .
6969
DEB=`ls *.deb`
7070
DEBNAME=`echo $DEB | sed s/Linux/$MCCODE_ARCH/g`
@@ -77,7 +77,7 @@ rm -rf build
7777
mkdir build
7878
cd build
7979
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DNCRYSTAL_ENABLE_CPACK=ON
80-
make
80+
make -j10
8181
cpack -G DEB .
8282
DEB=`ls *.deb`
8383
DEBNAME=`echo $DEB | sed s/Linux/$MCCODE_ARCH/g`

‎cmake/Modules/InstallMCCODE.cmake‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,27 @@ macro(installMCCODE)
3131
endif()
3232

3333
## CPack configuration
34-
set(CPACK_PACKAGE_NAME "${FLAVOR}-${MCCODE_VERSION}")
34+
set(CPACK_PACKAGE_NAME "${FLAVOR}")
3535
set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../COPYING")
3636
set(CPACK_PACKAGE_CONTACT "[email protected]")
3737

38-
## Package versioning
39-
set(MAJOR "1")
40-
set(MINOR "0")
41-
42-
set(CPACK_PACKAGE_VERSION "${MAJOR}.${MINOR}")
43-
set(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR}")
44-
set(CPACK_PACKAGE_VERSION_MINOR "${MINOR}")
38+
# Split incoming MCCODE_VERSION to list
39+
string(REPLACE "." ";" MCCODE_VERSION_LIST ${MCCODE_VERSION})
4540

41+
## Package versioning
42+
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
43+
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
44+
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)
45+
46+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
47+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
48+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
49+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
4650
## Debian
4751
set(CPACK_DEBIAN_PACKAGE_DEPENDS "build-essential, libopenmpi-dev, bash")
48-
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "${FLAVOR}-comps-${MCCODE_VERSION}")
49-
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${FLAVOR}-2.1rc1")
52+
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "${FLAVOR}-comps")
5053
set(CPACK_DEBIAN_PACKAGE_SUGGESTS "")
54+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-3.5.1")
5155

5256
## FreeBSD
5357
set(CPACK_FREEBSD_PACKAGE_LICENSE "GPLv3")

‎cmake/Modules/MCUtil.cmake‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,27 @@ macro(setupMCCODE FLAVOR)
142142
if (MCVERSION)
143143
set(MCCODE_VERSION "${MCVERSION}")
144144
else ()
145-
set(MCCODE_VERSION "3.9999-git")
145+
set(MCCODE_VERSION "3.999.999-git")
146146
endif()
147147
set(MCCODE_NAME "${FLAVOR}")
148148
set(MCCODE_DATE "git")
149149
set(MCCODE_STRING "${NAME} ${MCCODE_VERSION}, ${MCCODE_DATE}")
150150
set(MCCODE_TARNAME "${FLAVOR}")
151151
endif()
152152

153+
# Split incoming MCCODE_VERSION to list
154+
string(REPLACE "." ";" MCCODE_VERSION_LIST ${MCCODE_VERSION})
155+
156+
## Package versioning
157+
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
158+
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
159+
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)
160+
161+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
162+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
163+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
164+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
165+
153166
include(Locations)
154167
# During migration set these as well:
155168
set( bin "${DEST_BINDIR}" )

‎doc/manuals/mcstas/CMakeLists.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ message( "setup MCCODE" )
2020
setupMCCODE("${FLAVOR}")
2121
# CPack configuration
2222
message( "CPack configuration" )
23-
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
23+
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
2424
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
2525
set(CPACK_PACKAGE_CONTACT "[email protected]")
2626

27-
set(CPACK_PACKAGE_VERSION "1.0")
28-
set(CPACK_PACKAGE_VERSION_MAJOR "1")
29-
set(CPACK_PACKAGE_VERSION_MINOR "0")
27+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
28+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
29+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
30+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
3031

3132
# NSIS
3233
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
@@ -46,7 +47,8 @@ endif()
4647

4748

4849
# Debian
49-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
50+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
51+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")
5052

5153
include(CPack)
5254

‎doc/manuals/mcxtrace/CMakeLists.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ setupMCCODE("${FLAVOR}")
2222

2323
# CPack configuration
2424
message( "CPack configuration" )
25-
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
25+
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
2626
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
2727
set(CPACK_PACKAGE_CONTACT "[email protected]")
2828

29-
set(CPACK_PACKAGE_VERSION "1.0")
30-
set(CPACK_PACKAGE_VERSION_MAJOR "1")
31-
set(CPACK_PACKAGE_VERSION_MINOR "0")
29+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
30+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
31+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
32+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
3233

3334
# NSIS
3435
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
@@ -48,8 +49,8 @@ endif()
4849

4950

5051
# Debian
51-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
52-
52+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
53+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")
5354
include(CPack)
5455

5556
message( "LaTeX configuration" )

‎docpkg/manuals/mcstas/CMakeLists.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ setupMCCODE("${FLAVOR}")
1919

2020
# CPack configuration
2121
message( "CPack configuration" )
22-
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
22+
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
2323
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
2424
set(CPACK_PACKAGE_CONTACT "[email protected]")
2525

26-
set(CPACK_PACKAGE_VERSION "1.0")
27-
set(CPACK_PACKAGE_VERSION_MAJOR "1")
28-
set(CPACK_PACKAGE_VERSION_MINOR "0")
26+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
27+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
28+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
29+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
2930

3031
# NSIS
3132
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
@@ -39,7 +40,8 @@ set(MCCODE_LIB "${DEST_DATADIR_COMPS}")
3940
set(MANDEST "${DEST_DATADIR_DOC}")
4041

4142
# Debian
42-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
43+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
44+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")
4345

4446
include(CPack)
4547

‎docpkg/manuals/mcxtrace/CMakeLists.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ setupMCCODE("${FLAVOR}")
1919

2020
# CPack configuration
2121
message( "CPack configuration" )
22-
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
22+
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
2323
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
2424
set(CPACK_PACKAGE_CONTACT "[email protected]")
2525

26-
set(CPACK_PACKAGE_VERSION "1.0")
27-
set(CPACK_PACKAGE_VERSION_MAJOR "1")
28-
set(CPACK_PACKAGE_VERSION_MINOR "0")
26+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
27+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
28+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
29+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
2930

3031
# NSIS
3132
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
@@ -39,7 +40,8 @@ set(MCCODE_LIB "${DEST_DATADIR_COMPS}")
3940
set(MANDEST "${DEST_DATADIR_DOC}")
4041

4142
# Debian
42-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
43+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
44+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")
4345

4446
include(CPack)
4547

‎mcstas-comps/CMakeLists.txt‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,36 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
1010
include(MCUtil)
1111
setupMCCODE("mcstas")
1212

13+
option( ENABLE_CIF2HKL "Build Third Party code cif2hkl (fortran)" ON )#TODO: Only enable enable Fortran if this is on
14+
if ( ENABLE_CIF2HKL )
15+
set(DEBIDEPS "${FLAVOR}, libnexus-dev, libgsl-dev")
16+
else()
17+
set(DEBIDEPS "${FLAVOR}, libnexus-dev, libgsl-dev, cif2hkl")
18+
endif()
19+
1320
set(WORK "${PROJECT_BINARY_DIR}/work")
1421

1522
# CPack configuration
16-
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps-${MCCODE_VERSION}")
23+
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps")
1724
set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
1825
set(CPACK_PACKAGE_CONTACT "[email protected]")
1926

20-
set(CPACK_PACKAGE_VERSION "1.0")
21-
set(CPACK_PACKAGE_VERSION_MAJOR "1")
22-
set(CPACK_PACKAGE_VERSION_MINOR "0")
27+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
28+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
29+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
30+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
31+
32+
33+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${DEBIDEPS}")
34+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-comps-3.5.1")
35+
2336

2437
# NSIS
2538
set(CPACK_NSIS_PACKAGE_NAME "${MCCODE_STRING} Components")
2639
set(CPACK_NSIS_DISPLAY_NAME "${MCCODE_STRING} Components")
2740

2841
include(CPack)
2942

30-
option( ENABLE_CIF2HKL "Build Third Party code cif2hkl (fortran)" ON )#TODO: Only enable enable Fortran if this is on
3143
if ( ENABLE_CIF2HKL )
3244
enable_language( Fortran )
3345
add_executable(
@@ -41,13 +53,6 @@ if ( ENABLE_CIF2HKL )
4153
)
4254
endif()
4355

44-
# Debian
45-
if ( ENABLE_CIF2HKL )
46-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libgsl-dev")
47-
else()
48-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libgsl-dev, cif2hkl")
49-
endif()
50-
5156
option( ENABLE_NEUTRONICS "Build Third Party code neutronics (fortran)" ON )#TODO: Only enable enable Fortran if this is on
5257
if ( ENABLE_NEUTRONICS )
5358
enable_language( Fortran )

‎mcxtrace-comps/CMakeLists.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ setupMCCODE("mcxtrace")
1313
set(WORK "${PROJECT_BINARY_DIR}/work")
1414

1515
# CPack configuration
16-
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps-${MCCODE_VERSION}")
16+
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps")
1717
set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
1818
set(CPACK_PACKAGE_CONTACT "[email protected]")
1919

20-
set(CPACK_PACKAGE_VERSION "1.0")
21-
set(CPACK_PACKAGE_VERSION_MAJOR "1")
22-
set(CPACK_PACKAGE_VERSION_MINOR "0")
20+
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
21+
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
22+
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
23+
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
2324

2425

2526
# NSIS
@@ -44,10 +45,11 @@ endif()
4445

4546
# Debian
4647
if ( ENABLE_CIF2HKL )
47-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libxrl-dev, libgsl-dev")
48+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, libnexus-dev, libxrl-dev, libgsl-dev")
4849
else()
49-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libxrl-dev, libgsl-dev, cif2hkl")
50+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, libnexus-dev, libxrl-dev, libgsl-dev, cif2hkl")
5051
endif()
52+
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-comps-3.5.1")
5153

5254
# System c-code
5355
install( DIRECTORY "share/" DESTINATION "${DEST_DATADIR_CODEFILES}")

‎meta-pkgs/deb/control.mcstas-suite-python‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Version: @VERSION@
33
Section: main
44
Priority: optional
55
Architecture: all
6-
Depends: mcstas-@VERSION@, mcstas-comps-@VERSION@, mcstas-tools-python-mcplot-pyqtgraph-@VERSION@, mcstas-tools-python-mcplot-matplotlib-@VERSION@, mcstas-tools-python-mcrun-@VERSION@, mcstas-tools-python-mcgui-@VERSION@, mcstas-tools-python-mccodelib-@VERSION@, mcstas-tools-python-mcdisplay-webgl-@VERSION@, mcstas-tools-python-mcdisplay-pyqtgraph-@VERSION@, mcstas-tools-python-mcdisplay-mantid-@VERSION@, mcstas-manuals-@VERSION@, mcstas-tools-python-mcdoc-@VERSION@, mcpl, ncrystal
6+
Depends: mcstas, mcstas-comps, mcstas-tools-python-mcplot-pyqtgraph, mcstas-tools-python-mcplot-matplotlib, mcstas-tools-python-mcrun, mcstas-tools-python-mcgui, mcstas-tools-python-mccodelib, mcstas-tools-python-mcdisplay-webgl, mcstas-tools-python-mcdisplay-pyqtgraph, mcstas-tools-python-mcdisplay-mantid, mcstas-manuals, mcstas-tools-python-mcdoc, mcpl, ncrystal
77
Installed-Size:
8-
Maintainer: Peter Willendrup
8+
Maintainer: Peter Willendrup <[email protected]>
99
Description: A metapackage for McStas + python tools

0 commit comments

Comments
 (0)