From 7726071098d119f45d6d0b81736648aaf7a41cfd Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 5 Dec 2011 11:36:02 +0000 Subject: [PATCH] [misc] updated acronym * Resourceful -> Reliable * also removed standalone makefile (mkf) --- src/drive.c | 2 +- src/format.c | 2 +- src/format.h | 2 +- src/license.h | 2 +- src/mkf | 53 --------------------------------------------------- src/msdos.c | 2 +- src/msdos.h | 2 +- src/rufus.c | 2 +- src/rufus.h | 2 +- src/rufus.rc | 14 +++++++------- src/stdio.c | 2 +- src/stdlg.c | 2 +- 12 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 src/mkf diff --git a/src/drive.c b/src/drive.c index 18d425bb..33f4b96f 100644 --- a/src/drive.c +++ b/src/drive.c @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Drive access function calls * Copyright (c) 2011 Pete Batard * diff --git a/src/format.c b/src/format.c index a9b7c41f..e8eaa769 100644 --- a/src/format.c +++ b/src/format.c @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Formatting function calls * Copyright (c) 2011 Pete Batard * diff --git a/src/format.h b/src/format.h index 9a56ed6d..73ca2a06 100644 --- a/src/format.h +++ b/src/format.h @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Formatting function calls * Copyright (c) 2011 Pete Batard * diff --git a/src/license.h b/src/license.h index 878bc3b3..f06c7f26 100644 --- a/src/license.h +++ b/src/license.h @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Licensing Data * Copyright (c) 20111 Pete Batard * diff --git a/src/mkf b/src/mkf deleted file mode 100644 index e6da915c..00000000 --- a/src/mkf +++ /dev/null @@ -1,53 +0,0 @@ -# Rufus STANDALONE Makefile - invoke with "make -f mf" -# This file is part of the Rufus project. -# -# Copyright (c) 2011 Pete Batard -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# - -OBJECTS = fat12.o fat16.o fat32.o br.o file.o drive.o msdos.o format.o stdio.o stdlg.o rufus.o -TARGET = rufus - -CC = gcc -RC = windres -STRIP = strip -CFLAGS = -DWINVER=0x501 -D_WIN32_IE=0x501 -I./inc -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow -LDFLAGS = -O2 -Wall -Wl,--subsystem,windows -LIBS = -lsetupapi -lole32 -lgdi32 - -.PHONY: all clean - -all: $(TARGET) - -$(TARGET): $(OBJECTS) $(TARGET)_rc.o - @echo "[CCLD] $@" - @$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(TARGET)_rc.o $(LIBS) - -%.o: %.c - @echo "[CC] $@" - @$(CC) -c -o $*.o $(CFLAGS) $< - -%_rc.o: %.rc - @echo "[RC] $@" - @$(RC) -i $< -o $@ - -clean: - rm -f *.exe *.o - -# This step produces the UPX compressed and signed release that is made available for public download -release: $(TARGET) - @$(STRIP) $(TARGET).exe - @upx $(TARGET).exe - @cmd.exe /k _sign.bat rufus.exe diff --git a/src/msdos.c b/src/msdos.c index 4b67d17a..d75101e9 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * MS-DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * Copyright (c) 2011 Pete Batard * diff --git a/src/msdos.h b/src/msdos.h index 7acbbb5b..8f530746 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * MS-DOS boot file extraction, from the FAT12 floppy image in diskcopy.dll * Copyright (c) 2011 Pete Batard * diff --git a/src/rufus.c b/src/rufus.c index 69119a94..66c9cb27 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Copyright (c) 2011 Pete Batard * * This program is free software: you can redistribute it and/or modify diff --git a/src/rufus.h b/src/rufus.h index c0986d4f..3bb0a369 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Copyright (c) 2011 Pete Batard * * This program is free software: you can redistribute it and/or modify diff --git a/src/rufus.rc b/src/rufus.rc index 34f92302..c8063a2e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 263 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.1.74" +CAPTION "Rufus v1.0.1.75" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,223,50,14 @@ -58,12 +58,12 @@ CAPTION "About Rufus" FONT 8, "Microsoft Sans Serif", 400, 0, 0x0 BEGIN ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20 - LTEXT "Rufus - The Resourceful USB Formatting Utility *BETA*",IDC_RUFUS_BOLD,46,8,240,10,SS_NOPREFIX | SS_NOTIFY + LTEXT "Rufus - The Reliable USB Formatting Utility *BETA*",IDC_RUFUS_BOLD,46,8,240,10,SS_NOPREFIX | SS_NOTIFY LTEXT "Copyright (c) 2011 Pete Batard",IDC_STATIC,46,36,139,8 DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "https://github.com/pbatard/rufus",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.0.1 (Build 74)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.1 (Build 75)",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 @@ -162,8 +162,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,74 - PRODUCTVERSION 1,0,1,74 + FILEVERSION 1,0,1,75 + PRODUCTVERSION 1,0,1,75 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -180,13 +180,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.1.74" + VALUE "FileVersion", "1.0.1.75" 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.1.74" + VALUE "ProductVersion", "1.0.1.75" END END BLOCK "VarFileInfo" diff --git a/src/stdio.c b/src/stdio.c index 98f44ab4..f33abe31 100644 --- a/src/stdio.c +++ b/src/stdio.c @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Standard I/O Routines (logging, status, etc.) * Copyright (c) 2011 Pete Batard * diff --git a/src/stdlg.c b/src/stdlg.c index a828a88a..67ef72a3 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -1,5 +1,5 @@ /* - * Rufus: The Resourceful USB Formatting Utility + * Rufus: The Reliable USB Formatting Utility * Standard Dialog Routines (Browse for folder, About, etc) * Copyright (c) 2011 Pete Batard *