lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-09-26 05:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Very minor documentation changes.

Browse Source 
NSIS: Don't strip update-smart-database.exe (it breaks if stripped) and
smartctl* (no reason to do it).
NSIS: Delete gtk installer on uninstall, sometimes it's not deleted during
installation.
This commit is contained in:
Alexander Shaduri
2011-06-20 20:59:36 +00:00
parent c954101bd9
commit a4aa68a085
8 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gsmartcontrol/Makefile.am
+7 -4
View File
@@ -68,7 +68,7 @@ src-rpm: dist
# NSIS installer support.
# Requires wine, installed NSIS, smartctl-nc.exe, smartctl.exe.
# Requires wine, installed NSIS, smartctl-nc.exe, smartctl.exe, update-smart-drivedb.exe.
# Gtkmm dlls and pcre dlls are required if linking against them.
# dos2unix on build machine.
# Execute only with win32 build present.
@@ -91,6 +91,8 @@ win-dist-clean: win-dist-cleanup
win-dist-prepare-all: nsis-dist-prepare win-zip-dist-prepare
# Don't strip smartctl (it will only change the header), and
# don't strip update-smart-drivedb (it will break its CRC check).
win-dist-prepare: all
$(MKDIR_P) win-dist
cp $(top_srcdir)/data/icon_*.png win-dist/
@@ -100,14 +102,15 @@ win-dist-prepare: all
cp $(top_srcdir)/AUTHORS.txt $(top_srcdir)/LICENSE_* $(top_srcdir)/README.txt win-dist/doc/
cp $(top_srcdir)/NEWS win-dist/doc/NEWS.txt
cp "@WINDOWS_BINDIR@"/smartctl-nc.exe win-dist/
cp "@WINDOWS_BINDIR@"/smartctl.exe win-dist/
cp src/gsmartcontrol.exe src/gsmartcontrol.exe.manifest win-dist/
unix2dos win-dist/doc/*.txt
$(STRIP) win-dist/*.exe
cp -p "@WINDOWS_BINDIR@"/smartctl-nc.exe win-dist/
cp -p "@WINDOWS_BINDIR@"/smartctl.exe win-dist/
cp -p "@WINDOWS_BINDIR@"/update-smart-drivedb.exe win-dist/
nsis-dist-prepare: win-dist-prepare
cp -a win-dist nsis-dist
gsmartcontrol/NEWS
+1 -1
View File
@@ -1,5 +1,5 @@
Version 0.8.6, released on 2011-05-29
Version 0.8.6, released on 2011-06-12
Support detecting drives behind 3ware controllers (Linux, Windows),
including tw_cli/cx/px mode in Windows. Having tw_cli is recommended
but not required.
gsmartcontrol/README.txt
+1 -1
View File
@@ -101,7 +101,7 @@ You need to have the following software installed:
* Gtkmm, version 2.6 or higher - see http://www.gtkmm.org .
* libglademm, version 2.4 or higher - see http://www.gtkmm.org .
Note: libglademm is not needed when using GTK / Gtkmm 2.12 or newer.
Note: libglademm is not needed when using GTK+ / Gtkmm 2.12 or newer.
Note that having GTK+ 2.12 and Gtkmm 2.12 is HIGHLY recommended. While earlier
versions may work, they may produce suboptimal results and buggy behavior.
gsmartcontrol/TODO
+3 -3
View File
@@ -37,9 +37,9 @@ Bugs / patches:
TODO:
test, release RC version for testing.
Update to drivedb.h from 5.41, include 5.41 into release.
Delete drivedb.h (and all related drivedb* files) on uninstall - windows.
add menu item - "update drive database" (not sure about linux, should
check if it's supported first; also need to run it in terminal).
Testing:
gsmartcontrol/data/nsis/distribution-nogtk.txt.in
+1 -1
View File
@@ -22,7 +22,7 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and
* Smartctl binaries (from smartmontools 5.41, http://smartmontools.sf.net/)
- smartctl-nc.exe (compiled without console output), smartctl.exe (compiled
with console output).
with console output), update-smart-drivedb.exe (drive database updater).
The combined distribution is multi-licensed under GNU GPL versions 2 and 3.
gsmartcontrol/data/nsis/distribution.txt.in
+1 -1
View File
@@ -18,7 +18,7 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and
* Smartctl binaries (from smartmontools 5.41, http://smartmontools.sf.net/)
- smartctl-nc.exe (compiled without console output), smartctl.exe (compiled
with console output).
with console output), update-smart-drivedb.exe (drive database updater).
* GTK+ for Windows Runtime package (@GTK_INSTALLER_NAME@)
from http://gtk-win.sf.net, either in original or unpacked form.
gsmartcontrol/data/nsis/gsmartcontrol.nsi.in
+12
View File
@@ -158,6 +158,7 @@ SectionIn 1 RO
; File *.dll
File smartctl-nc.exe
File smartctl.exe
File update-smart-drivedb.exe
; Include the "doc" directory completely, excluding the file we're not using (e.g. the -nogtk file in gtk installer).
!ifdef NO_GTK
@@ -400,6 +401,14 @@ Section Uninstall
; Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\smartctl-nc.exe"
Delete "$INSTDIR\smartctl.exe"
Delete "$INSTDIR\update-smart-drivedb.exe"
; update-smart-drivedb may leave these
Delete "$INSTDIR\drivedb.h"
Delete "$INSTDIR\drivedb.h.new"
Delete "$INSTDIR\drivedb.h.old"
Delete "$INSTDIR\drivedb.h.error"
Delete "$INSTDIR\drivedb.h.lastcheck"
RMDir /r "$INSTDIR\doc"
@@ -409,6 +418,9 @@ Section Uninstall
RMDir "$INSTDIR" ; only if empty
; For some reason, sometimes it's not deleted in the sections, so do it here.
Delete "$INSTDIR\${GTK_INSTALLER_EXE}"
!ifndef NO_GTK
StrCmp $gtk_mode "private" skip_exe_PATH_remove
!endif
gsmartcontrol/debian.dist/copyright
+2 -2
View File
@@ -5,7 +5,7 @@ It was downloaded from <http://gsmartcontrol.berlios.de/>
Copyright:
Copyright (C) 2008 - 2010 Alexander Shaduri <ashaduri 'at' gmail.com>
Copyright (C) 2008 - 2011 Alexander Shaduri <ashaduri 'at' gmail.com>
License:
@@ -27,6 +27,6 @@ On Debian systems, the complete text of the GNU General
Public Licenses can be found in `/usr/share/common-licenses/GPL-2' and
`/usr/share/common-licenses/GPL-3'.
The Debian packaging is (C) 2008 - 2010 Alexander Shaduri <ashaduri 'at' gmail.com> and
The Debian packaging is (C) 2008 - 2011 Alexander Shaduri <ashaduri 'at' gmail.com> and
is licensed under the GPLv2 and GPLv3, see above.