Commit 52c16130 authored by Didier Raboud's avatar Didier Raboud

New upstream version 3.18.9

parent e1e7ce22

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -62,7 +62,9 @@ libsane_hpaio_la_SOURCES = scan/sane/hpaio.c scan/sane/mfpdtf.c scan/sane/pml.c
scan/sane/sanei_init_debug.c scan/sane/marvell.h scan/sane/marvelli.h scan/sane/marvell.c scan/sane/soapht.c scan/sane/soap.c \
scan/sane/soaphti.h scan/sane/soapi.h scan/sane/xml.c scan/sane/xml.h scan/sane/ledm.h scan/sane/ledmi.h scan/sane/ledm.c \
scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \
scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c
scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c \
scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \
scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h
if DARWIN_BUILD
libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
else
......@@ -176,7 +178,7 @@ if !HPLIP_CLASS_DRIVER
dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
sendfax.py setup.py makecopies.py probe.py timedate.py firmware.py scan.py systray.py plugin.py linefeedcal.py pqdiag.py \
faxsetup.py devicesettings.py printsettings.py query.py pkservice.py wificonfig.py diagnose_plugin.py uninstall.py \
upgrade.py config_usb_printer.py diagnose_queues.py logcapture.py doctor.py
upgrade.py config_usb_printer.py diagnose_queues.py logcapture.py doctor.py uiscan.py
homedir = $(hplipdir)
dist_home_DATA = check-plugin.py
......@@ -191,7 +193,7 @@ dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.p
base/imagesize.py base/models.py base/validation.py base/sixext.py base/avahi.py \
base/mdns.py base/tui.py base/dime.py base/ldif.py base/vcard.py base/module.py \
base/pkit.py base/queues.py base/password.py base/services.py base/os_utils.py \
base/smart_install.py base/six.py
base/smart_install.py base/six.py base/imageprocessing.py
basepexpectdir = $(hplipdir)/base/pexpect
dist_basepexpect_DATA=base/pexpect/__init__.py
......@@ -471,6 +473,10 @@ hplip_desktop_DATA = hplip.desktop
# hplip-systray.desktop
hplip_systraydir = $(systraydir)
hplip_systray_DATA = hplip-systray.desktop
#hp-uiscan_desktop
hp_uiscan_desktopdir = $(icondir)
hp_uiscan_desktop_DATA = hp-uiscan.desktop
endif
......@@ -589,7 +595,6 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
......@@ -705,8 +710,8 @@ if !HPLIP_CLASS_DRIVER
ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(libdir)/x86_64-linux-gnu/sane/ ; \
fi; \
if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/i386-linux-gnu" \) ]; then \
ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so ; \
ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so.0 ; \
ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so ; \
ln -sf $(libdir)/libhpmud.so.0.0.6 $(libdir)/i386-linux-gnu/libhpmud.so.0 ; \
ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so.1 ; \
ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so ; \
fi \
......@@ -778,6 +783,7 @@ if HPLIP_CLASS_DRIVER
rm -rf $(distdir)/ui5/
rm -rf $(distdir)/align.py
rm -rf $(distdir)/info.py
rm -rf $(distdir)/uiscan.py
rm -rf $(distdir)/toolbox.py
rm -rf $(distdir)/clean.py
rm -rf $(distdir)/colorcal.py
......@@ -821,6 +827,7 @@ if HPLIP_CLASS_DRIVER
rm -rf $(distdir)/__init__.py
rm -rf $(distdir)/hpdio.py
rm -rf $(distdir)/hplip.desktop.in
rm -rf $(distdir)/hp-uiscan.desktop.in
rm -rf $(distdir)/hplip-systray.desktop.in
rm -rf $(distdir)/print.py
rm -rf $(distdir)/printsettings.py
......
This diff is collapsed.
This diff is collapsed.
......@@ -35,7 +35,7 @@ USAGE_FLAG_SUPRESS_G_DEBUG_FLAG = 0x02
USAGE_FLAG_FILE_ARGS = 0x04
uiscan=False
class Module(object):
def __init__(self, mod, title, version, doc,
usage_data=None, avail_modes=None,
......@@ -311,6 +311,7 @@ class Module(object):
show_usage = None
device_uri = None
printer_name = None
uiscan=False
error_msg = []
mode = self.default_mode
if prop.gui_build:
......@@ -368,6 +369,9 @@ class Module(object):
elif o == '--help-desc':
show_usage = 'desc'
elif o == '--uiscan':
uiscan = True
elif o in ('--qt3', '--use-qt3'):
if self.avail_modes is not None and GUI_MODE in self.avail_modes:
......@@ -416,12 +420,14 @@ class Module(object):
if self.help_only_support:
if show_usage or error_msg:
self.usage(show_usage, error_msg)
if uiscan == False:
self.usage(show_usage, error_msg)
else:
log.info(log.bold("\nPlease check usage '%s --help'"%self.mod))
show_usage = 'text'
else:
self.usage(show_usage, error_msg)
if uiscan == False:
self.usage(show_usage, error_msg)
if show_usage is not None:
sys.exit(0)
......@@ -472,10 +478,13 @@ class Module(object):
log.info("")
if show_ver:
log.info(log.bold("HP Linux Imaging and Printing System (ver. %s)" % prop.version))
#if uiscan == False:
log.info(log.bold("HP Linux Imaging and Printing System (ver. %s)" % prop.version))
else:
log.info(log.bold("HP Linux Imaging and Printing System"))
#if uiscan == False:
log.info(log.bold("HP Linux Imaging and Printing System"))
#if uiscan == False:
log.info(log.bold("%s ver. %s" % (self.title, self.version)))
log.info("")
log.info("Copyright (c) 2001-15 HP Development Company, LP")
......
......@@ -1423,6 +1423,24 @@ def collapse_range(x): # x --> sorted list of ints
return ''.join(s)
def createBBSequencedFilename(basename, ext, dir=None, digits=3):
if dir is None:
dir = os.getcwd()
m = 0
for f in walkFiles(dir, recurse=False, abs_paths=False, return_folders=False, pattern='*', path=None):
r, e = os.path.splitext(f)
if r.startswith(basename) and ext == e:
try:
i = int(r[len(basename):])
except ValueError:
continue
else:
m = max(m, i)
return os.path.join(dir, "%s%0*d%s" % (basename, digits, m+1, ext))
def createSequencedFilename(basename, ext, dir=None, digits=3):
if dir is None:
......
......@@ -23,6 +23,7 @@
#define SCAN_PLUGIN_SOAP "bb_soap.so"
#define SCAN_PLUGIN_SOAPHT "bb_soapht.so"
#define SCAN_PLUGIN_ESCL "bb_escl.so"
#define SCAN_PLUGIN_ORBLITE "bb_orblite.so"
#define HPLIP_PLUGIN_STATE "/var/lib/hp/hplip.state"
#define CUPS_TMP_DIR getenv("TMPDIR") ? : getenv("HOME") ?:"/tmp"
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.7.
# Generated by GNU Autoconf 2.68 for HP Linux Imaging and Printing 3.18.9.
#
# Report bugs to <3.18.7>.
# Report bugs to <3.18.9>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -246,7 +246,7 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.7 about your
$as_echo "$0: Please tell bug-autoconf@gnu.org and 3.18.9 about your
$0: system, including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
......@@ -569,9 +569,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HP Linux Imaging and Printing'
PACKAGE_TARNAME='hplip'
PACKAGE_VERSION='3.18.7'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.7'
PACKAGE_BUGREPORT='3.18.7'
PACKAGE_VERSION='3.18.9'
PACKAGE_STRING='HP Linux Imaging and Printing 3.18.9'
PACKAGE_BUGREPORT='3.18.9'
PACKAGE_URL=''
# Factoring default headers for most tests.
......@@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures HP Linux Imaging and Printing 3.18.7 to adapt to many kinds of systems.
\`configure' configures HP Linux Imaging and Printing 3.18.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1558,7 +1558,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.18.7:";;
short | recursive ) echo "Configuration of HP Linux Imaging and Printing 3.18.9:";;
esac
cat <<\_ACEOF
......@@ -1619,6 +1619,8 @@ Optional Packages:
[default=/usr/lib/cups/filter]
--with-icondir=DIR set hplip.desktop install directory
[default=/usr/share/applications]
--with-icondir=DIR set hp-uiscan.desktop install directory
[default=/usr/share/applications]
--with-systraydir=DIR set hplip-systray.desktop install directory
[default=/etc/xdg/autostart]
--with-hpppddir=DIR set hp ppd install directory
......@@ -1659,7 +1661,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <3.18.7>.
Report bugs to <3.18.9>.
_ACEOF
ac_status=$?
fi
......@@ -1722,7 +1724,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
HP Linux Imaging and Printing configure 3.18.7
HP Linux Imaging and Printing configure 3.18.9
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2189,7 +2191,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## --------------------- ##
## Report this to 3.18.7 ##
## Report this to 3.18.9 ##
## --------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
......@@ -2266,7 +2268,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by HP Linux Imaging and Printing $as_me 3.18.7, which was
It was created by HP Linux Imaging and Printing $as_me 3.18.9, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -3082,7 +3084,7 @@ fi
# Define the identity of the package.
PACKAGE='hplip'
VERSION='3.18.7'