diff --git a/Makefile.am b/Makefile.am index b9714a17..137f5042 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,10 +6,5 @@ release: all @mv src/$(TARGET)$(EXEEXT) . @$(STRIP) $(TARGET)$(EXEEXT) @upx $(TARGET)$(EXEEXT) - @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXESUFFIX)$(EXEEXT) -# Don't want to enter a password twice => only sign when we have both release files - @if [ -f $(TARGET)_v$(VERSION)f$(EXEEXT) ]; then \ - if [ -f $(TARGET)_v$(VERSION)$(EXEEXT) ]; then \ - cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT); \ - fi; \ - fi \ No newline at end of file + @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT) + @cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) diff --git a/Makefile.in b/Makefile.in index 115d791d..131d5fcb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,7 +71,6 @@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_LDFLAGS = @AM_LDFLAGS@ -AM_RCFLAGS = @AM_RCFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -85,7 +84,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EXEEXT = @EXEEXT@ -EXESUFFIX = @EXESUFFIX@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -449,13 +447,8 @@ release: all @mv src/$(TARGET)$(EXEEXT) . @$(STRIP) $(TARGET)$(EXEEXT) @upx $(TARGET)$(EXEEXT) - @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXESUFFIX)$(EXEEXT) -# Don't want to enter a password twice => only sign when we have both release files - @if [ -f $(TARGET)_v$(VERSION)f$(EXEEXT) ]; then \ - if [ -f $(TARGET)_v$(VERSION)$(EXEEXT) ]; then \ - cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT); \ - fi; \ - fi + @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT) + @cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(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/README.txt b/README.txt index 8f33e545..cbaa09b8 100644 --- a/README.txt +++ b/README.txt @@ -5,16 +5,14 @@ Features: - Creates DOS bootable USB drives, with no external files required - Creates bootable USB drives from bootable ISOs (Windows, Linux, etc.) - Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO->USB (1) -- Bad blocks check +- Bad blocks check, with detection for fake capacity - Modern UI, with UAC elevation for Windows Vista and later -- Very small footprint, no installation required +- Small footprint, no installation required - 100% Free Source Software (GPL v3) Compilation: Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then invoke the .sln, wdk_build.cmd or configure/make respectively. - You can change the project options (FreeDOS support, etc) by editing the top-level - ms-config.h (Visual Studio, WDK) or running "./configure --help" (MinGW). Additional information: Rufus provides extensive information about what it is doing through the Windows diff --git a/_post-commit.sh b/_post-commit.sh index 006da2ce..a60416e9 100644 --- a/_post-commit.sh +++ b/_post-commit.sh @@ -12,5 +12,5 @@ type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; } TAGVER=`cat ./.tag` -git tag "#$TAGVER" +git tag "b$TAGVER" rm ./.tag \ No newline at end of file diff --git a/_release.sh b/_release.sh index 2434a9fb..23a02b1f 100644 --- a/_release.sh +++ b/_release.sh @@ -1,10 +1,5 @@ #!/bin/sh rm -f rufus*.exe -./configure --without-freedos +./configure make clean make release -j2 -./configure --with-freedos -# The only difference between FreeDOS and non FreeDOS is with the RC -# => instead of invoking 'make clean, just remove the RC object -rm src/rufus_rc.o -make release -j2 diff --git a/configure b/configure index 89cdac37..2402cedc 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.1.6. +# Generated by GNU Autoconf 2.68 for rufus 1.2.0. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='1.1.6' -PACKAGE_STRING='rufus 1.1.6' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='rufus 1.2.0' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='http://rufus.akeo.ie' @@ -569,8 +569,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -EXESUFFIX -AM_RCFLAGS AM_LDFLAGS AM_CFLAGS VISIBILITY_CFLAGS @@ -651,7 +649,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_silent_rules -with_freedos enable_debug ' ac_precious_vars='build_alias @@ -1204,7 +1201,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.1.6 to adapt to many kinds of systems. +\`configure' configures rufus 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1267,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 1.1.6:";; + short | recursive ) echo "Configuration of rufus 1.2.0:";; esac cat <<\_ACEOF @@ -1282,11 +1279,6 @@ Optional Features: --disable-silent-rules verbose build output (undo: `make V=0') --enable-debug keep debug symbols for gdb (default=yes) -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-freedos embed FreeDOS support (default=yes) - Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1363,7 +1355,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 1.1.6 +rufus configure 1.2.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1418,7 +1410,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.1.6, which was +It was created by rufus $as_me 1.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2233,7 +2225,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='1.1.6' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -3450,20 +3442,6 @@ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" -# FreeDOS support - -# Check whether --with-freedos was given. -if test "${with_freedos+set}" = set; then : - withval=$with_freedos; -else - with_freedos=yes -fi - -if test "x$with_freedos" != "xno" ; then - AM_RCFLAGS="${AM_RCFLAGS} -DWITH_FREEDOS" - EXESUFFIX="f" -fi - # Debug symbols # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : @@ -3511,8 +3489,6 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot - - ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files src/Makefile" @@ -4091,7 +4067,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.1.6, which was +This file was extended by rufus $as_me 1.2.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4145,7 +4121,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.1.6 +rufus config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -4726,6 +4702,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeDOS support: $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled)" >&5 -$as_echo "FreeDOS support: $(test \"x$with_freedos\" != \"xno\" && echo enabled || echo disabled)" >&6; } diff --git a/configure.ac b/configure.ac index 2dc7eefe..3a48d357 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [1.1.6], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [1.2.0], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -21,17 +21,6 @@ AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions]) AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" -# FreeDOS support -AC_ARG_WITH([freedos], - [AS_HELP_STRING([--with-freedos], - [embed FreeDOS support (default=yes)])], - [], - [with_freedos=yes]) -if test "x$with_freedos" != "xno" ; then - AM_RCFLAGS="${AM_RCFLAGS} -DWITH_FREEDOS" - EXESUFFIX="f" -fi - # Debug symbols AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], @@ -60,8 +49,6 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot AC_SUBST([VISIBILITY_CFLAGS]) AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_LDFLAGS]) -AC_SUBST([AM_RCFLAGS]) -AC_SUBST([EXESUFFIX]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([src/Makefile]) @@ -72,5 +59,3 @@ AC_CONFIG_FILES([src/libcdio/iso9660/Makefile]) AC_CONFIG_FILES([src/libcdio/udf/Makefile]) AC_CONFIG_FILES([src/libcdio/driver/Makefile]) AC_OUTPUT - -AC_MSG_RESULT([FreeDOS support: $(test "x$with_freedos" != "xno" && echo enabled || echo disabled)]) diff --git a/ms-config.h b/ms-config.h deleted file mode 100644 index e0006a10..00000000 --- a/ms-config.h +++ /dev/null @@ -1,5 +0,0 @@ -/* Option for Visual Studio and WDK compilation */ -/* For MinGW, use "./configure