mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[internal] added post-commit hook for autotagging
This commit is contained in:
		
							parent
							
								
									1b20310395
								
							
						
					
					
						commit
						651cdcaa65
					
				
					 3 changed files with 21 additions and 11 deletions
				
			
		
							
								
								
									
										13
									
								
								_post-commit.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								_post-commit.sh
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,13 @@ | ||||||
|  | #!/bin/sh | ||||||
|  | # | ||||||
|  | # Creates a tag according to the number of commits on this branch | ||||||
|  | # | ||||||
|  | # To have git run this script on commit, create a "post-commit" text file in | ||||||
|  | # .git/hooks/ with the following content: | ||||||
|  | # #!/bin/sh | ||||||
|  | # source ./_post-commit.sh | ||||||
|  | 
 | ||||||
|  | type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; } | ||||||
|  | 
 | ||||||
|  | TAGVER=`cat .tag` | ||||||
|  | git tag "#$TAGVER" | ||||||
|  | @ -18,9 +18,11 @@ TAGVER=`echo $VER` | ||||||
| # of a .amend file in the current directory will do | # of a .amend file in the current directory will do | ||||||
| if [ -f ./.amend ]; then | if [ -f ./.amend ]; then | ||||||
| 	TAGVER=`expr $TAGVER - 1` | 	TAGVER=`expr $TAGVER - 1` | ||||||
|  | 	git tag -d "#$TAGVER" | ||||||
| 	rm ./.amend; | 	rm ./.amend; | ||||||
| fi | fi | ||||||
| echo "setting nano to $TAGVER" | echo "setting nano to $TAGVER" | ||||||
|  | echo $TAGVER > .tag | ||||||
| 
 | 
 | ||||||
| cat > cmd.sed <<\_EOF | cat > cmd.sed <<\_EOF | ||||||
| s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@TAGVER@@/ | s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@TAGVER@@/ | ||||||
|  | @ -47,8 +49,3 @@ git add ./rufus.rc | ||||||
| #mv _bm.sh~ _bm.sh | #mv _bm.sh~ _bm.sh | ||||||
| 
 | 
 | ||||||
| rm cmd.sed | rm cmd.sed | ||||||
| 
 |  | ||||||
| # TODO?: use the following in post-commit to setup a tag every 10 commits |  | ||||||
| #if [ "${TAGVER:${#TAGVER}-1:1}" == '0' ]; then |  | ||||||
| #	echo "  commit #${TAGVER:${#TAGVER}-1:1}"; |  | ||||||
| #fi |  | ||||||
|  |  | ||||||
							
								
								
									
										12
									
								
								rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										12
									
								
								rufus.rc
									
										
									
									
									
								
							|  | @ -63,7 +63,7 @@ BEGIN | ||||||
|     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP |     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP | ||||||
|     CONTROL         "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL, |     CONTROL         "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL, | ||||||
|                     "SysLink",WS_TABSTOP,46,47,114,9 |                     "SysLink",WS_TABSTOP,46,47,114,9 | ||||||
|     LTEXT           "Version 1.0.0 (Build 51)",IDC_STATIC,46,19,78,8 |     LTEXT           "Version 1.0.0 (Build 52)",IDC_STATIC,46,19,78,8 | ||||||
|     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP |     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP | ||||||
|     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL |     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL | ||||||
|     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 |     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 | ||||||
|  | @ -162,8 +162,8 @@ END | ||||||
| // | // | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
|  FILEVERSION 1,0,0,51 |  FILEVERSION 1,0,0,52 | ||||||
|  PRODUCTVERSION 1,0,0,51 |  PRODUCTVERSION 1,0,0,52 | ||||||
|  FILEFLAGSMASK 0x3fL |  FILEFLAGSMASK 0x3fL | ||||||
| #ifdef _DEBUG | #ifdef _DEBUG | ||||||
|  FILEFLAGS 0x1L |  FILEFLAGS 0x1L | ||||||
|  | @ -180,13 +180,13 @@ BEGIN | ||||||
|         BEGIN |         BEGIN | ||||||
|             VALUE "CompanyName", "akeo.ie" |             VALUE "CompanyName", "akeo.ie" | ||||||
|             VALUE "FileDescription", "Rufus" |             VALUE "FileDescription", "Rufus" | ||||||
|             VALUE "FileVersion", "1.0.0.51" |             VALUE "FileVersion", "1.0.0.52" | ||||||
|             VALUE "InternalName", "Rufus" |             VALUE "InternalName", "Rufus" | ||||||
|             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" |             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" | ||||||
|             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" |             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" | ||||||
|             VALUE "OriginalFilename", "rufus.exe" |             VALUE "OriginalFilename", "rufus.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "1.0.0.51" |             VALUE "ProductVersion", "1.0.0.52" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  | @ -212,7 +212,7 @@ IDI_ICON                ICON                    "rufus.ico" | ||||||
| 
 | 
 | ||||||
| STRINGTABLE | STRINGTABLE | ||||||
| BEGIN | BEGIN | ||||||
|     IDS_VERSION             "Rufus v1.0.0.51" |     IDS_VERSION             "Rufus v1.0.0.52" | ||||||
| END | END | ||||||
| 
 | 
 | ||||||
| #endif    // English resources | #endif    // English resources | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue