From 00947eb865aa9f7d8d4f2a282f1048fcacb6030a Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 16 Jun 2015 18:46:05 +0100 Subject: [PATCH] [misc] fix getopt build path for Visual Studio * getopt was being built outside of the project directory * Also add a scripts to create git hooks and .amend --- .amend.cmd | 2 ++ _set_git_hooks.sh | 18 ++++++++++++++++++ src/getopt/.msvc/getopt.vcxproj | 16 ++++++++-------- src/rufus.rc | 16 ++++++++-------- 4 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 .amend.cmd create mode 100755 _set_git_hooks.sh diff --git a/.amend.cmd b/.amend.cmd new file mode 100644 index 00000000..bd37740f --- /dev/null +++ b/.amend.cmd @@ -0,0 +1,2 @@ +echo off +echo .>.amend \ No newline at end of file diff --git a/_set_git_hooks.sh b/_set_git_hooks.sh new file mode 100755 index 00000000..1c3fd8cd --- /dev/null +++ b/_set_git_hooks.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# Sets the git hooks on a new git development system +if [ -e ".git/hooks/pre-commit" ] || [ -e ".git/hooks/post-commit" ] ; then + echo 'pre-commit or post-commit git hook is already set, aborting.' + exit +fi + +echo 'Creating pre-commit git hook...' +echo '#!/bin/sh' > .git/hooks/pre-commit +echo 'if [ -x ./_pre-commit.sh ]; then' >> .git/hooks/pre-commit +echo ' source ./_pre-commit.sh' >> .git/hooks/pre-commit +echo 'fi' >> .git/hooks/pre-commit + +echo 'Creating post-commit git hook...' +echo '#!/bin/sh' > .git/hooks/post-commit +echo 'if [ -x ./_post-commit.sh ]; then' >> .git/hooks/post-commit +echo ' source ./_post-commit.sh' >> .git/hooks/post-commit +echo 'fi' >> .git/hooks/post-commit diff --git a/src/getopt/.msvc/getopt.vcxproj b/src/getopt/.msvc/getopt.vcxproj index bd5a315a..0c09fb86 100644 --- a/src/getopt/.msvc/getopt.vcxproj +++ b/src/getopt/.msvc/getopt.vcxproj @@ -63,14 +63,14 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\ - $(SolutionDir)..\$(Platform)\$(Configuration)\lib\getopt\ + $(SolutionDir)x86_32\$(Configuration)\ + $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86_64\$(Configuration)\ + $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86_32\$(Configuration)\ + $(SolutionDir)x86_32\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86_64\$(Configuration)\ + $(SolutionDir)x86_64\$(Configuration)\$(ProjectName)\ diff --git a/src/rufus.rc b/src/rufus.rc index d072156f..1c2765ee 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.3.674" +CAPTION "Rufus 2.3.675" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.3.674" +CAPTION "Rufus 2.3.675" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.3.674" +CAPTION "Rufus 2.3.675" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.3.674" +CAPTION "Rufus 2.3.675" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,674,0 - PRODUCTVERSION 2,3,674,0 + FILEVERSION 2,3,675,0 + PRODUCTVERSION 2,3,675,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -689,13 +689,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.3.674" + VALUE "FileVersion", "2.3.675" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.3.674" + VALUE "ProductVersion", "2.3.675" END END BLOCK "VarFileInfo"