[v1,4/9] configure: the version cannot use a script

Message ID	1500026405-14155-5-git-send-email-odpbot@yandex.ru
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; From: Github ODP bot <odpbot@yandex.ru> To: lng-odp@lists.linaro.org Date: Fri, 14 Jul 2017 13:00:00 +0300 Message-Id: <1500026405-14155-5-git-send-email-odpbot@yandex.ru> In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 77 Subject: [lng-odp] [PATCH v1 4/9] configure: the version cannot use a script Precedence: list Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>
Series	[v1,1/9] bug: linux-generic: add syntax to allow newer clang to compile odp \| expand [v1,1/9] bug: linux-generic: add syntax to allow newer clang to compile odp [v1,4/9] configure: the version cannot use a script [v1,5/9] configure: remove dependency of autoconf-archive [v1,6/9] configure.ac: do not trap if libatomic is not found [v1,8/9] test: skip pktio_perf tests on 1 and 2 cpus machines [v1,9/9] travis: port travis checks from master

Message ID

1500026405-14155-5-git-send-email-odpbot@yandex.ru

State

New

Headers

Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org
	designates 54.225.227.206 as permitted sender)
	client-ip=54.225.227.206; 
From: Github ODP bot <odpbot@yandex.ru>
To: lng-odp@lists.linaro.org
Date: Fri, 14 Jul 2017 13:00:00 +0300
Message-Id: <1500026405-14155-5-git-send-email-odpbot@yandex.ru>
In-Reply-To: <1500026405-14155-1-git-send-email-odpbot@yandex.ru>
References: <1500026405-14155-1-git-send-email-odpbot@yandex.ru>
Github-pr-num: 77
Subject: [lng-odp] [PATCH v1 4/9] configure: the version cannot use a script
Precedence: list
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Series

[v1,1/9] bug: linux-generic: add syntax to allow newer clang to compile odp | expand

Commit Message

Github ODP bot July 14, 2017, 10 a.m. UTC

From: Mike Holmes <mike.holmes@linaro.org>


Use of a script in the autotools breaks github CI
Define the API version in configure and reuse it in the code

Benefits:
removes dependence on scripts to build
removes scripts and the make file from odp/scripts
removes generated .scmversion file
places api versioning right next to lib versioning in the configure.ac
allows github to auto build odp repos

Signed-off-by: Mike Holmes <mike.holmes@linaro.org>

Reviewed-by: Brian Brooks <brian.brooks@linaro.org>

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** Email created from pull request 77 (muvarov:monarch_lts)
 ** https://github.com/Linaro/odp/pull/77
 ** Patch: https://github.com/Linaro/odp/pull/77.patch
 ** Base sha: 0c15c40db40834f1df217191c4b6a06303ab0872
 ** Merge commit sha: f06a7319a03ad565ced026ddc76a66164aa93782
 **/
 .gitignore                                       |  1 -
 .scmversion                                      |  1 +
 Makefile.am                                      |  5 ++---
 configure.ac                                     | 21 +++++++++++++++++++--
 include/odp/api/spec/.gitignore                  |  1 +
 include/odp/api/spec/{version.h => version.h.in} |  6 +++---
 platform/Makefile.inc                            |  3 +--
 scripts/Makefile.am                              |  1 -
 scripts/get_impl_str.sh                          | 11 -----------
 9 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 .scmversion
 create mode 100644 include/odp/api/spec/.gitignore
 rename include/odp/api/spec/{version.h => version.h.in} (93%)
 delete mode 100644 scripts/Makefile.am
 delete mode 100755 scripts/get_impl_str.sh

diff --git a/.gitignore b/.gitignore
index d4e7d02e..fbc0eab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ 
 .deps/
 .dirstamp
 .libs/
-.scmversion
 CUnit-Memory-Dump.xml
 ID
 Makefile
diff --git a/.scmversion b/.scmversion
new file mode 100644
index 00000000..dc7bf3df
--- /dev/null
+++ b/.scmversion
@@ -0,0 +1 @@ 
+1.11.0.1_monarch.git10.g7106d8b0
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 625748af..2a9a658d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,8 @@  SUBDIRS = @platform_with_platform@ \
 	  test \
 	  helper/test \
 	  doc \
-	  example \
-	  scripts
+	  example
 
 @DX_RULES@
 
-EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion
+EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README
diff --git a/configure.ac b/configure.ac
index 08cc375d..efb9f7ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,23 @@ 
 AC_PREREQ([2.5])
-AC_INIT([OpenDataPlane], m4_esyscmd_s(./scripts/git_hash.sh .), [lng-odp@lists.linaro.org])
+##########################################################################
+# Set correct API version
+##########################################################################
+m4_define([odpapi_generation_version], [1])
+m4_define([odpapi_major_version], [11])
+m4_define([odpapi_minor_version], [0])
+m4_define([odpapi_point_version], [1])
+m4_define([odpapi_version],
+    [odpapi_generation_version.odpapi_major_version.odpapi_minor_version.odpapi_point_version])
+AC_INIT([OpenDataPlane],[odpapi_version],[lng-odp@lists.linaro.org])
+
+ODP_VERSION_API_GENERATION=odpapi_generation_version
+AC_SUBST(ODP_VERSION_API_GENERATION)
+ODP_VERSION_API_MAJOR=odpapi_major_version
+AC_SUBST(ODP_VERSION_API_MAJOR)
+ODP_VERSION_API_MINOR=odpapi_minor_version
+AC_SUBST(ODP_VERSION_API_MINOR)
+AC_CONFIG_FILES([include/odp/api/spec/version.h])
+
 AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects])
 AC_CONFIG_SRCDIR([helper/config.h.in])
 AM_CONFIG_HEADER([helper/config.h])
@@ -267,7 +285,6 @@  AC_CONFIG_FILES([Makefile
 		 helper/test/Makefile
 		 pkgconfig/libodp-linux.pc
 		 pkgconfig/libodphelper-linux.pc
-		 scripts/Makefile
 		 ])
 
 AC_SEARCH_LIBS([timer_create],[rt posix4])
diff --git a/include/odp/api/spec/.gitignore b/include/odp/api/spec/.gitignore
new file mode 100644
index 00000000..67020331
--- /dev/null
+++ b/include/odp/api/spec/.gitignore
@@ -0,0 +1 @@ 
+version.h
diff --git a/include/odp/api/spec/version.h b/include/odp/api/spec/version.h.in
similarity index 93%
rename from include/odp/api/spec/version.h
rename to include/odp/api/spec/version.h.in
index 1ddb9cea..4b16dcc5 100644
--- a/include/odp/api/spec/version.h
+++ b/include/odp/api/spec/version.h.in
@@ -37,7 +37,7 @@  extern "C" {
  * very significant changes to the API. APIs with different
  * versions are likely not backward compatible.
  */
-#define ODP_VERSION_API_GENERATION 1
+#define ODP_VERSION_API_GENERATION @ODP_VERSION_API_GENERATION@
 
 /**
  * ODP API major version
@@ -45,7 +45,7 @@  extern "C" {
  * Introduction of major new features or changes. APIs with different major
  * versions are likely not backward compatible.
  */
-#define ODP_VERSION_API_MAJOR 11
+#define  ODP_VERSION_API_MAJOR @ODP_VERSION_API_MAJOR@
 
 /**
  * ODP API minor version
@@ -54,7 +54,7 @@  extern "C" {
  * to the API. For an API with common generation and major version, but with
  * different minor numbers the two versions are backward compatible.
  */
-#define ODP_VERSION_API_MINOR 0
+#define ODP_VERSION_API_MINOR @ODP_VERSION_API_MINOR@
 
 /**
  * ODP API version string
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 053bd121..4a0e68b7 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -10,8 +10,7 @@  lib_LTLIBRARIES = $(LIB)/libodp-linux.la
 
 AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
 
-GIT_DESC = `$(top_srcdir)/scripts/get_impl_str.sh $(top_srcdir)`
-AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
+AM_CFLAGS += "-DGIT_HASH=$(VERSION)"
 AM_CFLAGS += $(VISIBILITY_CFLAGS)
 
 #The implementation will need to retain the deprecated implementation
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 189b3efc..00000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@ 
-EXTRA_DIST = get_impl_str.sh git_hash.sh
diff --git a/scripts/get_impl_str.sh b/scripts/get_impl_str.sh
deleted file mode 100755
index d765a531..00000000
--- a/scripts/get_impl_str.sh
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#!/bin/bash
-
-if [ -z ${1} ]; then
-	echo "should be called with a path"
-	exit
-fi
-ROOTDIR=${1}
-
-CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git}
-
-echo -n "'${CUSTOM_STR}' ($(cat ${ROOTDIR}/.scmversion))"