From e49549d26a9c68409df3bcb7d40a2525f06b7232 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 11 Jan 2012 00:25:15 +0000 Subject: [PATCH] [misc] moved binary resources to /res subdirectory --- {freedos => res/freedos}/COMMAND.COM | Bin {freedos => res/freedos}/DISPLAY.EXE | Bin {freedos => res/freedos}/KERNEL.SYS | Bin {freedos => res/freedos}/KEYB.EXE | Bin {freedos => res/freedos}/KEYBOARD.SYS | Bin {freedos => res/freedos}/KEYBRD2.SYS | Bin {freedos => res/freedos}/KEYBRD3.SYS | Bin {freedos => res/freedos}/KEYBRD4.SYS | Bin {freedos => res/freedos}/ega.cpx | Bin {freedos => res/freedos}/ega10.cpx | Bin {freedos => res/freedos}/ega11.cpx | Bin {freedos => res/freedos}/ega12.cpx | Bin {freedos => res/freedos}/ega13.cpx | Bin {freedos => res/freedos}/ega14.cpx | Bin {freedos => res/freedos}/ega15.cpx | Bin {freedos => res/freedos}/ega16.cpx | Bin {freedos => res/freedos}/ega17.cpx | Bin {freedos => res/freedos}/ega18.cpx | Bin {freedos => res/freedos}/ega2.cpx | Bin {freedos => res/freedos}/ega3.cpx | Bin {freedos => res/freedos}/ega4.cpx | Bin {freedos => res/freedos}/ega5.cpx | Bin {freedos => res/freedos}/ega6.cpx | Bin {freedos => res/freedos}/ega7.cpx | Bin {freedos => res/freedos}/ega8.cpx | Bin {freedos => res/freedos}/ega9.cpx | Bin {freedos => res/freedos}/mode.com | Bin {freedos => res/freedos}/readme.txt | 0 {src => res}/rufus.ico | Bin src/rufus.rc | 122 +++++++++++++------------- 30 files changed, 61 insertions(+), 61 deletions(-) rename {freedos => res/freedos}/COMMAND.COM (100%) rename {freedos => res/freedos}/DISPLAY.EXE (100%) rename {freedos => res/freedos}/KERNEL.SYS (100%) rename {freedos => res/freedos}/KEYB.EXE (100%) rename {freedos => res/freedos}/KEYBOARD.SYS (100%) rename {freedos => res/freedos}/KEYBRD2.SYS (100%) rename {freedos => res/freedos}/KEYBRD3.SYS (100%) rename {freedos => res/freedos}/KEYBRD4.SYS (100%) rename {freedos => res/freedos}/ega.cpx (100%) rename {freedos => res/freedos}/ega10.cpx (100%) rename {freedos => res/freedos}/ega11.cpx (100%) rename {freedos => res/freedos}/ega12.cpx (100%) rename {freedos => res/freedos}/ega13.cpx (100%) rename {freedos => res/freedos}/ega14.cpx (100%) rename {freedos => res/freedos}/ega15.cpx (100%) rename {freedos => res/freedos}/ega16.cpx (100%) rename {freedos => res/freedos}/ega17.cpx (100%) rename {freedos => res/freedos}/ega18.cpx (100%) rename {freedos => res/freedos}/ega2.cpx (100%) rename {freedos => res/freedos}/ega3.cpx (100%) rename {freedos => res/freedos}/ega4.cpx (100%) rename {freedos => res/freedos}/ega5.cpx (100%) rename {freedos => res/freedos}/ega6.cpx (100%) rename {freedos => res/freedos}/ega7.cpx (100%) rename {freedos => res/freedos}/ega8.cpx (100%) rename {freedos => res/freedos}/ega9.cpx (100%) rename {freedos => res/freedos}/mode.com (100%) rename {freedos => res/freedos}/readme.txt (100%) rename {src => res}/rufus.ico (100%) diff --git a/freedos/COMMAND.COM b/res/freedos/COMMAND.COM similarity index 100% rename from freedos/COMMAND.COM rename to res/freedos/COMMAND.COM diff --git a/freedos/DISPLAY.EXE b/res/freedos/DISPLAY.EXE similarity index 100% rename from freedos/DISPLAY.EXE rename to res/freedos/DISPLAY.EXE diff --git a/freedos/KERNEL.SYS b/res/freedos/KERNEL.SYS similarity index 100% rename from freedos/KERNEL.SYS rename to res/freedos/KERNEL.SYS diff --git a/freedos/KEYB.EXE b/res/freedos/KEYB.EXE similarity index 100% rename from freedos/KEYB.EXE rename to res/freedos/KEYB.EXE diff --git a/freedos/KEYBOARD.SYS b/res/freedos/KEYBOARD.SYS similarity index 100% rename from freedos/KEYBOARD.SYS rename to res/freedos/KEYBOARD.SYS diff --git a/freedos/KEYBRD2.SYS b/res/freedos/KEYBRD2.SYS similarity index 100% rename from freedos/KEYBRD2.SYS rename to res/freedos/KEYBRD2.SYS diff --git a/freedos/KEYBRD3.SYS b/res/freedos/KEYBRD3.SYS similarity index 100% rename from freedos/KEYBRD3.SYS rename to res/freedos/KEYBRD3.SYS diff --git a/freedos/KEYBRD4.SYS b/res/freedos/KEYBRD4.SYS similarity index 100% rename from freedos/KEYBRD4.SYS rename to res/freedos/KEYBRD4.SYS diff --git a/freedos/ega.cpx b/res/freedos/ega.cpx similarity index 100% rename from freedos/ega.cpx rename to res/freedos/ega.cpx diff --git a/freedos/ega10.cpx b/res/freedos/ega10.cpx similarity index 100% rename from freedos/ega10.cpx rename to res/freedos/ega10.cpx diff --git a/freedos/ega11.cpx b/res/freedos/ega11.cpx similarity index 100% rename from freedos/ega11.cpx rename to res/freedos/ega11.cpx diff --git a/freedos/ega12.cpx b/res/freedos/ega12.cpx similarity index 100% rename from freedos/ega12.cpx rename to res/freedos/ega12.cpx diff --git a/freedos/ega13.cpx b/res/freedos/ega13.cpx similarity index 100% rename from freedos/ega13.cpx rename to res/freedos/ega13.cpx diff --git a/freedos/ega14.cpx b/res/freedos/ega14.cpx similarity index 100% rename from freedos/ega14.cpx rename to res/freedos/ega14.cpx diff --git a/freedos/ega15.cpx b/res/freedos/ega15.cpx similarity index 100% rename from freedos/ega15.cpx rename to res/freedos/ega15.cpx diff --git a/freedos/ega16.cpx b/res/freedos/ega16.cpx similarity index 100% rename from freedos/ega16.cpx rename to res/freedos/ega16.cpx diff --git a/freedos/ega17.cpx b/res/freedos/ega17.cpx similarity index 100% rename from freedos/ega17.cpx rename to res/freedos/ega17.cpx diff --git a/freedos/ega18.cpx b/res/freedos/ega18.cpx similarity index 100% rename from freedos/ega18.cpx rename to res/freedos/ega18.cpx diff --git a/freedos/ega2.cpx b/res/freedos/ega2.cpx similarity index 100% rename from freedos/ega2.cpx rename to res/freedos/ega2.cpx diff --git a/freedos/ega3.cpx b/res/freedos/ega3.cpx similarity index 100% rename from freedos/ega3.cpx rename to res/freedos/ega3.cpx diff --git a/freedos/ega4.cpx b/res/freedos/ega4.cpx similarity index 100% rename from freedos/ega4.cpx rename to res/freedos/ega4.cpx diff --git a/freedos/ega5.cpx b/res/freedos/ega5.cpx similarity index 100% rename from freedos/ega5.cpx rename to res/freedos/ega5.cpx diff --git a/freedos/ega6.cpx b/res/freedos/ega6.cpx similarity index 100% rename from freedos/ega6.cpx rename to res/freedos/ega6.cpx diff --git a/freedos/ega7.cpx b/res/freedos/ega7.cpx similarity index 100% rename from freedos/ega7.cpx rename to res/freedos/ega7.cpx diff --git a/freedos/ega8.cpx b/res/freedos/ega8.cpx similarity index 100% rename from freedos/ega8.cpx rename to res/freedos/ega8.cpx diff --git a/freedos/ega9.cpx b/res/freedos/ega9.cpx similarity index 100% rename from freedos/ega9.cpx rename to res/freedos/ega9.cpx diff --git a/freedos/mode.com b/res/freedos/mode.com similarity index 100% rename from freedos/mode.com rename to res/freedos/mode.com diff --git a/freedos/readme.txt b/res/freedos/readme.txt similarity index 100% rename from freedos/readme.txt rename to res/freedos/readme.txt diff --git a/src/rufus.ico b/res/rufus.ico similarity index 100% rename from src/rufus.ico rename to res/rufus.ico diff --git a/src/rufus.rc b/src/rufus.rc index 098c1027..3bc3ba0f 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.7.113" +CAPTION "Rufus v1.0.7.114" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -66,7 +66,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.7 (Build 113)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.7 (Build 114)",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 @@ -122,33 +122,33 @@ BEGIN "\r\n" "// Only include these in rufus_fd\r\n" "#if defined(WITH_FREEDOS)\r\n" - "IDR_FD_COMMAND_COM RCDATA ""../freedos/COMMAND.COM""\r\n" - "IDR_FD_KERNEL_SYS RCDATA ""../freedos/KERNEL.SYS""\r\n" - "IDR_FD_DISPLAY_EXE RCDATA ""../freedos/DISPLAY.EXE""\r\n" - "IDR_FD_KEYB_EXE RCDATA ""../freedos/KEYB.EXE""\r\n" - "IDR_FD_MODE_COM RCDATA ""../freedos/MODE.COM""\r\n" - "IDR_FD_KB1_SYS RCDATA ""../freedos/KEYBOARD.SYS""\r\n" - "IDR_FD_KB2_SYS RCDATA ""../freedos/KEYBRD2.SYS""\r\n" - "IDR_FD_KB3_SYS RCDATA ""../freedos/KEYBRD3.SYS""\r\n" - "IDR_FD_KB4_SYS RCDATA ""../freedos/KEYBRD4.SYS""\r\n" - "IDR_FD_EGA1_CPX RCDATA ""../freedos/ega.cpx""\r\n" - "IDR_FD_EGA2_CPX RCDATA ""../freedos/ega2.cpx""\r\n" - "IDR_FD_EGA3_CPX RCDATA ""../freedos/ega3.cpx""\r\n" - "IDR_FD_EGA4_CPX RCDATA ""../freedos/ega4.cpx""\r\n" - "IDR_FD_EGA5_CPX RCDATA ""../freedos/ega5.cpx""\r\n" - "IDR_FD_EGA6_CPX RCDATA ""../freedos/ega6.cpx""\r\n" - "IDR_FD_EGA7_CPX RCDATA ""../freedos/ega7.cpx""\r\n" - "IDR_FD_EGA8_CPX RCDATA ""../freedos/ega8.cpx""\r\n" - "IDR_FD_EGA9_CPX RCDATA ""../freedos/ega9.cpx""\r\n" - "IDR_FD_EGA10_CPX RCDATA ""../freedos/ega10.cpx""\r\n" - "IDR_FD_EGA11_CPX RCDATA ""../freedos/ega11.cpx""\r\n" - "IDR_FD_EGA12_CPX RCDATA ""../freedos/ega12.cpx""\r\n" - "IDR_FD_EGA13_CPX RCDATA ""../freedos/ega13.cpx""\r\n" - "IDR_FD_EGA14_CPX RCDATA ""../freedos/ega14.cpx""\r\n" - "IDR_FD_EGA15_CPX RCDATA ""../freedos/ega15.cpx""\r\n" - "IDR_FD_EGA16_CPX RCDATA ""../freedos/ega16.cpx""\r\n" - "IDR_FD_EGA17_CPX RCDATA ""../freedos/ega17.cpx""\r\n" - "IDR_FD_EGA18_CPX RCDATA ""../freedos/ega18.cpx""\r\n" + "IDR_FD_COMMAND_COM RCDATA ""../res/freedos/COMMAND.COM""\r\n" + "IDR_FD_KERNEL_SYS RCDATA ""../res/freedos/KERNEL.SYS""\r\n" + "IDR_FD_DISPLAY_EXE RCDATA ""../res/freedos/DISPLAY.EXE""\r\n" + "IDR_FD_KEYB_EXE RCDATA ""../res/freedos/KEYB.EXE""\r\n" + "IDR_FD_MODE_COM RCDATA ""../res/freedos/MODE.COM""\r\n" + "IDR_FD_KB1_SYS RCDATA ""../res/freedos/KEYBOARD.SYS""\r\n" + "IDR_FD_KB2_SYS RCDATA ""../res/freedos/KEYBRD2.SYS""\r\n" + "IDR_FD_KB3_SYS RCDATA ""../res/freedos/KEYBRD3.SYS""\r\n" + "IDR_FD_KB4_SYS RCDATA ""../res/freedos/KEYBRD4.SYS""\r\n" + "IDR_FD_EGA1_CPX RCDATA ""../res/freedos/ega.cpx""\r\n" + "IDR_FD_EGA2_CPX RCDATA ""../res/freedos/ega2.cpx""\r\n" + "IDR_FD_EGA3_CPX RCDATA ""../res/freedos/ega3.cpx""\r\n" + "IDR_FD_EGA4_CPX RCDATA ""../res/freedos/ega4.cpx""\r\n" + "IDR_FD_EGA5_CPX RCDATA ""../res/freedos/ega5.cpx""\r\n" + "IDR_FD_EGA6_CPX RCDATA ""../res/freedos/ega6.cpx""\r\n" + "IDR_FD_EGA7_CPX RCDATA ""../res/freedos/ega7.cpx""\r\n" + "IDR_FD_EGA8_CPX RCDATA ""../res/freedos/ega8.cpx""\r\n" + "IDR_FD_EGA9_CPX RCDATA ""../res/freedos/ega9.cpx""\r\n" + "IDR_FD_EGA10_CPX RCDATA ""../res/freedos/ega10.cpx""\r\n" + "IDR_FD_EGA11_CPX RCDATA ""../res/freedos/ega11.cpx""\r\n" + "IDR_FD_EGA12_CPX RCDATA ""../res/freedos/ega12.cpx""\r\n" + "IDR_FD_EGA13_CPX RCDATA ""../res/freedos/ega13.cpx""\r\n" + "IDR_FD_EGA14_CPX RCDATA ""../res/freedos/ega14.cpx""\r\n" + "IDR_FD_EGA15_CPX RCDATA ""../res/freedos/ega15.cpx""\r\n" + "IDR_FD_EGA16_CPX RCDATA ""../res/freedos/ega16.cpx""\r\n" + "IDR_FD_EGA17_CPX RCDATA ""../res/freedos/ega17.cpx""\r\n" + "IDR_FD_EGA18_CPX RCDATA ""../res/freedos/ega18.cpx""\r\n" "#endif\r\n" "\r\n" "// Must reference a manifest for visual styles and elevation\r\n" @@ -196,8 +196,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,7,113 - PRODUCTVERSION 1,0,7,113 + FILEVERSION 1,0,7,114 + PRODUCTVERSION 1,0,7,114 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -214,13 +214,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.7.113" + VALUE "FileVersion", "1.0.7.114" 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.7.113" + VALUE "ProductVersion", "1.0.7.114" END END BLOCK "VarFileInfo" @@ -237,7 +237,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON ICON "rufus.ico" +IDI_ICON ICON "../res/rufus.ico" #endif // English resources ///////////////////////////////////////////////////////////////////////////// @@ -251,33 +251,33 @@ IDI_ICON ICON "rufus.ico" // Only include these in rufus_fd #if defined(WITH_FREEDOS) -IDR_FD_COMMAND_COM RCDATA "../freedos/COMMAND.COM" -IDR_FD_KERNEL_SYS RCDATA "../freedos/KERNEL.SYS" -IDR_FD_DISPLAY_EXE RCDATA "../freedos/DISPLAY.EXE" -IDR_FD_KEYB_EXE RCDATA "../freedos/KEYB.EXE" -IDR_FD_MODE_COM RCDATA "../freedos/MODE.COM" -IDR_FD_KB1_SYS RCDATA "../freedos/KEYBOARD.SYS" -IDR_FD_KB2_SYS RCDATA "../freedos/KEYBRD2.SYS" -IDR_FD_KB3_SYS RCDATA "../freedos/KEYBRD3.SYS" -IDR_FD_KB4_SYS RCDATA "../freedos/KEYBRD4.SYS" -IDR_FD_EGA1_CPX RCDATA "../freedos/ega.cpx" -IDR_FD_EGA2_CPX RCDATA "../freedos/ega2.cpx" -IDR_FD_EGA3_CPX RCDATA "../freedos/ega3.cpx" -IDR_FD_EGA4_CPX RCDATA "../freedos/ega4.cpx" -IDR_FD_EGA5_CPX RCDATA "../freedos/ega5.cpx" -IDR_FD_EGA6_CPX RCDATA "../freedos/ega6.cpx" -IDR_FD_EGA7_CPX RCDATA "../freedos/ega7.cpx" -IDR_FD_EGA8_CPX RCDATA "../freedos/ega8.cpx" -IDR_FD_EGA9_CPX RCDATA "../freedos/ega9.cpx" -IDR_FD_EGA10_CPX RCDATA "../freedos/ega10.cpx" -IDR_FD_EGA11_CPX RCDATA "../freedos/ega11.cpx" -IDR_FD_EGA12_CPX RCDATA "../freedos/ega12.cpx" -IDR_FD_EGA13_CPX RCDATA "../freedos/ega13.cpx" -IDR_FD_EGA14_CPX RCDATA "../freedos/ega14.cpx" -IDR_FD_EGA15_CPX RCDATA "../freedos/ega15.cpx" -IDR_FD_EGA16_CPX RCDATA "../freedos/ega16.cpx" -IDR_FD_EGA17_CPX RCDATA "../freedos/ega17.cpx" -IDR_FD_EGA18_CPX RCDATA "../freedos/ega18.cpx" +IDR_FD_COMMAND_COM RCDATA "../res/freedos/COMMAND.COM" +IDR_FD_KERNEL_SYS RCDATA "../res/freedos/KERNEL.SYS" +IDR_FD_DISPLAY_EXE RCDATA "../res/freedos/DISPLAY.EXE" +IDR_FD_KEYB_EXE RCDATA "../res/freedos/KEYB.EXE" +IDR_FD_MODE_COM RCDATA "../res/freedos/MODE.COM" +IDR_FD_KB1_SYS RCDATA "../res/freedos/KEYBOARD.SYS" +IDR_FD_KB2_SYS RCDATA "../res/freedos/KEYBRD2.SYS" +IDR_FD_KB3_SYS RCDATA "../res/freedos/KEYBRD3.SYS" +IDR_FD_KB4_SYS RCDATA "../res/freedos/KEYBRD4.SYS" +IDR_FD_EGA1_CPX RCDATA "../res/freedos/ega.cpx" +IDR_FD_EGA2_CPX RCDATA "../res/freedos/ega2.cpx" +IDR_FD_EGA3_CPX RCDATA "../res/freedos/ega3.cpx" +IDR_FD_EGA4_CPX RCDATA "../res/freedos/ega4.cpx" +IDR_FD_EGA5_CPX RCDATA "../res/freedos/ega5.cpx" +IDR_FD_EGA6_CPX RCDATA "../res/freedos/ega6.cpx" +IDR_FD_EGA7_CPX RCDATA "../res/freedos/ega7.cpx" +IDR_FD_EGA8_CPX RCDATA "../res/freedos/ega8.cpx" +IDR_FD_EGA9_CPX RCDATA "../res/freedos/ega9.cpx" +IDR_FD_EGA10_CPX RCDATA "../res/freedos/ega10.cpx" +IDR_FD_EGA11_CPX RCDATA "../res/freedos/ega11.cpx" +IDR_FD_EGA12_CPX RCDATA "../res/freedos/ega12.cpx" +IDR_FD_EGA13_CPX RCDATA "../res/freedos/ega13.cpx" +IDR_FD_EGA14_CPX RCDATA "../res/freedos/ega14.cpx" +IDR_FD_EGA15_CPX RCDATA "../res/freedos/ega15.cpx" +IDR_FD_EGA16_CPX RCDATA "../res/freedos/ega16.cpx" +IDR_FD_EGA17_CPX RCDATA "../res/freedos/ega17.cpx" +IDR_FD_EGA18_CPX RCDATA "../res/freedos/ega18.cpx" #endif // Must reference a manifest for visual styles and elevation