Skip to content

Commit abf8fd6

Browse files
committed
Drop ippevepcl and ippeveps - use ipptransform instead.
1 parent 00396d1 commit abf8fd6

6 files changed

Lines changed: 38 additions & 77 deletions

File tree

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Changes in libcups
44
libcups v3.0b2 (TBD)
55
--------------------
66

7-
- Added `ipptransform` command (Issue #65)
7+
- Added the `ipptransform` command to replace/upgrade the `ippevepcl` and
8+
`ippeveps` commands (Issue #65)
89
- Added `cupsFormDecode` and `cupsFormEncode` APIs (Issue #49)
910
- Added `cupsJWT` APIs to support JSON Web Tokens (Issue #50, Issue #52)
1011
- Added `ippAddCredentialsString` and `ippCopyCredentialsString` APIs

doc/ippevepcl.html

Lines changed: 0 additions & 72 deletions
This file was deleted.

doc/ipptransform.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
<h1 id="ipptransform-1">ipptransform(1)</h1>
2424
<h2 id="ipptransform-1.name">Name</h2>
2525
<p>ipptransform - convert document data to alternate formats
26+
<br>
27+
ippevepcl - convert document data to hp pcl
28+
<br>
29+
ippeveps - convert document data to postscript
2630
</p>
2731
<h2 id="ipptransform-1.synopsis">Synopsis</h2>
2832
<p><strong>ipptransform</strong>

man/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ include ../Makedefs
1717
#
1818

1919
MAN1 = \
20-
ippevepcl.1 \
2120
ippeveprinter.1 \
2221
ippfind.1 \
2322
ipptool.1 \
@@ -64,8 +63,10 @@ install:
6463
for file in $(MAN1); do \
6564
$(INSTALL_MAN) $$file $(BUILDROOT)$(mandir)/man1; \
6665
done
66+
$(RM) $(BUILDROOT)$(mandir)/man1/ippevepcl.1
67+
$(LN) ipptransform.1 $(BUILDROOT)$(mandir)/man1/ippevepcl.1
6768
$(RM) $(BUILDROOT)$(mandir)/man1/ippeveps.1
68-
$(LN) ippevepcl.1 $(BUILDROOT)$(mandir)/man1/ippeveps.1
69+
$(LN) ipptransform.1 $(BUILDROOT)$(mandir)/man1/ippeveps.1
6970
echo "Installing man pages in $(BUILDROOT)$(mandir)/man5..."
7071
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(mandir)/man5
7172
for file in $(MAN5); do \
@@ -79,10 +80,15 @@ install:
7980

8081
uninstall:
8182
echo "Uninstalling man pages from $(BUILDROOT)$(mandir)/man1..."
82-
for file in $(MAN1) ippeveps.1; do \
83+
for file in $(MAN1) ippevepcl.1 ippeveps.1; do \
8384
$(RM) $(BUILDROOT)$(mandir)/man1/$$file; \
8485
done
8586
-$(RMDIR) $(BUILDROOT)$(mandir)/man1
87+
echo "Uninstalling man pages from $(BUILDROOT)$(mandir)/man5..."
88+
for file in $(MAN5); do \
89+
$(RM) $(BUILDROOT)$(mandir)/man5/$$file; \
90+
done
91+
-$(RMDIR) $(BUILDROOT)$(mandir)/man5
8692

8793

8894
#

man/ipptransform.1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
.\" Licensed under Apache License v2.0. See the file "LICENSE" for more
99
.\" information.
1010
.\"
11-
.TH ipptransform 1 "ippsample" "2023-09-28" "OpenPrinting"
11+
.TH ipptransform 1 "ippsample" "2023-10-03" "OpenPrinting"
1212
.SH NAME
1313
ipptransform \- convert document data to alternate formats
14+
.br
15+
ippevepcl \- convert document data to hp pcl
16+
.br
17+
ippeveps \- convert document data to postscript
1418
.SH SYNOPSIS
1519
.B ipptransform
1620
[

tools/ipptransform.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,24 @@ main(int argc, // I - Number of command-line args
468468
if (num_files == 0)
469469
usage(1);
470470

471+
if (!output_type)
472+
{
473+
// See if we can default the output type from the (legacy) program name...
474+
if ((opt = strrchr(argv[0], '/')) != NULL)
475+
opt ++;
476+
#if _WIN32
477+
else if ((opt = strrchr(argv[0], '\\')) != NULL)
478+
opt ++;
479+
#endif // _WIN32
480+
else
481+
opt = argv[0];
482+
483+
if (!strcmp(opt, "ippevepcl"))
484+
output_type = "application/vnd.hp-PCL";
485+
else if (!strcmp(opt, "ippeveps"))
486+
output_type = "application/postscript";
487+
}
488+
471489
if (!output_type)
472490
{
473491
cupsLangPrintf(stderr, _("%s: Unknown output format, please specify with '-m' option."), Prefix);

0 commit comments

Comments
 (0)