always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: rename PRE_RELEASE as RELEASE_CANDIDATE

Browse Source
This commit is contained in:
Mizux Seiha
2025-12-02 17:24:47 +01:00
committed by Corentin Le Molgat
parent 94dceb5957
commit 32ee8627ca
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Version.txt
View File

@@ -1,3 +1,3 @@
OR_TOOLS_MAJOR=9 OR_TOOLS_MAJOR=9
OR_TOOLS_MINOR=15 OR_TOOLS_MINOR=15
#PRE_RELEASE=YES #RELEASE_CANDIDATE=YES

2
cmake/utils.cmake
View File

@@ -50,7 +50,7 @@ function(set_version VERSION RELEASE)
if(${STR} MATCHES "OR_TOOLS_MINOR=(.*)") if(${STR} MATCHES "OR_TOOLS_MINOR=(.*)")
set(MINOR ${CMAKE_MATCH_1}) set(MINOR ${CMAKE_MATCH_1})
endif() endif()
if(${STR} MATCHES "^PRE_RELEASE=YES\$") if(${STR} MATCHES "^RELEASE_CANDIDATE=YES\$")
set(IS_RELEASE FALSE) set(IS_RELEASE FALSE)
endif() endif()
endforeach() endforeach()

6
makefiles/Makefile.port.mk
View File

@@ -298,9 +298,9 @@ endif
OR_TOOLS_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR).$(OR_TOOLS_PATCH) OR_TOOLS_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR).$(OR_TOOLS_PATCH)
OR_TOOLS_SHORT_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR) OR_TOOLS_SHORT_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR)
ifdef PRE_RELEASE ifdef RELEASE_CANDIDATE
OR_TOOLS_VERSION := $(OR_TOOLS_VERSION)-beta OR_TOOLS_VERSION := $(OR_TOOLS_VERSION)-rc
OR_TOOLS_SHORT_VERSION := $(OR_TOOLS_SHORT_VERSION)-beta OR_TOOLS_SHORT_VERSION := $(OR_TOOLS_SHORT_VERSION)-rc
endif endif
ifneq ($(wildcard .git),) ifneq ($(wildcard .git),)

4
makefiles/Makefile.python.mk
View File

@@ -459,10 +459,10 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/README.txt: ortools/python/README.pypi.txt | $(
$(PYPI_ARCHIVE_TEMP_DIR)/ortools/LICENSE: LICENSE | $(PYPI_ARCHIVE_TEMP_DIR)/ortools $(PYPI_ARCHIVE_TEMP_DIR)/ortools/LICENSE: LICENSE | $(PYPI_ARCHIVE_TEMP_DIR)/ortools
$(COPY) LICENSE $(PYPI_ARCHIVE_TEMP_DIR)$Sortools $(COPY) LICENSE $(PYPI_ARCHIVE_TEMP_DIR)$Sortools
ifndef PRE_RELEASE ifndef RELEASE_CANDIDATE
OR_TOOLS_PYTHON_VERSION := $(OR_TOOLS_VERSION) OR_TOOLS_PYTHON_VERSION := $(OR_TOOLS_VERSION)
else else
OR_TOOLS_PYTHON_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR)b$(OR_TOOLS_PATCH) OR_TOOLS_PYTHON_VERSION := $(OR_TOOLS_VERSION)rc1
endif endif

2
tools/docker/Makefile
View File

@@ -151,7 +151,7 @@ OR_TOOLS_SHA1 := $(shell git rev-parse --verify HEAD)
include ../../Version.txt include ../../Version.txt
OR_TOOLS_PATCH := $(shell git rev-list --count v${OR_TOOLS_MAJOR}.0..HEAD || echo 0) OR_TOOLS_PATCH := $(shell git rev-list --count v${OR_TOOLS_MAJOR}.0..HEAD || echo 0)
OR_TOOLS_VERSION := ${OR_TOOLS_MAJOR}.${OR_TOOLS_MINOR}.${OR_TOOLS_PATCH} OR_TOOLS_VERSION := ${OR_TOOLS_MAJOR}.${OR_TOOLS_MINOR}.${OR_TOOLS_PATCH}
ifdef PRE_RELEASE ifdef RELEASE_CANDIDATE
OR_TOOLS_VERSION := ${OR_TOOLS_VERSION}-rc OR_TOOLS_VERSION := ${OR_TOOLS_VERSION}-rc
endif endif
$(info branch: ${OR_TOOLS_BRANCH}) $(info branch: ${OR_TOOLS_BRANCH})