From 382d9939b38529ee396e5adb9472896468f37b59 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Wed, 7 Jun 2017 10:26:41 +0200 Subject: [PATCH] Move versioning to a stand alone file --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fbd647f3ef..7ec840c8ff 100755 --- a/Makefile +++ b/Makefile @@ -7,9 +7,6 @@ help: @echo " - .NET: csharp test_csharp clean_csharp " @echo " - all: all test clean" -OR_TOOLS_MAJOR = 6 -OR_TOOLS_MINOR = 0 - # OR_ROOT is the minimal prefix to define the root of or-tools, if we # are compiling in the or-tools root, it is empty. Otherwise, it is # $(OR_TOOLS_TOP)/ or $(OR_TOOLS_TOP)\\ depending on the platform. It @@ -35,7 +32,10 @@ all: third_party_check cc java python csharp @echo Or-tools have been built for $(BUILT_LANGUAGES) clean: clean_cc clean_java clean_python clean_csharp clean_compat -# First, we try to detect the platform. +# Read version. +include $(OR_ROOT)Version.txt + +# We try to detect the platform. include $(OR_ROOT)makefiles/Makefile.port OR_ROOT_FULL=$(OR_TOOLS_TOP)