Skip to content

Commit

Permalink
use versioned project name (#6529)
Browse files Browse the repository at this point in the history
* use versioned project name

* move release name to RELEASE file
  • Loading branch information
kevinushey committed Apr 24, 2020
1 parent 8bc84fe commit 8e5f6ed
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
2 changes: 0 additions & 2 deletions CMakeGlobals.txt
Expand Up @@ -40,8 +40,6 @@ else()
endif()
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

set(RSTUDIO_RELEASE_NAME "Wax Begonia")

string(TIMESTAMP CPACK_COPYRIGHT_YEAR "%Y")
string(TIMESTAMP CPACK_BUILD_DATE "%Y-%m-%d")

Expand Down
7 changes: 6 additions & 1 deletion CMakeLists.txt
Expand Up @@ -14,7 +14,12 @@
#

cmake_minimum_required(VERSION 3.4.3)
project (RStudio)

# release name
include(CMakeRelease.txt)

# project name
project("RStudio [${RSTUDIO_RELEASE_NAME}]")

# set compiler
include(CMakeCompiler.txt)
Expand Down
16 changes: 16 additions & 0 deletions CMakeRelease.txt
@@ -0,0 +1,16 @@
# CMakeRelease.txt
#
# Copyright (C) 2009-20 by RStudio, PBC
#
# Unless you have received this program directly from RStudio pursuant
# to the terms of a commercial license agreement with RStudio, then
# this program is licensed to you under the terms of version 3 of the
# GNU Affero General Public License. This program is distributed WITHOUT
# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
#

file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/RELEASE" RSTUDIO_RELEASE_NAME LIMIT_COUNT 1)
set(RSTUDIO_RELEASE_NAME "${RSTUDIO_RELEASE_NAME}" CACHE STRING "RStudio release name")

1 change: 1 addition & 0 deletions RELEASE
@@ -0,0 +1 @@
Wax Begonia
7 changes: 6 additions & 1 deletion src/cpp/CMakeLists.txt
Expand Up @@ -16,8 +16,13 @@
# set minimum version
cmake_minimum_required(VERSION 3.4.3)

project (RSTUDIO_CPP)
# read release name
include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeRelease.txt")

# set project name
project("RStudio [${RSTUDIO_RELEASE_NAME}]")

# tools for reading executable file pre-requisites
include(GetPrerequisites)

# set compiler
Expand Down

0 comments on commit 8e5f6ed

Please sign in to comment.