Version 1.6

rasa · Feb 18, 2015 · b5ac147 · b5ac147
1 parent 7fc0efb
commit b5ac147
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -20,10 +20,10 @@ CYGENV=MAKEFLAGS="" PATH=$(MSVC_DIR)/bin:$$PATH
 APP_ZIP?=$(APP)-$(VER)-win32.zip
 SRC_ZIP?=$(APP)-$(VER)-win32-src.zip
 ZIP?=zip
-ZIP_OPTS?=-9jquX
+ZIP_OPTS?=-9quX
 CWD=$(shell pwd)
-APP_FILES=Debug/$(APP).exe changelog.txt COPYING readme.txt
-SRC_FILES=$(APP_FILES) $(shell ls *.cpp *.c *.h *.hpp *.inl *.dsp *.dsw *.mak *.dep *.vcxproj Makefile 2>nul)
+APP_FILES=Release/$(APP).exe Debug/$(APP).exe changelog.txt COPYING readme.txt
+SRC_FILES=$(APP_FILES) $(shell ls *.cpp *.c *.h *.hpp *.inl *.dsp *.dsw *.mak *.dep *.vcxproj Makefile *.ico *.rc ../shared/shared-1.2-win32-src.zip 2>nul)
 
 .PHONY:	dist
 dist:	all $(APP_ZIP) $(SRC_ZIP)

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,12 @@
 lsdsk changelog
 
+Version 1.6 - 02 Oct 11
+
+	Fixed crash if domain is null
+	Added Release version to zip files
+	Added .ico and .rc files to source zip file
+	Added shared lib to source zip file (unzip into lsdsk/../shared)
+
 Version 1.5 - 26 Sep 11
 
 	Updated to Visual Studio 2010 Express

diff --git a/lsdsk.ico b/lsdsk.ico
diff --git a/lsdsk.rc b/lsdsk.rc
@@ -0,0 +1,118 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "windows.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON                ICON    DISCARDABLE     "lsdsk.ico"
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,5,0,0
+ PRODUCTVERSION 1,5,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Ross Smith II (http://smithii.com)\0"
+            VALUE "FileDescription", "List disks\0"
+            VALUE "FileVersion", "1.5.0.0\0"
+            VALUE "InternalName", "lsdsk\0"
+            VALUE "LegalCopyright", "Copyright (c) 2005-2009 Ross Smith II. All Rights Reserved.\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "lsdsk.exe\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "List disks\0"
+            VALUE "ProductVersion", "1.5.0.0\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "windows.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,8 @@
-lsdsk - Version 1.5 - Sep 26 2011
+lsdsk - Version 1.6 - Oct 02 2011
 Copyright (c) 2005-2011 Ross Smith II (http://smithii.com) All Rights Reserved
 
 ------------------------------------------------------------------------------
+To build, unzip the shared*.zip file to lsdsk/../shared
 
 Usage: lsdsk [options]
 Options:
@@ -39,24 +40,27 @@ M: Subst     example_c       7.1G 439M 7.1G NTFS  C:\User\Example\Documents
 Y: Network   sharename       123M 456M 579M NTFS  \\servername\sharename (username)
 Z: Network   c$              177M 782M 959M NTFS  \\servername\c$ (DOMAIN\user)
 
-C:\>lsdsk -tna -e b
-Dr Type      Name
--- --------- -----------------------------
-C: Fixed     \Device\HarddiskVolume1
-D: Fixed     \Device\HarddiskVolume3
-E: CD-ROM
-F: Fixed     \Device\HarddiskVolume2
-G: Removable
-I: Subst     D:\a\path\on\d
-M: Subst     C:\Documents and Settings\ex\My Documents
-Y: Network   \\servername\sharename (username)
-Z: Network   \\servername\c$ (DOMAIN\user)
+------------------------------------------------------------------------------
+
+C:\>lsdsk -na
+Dr Name
+-- -----------------------------
+B: RAMDisk
+C: example_c
+D: example_d
+E: EXAMPLEVOL      
+F: EXAMPLE_F
+G: usb_stick
+I: D:\a\path\on\d
+M: C:\User\Example\Documents
+Y: \\servername\sharename
+Z: \\servername\c$
 
 Free: A: H: J: K: L: N: O: P: Q: R: S: T: U: V: W: X:
 
 ------------------------------------------------------------------------------
 
-C:\>set LSDSK=-tna -e b
+C:\>set LSDSK=-na
 C:\>lsdsk
 
 (same as above)

diff --git a/version.h b/version.h
@@ -18,7 +18,7 @@ General Public License for more details.
 #define VER_INTERNAL_NAME 		"lsdsk"
 #define	VER_FILE_DESCRIPTION	"List disks"
 #define VER_MAJOR				1
-#define VER_MINOR				5
-#define VER_STRING2				"1.5"
+#define VER_MINOR				6
+#define VER_STRING2				"1.6"
 
 #include "ver_defaults.h"