Merge pull request #3 from ggtakec/master

Updated changelog for v1.0.21

ChangeLog

@@ -1,3 +1,10 @@
+k2htpdtor (1.0.21) trusty; urgency=low
+
+  * Added lib_version_for_link option to make_valiables.sh
+  * Updated submodule dependency for chmpx/k2hash/fullock
+
+ -- Takeshi Nakatani <[email protected]>  Tue, 28 Mar 2017 13:20:11 +0900
+
 k2htpdtor (1.0.20) trusty; urgency=low
 
   * Updated dependency for fixing bugs in libfullock

configure.ac

@@ -67,23 +67,23 @@ AC_CONFIG_FILES([Makefile
 
 # k2hash
 if test "x${CHECK_K2HASH}" != "xno"; then
-	PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.54], [have_k2hash=yes], [have_k2hash=no])
+	PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.56], [have_k2hash=yes], [have_k2hash=no])
 	if test "x${have_k2hash}" = "xno"; then
 		AC_MSG_ERROR([not found k2hash package.])
 	fi
 fi
 
 # chmpx
 if test "x${CHECK_CHMPX}" != "xno"; then
-	PKG_CHECK_MODULES([chmpx], [libchmpx >= 1.0.51], [have_chmpx=yes], [have_chmpx=no])
+	PKG_CHECK_MODULES([chmpx], [libchmpx >= 1.0.52], [have_chmpx=yes], [have_chmpx=no])
 	if test "x${have_chmpx}" = "xno"; then
 		AC_MSG_ERROR([not found chmpx package.])
 	fi
 fi
 
 #fullock
 if test "x${CHECK_FULLOCK}" != "xno"; then
-	PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.23], [have_fullock=yes], [have_fullock=no])
+	PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.24], [have_fullock=yes], [have_fullock=no])
 	if test "x${have_fullock}" = "xno"; then
 		AC_MSG_ERROR([not found fullock package.])
 	fi

make_valiables.sh

@@ -29,7 +29,7 @@ TOP_DIR=`cd ${PROGRAM_DIR}; pwd`
 
 if [ $# -ne 1 ]; then
 	echo "ERROR: ${PROGRAM_NAME} needs parameter."
-	echo "Usage: ${PROGRAM_NAME} [-pkg_version | -lib_version_info | -major_number]"
+	echo "Usage: ${PROGRAM_NAME} [-pkg_version | -lib_version_info | -lib_version_for_link | -major_number]"
 	exit 1
 fi
 
@@ -43,8 +43,41 @@ if [ "X$1" = "X-h" -o "X$1" = "X--help" ]; then
 elif [ "X$1" = "X-pkg_version" ]; then
 	RESULT=`cat ${TOP_DIR}/RELEASE_VERSION`
 
-elif [ "X$1" = "X-lib_version_info" ]; then
-	RESULT=`cat ${TOP_DIR}/RELEASE_VERSION | sed 's/["|\.]/ /g' | awk '{print $1":"$3":0"}'`
+elif [ "X$1" = "X-lib_version_info" -o "X$1" = "X-lib_version_for_link" ]; then
+	MAJOR_VERSION=`cat ${TOP_DIR}/RELEASE_VERSION | sed 's/["|\.]/ /g' | awk '{print $1}'`
+	MID_VERSION=`cat ${TOP_DIR}/RELEASE_VERSION | sed 's/["|\.]/ /g' | awk '{print $2}'`
+	LAST_VERSION=`cat ${TOP_DIR}/RELEASE_VERSION | sed 's/["|\.]/ /g' | awk '{print $3}'`
+
+	# check version number
+	expr "${MAJOR_VERSION}" + 1 >/dev/null 2>&1
+	if [ $? -ge 2 ]; then
+		echo "ERROR: wrong version number in RELEASE_VERSION file"
+		exit 1
+	fi
+	expr "${MID_VERSION}" + 1 >/dev/null 2>&1
+	if [ $? -ge 2 ]; then
+		echo "ERROR: wrong version number in RELEASE_VERSION file"
+		exit 1
+	fi
+	expr "${LAST_VERSION}" + 1 >/dev/null 2>&1
+	if [ $? -ge 2 ]; then
+		echo "ERROR: wrong version number in RELEASE_VERSION file"
+		exit 1
+	fi
+
+	# make library revision number
+	if [ ${MID_VERSION} -gt 0 ]; then
+		REV_VERSION=`expr ${MID_VERSION} \* 1000`
+		REV_VERSION=`expr ${LAST_VERSION} + ${REV_VERSION}`
+	else
+		REV_VERSION=${LAST_VERSION}
+	fi
+
+	if [ "X$1" = "X-lib_version_info" ]; then
+		RESULT="${MAJOR_VERSION}:${REV_VERSION}:0"
+	else
+		RESULT="${MAJOR_VERSION}.0.${REV_VERSION}"
+	fi
 
 elif [ "X$1" = "X-major_number" ]; then
 	RESULT=`cat ${TOP_DIR}/RELEASE_VERSION | sed 's/["|\.]/ /g' | awk '{print $1}'`