Skip to content
Snippets Groups Projects
Commit 39487d21 authored by chrfranke's avatar chrfranke
Browse files

Move drive database entries from 'knowndrives.cpp' to new file 'drivedb.h'.

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@2998 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent 8e2e47d3
Branches
No related tags found
No related merge requests found
...@@ -43,6 +43,11 @@ NOTES FOR FUTURE RELEASES: see TODO file. ...@@ -43,6 +43,11 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE> <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
[CF] Move drive database entries from 'knowndrives.cpp' to new file
'drivedb.h'. This allows to update the drive database from SVN
if installation was configured with '--enable-drivedb'.
Remove the Makefile target to create 'drivedb.h'.
[CF] do_release: Add support to release from a dir below 'branches'. [CF] do_release: Add support to release from a dir below 'branches'.
Accept partial checkouts. Accept partial checkouts.
......
...@@ -35,6 +35,7 @@ smartd_SOURCES = smartd.cpp \ ...@@ -35,6 +35,7 @@ smartd_SOURCES = smartd.cpp \
dev_interface.cpp \ dev_interface.cpp \
dev_interface.h \ dev_interface.h \
dev_tunnelled.h \ dev_tunnelled.h \
drivedb.h \
extern.h \ extern.h \
int64.h \ int64.h \
knowndrives.cpp \ knowndrives.cpp \
...@@ -104,6 +105,7 @@ smartctl_SOURCES= smartctl.cpp \ ...@@ -104,6 +105,7 @@ smartctl_SOURCES= smartctl.cpp \
dev_interface.cpp \ dev_interface.cpp \
dev_interface.h \ dev_interface.h \
dev_tunnelled.h \ dev_tunnelled.h \
drivedb.h \
extern.h \ extern.h \
int64.h \ int64.h \
knowndrives.cpp \ knowndrives.cpp \
...@@ -242,8 +244,7 @@ EXTRA_DIST = smartd.initd.in \ ...@@ -242,8 +244,7 @@ EXTRA_DIST = smartd.initd.in \
os_win32/installer.nsi \ os_win32/installer.nsi \
$(docs_DATA) $(docs_DATA)
CLEANFILES = drivedb.h \ CLEANFILES = smartd.conf.5 \
smartd.conf.5 \
smartd.conf.4 \ smartd.conf.4 \
smartd.8 \ smartd.8 \
smartd.1m \ smartd.1m \
...@@ -301,11 +302,6 @@ svnversion.h: CHANGELOG Makefile ...@@ -301,11 +302,6 @@ svnversion.h: CHANGELOG Makefile
endif endif
# Drive Database
drivedb.h: knowndrives.cpp Makefile
echo '/* drivedb.h. Generated from knowndrives.cpp by Makefile. */' > $@
sed '1,/^\/\/ BEGIN drivedb.h/d;/^\/\/ END drivedb.h/,$$d;s/^ //' $(srcdir)/knowndrives.cpp >> $@
if ENABLE_DRIVEDB if ENABLE_DRIVEDB
drivedb_DATA = drivedb.h drivedb_DATA = drivedb.h
endif endif
......
This diff is collapsed.
This diff is collapsed.
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
* Home page of code is: http://smartmontools.sourceforge.net * Home page of code is: http://smartmontools.sourceforge.net
* Address of support mailing list: smartmontools-support@lists.sourceforge.net * Address of support mailing list: smartmontools-support@lists.sourceforge.net
* *
* Copyright (C) 2003-8 Philip Williams, Bruce Allen * Copyright (C) 2003-9 Philip Williams, Bruce Allen
* Copyright (C) 2008 Christian Franke <smartmontools-support@lists.sourceforge.net> * Copyright (C) 2008-9 Christian Franke <smartmontools-support@lists.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -23,25 +23,7 @@ ...@@ -23,25 +23,7 @@
#define KNOWNDRIVES_H_CVSID "$Id$\n" #define KNOWNDRIVES_H_CVSID "$Id$\n"
/* Structure used to store settings for specific drives in knowndrives[]. The // Structure to store drive database entries, see drivedb.h for a description.
* elements are used in the following ways:
*
* modelfamily Informal string about the model family/series of a
* device. Set to "" if no info (apart from device id)
* known.
* modelregexp POSIX regular expression to match the model of a device.
* This should never be "".
* firmwareregexp POSIX regular expression to match a devices's firmware
* version. This is optional and should be "" if it is not
* to be used. If it is nonempty then it will be used to
* narrow the set of devices matched by modelregexp.
* warningmsg A message that may be displayed for matching drives. For
* example, to inform the user that they may need to apply a
* firmware patch.
* presets String with vendor-specific attribute ('-v') and firmware
* bug fix ('-F') options. Same syntax as in smartctl command
* line. The user's own settings override these.
*/
struct drive_settings { struct drive_settings {
const char * modelfamily; const char * modelfamily;
const char * modelregexp; const char * modelregexp;
......
...@@ -545,6 +545,10 @@ ...@@ -545,6 +545,10 @@
RelativePath="..\Doxyfile" RelativePath="..\Doxyfile"
> >
</File> </File>
<File
RelativePath="..\drivedb.h"
>
</File>
<File <File
RelativePath="..\extern.h" RelativePath="..\extern.h"
> >
......
...@@ -465,6 +465,10 @@ ...@@ -465,6 +465,10 @@
RelativePath="..\Doxyfile" RelativePath="..\Doxyfile"
> >
</File> </File>
<File
RelativePath="..\drivedb.h"
>
</File>
<File <File
RelativePath="..\extern.h" RelativePath="..\extern.h"
> >
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment