diff --git a/Makefile.am b/Makefile.am index 938c8f20..619c53ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,3 +19,6 @@ appx: @sed -b -i -f cmd.sed res/appstore/AppxManifest.xml @rm cmd.sed @cd res/appstore; cmd.exe //c packme.cmd + @mv arm/Release/$(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)_arm$(EXEEXT) + @mv arm64/Release/$(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)_arm64$(EXEEXT) + @mv res/appstore/Rufus-$(VERSION).appx . diff --git a/Makefile.in b/Makefile.in index 9b7e36ee..0e9022e0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -516,6 +516,9 @@ appx: @sed -b -i -f cmd.sed res/appstore/AppxManifest.xml @rm cmd.sed @cd res/appstore; cmd.exe //c packme.cmd + @mv arm/Release/$(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)_arm$(EXEEXT) + @mv arm64/Release/$(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)_arm64$(EXEEXT) + @mv res/appstore/Rufus-$(VERSION).appx . # 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 6c47aa0a..dcf3c683 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rufus 3.7. +# Generated by GNU Autoconf 2.69 for rufus 3.8. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='3.7' -PACKAGE_STRING='rufus 3.7' +PACKAGE_VERSION='3.8' +PACKAGE_STRING='rufus 3.8' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='https://rufus.ie' @@ -1228,7 +1228,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 3.7 to adapt to many kinds of systems. +\`configure' configures rufus 3.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1294,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 3.7:";; + short | recursive ) echo "Configuration of rufus 3.8:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 3.7 +rufus configure 3.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1440,7 +1440,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 3.7, which was +It was created by rufus $as_me 3.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,7 +2303,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='3.7' + VERSION='3.8' cat >>confdefs.h <<_ACEOF @@ -4483,7 +4483,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 3.7, which was +This file was extended by rufus $as_me 3.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4537,7 +4537,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 3.7 +rufus config.status 3.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 211be5f8..7fc9240d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [3.7], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) +AC_INIT([rufus], [3.8], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml index 225bc162..e8f75aeb 100644 --- a/res/appstore/AppxManifest.xml +++ b/res/appstore/AppxManifest.xml @@ -8,7 +8,7 @@ for an interesting struggle, when you also happen to have a comma in one of the fields... --> diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index 42a20959..b8eec712 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -1,6 +1,6 @@ @echo off setlocal EnableExtensions DisableDelayedExpansion -set VERSION=3.7 +set VERSION=3.8 del /q *.appx >NUL 2>&1 del /q *.appxbundle >NUL 2>&1 diff --git a/src/rufus.rc b/src/rufus.rc index 7b2ae4a3..cfda91fc 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.7.1576" +CAPTION "Rufus 3.8.1577" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,1576,0 - PRODUCTVERSION 3,7,1576,0 + FILEVERSION 3,8,1577,0 + PRODUCTVERSION 3,8,1577,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -410,16 +410,16 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "https://akeo.ie" + VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.7.1576" + VALUE "FileVersion", "3.8.1577" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" - VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" - VALUE "OriginalFilename", "rufus-3.7.exe" + VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" + VALUE "OriginalFilename", "rufus-3.8.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.7.1576" + VALUE "ProductVersion", "3.8.1577" END END BLOCK "VarFileInfo"