kopia lustrzana https://gitlab.com/sane-project/backends
Merge branch '228-remove-sane-desc-timestamping' into 'master'
Resolve "Make sane reproducible" Closes #228 See merge request sane-project/backends!352fix-build-obselete-jpeg
Olaf Meeuwissen
commit
9f9536709c
|
|
@ -28,19 +28,25 @@ check: check.local
|
|||
|
||||
check.local:
|
||||
@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
|
||||
@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
|
||||
@pass=true; \
|
||||
for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
|
||||
do \
|
||||
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
|
||||
if diff -I "[ 012][0-9]:[0-5][0-9]:[0-6][0-9] 20[0-9][0-9]" \
|
||||
-I "sane-backends 1\.0\.[0-9]\+\([-0-9a-fgdirty]\+\)\?$$" \
|
||||
if diff -I "sane-backends 1\.0\.[0-9]\+\([-0-9a-fgdirty]\+\)\?$$" \
|
||||
$(srcdir)/data/$$mode.ref $$mode.res ; \
|
||||
then \
|
||||
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
|
||||
else \
|
||||
echo "FAIL: sane-desc -m $$mode -s $(srcdir)/data"; \
|
||||
exit 1 ;\
|
||||
pass=false ; \
|
||||
fi; \
|
||||
done ;\
|
||||
echo "================" ;\
|
||||
echo "All tests passed" ;\
|
||||
echo "================"
|
||||
if `$$pass`; then \
|
||||
echo "================" ; \
|
||||
echo "All tests passed" ; \
|
||||
echo "================" ; \
|
||||
else \
|
||||
echo "========================" ; \
|
||||
echo "One or more tests failed" ; \
|
||||
echo "========================" ; \
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was automatically created based on description files (*.desc)
|
||||
# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
|
||||
# This file was generated from description files (*.desc)
|
||||
# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
#
|
||||
# The entries below are used to detect a USB device when it's plugged in
|
||||
# and then run a script to change the ownership and
|
||||
|
|
|
|||
|
|
@ -16496,7 +16496,6 @@ Grandtek Scopecam
|
|||
>Contact</a>
|
||||
</address>
|
||||
<font size=-1>
|
||||
This page was last updated on Wed Jul 31 07:52:48 2013
|
||||
by sane-desc 3.5 from sane-backends 1.0.24git
|
||||
This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
</font>
|
||||
</body> </html>
|
||||
|
|
|
|||
|
|
@ -23910,7 +23910,6 @@ qcam<br>(unmaintained)
|
|||
>Contact</a>
|
||||
</address>
|
||||
<font size=-1>
|
||||
This page was last updated on Wed Jul 31 07:52:48 2013
|
||||
by sane-desc 3.5 from sane-backends 1.0.24git
|
||||
This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
</font>
|
||||
</body> </html>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was automatically created based on description files (*.desc)
|
||||
# by sane-desc 3.5 from sane-backends 1.0.25git on Tue Dec 3 15:24:46 2013
|
||||
# This file was generated from description files (*.desc)
|
||||
# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
#
|
||||
# hwdb file for supported USB devices
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was automatically created based on description files (*.desc)
|
||||
# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013
|
||||
# This file was generated from description files (*.desc)
|
||||
# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
#
|
||||
# udev rules file for supported USB and SCSI devices
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was automatically created based on description files (*.desc)
|
||||
# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug 1 18:50:15 2013
|
||||
# This file was generated from description files (*.desc)
|
||||
# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
#
|
||||
# udev rules file for supported USB and SCSI devices
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was automatically created based on description files (*.desc)
|
||||
# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
|
||||
# This file was generated from description files (*.desc)
|
||||
# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
#
|
||||
# udev rules file for supported USB and SCSI devices
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# This file was automatically created based on description files (*.desc)
|
||||
# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013
|
||||
# This file was generated from description files (*.desc)
|
||||
# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab
|
||||
#
|
||||
# The entries below are used to detect a USB device and change owner
|
||||
# and permissions on the "device node" used by libusb.
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
#include "../include/sane/sanei.h"
|
||||
#include "../include/sane/sanei_config.h"
|
||||
|
||||
#define SANE_DESC_VERSION "3.5"
|
||||
#define SANE_DESC_VERSION "3.6"
|
||||
|
||||
#define MAN_PAGE_LINK "man/%s.5.html"
|
||||
#define COLOR_MINIMAL "\"#B00000\""
|
||||
|
|
@ -2808,16 +2808,14 @@ html_print_header (void)
|
|||
static void
|
||||
html_print_footer (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
|
||||
printf
|
||||
("<hr>\n"
|
||||
"<a href=\"./\">SANE homepage</a>\n"
|
||||
"<address>\n"
|
||||
"<a href=\"imprint.html\"\n"
|
||||
">Contact</a>\n" "</address>\n" "<font size=-1>\n");
|
||||
printf ("This page was last updated on %s by sane-desc %s from %s\n",
|
||||
asctime (localtime (¤t_time)), SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
printf ("This page was created by sane-desc %s from %s\n",
|
||||
SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
printf ("</font>\n");
|
||||
printf ("</body> </html>\n");
|
||||
}
|
||||
|
|
@ -3318,21 +3316,22 @@ create_scsiids_table (void)
|
|||
return first_scsiid;
|
||||
}
|
||||
|
||||
static void
|
||||
print_header_comment (void)
|
||||
{
|
||||
printf ("# This file was generated from description files (*.desc)\n"
|
||||
"# by sane-desc %s from %s\n",
|
||||
SANE_DESC_VERSION, PACKAGE_STRING);
|
||||
}
|
||||
|
||||
/* print USB usermap file to be used by the hotplug tools */
|
||||
static void
|
||||
print_usermap_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
|
||||
print_header_comment ();
|
||||
printf
|
||||
("# This file was automatically created based on description files (*.desc)\n"
|
||||
"# by sane-desc %s from %s on %s"
|
||||
"#\n"
|
||||
,
|
||||
SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
|
||||
printf
|
||||
("# The entries below are used to detect a USB device and change owner\n"
|
||||
("#\n"
|
||||
"# The entries below are used to detect a USB device and change owner\n"
|
||||
"# and permissions on the \"device node\" used by libusb.\n"
|
||||
"#\n"
|
||||
"# The 0x0003 match flag means the device is matched by its vendor and\n"
|
||||
|
|
@ -3396,10 +3395,7 @@ print_usermap (void)
|
|||
static void
|
||||
print_db_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
"# by sane-desc %s from %s on %s",
|
||||
SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
print_header_comment ();
|
||||
printf
|
||||
("#\n"
|
||||
"# The entries below are used to detect a USB device when it's plugged in\n"
|
||||
|
|
@ -3461,11 +3457,7 @@ print_db (void)
|
|||
static void
|
||||
print_udev_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
"# by sane-desc %s from %s on %s",
|
||||
SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
|
||||
print_header_comment ();
|
||||
printf
|
||||
("#\n"
|
||||
"# udev rules file for supported USB and SCSI devices\n"
|
||||
|
|
@ -3654,11 +3646,7 @@ print_udev (void)
|
|||
static void
|
||||
print_udevhwdb_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
"# by sane-desc %s from %s on %s",
|
||||
SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
|
||||
print_header_comment ();
|
||||
printf
|
||||
("#\n"
|
||||
"# udev rules file for supported USB and SCSI devices\n"
|
||||
|
|
@ -3764,11 +3752,7 @@ print_udevhwdb (void)
|
|||
static void
|
||||
print_hwdb_header (void)
|
||||
{
|
||||
time_t current_time = time (0);
|
||||
printf ("# This file was automatically created based on description files (*.desc)\n"
|
||||
"# by sane-desc %s from %s on %s",
|
||||
SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (¤t_time)));
|
||||
|
||||
print_header_comment ();
|
||||
printf
|
||||
("#\n"
|
||||
"# hwdb file for supported USB devices\n"
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue