audio: new platform branch build error [1/1]
PD#SWPL-72065
Problem:
git parent version is null when new platform branch
Solution:
1.add default header file
2.uses sh file and sed do version check
Verify:
rdk-212
Change-Id: I66c5eb66be5479271c3f3d45a5133dd8a0fabaf2
Signed-off-by: jing.zhang <jing.zhang@amlogic.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc29abd..6e0dbf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,19 +4,7 @@
VERSION 1.0)
include(GNUInstallDirs)
-set(COMMIT_HASH_AUDIO_HAL_P "")
-set(COMMIT_HASH_AUDIO_HAL_H "")
-set(COMMIT_ATIME_AUDIO_HAL "")
-set(COMMIT_CTIME_AUDIO_HAL "")
-execute_process(COMMAND git log -1 --format="%p" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE COMMIT_HASH_AUDIO_HAL_P OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND git log -1 --format="%h" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE COMMIT_HASH_AUDIO_HAL_H OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND git log -1 --format="%ad" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE COMMIT_ATIME_AUDIO_HAL OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND git log -1 --format="%cd" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE COMMIT_CTIME_AUDIO_HAL OUTPUT_STRIP_TRAILING_WHITESPACE)
-configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/version.h.ini
- ${CMAKE_CURRENT_SOURCE_DIR}/audio_hal/audio_hal_version.h
- @ONLY
- )
+execute_process(COMMAND sh version_config.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory("libms12_v24")
add_subdirectory("audio_codec/libfaad")
add_subdirectory("audio_codec/libmad")
diff --git a/audio_hal/audio_hal_version.h b/audio_hal/audio_hal_version.h
new file mode 100644
index 0000000..2e54811
--- /dev/null
+++ b/audio_hal/audio_hal_version.h
@@ -0,0 +1,14 @@
+#ifndef __AML_AUDIO_VERSION_H__
+#define __AML_AUDIO_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char libVersion[]=
+"MM-module-name:aml_audio_hal,version:1.0.1-r675-gefe12f53";
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*__AML_VERSION_H__*/
\ No newline at end of file
diff --git a/audio_hal/audio_hw.c b/audio_hal/audio_hw.c
index 2641b9c..32e32e9 100644
--- a/audio_hal/audio_hw.c
+++ b/audio_hal/audio_hw.c
@@ -9838,9 +9838,7 @@
}
#endif
aml_dev->debug_flag = aml_audio_get_debug_flag();
-#ifdef AUDIO_HAL_GIT_VERSION_P
- dprintf(fd, "AUDIO_HAL_GIT_VERSION %s,%s,%s,%s\n",AUDIO_HAL_GIT_VERSION_P,AUDIO_HAL_GIT_VERSION_H,AUDIO_HAL_GIT_VER_TIMEC,AUDIO_HAL_GIT_VER_TIMEA);
-#endif
+ dprintf(fd, "AUDIO_HAL_GIT_VERSION %s\n",libVersion);
dprintf(fd, "\n----------------------------[AML_HAL] primary audio hal[dev:%p]----------------------------\n", aml_dev);
while (retry > 0 && pthread_mutex_trylock(&aml_dev->lock) != 0) {
diff --git a/version.h.ini b/version.h.ini
deleted file mode 100644
index fa9773e..0000000
--- a/version.h.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HAL_AUDIO_GIT_VER
-#define HAL_AUDIO_GIT_VER
-
-#define AUDIO_HAL_GIT_VERSION_P @COMMIT_HASH_AUDIO_HAL_P@
-#define AUDIO_HAL_GIT_VERSION_H @COMMIT_HASH_AUDIO_HAL_H@
-#define AUDIO_HAL_GIT_VER_TIMEA @COMMIT_ATIME_AUDIO_HAL@
-#define AUDIO_HAL_GIT_VER_TIMEC @COMMIT_CTIME_AUDIO_HAL@
-#endif
diff --git a/version_config.sh b/version_config.sh
new file mode 100755
index 0000000..020eaa5
--- /dev/null
+++ b/version_config.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#version rule:MAJORVERSION.MINORVERSION.REVISION-r(COMMIT_COUNT)-g(COMMIT_ID)
+
+BASE=$(pwd)
+echo $BASE
+
+#major version
+MAJORVERSION=1
+
+#minor version
+MINORVERSION=0
+
+#reversion,now use commit count
+REVISION=1
+
+#modue name/
+MODULE_NAME=MM-module-name:aml_audio_hal
+
+#get all commit count
+COMMIT_COUNT=$(git rev-list HEAD --count)
+echo commit count $COMMIT_COUNT
+
+#get current commit id
+COMMIT_ID=$(git show -s --pretty=format:%h)
+echo commit id $COMMIT_ID
+
+#find the module name line
+MODULE_NAME_LINE=`sed -n '/\"MM-module-name/=' audio_hal/audio_hal_version.h`
+#echo $VERSION_LINE
+
+#version rule string
+VERSION_STRING=${MAJORVERSION}.${MINORVERSION}.${REVISION}-r${COMMIT_COUNT}-g${COMMIT_ID}
+
+#update the original version
+if [ ${MODULE_NAME_LINE} -gt 0 ]; then
+sed -i -e ${MODULE_NAME_LINE}s"/.*/\"${MODULE_NAME},version:${VERSION_STRING}\"\;/" audio_hal/audio_hal_version.h
+fi