[Dps-devel] [jch@pps.jussieu.fr: pswrap patch]

[Juliusz C. <jc...@pp...>]

Dear all,

I've just submitted the following for inclusion in XFree86.  This is
just a quick fix for 4.0.3, which will be a bug fix-only version.  For
4.1.*, I'm going to do some cleaning up of pswrap, and include
dpsexec, texteroids, as well as a homebrew ``dpsinfo'' utility.

                                        Juliusz

------- Start of forwarded message -------
To: (censored)
Cc: Thomas Dickey <di...@he...>
Subject: pswrap patch
From: Juliusz Chroboczek <jc...@pp...>
Date: 24 Feb 2001 19:26:19 +0100
Content-Type: multipart/mixed; boundary="=-=-="

- --=-=-=

Dear David,

The following patch makes the stub files that pswrap generates contain
the same set of includes as the Adobe version (as used e.g. on
Solaris).

The goal of the XFree86 changes was to fix some compiler warnings;
unfortunately, the effect was to break building of standalone DPS
clients.

In addition, I've changed the initial comment generated to identify
the version of pswrap as being an XFree86 version.  It would be great
if the version of XFree86 used could also be included, but I don't see
a handy include file that can be used for finding out that information.

I cannot see a way how this patch can have negative effects other than
some compiler warnings, and I would be very keen on it getting into
4.0.3.  (More extensive patches for 4.1.* follow.)

Regards,

                                        Juliusz

- --=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=pswrap.patch

? config/pswrap/Makefile
? config/pswrap/pswparser.c
? config/pswrap/pswparser.h
? config/pswrap/lexer.c
? config/pswrap/pswrap
? config/pswrap/pswrap._man
Index: config/pswrap/Imakefile
===================================================================
RCS file: /cvs/xc/config/pswrap/Imakefile,v
retrieving revision 1.6
diff -c -r1.6 Imakefile
*** config/pswrap/Imakefile	2000/06/07 21:58:25	1.6
- --- config/pswrap/Imakefile	2001/02/24 10:34:22
***************
*** 1,6 ****
  XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6 2000/06/07 21:58:25 tsi Exp $
  
!    FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsclient.h>"'
        DEFINES = -DXENVIRONMENT
        DEPLIBS =
         YFLAGS = -d
- --- 1,6 ----
  XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6 2000/06/07 21:58:25 tsi Exp $
  
!    FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsfriends.h>"'
        DEFINES = -DXENVIRONMENT
        DEPLIBS =
         YFLAGS = -d
Index: config/pswrap/pswfile.c
===================================================================
RCS file: /cvs/xc/config/pswrap/pswfile.c,v
retrieving revision 1.4
diff -c -r1.4 pswfile.c
*** config/pswrap/pswfile.c	2000/06/07 21:58:25	1.4
- --- config/pswrap/pswfile.c	2001/02/24 10:34:22
***************
*** 81,92 ****
  #endif /* __MACH__ */
      printf("#include %s\n", FRIENDSFILE);
      printf("#include <string.h>\n");
!     if (special_h == 0) {
! 	printf("#include \"%spsops.h\"\n\n", dpsops ? "d" : "");
!     } else {
  	printf("#include \"%s\"\n\n", special_h);
      }
- -     outlineno += 4;  /* UPDATE this if you add more prolog */
      printf("#line 1 \"%s\"\n",ifile);
      outlineno++;
  }
- --- 81,91 ----
  #endif /* __MACH__ */
      printf("#include %s\n", FRIENDSFILE);
      printf("#include <string.h>\n");
!     outlineno += 3;  /* UPDATE this if you add more prolog */
!     if (special_h) {
  	printf("#include \"%s\"\n\n", special_h);
+         outlineno ++;
      }
      printf("#line 1 \"%s\"\n",ifile);
      outlineno++;
  }
Index: config/pswrap/pswversion.h
===================================================================
RCS file: /cvs/xc/config/pswrap/pswversion.h,v
retrieving revision 1.1
diff -c -r1.1 pswversion.h
*** config/pswrap/pswversion.h	2000/02/13 00:12:35	1.1
- --- config/pswrap/pswversion.h	2001/02/24 10:34:22
***************
*** 36,41 ****
   * Author:  Adobe Systems Incorporated
   */
  
! #define PSW_VERSION "V1.009  Wed Apr 19 17:50:24 PDT 1989"
  
  #define PSW_OS "unix"
- --- 36,41 ----
   * Author:  Adobe Systems Incorporated
   */
  
! #define PSW_VERSION "V1.009 XFree86"
  
  #define PSW_OS "unix"

- --=-=-=--
------- End of forwarded message -------