Skip to content

Commit 951b0cf

Browse files
author
Gleb Aronsky
committed
Fixed package name
Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
1 parent ec09fbe commit 951b0cf

File tree

4 files changed

+51
-0
lines changed

4 files changed

+51
-0
lines changed

CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ if (NOT LICENSE_FILE)
1818
set (LICENSE_FILE "LICENSE.txt")
1919
endif()
2020

21+
include (${HPCC_GM_SOURCE_DIR}/version.cmake)
2122
include (${HPCC_GM_SOURCE_DIR}/cmake_modules/gmCommonSetup.cmake)
23+
SET(CPACK_PACKAGE_VERSION_MAJOR ${majorver})
24+
SET(CPACK_PACKAGE_VERSION_MINOR ${minorver})
25+
SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
26+
2227

2328
set (CPACK_PACKAGE_CONTACT "HPCCSystems <ossdevelopment@lexisnexis.com>")
2429
set (CPACK_SOURCE_GENERATOR TGZ )

LICENSE.txt

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[ Please note: HPCC SYSTEMS now licenses the HPCC Systems Community Edition, starting with v3.8, under the Apache v2 license agreement. Appropriate files are being updated. ]
2+
3+
4+
HPCC SYSTEMS software Copyright (C) 2013 HPCC Systems.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.

cmake_modules/gmCommonSetup.cmake

+20
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,24 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
4242
endif ()
4343
message ("-- Making ${CMAKE_BUILD_TYPE} system")
4444

45+
# Build tag generation
46+
47+
set(majorver ${HPCC_MAJOR})
48+
set(minorver ${HPCC_MINOR})
49+
set(point ${HPCC_POINT})
50+
if ( "${HPCC_MATURITY}" STREQUAL "release" )
51+
set(stagever "${HPCC_SEQUENCE}")
52+
else()
53+
set(stagever "${HPCC_MATURITY}${HPCC_SEQUENCE}")
54+
endif()
55+
set(version ${majorver}.${minorver}.${point})
56+
57+
IF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
58+
set( stagever "${stagever}Debug" )
59+
ENDIF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
60+
61+
###########################################################################
62+
63+
64+
4565
endif()

version.cmake

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
###
2+
## Version Information
3+
###
4+
set ( HPCC_PROJECT "community" )
5+
set ( HPCC_MAJOR 4 )
6+
set ( HPCC_MINOR 1 )
7+
set ( HPCC_POINT 0 )
8+
set ( HPCC_MATURITY "trunk" )
9+
set ( HPCC_SEQUENCE 1 )
10+
###

0 commit comments

Comments
 (0)