diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-05-05 11:50:24 -0700 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-05-09 09:03:24 +0000 |
| commit | 3f247a5cee61d8f2139ade94cd9840b100337b05 (patch) | |
| tree | 1e5775cd8ab94d74c299c09b2a8de16dec464c7b /tools | |
| parent | e5cfd9e13a0b6372b87727167843fa61d4926f95 (diff) | |
Be less aggressive about rebuilding sminmpec.c.
Instead of forcing developers to generate sminmpec.c (which will have
different results depending on the presence or absence of a working
Internet connection) add sminmpec.c back to the repository. I'll add
it to the weekly update-numbers script so that it will be updated at
the same time as manuf, services, enterprise-numbers, and usb.c.
Change the Autotools, CMake, and Nmake sminmpec.c target name to
"update-sminmpec".
Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers
and sminmpec.c while we're here.
Tested with an in-tree Autotools build and an out-of-tree CMake build.
Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026
Reviewed-on: https://code.wireshark.org/review/1516
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make-sminmpec.pl | 18 | ||||
| -rwxr-xr-x | tools/make-usb.py | 5 |
2 files changed, 13 insertions, 10 deletions
diff --git a/tools/make-sminmpec.pl b/tools/make-sminmpec.pl index e1a9afaf5b..339532f459 100755 --- a/tools/make-sminmpec.pl +++ b/tools/make-sminmpec.pl @@ -19,6 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + use strict; use File::Spec; @@ -48,12 +49,6 @@ if($in =~ m/^http:/i) { my $request = HTTP::Request->new(GET => $in); - if (-f "enterprise-numbers") { - my $mtime; - (undef,undef,undef,undef,undef,undef,undef,undef,undef,$mtime,undef,undef,undef) = stat("enterprise-numbers"); - $request->if_modified_since( $mtime ); - } - my $result = $agent->request($request); if ($result->code eq 200) { @@ -127,11 +122,14 @@ print OUT <<"_SMINMPEC"; /* * THIS FILE IS AUTOGENERATED, DO NOT EDIT * generated from http://www.iana.org/assignments/enterprise-numbers - * run "tools/make-sminmspec <infile> <outfile>" to regenerate + * run "tools/make-sminmpec.pl <infile> <outfile>" to regenerate + * + * Note 1: "Gaps" in the iana enterprise-numbers list have been "filled in" + * with "(Unknown)" as the name so that direct (indexed) access to + * the list is possible. * - * Note: "Gaps" in the iana enterprise-numbers list have been "filled in" - * with "(Unknown)" as the name so that direct (indexed) access - * to the list is possible. + * Note 2: We should probably parse "enterprise-numbers" at program start + * instead of generating this file. */ #include "config.h" diff --git a/tools/make-usb.py b/tools/make-usb.py index f2401c4bd0..1e967f70f6 100755 --- a/tools/make-usb.py +++ b/tools/make-usb.py @@ -112,6 +112,11 @@ header="""/* usb.c * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* + * XXX We should probably parse a USB ID file at program start instead + * of generating this file. + */ + #include "config.h" #include <epan/packet.h> """ |