Merge pull request #8 from ggtakec/master

Updated files for release 1.0.61
yahoojapan · Jul 4, 2018 · 9258c42 · 9258c42
2 parents c1ca782 + ea5798e
commit 9258c42
Show file tree

Hide file tree

Showing 127 changed files with 5,738 additions and 1,363 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 #
 # K2HASH
 #
-# Copyright 2013 Yahoo! JAPAN corporation.
+# Copyright 2013 Yahoo Japan Corporation.
 #
 # K2HASH is key-valuew store base libraries.
 # K2HASH is made for the purpose of the construction of
@@ -11,7 +11,7 @@
 # and is provided safely as available KVS.
 #
 # For the full copyright and license information, please view
-# the LICENSE file that was distributed with this source code.
+# the license file that was distributed with this source code.
 #
 # AUTHOR:   Takeshi Nakatani
 # CREATE:   Fri Dec 2 2013
@@ -89,15 +89,15 @@ stamp-h1
 # automakes
 #
 Makefile.in
-*/Makefile.in
-
+Makefile
 
 #
 # archive files and backups
 #
 *.tgz
 *.tar.gz
 *.rpm
+*.deb
 *.swp
 
 #
@@ -121,16 +121,25 @@ test-driver/*
 #
 # Other built objects
 #
-*.pc
-Makefile
-*/Makefile
-
-#
-# project custom
-#
 RELEASE_VERSION
-lib/k2hashversion.cc
+COMMIT_HASH
+*.pc
+*.spec
 *.k2h
+buildutils/control
+buildutils/copyright
+rpmbuild
+rpmbuild/*
+debian
+debian/*
+debian_build
+debian_build/*
+lib/k2hashversion.cc
+tests/results.xml
+tests/test-suite.log
+tests/test.sh.log
+tests/test.sh.trs
+tests/test_linetool_noverinfo.log
 tests/k2hinittest
 tests/k2hmemtest
 tests/k2hrwtest

diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ git:
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config
- - git submodule update --init --recursive
+ - git clone https://github.com/yahoojapan/fullock.git
  - cd fullock
  - ./autogen.sh
  - ./configure --prefix=/usr

diff --git a/AUTHORS b/AUTHORS
@@ -10,3 +10,6 @@ Wrote k2htouch, k2himport and k2hedit.
 
 Porting to multiple languages for k2hash.
 
+4. Hirotaka Wakabayashi <[email protected]>
+
+Technical engineer of k2hash product.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,35 @@
+k2hash (1.0.61) trusty; urgency=low
+
+  * avoid static object initialization order problem(SIOF)
+
+ -- Takeshi Nakatani <[email protected]>  Fri, 29 Jun 2018 14:54:05 +0900
+
+k2hash (1.0.60) trusty; urgency=low
+
+  * Fixed build options for pthread
+
+ -- Takeshi Nakatani <[email protected]>  Tue, 26 Jun 2018 11:32:23 +0900
+
+k2hash (1.0.59) trusty; urgency=low
+
+  * Fixed a bug about lead loop
+
+ -- Takeshi Nakatani <[email protected]>  Thu, 21 Jun 2018 18:27:00 +0900
+
+k2hash (1.0.58) trusty; urgency=low
+
+  * Cleanup credit comments in sources
+  * Supported multi crypt libraries(NSS/gcrypt/nettle)
+  * Changed build logic to new for rpm/debian packaging
+  * Fixed build error with openssl 1.1.0
+
+ -- Takeshi Nakatani <[email protected]>  Wed, 16 May 2018 10:13:04 +0900
+
 k2hash (1.0.57) trusty; urgency=low
 
   * Fixed type qualifiers ignored on function return type
 
--- Takeshi Nakatani <[email protected]> Wed, 17 May 2017 08:19:59 +0900
+ -- Takeshi Nakatani <[email protected]> Wed, 17 May 2017 08:19:59 +0900
 
 k2hash (1.0.56) trusty; urgency=low
 

diff --git a/Makefile.am b/Makefile.am
@@ -1,7 +1,7 @@
 #
 # K2HASH
 #
-# Copyright 2013 Yahoo! JAPAN corporation.
+# Copyright 2013 Yahoo Japan Corporation.
 #
 # K2HASH is key-valuew store base libraries.
 # K2HASH is made for the purpose of the construction of
@@ -11,16 +11,16 @@
 # and is provided safely as available KVS.
 #
 # For the full copyright and license information, please view
-# the LICENSE file that was distributed with this source code.
+# the license file that was distributed with this source code.
 #
 # AUTHOR:   Takeshi Nakatani
 # CREATE:   Fri Dec 2 2013
 # REVISION:
 #
 
-SUBDIRS=lib docs tests
+SUBDIRS=lib docs tests buildutils
 
-EXTRA_DIST=RELEASE_VERSION make_valiables.sh make_release_version_file.sh make_rev.sh
+EXTRA_DIST=RELEASE_VERSION
 
 #
 # VIM modelines

diff --git a/README b/README
@@ -1,7 +1,7 @@
 k2hash
 ------
 
-K2HASH - NoSQL Key Value Store(KVS) library by Yahoo! JAPAN
+K2HASH - NoSQL Key Value Store(KVS) library
 
 ### Overview
 K2HASH is NoSQL(key value store) library and tools for this library by
@@ -23,6 +23,7 @@ Yahoo! JAPAN. K2HASH is following specifications.
   - https://github.com/yahoojapan/k2hash/wiki
 
 ### License
-This software is released under the MIT License, see the LICENSE file.
+This software is released under the MIT License, see the license file.
+
+Copyright(C) 2013 Yahoo Japan Corporation.
 
-Copyright 2013 Yahoo! JAPAN corporation.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@ k2hash
 ------
 [![Build Status](https://travis-ci.org/yahoojapan/k2hash.svg?branch=master)](https://travis-ci.org/yahoojapan/k2hash)
 
-K2HASH - NoSQL Key Value Store(KVS) library by Yahoo! JAPAN
+K2HASH - NoSQL Key Value Store(KVS) library
 
 ### Overview
 K2HASH is NoSQL(key value store) library and tools for this library by

diff --git a/autogen.sh b/autogen.sh
@@ -1,24 +1,30 @@
 #!/bin/sh
 #
-# Automatically generate configuration - autogen.sh
+# K2HASH
 #
-# Copyright 2016 Yahoo! JAPAN corporation.
+# Utility tools for building configure/packages by AntPickax
 #
-# Templates for customizing screwdriver CPP and autotools.
-# This template files are provided by yjcore team.
+# Copyright 2018 Yahoo Japan Corporation.
 #
-# This script file is for initializing autoconf/autotools
-# files. And make version number information file from
-# git tag(release), this file is used by other build tools.
+# AntPickax provides utility tools for supporting autotools
+# builds.
 #
+# These tools retrieve the necessary information from the
+# repository and appropriately set the setting values of
+# configure, Makefile, spec,etc file and so on.
+# These tools were recreated to reduce the number of fixes and
+# reduce the workload of developers when there is a change in
+# the project configuration.
+# 
 # For the full copyright and license information, please view
-# the LICENSE file that was distributed with this source code.
+# the license file that was distributed with this source code.
 #
 # AUTHOR:   Takeshi Nakatani
-# CREATE:   Thu, Jun 2 2016
+# CREATE:   Fri, Apr 13 2018
 # REVISION:
 #
 
+
 #
 # Usage: autogen.sh [-noupdate_version_file] [-no_aclocal_force] [-no_check_ver_diff]
 #
@@ -46,7 +52,7 @@ while [ $# -ne 0 ]; do
 		echo "Usage: ${AUTOGEN_NAME} [-noupdate_version_file] [-no_aclocal_force] [-no_check_ver_diff]"
 		exit 1
 	else
-		echo "ERROR: Unkown option $1"
+		echo "ERROR: Unknown option $1"
 		echo "Usage: ${AUTOGEN_NAME} [-noupdate_version_file] [-no_aclocal_force] [-no_check_ver_diff]"
 		exit 1
 	fi
@@ -57,7 +63,8 @@ done
 # update RELEASE_VERSION file
 #
 if [ "X${NOUPDATE}" = "Xno" ]; then
-	${SRCTOP}/make_release_version_file.sh ${PARAMETERS}
+	echo "--- run make_release_version_file.sh"
+	${SRCTOP}/buildutils/make_release_version_file.sh ${PARAMETERS}
 	if [ $? -ne 0 ]; then
 		echo "ERROR: update RELEASE_VERSION file"
 		exit 1

diff --git a/buildutils/Makefile.am b/buildutils/Makefile.am
@@ -0,0 +1,38 @@
+#
+# K2HASH
+#
+# Utility tools for building configure/packages by AntPickax
+#
+# Copyright 2018 Yahoo Japan Corporation.
+#
+# AntPickax provides utility tools for supporting autotools
+# builds.
+#
+# These tools retrieve the necessary information from the
+# repository and appropriately set the setting values of
+# configure, Makefile, spec,etc file and so on.
+# These tools were recreated to reduce the number of fixes and
+# reduce the workload of developers when there is a change in
+# the project configuration.
+#
+# For the full copyright and license information, please view
+# the license file that was distributed with this source code.
+#
+# AUTHOR:   Takeshi Nakatani
+# CREATE:   Fri, Apr 13 2018
+# REVISION:
+#
+
+EXTRA_DIST =make_variables.sh \
+			make_release_version_file.sh \
+			make_commit_hash.sh \
+			make_commit_hash_source.sh \
+			make_rpm_changelog.sh \
+			make_description.sh \
+			debian_build.sh
+
+#
+# VIM modelines
+#
+# vim:set ts=4 fenc=utf-8:
+#
diff --git a/buildutils/control.in b/buildutils/control.in
@@ -0,0 +1,24 @@
+Source: @PACKAGE_NAME@
+Section: database
+Priority: extra
+Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
+Build-Depends: debhelper (>= 9), autotools-dev, libfullock-dev (>= 1.0.28)
+Standards-Version: 3.9.5
+Homepage: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
+Vcs-Git: git://@GIT_DOMAIN@/@GIT_ORG@/@[email protected]
+Vcs-Browser: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
+
+Package: @PACKAGE_NAME@-dev
+Section: devel
+Architecture: amd64
+Depends: @PACKAGE_NAME@ (= ${binary:Version}), libfullock-dev (>= 1.0.28)
+Description: @SHORTDESC@ (development)
+ Development package for building with @PACKAGE_NAME@ shared library.
+  This package has header files and symbols for it.
+
+Package: @PACKAGE_NAME@
+Section: database
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libfullock (>= 1.0.28)
+Description: @SHORTDESC@
+@DEBLONGDESC@
diff --git a/buildutils/copyright.in b/buildutils/copyright.in
@@ -0,0 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: @PACKAGE_NAME@
+Source: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
+
+Files: *
+Copyright: 2013 Yahoo Japan Corporation
+License: @PKGLICENSE@
+@DEBCOPYING@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,6 @@ Wrote k2htouch, k2himport and k2hedit.

		Porting to multiple languages for k2hash.

		4. Hirotaka Wakabayashi <[email protected]>

		Technical engineer of k2hash product.