From 4c8b022042af7a7678cc80cb19f5b6094f66af74 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 28 Nov 2014 00:00:59 +0000 Subject: [PATCH] [internal] enable ALPHA/BETA from configure * Pass --enable-alpha or --enable-beta to configure/_release.sh --- Makefile.am | 4 ++-- Makefile.in | 5 +++-- _release.sh | 2 +- configure | 30 +++++++++++++++++++++++++++ configure.ac | 13 ++++++++++++ res/localization/Makefile.in | 1 + src/Makefile.in | 1 + src/libcdio/driver/Makefile.in | 1 + src/libcdio/iso9660/Makefile.in | 1 + src/libcdio/udf/Makefile.in | 1 + src/ms-sys/Makefile.in | 1 + src/rufus.c | 10 +++------ src/rufus.rc | 16 +++++++------- src/syslinux/libfat/Makefile.in | 1 + src/syslinux/libinstaller/Makefile.in | 1 + 15 files changed, 68 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index e0023768..eb0dc433 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,5 +7,5 @@ release: all @mv src/$(TARGET)$(EXEEXT) . @$(STRIP) $(TARGET)$(EXEEXT) @upx --lzma $(TARGET)$(EXEEXT) - @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(EXEEXT) - @cmd.exe /k _sign.cmd $(TARGET)-$(VERSION)$(EXEEXT) + @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) + @cmd.exe /k _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) diff --git a/Makefile.in b/Makefile.in index 349ef169..0878942c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -110,6 +110,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ @@ -449,8 +450,8 @@ release: all @mv src/$(TARGET)$(EXEEXT) . @$(STRIP) $(TARGET)$(EXEEXT) @upx --lzma $(TARGET)$(EXEEXT) - @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(EXEEXT) - @cmd.exe /k _sign.cmd $(TARGET)-$(VERSION)$(EXEEXT) + @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) + @cmd.exe /k _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(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/_release.sh b/_release.sh index b4c9d2ae..72756d68 100644 --- a/_release.sh +++ b/_release.sh @@ -1,5 +1,5 @@ #!/bin/sh rm -f rufus*.exe -./configure --disable-debug +./configure --disable-debug "$@" make clean make release diff --git a/configure b/configure index 49d98d49..08625f18 100644 --- a/configure +++ b/configure @@ -570,6 +570,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +SUFFIX AM_LDFLAGS AM_CFLAGS VISIBILITY_CFLAGS @@ -652,6 +653,8 @@ ac_user_opts=' enable_option_checking enable_silent_rules enable_debug +enable_alpha +enable_beta ' ac_precious_vars='build_alias host_alias @@ -1280,6 +1283,8 @@ Optional Features: --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') --enable-debug keep debug symbols for gdb (default=yes) + --enable-alpha build an ALPHA release (default=no) + --enable-beta build a BETA release (default=no) Some influential environment variables: CC C compiler command @@ -3526,6 +3531,30 @@ else LDFLAGS="-s" fi +# Alpha/Beta +# Check whether --enable-alpha was given. +if test "${enable_alpha+set}" = set; then : + enableval=$enable_alpha; alpha_enabled=$enableval +else + alpha_enabled='no' +fi + +if test "x$alpha_enabled" != "xno" ; then + CFLAGS+=" -DALPHA" + SUFFIX=_ALPHA +fi +# Check whether --enable-beta was given. +if test "${enable_beta+set}" = set; then : + enableval=$enable_beta; beta_enabled=$enableval +else + beta_enabled='no' +fi + +if test "x$beta_enabled" != "xno" ; then + CFLAGS+=" -DBETA" + SUFFIX=_BETA +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling Large File Support (ISO support)" >&5 $as_echo "enabling Large File Support (ISO support)" >&6; } AM_CFLAGS="$AM_CFLAGS -D_FILE_OFFSET_BITS=64 -D_OFF_T_ -D_off_t=off64_t -Doff_t=off64_t -Doff32_t=long" @@ -3558,6 +3587,7 @@ 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" diff --git a/configure.ac b/configure.ac index 21226c91..a6afb1e9 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,18 @@ else LDFLAGS="-s" fi +# Alpha/Beta +AC_ARG_ENABLE([alpha],[AS_HELP_STRING([--enable-alpha], [build an ALPHA release (default=no)])], [alpha_enabled=$enableval], [alpha_enabled='no']) +if test "x$alpha_enabled" != "xno" ; then + CFLAGS+=" -DALPHA" + SUFFIX=_ALPHA +fi +AC_ARG_ENABLE([beta],[AS_HELP_STRING([--enable-beta], [build a BETA release (default=no)])], [beta_enabled=$enableval], [beta_enabled='no']) +if test "x$beta_enabled" != "xno" ; then + CFLAGS+=" -DBETA" + SUFFIX=_BETA +fi + AC_MSG_RESULT([enabling Large File Support (ISO support)]) AM_CFLAGS="$AM_CFLAGS -D_FILE_OFFSET_BITS=64 -D_OFF_T_ -D_off_t=off64_t -Doff_t=off64_t -Doff32_t=long" @@ -47,6 +59,7 @@ 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([SUFFIX]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([src/Makefile]) diff --git a/res/localization/Makefile.in b/res/localization/Makefile.in index e5339ba8..4f4c475c 100644 --- a/res/localization/Makefile.in +++ b/res/localization/Makefile.in @@ -96,6 +96,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/Makefile.in b/src/Makefile.in index e091192b..decf2f4e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -140,6 +140,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/libcdio/driver/Makefile.in b/src/libcdio/driver/Makefile.in index 99171807..caceb8b7 100644 --- a/src/libcdio/driver/Makefile.in +++ b/src/libcdio/driver/Makefile.in @@ -125,6 +125,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/libcdio/iso9660/Makefile.in b/src/libcdio/iso9660/Makefile.in index 16066ea3..5bafe576 100644 --- a/src/libcdio/iso9660/Makefile.in +++ b/src/libcdio/iso9660/Makefile.in @@ -122,6 +122,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/libcdio/udf/Makefile.in b/src/libcdio/udf/Makefile.in index bd2979b2..2ae4d39f 100644 --- a/src/libcdio/udf/Makefile.in +++ b/src/libcdio/udf/Makefile.in @@ -122,6 +122,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/ms-sys/Makefile.in b/src/ms-sys/Makefile.in index ed05e0ff..f5dc3792 100644 --- a/src/ms-sys/Makefile.in +++ b/src/ms-sys/Makefile.in @@ -123,6 +123,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/rufus.c b/src/rufus.c index d93b3a2c..83413116 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -42,10 +42,6 @@ #include "registry.h" #include "localization.h" -// These should be commented out for release -//#define IS_ALPHA -#define IS_BETA - /* Redefinitions for WDK and MinGW */ // TODO: these would be better in a 'missing.h' file #ifndef PBM_SETSTATE @@ -1336,9 +1332,9 @@ static BOOL BootCheck(void) static __inline const char* IsAlphaOrBeta(void) { -#if defined(IS_ALPHA) +#if defined(ALPHA) return " (Alpha) "; -#elif defined(IS_BETA) +#elif defined(BETA) return " (Beta) "; #else return " "; @@ -1697,7 +1693,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA SetWindowPos(hMainDialog, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); SetWindowPos(hMainDialog, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); -#if defined(IS_ALPHA) +#if defined(ALPHA) // Add a VERY ANNOYING popup for Alpha releases, so that people don't start redistributing them Notification(MSG_INFO, NULL, "ALPHA VERSION", "This is an Alpha version of " APPLICATION_NAME " - It is meant to be used for testing ONLY and should NOT be distributed as a release."); diff --git a/src/rufus.rc b/src/rufus.rc index 547a2631..4b095054 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.550" +CAPTION "Rufus 1.5.0.551" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -164,7 +164,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.550" +CAPTION "Rufus 1.5.0.551" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -297,7 +297,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.550" +CAPTION "Rufus 1.5.0.551" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -437,7 +437,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.550" +CAPTION "Rufus 1.5.0.551" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -702,8 +702,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,550 - PRODUCTVERSION 1,5,0,550 + FILEVERSION 1,5,0,551 + PRODUCTVERSION 1,5,0,551 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -720,13 +720,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.5.0.550" + VALUE "FileVersion", "1.5.0.551" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.5.0.550" + VALUE "ProductVersion", "1.5.0.551" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/Makefile.in b/src/syslinux/libfat/Makefile.in index edfb60fe..ed3cd79f 100644 --- a/src/syslinux/libfat/Makefile.in +++ b/src/syslinux/libfat/Makefile.in @@ -122,6 +122,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ diff --git a/src/syslinux/libinstaller/Makefile.in b/src/syslinux/libinstaller/Makefile.in index 893aeda4..2a9c139a 100644 --- a/src/syslinux/libinstaller/Makefile.in +++ b/src/syslinux/libinstaller/Makefile.in @@ -123,6 +123,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@