diff --git a/Makefile.am b/Makefile.am index 3b58ae1a..fc6fefb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,3 +10,5 @@ release: all @upx $(TARGET)$(EXEEXT) @upx $(TARGET)_fd$(EXEEXT) @cmd.exe /k _sign.cmd $(TARGET)$(EXEEXT) $(TARGET)_fd$(EXEEXT) + @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT) + @mv $(TARGET)_fd$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT) diff --git a/Makefile.in b/Makefile.in index f15e3a8d..933a6c79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -450,6 +450,8 @@ release: all @upx $(TARGET)$(EXEEXT) @upx $(TARGET)_fd$(EXEEXT) @cmd.exe /k _sign.cmd $(TARGET)$(EXEEXT) $(TARGET)_fd$(EXEEXT) + @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT) + @mv $(TARGET)_fd$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/configure b/configure index 79617a0d..7dd14e90 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rufus 1.0.4. +# Generated by GNU Autoconf 2.68 for rufus 1.0.5. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='rufus 1.0.4' +PACKAGE_VERSION='1.0.5' +PACKAGE_STRING='rufus 1.0.5' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='https://github.com/pbatard/rufus' @@ -1200,7 +1200,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 1.0.4 to adapt to many kinds of systems. +\`configure' configures rufus 1.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1266,7 +1266,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 1.0.4:";; + short | recursive ) echo "Configuration of rufus 1.0.5:";; esac cat <<\_ACEOF @@ -1354,7 +1354,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 1.0.4 +rufus configure 1.0.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1409,7 +1409,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 1.0.4, which was +It was created by rufus $as_me 1.0.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2224,7 +2224,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='1.0.4' + VERSION='1.0.5' cat >>confdefs.h <<_ACEOF @@ -3982,7 +3982,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 1.0.4, which was +This file was extended by rufus $as_me 1.0.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4036,7 +4036,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 1.0.4 +rufus config.status 1.0.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 659140e9..9326b3f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [1.0.4], [https://github.com/pbatard/rufus/issues], [rufus], [https://github.com/pbatard/rufus]) +AC_INIT([rufus], [1.0.5], [https://github.com/pbatard/rufus/issues], [rufus], [https://github.com/pbatard/rufus]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/rufus.c b/src/rufus.c index 47b7bde5..3034cd57 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -912,6 +912,13 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA SendMessage (hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon); hBigIcon = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 32, 32, 0); SendMessage (hDlg, WM_SETICON, ICON_BIG, (LPARAM)hBigIcon); + // Update the title if we have FreeDOS support + if (bWithFreeDOS) { + GetWindowTextA(hDlg, &tmp[15], sizeof(tmp)-15); + safe_sprintf(tmp, sizeof(tmp), "Rufus (with FreeDOS)"); + tmp[20] = ' '; + SetWindowTextA(hDlg, tmp); + } // Create the status line CreateStatusBar(); // Use maximum granularity for the progress bar diff --git a/src/rufus.rc b/src/rufus.rc index 0aa8323f..dbac1ae0 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.4.100" +CAPTION "Rufus v1.0.5.101" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -65,7 +65,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.0.4 (Build 100)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.5 (Build 101)",IDC_STATIC,46,19,78,8 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 LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -170,8 +170,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,4,100 - PRODUCTVERSION 1,0,4,100 + FILEVERSION 1,0,5,101 + PRODUCTVERSION 1,0,5,101 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -188,13 +188,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.4.100" + VALUE "FileVersion", "1.0.5.101" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.0.4.100" + VALUE "ProductVersion", "1.0.5.101" END END BLOCK "VarFileInfo"