Bump GetGitRevisionDescription.cmake to 6a748896188fdf3f885820ccd686393ea5215dbf (from cmake-modules)

48 files changed, 250 insertions, 91 deletions

diff --git a/cmake/modules/GetGitRevisionDescription.cmake b/cmake/modules/GetGitRevisionDescription.cmake
index c8d27f2e..87f691ad 100644
--- a/cmake/modules/GetGitRevisionDescription.cmake
+++ b/cmake/modules/GetGitRevisionDescription.cmake
@@ -3,7 +3,7 @@
 # These functions force a re-configure on each git commit so that you can
 # trust the values of the variables in your build system.
 #
-#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+#  get_git_head_revision(<refspecvar> <hashvar> [ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR])
 #
 # Returns the refspec and sha hash of the current head revision
 #
@@ -12,26 +12,39 @@
 # Returns the results of git describe on the source tree, and adjusting
 # the output so that it tests false if an error occurs.
 #
+#  git_describe_working_tree(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the working tree (--dirty option),
+# and adjusting the output so that it tests false if an error occurs.
+#
 #  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
 #
 # Returns the results of git describe --exact-match on the source tree,
 # and adjusting the output so that it tests false if there was no exact
 # matching tag.
 #
+#  git_local_changes(<var>)
+#
+# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes.
+# Uses the return code of "git diff-index --quiet HEAD --".
+# Does not regard untracked files.
+#
 # Requires CMake 2.6 or newer (uses the 'function' command)
 #
 # Original Author:
-# 2009-2010 Ryan Pavlik <[email protected]> <[email protected]>
+# 2009-2020 Ryan Pavlik <[email protected]> <[email protected]>
 # http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
 #
-# Copyright Iowa State University 2009-2010.
+# Copyright 2009-2013, Iowa State University.
+# Copyright 2013-2020, Ryan Pavlik
+# Copyright 2013-2020, Contributors
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
 if(__get_git_revision_description)
-	return()
+    return()
 endif()
 set(__get_git_revision_description YES)
 
@@ -39,92 +52,233 @@ set(__get_git_revision_description YES)
 # to find the path to this module rather than the path to a calling list file
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 
+# Function _git_find_closest_git_dir finds the next closest .git directory
+# that is part of any directory in the path defined by _start_dir.
+# The result is returned in the parent scope variable whose name is passed
+# as variable _git_dir_var. If no .git directory can be found, the
+# function returns an empty string via _git_dir_var.
+#
+# Example: Given a path C:/bla/foo/bar and assuming C:/bla/.git exists and
+# neither foo nor bar contain a file/directory .git. This wil return
+# C:/bla/.git
+#
+function(_git_find_closest_git_dir _start_dir _git_dir_var)
+    set(cur_dir "${_start_dir}")
+    set(git_dir "${_start_dir}/.git")
+    while(NOT EXISTS "${git_dir}")
+        # .git dir not found, search parent directories
+        set(git_previous_parent "${cur_dir}")
+        get_filename_component(cur_dir ${cur_dir} DIRECTORY)
+        if(cur_dir STREQUAL git_previous_parent)
+            # We have reached the root directory, we are not in git
+            set(${_git_dir_var}
+                ""
+                PARENT_SCOPE)
+            return()
+        endif()
+        set(git_dir "${cur_dir}/.git")
+    endwhile()
+    set(${_git_dir_var}
+        "${git_dir}"
+        PARENT_SCOPE)
+endfunction()
+
 function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			return()
-		endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	# check if this is a submodule
-	if(NOT IS_DIRECTORY ${GIT_DIR})
-		file(READ ${GIT_DIR} submodule)
-		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
-		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
-	endif()
-	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
-	if(NOT EXISTS "${GIT_DATA}")
-		file(MAKE_DIRECTORY "${GIT_DATA}")
-	endif()
-
-	if(NOT EXISTS "${GIT_DIR}/HEAD")
-		return()
-	endif()
-	set(HEAD_FILE "${GIT_DATA}/HEAD")
-	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
-
-	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-		"${GIT_DATA}/grabRef.cmake"
-		@ONLY)
-	include("${GIT_DATA}/grabRef.cmake")
-
-	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+    _git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
+
+    if("${ARGN}" STREQUAL "ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR")
+        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR TRUE)
+    else()
+        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR FALSE)
+    endif()
+    if(NOT "${GIT_DIR}" STREQUAL "")
+        file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}"
+             "${GIT_DIR}")
+        if("${_relative_to_source_dir}" MATCHES "[.][.]" AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
+            # We've gone above the CMake root dir.
+            set(GIT_DIR "")
+        endif()
+    endif()
+    if("${GIT_DIR}" STREQUAL "")
+        set(${_refspecvar}
+            "GITDIR-NOTFOUND"
+            PARENT_SCOPE)
+        set(${_hashvar}
+            "GITDIR-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    # Check if the current source dir is a git submodule or a worktree.
+    # In both cases .git is a file instead of a directory.
+    #
+    if(NOT IS_DIRECTORY ${GIT_DIR})
+        # The following git command will return a non empty string that
+        # points to the super project working tree if the current
+        # source dir is inside a git submodule.
+        # Otherwise the command will return an empty string.
+        #
+        execute_process(
+            COMMAND "${GIT_EXECUTABLE}" rev-parse
+                    --show-superproject-working-tree
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+            OUTPUT_VARIABLE out
+            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(NOT "${out}" STREQUAL "")
+            # If out is empty, GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a submodule
+            file(READ ${GIT_DIR} submodule)
+            string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE
+                                 ${submodule})
+            string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE)
+            get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+            get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
+                                   ABSOLUTE)
+            set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
+        else()
+            # GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a worktree
+            file(READ ${GIT_DIR} worktree_ref)
+            # The .git directory contains a path to the worktree information directory
+            # inside the parent git repo of the worktree.
+            #
+            string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir
+                                 ${worktree_ref})
+            string(STRIP ${git_worktree_dir} git_worktree_dir)
+            _git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR)
+            set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD")
+        endif()
+    else()
+        set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
+    endif()
+    set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+    if(NOT EXISTS "${GIT_DATA}")
+        file(MAKE_DIRECTORY "${GIT_DATA}")
+    endif()
+
+    if(NOT EXISTS "${HEAD_SOURCE_FILE}")
+        return()
+    endif()
+    set(HEAD_FILE "${GIT_DATA}/HEAD")
+    configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY)
+
+    configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+                   "${GIT_DATA}/grabRef.cmake" @ONLY)
+    include("${GIT_DATA}/grabRef.cmake")
+
+    set(${_refspecvar}
+        "${HEAD_REF}"
+        PARENT_SCOPE)
+    set(${_hashvar}
+        "${HEAD_HASH}"
+        PARENT_SCOPE)
 endfunction()
 
 function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
-
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
-
-	set(${_var} "${out}" PARENT_SCOPE)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    # TODO sanitize
+    #if((${ARGN}" MATCHES "&&") OR
+    #	(ARGN MATCHES "||") OR
+    #	(ARGN MATCHES "\\;"))
+    #	message("Please report the following error to the project!")
+    #	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+    #endif()
+
+    #message(STATUS "Arguments to execute_process: ${ARGN}")
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --tags --always ${hash} ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_describe_working_tree _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --dirty ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
 endfunction()
 
 function(git_get_exact_tag _var)
-	git_describe(out --exact-match ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
+    git_describe(out --exact-match ${ARGN})
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_local_changes _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD --
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(res EQUAL 0)
+        set(${_var}
+            "CLEAN"
+            PARENT_SCOPE)
+    else()
+        set(${_var}
+            "DIRTY"
+            PARENT_SCOPE)
+    endif()
 endfunction()
diff --git a/cmake/modules/GetGitRevisionDescription.cmake.in b/cmake/modules/GetGitRevisionDescription.cmake.in
index 888ce13a..116efc4e 100644
--- a/cmake/modules/GetGitRevisionDescription.cmake.in
+++ b/cmake/modules/GetGitRevisionDescription.cmake.in
@@ -1,4 +1,4 @@
-# 
+#
 # Internal file for GetGitRevisionDescription.cmake
 #
 # Requires CMake 2.6 or newer (uses the 'function' command)
@@ -8,10 +8,12 @@
 # http://academic.cleardefinition.com
 # Iowa State University HCI Graduate Program/VRAC
 #
-# Copyright Iowa State University 2009-2010.
+# Copyright 2009-2012, Iowa State University
+# Copyright 2011-2015, Contributors
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
+# SPDX-License-Identifier: BSL-1.0
 
 set(HEAD_HASH)
 
@@ -23,9 +25,12 @@ if(HEAD_CONTENTS MATCHES "ref")
 	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
 	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
 		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
-		configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-		set(HEAD_HASH "${HEAD_REF}")
+	else()
+		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+			set(HEAD_HASH "${CMAKE_MATCH_1}")
+		endif()
 	endif()
 else()
 	# detached HEAD
diff --git a/java/direct_bt/tinyb/DBTAdapter.java b/java/jau/direct_bt/DBTAdapter.java
index 4a12cd27..4a12cd27 100644
--- a/java/direct_bt/tinyb/DBTAdapter.java
+++ b/java/jau/direct_bt/DBTAdapter.java
diff --git a/java/direct_bt/tinyb/DBTDevice.java b/java/jau/direct_bt/DBTDevice.java
index a3f87ac8..a3f87ac8 100644
--- a/java/direct_bt/tinyb/DBTDevice.java
+++ b/java/jau/direct_bt/DBTDevice.java
diff --git a/java/direct_bt/tinyb/DBTEvent.java b/java/jau/direct_bt/DBTEvent.java
index 66317ea9..66317ea9 100644
--- a/java/direct_bt/tinyb/DBTEvent.java
+++ b/java/jau/direct_bt/DBTEvent.java
diff --git a/java/direct_bt/tinyb/DBTGattCharacteristic.java b/java/jau/direct_bt/DBTGattCharacteristic.java
index c8d71998..c8d71998 100644
--- a/java/direct_bt/tinyb/DBTGattCharacteristic.java
+++ b/java/jau/direct_bt/DBTGattCharacteristic.java
diff --git a/java/direct_bt/tinyb/DBTGattDescriptor.java b/java/jau/direct_bt/DBTGattDescriptor.java
index bef26e91..bef26e91 100644
--- a/java/direct_bt/tinyb/DBTGattDescriptor.java
+++ b/java/jau/direct_bt/DBTGattDescriptor.java
diff --git a/java/direct_bt/tinyb/DBTGattService.java b/java/jau/direct_bt/DBTGattService.java
index eca6ddf1..eca6ddf1 100644
--- a/java/direct_bt/tinyb/DBTGattService.java
+++ b/java/jau/direct_bt/DBTGattService.java
diff --git a/java/direct_bt/tinyb/DBTManager.java b/java/jau/direct_bt/DBTManager.java
index d1f1d755..d1f1d755 100644
--- a/java/direct_bt/tinyb/DBTManager.java
+++ b/java/jau/direct_bt/DBTManager.java
diff --git a/java/direct_bt/tinyb/DBTNativeDownlink.java b/java/jau/direct_bt/DBTNativeDownlink.java
index d9039db3..d9039db3 100644
--- a/java/direct_bt/tinyb/DBTNativeDownlink.java
+++ b/java/jau/direct_bt/DBTNativeDownlink.java
diff --git a/java/direct_bt/tinyb/DBTObject.java b/java/jau/direct_bt/DBTObject.java
index 2365ab0d..2365ab0d 100644
--- a/java/direct_bt/tinyb/DBTObject.java
+++ b/java/jau/direct_bt/DBTObject.java
diff --git a/java/org/tinyb/AdapterSettings.java b/java/org/direct_bt/AdapterSettings.java
index 6ce39e33..6ce39e33 100644
--- a/java/org/tinyb/AdapterSettings.java
+++ b/java/org/direct_bt/AdapterSettings.java
diff --git a/java/org/tinyb/AdapterStatusListener.java b/java/org/direct_bt/AdapterStatusListener.java
index 2bd0be7b..2bd0be7b 100644
--- a/java/org/tinyb/AdapterStatusListener.java
+++ b/java/org/direct_bt/AdapterStatusListener.java
diff --git a/java/org/tinyb/BDAddressAndType.java b/java/org/direct_bt/BDAddressAndType.java
index 270ae210..270ae210 100644
--- a/java/org/tinyb/BDAddressAndType.java
+++ b/java/org/direct_bt/BDAddressAndType.java
diff --git a/java/org/tinyb/BDAddressType.java b/java/org/direct_bt/BDAddressType.java
index 199a9fb8..199a9fb8 100644
--- a/java/org/tinyb/BDAddressType.java
+++ b/java/org/direct_bt/BDAddressType.java
diff --git a/java/org/tinyb/BLERandomAddressType.java b/java/org/direct_bt/BLERandomAddressType.java
index 808789aa..808789aa 100644
--- a/java/org/tinyb/BLERandomAddressType.java
+++ b/java/org/direct_bt/BLERandomAddressType.java
diff --git a/java/org/tinyb/BTMode.java b/java/org/direct_bt/BTMode.java
index 95d7cb83..95d7cb83 100644
--- a/java/org/tinyb/BTMode.java
+++ b/java/org/direct_bt/BTMode.java
diff --git a/java/org/tinyb/BTSecurityLevel.java b/java/org/direct_bt/BTSecurityLevel.java
index f57105a7..f57105a7 100644
--- a/java/org/tinyb/BTSecurityLevel.java
+++ b/java/org/direct_bt/BTSecurityLevel.java
diff --git a/java/org/tinyb/BluetoothAdapter.java b/java/org/direct_bt/BluetoothAdapter.java
index 0d72e4c1..0d72e4c1 100644
--- a/java/org/tinyb/BluetoothAdapter.java
+++ b/java/org/direct_bt/BluetoothAdapter.java
diff --git a/java/org/tinyb/BluetoothCallback.java b/java/org/direct_bt/BluetoothCallback.java
index d2f59c35..d2f59c35 100644
--- a/java/org/tinyb/BluetoothCallback.java
+++ b/java/org/direct_bt/BluetoothCallback.java
diff --git a/java/org/tinyb/BluetoothDevice.java b/java/org/direct_bt/BluetoothDevice.java
index 710d9c16..710d9c16 100644
--- a/java/org/tinyb/BluetoothDevice.java
+++ b/java/org/direct_bt/BluetoothDevice.java
diff --git a/java/org/tinyb/BluetoothEvent.java b/java/org/direct_bt/BluetoothEvent.java
index 620ab0ad..620ab0ad 100644
--- a/java/org/tinyb/BluetoothEvent.java
+++ b/java/org/direct_bt/BluetoothEvent.java
diff --git a/java/org/tinyb/BluetoothException.java b/java/org/direct_bt/BluetoothException.java
index 81628412..81628412 100644
--- a/java/org/tinyb/BluetoothException.java
+++ b/java/org/direct_bt/BluetoothException.java
diff --git a/java/org/tinyb/BluetoothFactory.java b/java/org/direct_bt/BluetoothFactory.java
index 6e4c3cde..6e4c3cde 100644
--- a/java/org/tinyb/BluetoothFactory.java
+++ b/java/org/direct_bt/BluetoothFactory.java
diff --git a/java/org/tinyb/BluetoothGattCharacteristic.java b/java/org/direct_bt/BluetoothGattCharacteristic.java
index a51c56f3..a51c56f3 100644
--- a/java/org/tinyb/BluetoothGattCharacteristic.java
+++ b/java/org/direct_bt/BluetoothGattCharacteristic.java
diff --git a/java/org/tinyb/BluetoothGattDescriptor.java b/java/org/direct_bt/BluetoothGattDescriptor.java
index 4ccdf2d6..4ccdf2d6 100644
--- a/java/org/tinyb/BluetoothGattDescriptor.java
+++ b/java/org/direct_bt/BluetoothGattDescriptor.java
diff --git a/java/org/tinyb/BluetoothGattService.java b/java/org/direct_bt/BluetoothGattService.java
index 5190fdce..5190fdce 100644
--- a/java/org/tinyb/BluetoothGattService.java
+++ b/java/org/direct_bt/BluetoothGattService.java
diff --git a/java/org/tinyb/BluetoothManager.java b/java/org/direct_bt/BluetoothManager.java
index fe7b5a44..fe7b5a44 100644
--- a/java/org/tinyb/BluetoothManager.java
+++ b/java/org/direct_bt/BluetoothManager.java
diff --git a/java/org/tinyb/BluetoothNotification.java b/java/org/direct_bt/BluetoothNotification.java
index abc90259..abc90259 100644
--- a/java/org/tinyb/BluetoothNotification.java
+++ b/java/org/direct_bt/BluetoothNotification.java
diff --git a/java/org/tinyb/BluetoothObject.java b/java/org/direct_bt/BluetoothObject.java
index 906f116e..906f116e 100644
--- a/java/org/tinyb/BluetoothObject.java
+++ b/java/org/direct_bt/BluetoothObject.java
diff --git a/java/org/tinyb/BluetoothType.java b/java/org/direct_bt/BluetoothType.java
index c05ace73..c05ace73 100644
--- a/java/org/tinyb/BluetoothType.java
+++ b/java/org/direct_bt/BluetoothType.java
diff --git a/java/org/tinyb/BluetoothUtils.java b/java/org/direct_bt/BluetoothUtils.java
index d088fadc..d088fadc 100644
--- a/java/org/tinyb/BluetoothUtils.java
+++ b/java/org/direct_bt/BluetoothUtils.java
diff --git a/java/org/tinyb/EIRDataTypeSet.java b/java/org/direct_bt/EIRDataTypeSet.java
index b5caa28f..b5caa28f 100644
--- a/java/org/tinyb/EIRDataTypeSet.java
+++ b/java/org/direct_bt/EIRDataTypeSet.java
diff --git a/java/org/tinyb/EUI48.java b/java/org/direct_bt/EUI48.java
index 16c679ab..16c679ab 100644
--- a/java/org/tinyb/EUI48.java
+++ b/java/org/direct_bt/EUI48.java
diff --git a/java/org/tinyb/GATTCharacteristicListener.java b/java/org/direct_bt/GATTCharacteristicListener.java
index 96114e07..96114e07 100644
--- a/java/org/tinyb/GATTCharacteristicListener.java
+++ b/java/org/direct_bt/GATTCharacteristicListener.java
diff --git a/java/org/tinyb/HCIStatusCode.java b/java/org/direct_bt/HCIStatusCode.java
index c329d1c9..c329d1c9 100644
--- a/java/org/tinyb/HCIStatusCode.java
+++ b/java/org/direct_bt/HCIStatusCode.java
diff --git a/java/org/tinyb/HCIWhitelistConnectType.java b/java/org/direct_bt/HCIWhitelistConnectType.java
index efe884c6..efe884c6 100644
--- a/java/org/tinyb/HCIWhitelistConnectType.java
+++ b/java/org/direct_bt/HCIWhitelistConnectType.java
diff --git a/java/org/tinyb/ObjectArgCallback.java b/java/org/direct_bt/ObjectArgCallback.java
index c201c8fb..c201c8fb 100644
--- a/java/org/tinyb/ObjectArgCallback.java
+++ b/java/org/direct_bt/ObjectArgCallback.java
diff --git a/java/org/tinyb/ObjectArrayArgCallback.java b/java/org/direct_bt/ObjectArrayArgCallback.java
index 91bb6e50..91bb6e50 100644
--- a/java/org/tinyb/ObjectArrayArgCallback.java
+++ b/java/org/direct_bt/ObjectArrayArgCallback.java
diff --git a/java/org/tinyb/PairingMode.java b/java/org/direct_bt/PairingMode.java
index 1e4b6243..1e4b6243 100644
--- a/java/org/tinyb/PairingMode.java
+++ b/java/org/direct_bt/PairingMode.java
diff --git a/java/org/tinyb/PlatformToolkit.java b/java/org/direct_bt/PlatformToolkit.java
index 7a8282b7..7a8282b7 100644
--- a/java/org/tinyb/PlatformToolkit.java
+++ b/java/org/direct_bt/PlatformToolkit.java
diff --git a/java/org/tinyb/SMPIOCapability.java b/java/org/direct_bt/SMPIOCapability.java
index 3824dd73..3824dd73 100644
--- a/java/org/tinyb/SMPIOCapability.java
+++ b/java/org/direct_bt/SMPIOCapability.java
diff --git a/java/org/tinyb/SMPKeyMask.java b/java/org/direct_bt/SMPKeyMask.java
index eb362956..eb362956 100644
--- a/java/org/tinyb/SMPKeyMask.java
+++ b/java/org/direct_bt/SMPKeyMask.java
diff --git a/java/org/tinyb/SMPLongTermKeyInfo.java b/java/org/direct_bt/SMPLongTermKeyInfo.java
index 5a6e0c6f..5a6e0c6f 100644
--- a/java/org/tinyb/SMPLongTermKeyInfo.java
+++ b/java/org/direct_bt/SMPLongTermKeyInfo.java
diff --git a/java/org/tinyb/SMPPairingState.java b/java/org/direct_bt/SMPPairingState.java
index 8c8348ab..8c8348ab 100644
--- a/java/org/tinyb/SMPPairingState.java
+++ b/java/org/direct_bt/SMPPairingState.java
diff --git a/java/org/tinyb/SMPSignatureResolvingKeyInfo.java b/java/org/direct_bt/SMPSignatureResolvingKeyInfo.java
index cc9e818b..cc9e818b 100644
--- a/java/org/tinyb/SMPSignatureResolvingKeyInfo.java
+++ b/java/org/direct_bt/SMPSignatureResolvingKeyInfo.java
diff --git a/java/org/tinyb/ScanType.java b/java/org/direct_bt/ScanType.java
index 9b9502fe..9b9502fe 100644
--- a/java/org/tinyb/ScanType.java
+++ b/java/org/direct_bt/ScanType.java
diff --git a/java/org/tinyb/TransportType.java b/java/org/direct_bt/TransportType.java
index 7c79d240..7c79d240 100644
--- a/java/org/tinyb/TransportType.java
+++ b/java/org/direct_bt/TransportType.java