Mercurial > louis > kiibohd-controller

changeset 294:834d69d22d47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adding list of modified files to the cli version command.
author Jacob Alexander <haata@kiibohd.com>
date Sat, 28 Feb 2015 23:50:13 -0800
parents 57f40871c726
children b311f387c921 413c6b2b21d0
files Debug/cli/cli.c Lib/CMake/modules.cmake Lib/_buildvars.h
diffstat 3 files changed, 39 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/Debug/cli/cli.c	Sat Feb 28 22:13:17 2015 -0800
+++ b/Debug/cli/cli.c	Sat Feb 28 23:50:13 2015 -0800
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 by Jacob Alexander
+/* Copyright (C) 2014-2015 by Jacob Alexander
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -422,7 +422,7 @@
 	print( NL );
 	print( " \033[1mRevision:\033[0m      " CLI_Revision       NL );
 	print( " \033[1mBranch:\033[0m        " CLI_Branch         NL );
-	print( " \033[1mTree Status:\033[0m   " CLI_ModifiedStatus NL );
+	print( " \033[1mTree Status:\033[0m   " CLI_ModifiedStatus CLI_ModifiedFiles NL );
 	print( " \033[1mRepo Origin:\033[0m   " CLI_RepoOrigin     NL );
 	print( " \033[1mCommit Date:\033[0m   " CLI_CommitDate     NL );
 	print( " \033[1mCommit Author:\033[0m " CLI_CommitAuthor   NL );
--- a/Lib/CMake/modules.cmake	Sat Feb 28 22:13:17 2015 -0800
+++ b/Lib/CMake/modules.cmake	Sat Feb 28 23:50:13 2015 -0800
@@ -157,7 +157,7 @@
 #
 
 #| Manufacturer name
-set( MANUFACTURER "Kiibohd" )
+set ( MANUFACTURER "Kiibohd" )
 
 
 #| Serial Number
@@ -165,19 +165,29 @@
 
 #| Modified
 #| Takes a bit of work to extract the "M " using CMake, and not using it if there are no modifications
-execute_process( COMMAND ${GIT_EXECUTABLE} status -s -uno --porcelain
+execute_process ( COMMAND ${GIT_EXECUTABLE} status -s -uno --porcelain
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	OUTPUT_VARIABLE Git_Modified_INFO
 	ERROR_QUIET
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-string( LENGTH "${Git_Modified_INFO}" Git_Modified_LENGTH )
-set( Git_Modified_Status "Clean" )
+string ( LENGTH "${Git_Modified_INFO}" Git_Modified_LENGTH )
+set ( Git_Modified_Status "Clean" )
 if ( ${Git_Modified_LENGTH} GREATER 2 )
-	string( SUBSTRING "${Git_Modified_INFO}" 1 2 Git_Modified_Flag_INFO )
-	set( Git_Modified_Status "Dirty" )
+	string ( SUBSTRING "${Git_Modified_INFO}" 1 2 Git_Modified_Flag_INFO )
+	set ( Git_Modified_Status "Dirty" )
 endif ()
 
+#| List of modified files
+execute_process ( COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD --
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+	OUTPUT_VARIABLE Git_Modified_Files
+	ERROR_QUIET
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+string ( REGEX REPLACE "\n" "\\\\r\\\\n\\\\t" Git_Modified_Files "${Git_Modified_Files}" )
+set ( Git_Modified_Files "\\r\\n\\t${Git_Modified_Files}" )
+
 #| Branch
 execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -187,7 +197,7 @@
 )
 
 #| Date
-execute_process( COMMAND ${GIT_EXECUTABLE} show -s --format=%ci
+execute_process ( COMMAND ${GIT_EXECUTABLE} show -s --format=%ci
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	OUTPUT_VARIABLE Git_Date_INFO
 	ERROR_QUIET
@@ -195,7 +205,7 @@
 )
 
 #| Commit Author and Email
-execute_process( COMMAND ${GIT_EXECUTABLE} show -s --format="%cn <%ce>"
+execute_process ( COMMAND ${GIT_EXECUTABLE} show -s --format="%cn <%ce>"
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	OUTPUT_VARIABLE Git_Commit_Author
 	ERROR_QUIET
@@ -203,7 +213,7 @@
 )
 
 #| Commit Revision
-execute_process( COMMAND ${GIT_EXECUTABLE} show -s --format=%H
+execute_process ( COMMAND ${GIT_EXECUTABLE} show -s --format=%H
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	OUTPUT_VARIABLE Git_Commit_Revision
 	ERROR_QUIET
@@ -211,7 +221,7 @@
 )
 
 #| Origin URL
-execute_process( COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
+execute_process ( COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	OUTPUT_VARIABLE Git_Origin_URL
 	ERROR_QUIET
@@ -219,25 +229,25 @@
 )
 
 #| Build Date
-execute_process( COMMAND "date" "+%Y-%m-%d %T %z"
+execute_process ( COMMAND "date" "+%Y-%m-%d %T %z"
 	OUTPUT_VARIABLE Build_Date
 	ERROR_QUIET
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 #| Last Commit Date
-set( GitLastCommitDate "${Git_Modified_Status} ${Git_Branch_INFO} - ${Git_Date_INFO}" )
+set ( GitLastCommitDate "${Git_Modified_Status} ${Git_Branch_INFO} - ${Git_Date_INFO}" )
 
 #| Uses CMake variables to include as defines
 #| Primarily for USB configuration
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Lib/_buildvars.h buildvars.h )
+configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/Lib/_buildvars.h buildvars.h )
 
 
 
 ###
 # Source Defines
 #
-set( SRCS
+set ( SRCS
 	${MAIN_SRCS}
 	${COMPILER_SRCS}
 	${Scan_SRCS}
@@ -247,7 +257,7 @@
 )
 
 #| Directories to include by default
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 
 
@@ -255,20 +265,20 @@
 # ctag Generation
 #
 
-if( CTAGS_EXECUTABLE )
+if ( CTAGS_EXECUTABLE )
 	# Populate list of directories for ctags to parse
 	# NOTE: Doesn't support dots in the folder names...
-	foreach( filename ${SRCS} )
-		string( REGEX REPLACE "/[a-zA-Z0-9_-]+.c$" "" pathglob ${filename} )
-		file( GLOB filenames "${pathglob}/*.c" )
-		set( CTAG_PATHS ${CTAG_PATHS} ${filenames} )
-		file( GLOB filenames "${pathglob}/*.h" )
-		set( CTAG_PATHS ${CTAG_PATHS} ${filenames} )
-	endforeach()
+	foreach ( filename ${SRCS} )
+		string ( REGEX REPLACE "/[a-zA-Z0-9_-]+.c$" "" pathglob ${filename} )
+		file ( GLOB filenames "${pathglob}/*.c" )
+		set ( CTAG_PATHS ${CTAG_PATHS} ${filenames} )
+		file ( GLOB filenames "${pathglob}/*.h" )
+		set ( CTAG_PATHS ${CTAG_PATHS} ${filenames} )
+	endforeach ()
 
 	# Generate the ctags
-	execute_process( COMMAND ctags ${CTAG_PATHS}
+	execute_process ( COMMAND ctags ${CTAG_PATHS}
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	)
-endif()
+endif ()
 
--- a/Lib/_buildvars.h	Sat Feb 28 22:13:17 2015 -0800
+++ b/Lib/_buildvars.h	Sat Feb 28 23:50:13 2015 -0800
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2014 by Jacob Alexander
+/* Copyright (C) 2013-2015 by Jacob Alexander
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,7 @@
 #define CLI_Revision            "@Git_Commit_Revision@"
 #define CLI_Branch              "@Git_Branch_INFO@"
 #define CLI_ModifiedStatus      "@Git_Modified_Status@"
+#define CLI_ModifiedFiles       "@Git_Modified_Files@"
 #define CLI_RepoOrigin          "@Git_Origin_URL@"
 #define CLI_CommitDate          "@Git_Date_INFO@"
 #define CLI_CommitAuthor        @Git_Commit_Author@