diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2015-07-15 19:22:38 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2015-07-20 18:15:35 +0100 |
| commit | cbc608e75fe1eb55e85611cb355652a97b6b3159 (patch) | |
| tree | 14ffd19871cac294722fd002a1c808750861fc01 | |
| parent | 94a0b391207baad49df2c58398e0d8c237e51357 (diff) | |
| download | ghostpdl-cbc608e75fe1eb55e85611cb355652a97b6b3159.tar.gz | |
Move gs_pdfwr.ps later in the init process
gs_pdfwr.ps relies on stuff defined during initialisation, so it should be
executed near the very end of initialisation.
To make that happen, it needs it's own .dev and becomes a "FEATURE_DEV" of
the Postscript interpreter.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | psi/int.mak | 10 | ||||
| -rw-r--r-- | psi/msvc.mak | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index dcf4f6050..26797618d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -495,9 +495,10 @@ SO_LIB_VERSION_SEPARATOR=@SO_LIB_VERSION_SEPARATOR@ # ------ Devices and features ------ # # Choose the language feature(s) to include. See gs.mak for details. -# Choose the language feature(s) to include. See gs.mak for details. + +# if it's included, $(PSD)gs_pdfwr.dev should always be one of the last in the list PSI_FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)epsf.dev $(PSD)ttfont.dev \ - @UTF8DEVS@ $(PSD)fapi_ps.dev $(PSD)jpx.dev $(PSD)rasterop.dev $(PSD)jbig2.dev + @UTF8DEVS@ $(PSD)fapi_ps.dev $(PSD)jpx.dev $(PSD)rasterop.dev $(PSD)jbig2.dev $(PSD)gs_pdfwr.dev PCL_FEATURE_DEVS=$(PLOBJDIR)/pl.dev $(PLOBJDIR)/pjl.dev $(PXLOBJDIR)/pxl.dev $(PCL5OBJDIR)/pcl5c.dev \ diff --git a/psi/int.mak b/psi/int.mak index 440b236a5..f4f9636dd 100644 --- a/psi/int.mak +++ b/psi/int.mak @@ -753,6 +753,12 @@ $(PSOBJ)zdouble.$(OBJ) : $(PSSRC)zdouble.c $(OP)\ $(PSD)epsf.dev : $(INT_MAK) $(ECHOGS_XE) $(MAKEDIRS) $(SETMOD) $(PSD)epsf -ps gs_epsf +# -------- Postscript end of the pdfwriter functionality --------- # + +$(PSD)gs_pdfwr.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)psl3.dev $(MAKEDIRS) + $(SETMOD) $(PSD)gs_pdfwr -include $(PSD)psl3 + $(ADDMOD) $(PSD)gs_pdfwr -ps gs_pdfwr + # ---------------- RasterOp ---------------- # # This should be a separable feature in the core also.... @@ -1014,7 +1020,7 @@ $(PSD)psl2int.dev : $(INT_MAK) $(ECHOGS_XE) $(psl2int_)\ $(SETMOD) $(PSD)psl2int $(psl2int_) $(ADDMOD) $(PSD)psl2int -include $(PSD)dps2int $(PSD)usparam $(ADDMOD) $(PSD)psl2int -oper zmisc2 - $(ADDMOD) $(PSD)psl2int -ps gs_lev2 gs_res gs_pdfwr + $(ADDMOD) $(PSD)psl2int -ps gs_lev2 gs_res ivmem2_h=$(PSSRC)ivmem2.h @@ -1097,7 +1103,7 @@ $(PSOBJ)zimage2.$(OBJ) : $(PSSRC)zimage2.c $(OP) $(math__h) $(memory__h)\ # ---------------- setpagedevice ---------------- # -# NOTE: gs_pdfwr.ps is strictly speaking an interpreter feature +# NOTE: gs_pdfwr.ps is not strictly speaking an interpreter feature # but is logically part of the PS resources, and requires the content # of gs_setpd.ps to work, so we include it here (rather than in the # graphics library). diff --git a/psi/msvc.mak b/psi/msvc.mak index c79433eb8..a1a94cafd 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -1265,11 +1265,11 @@ JPX_CFLAGS = $JPX_CFLAGS -DUSE_JPIP -DUSE_OPENJPEG_JP2 # Choose the language feature(s) to include. See gs.mak for details. !ifndef FEATURE_DEVS -# FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(PSD)mshandle.dev $(PSD)mspoll.dev $(PSD)fapi_ps.dev $(PSD)winutf8.dev $(PSD)ramfs.dev - # Choose the language feature(s) to include. See gs.mak for details. + +# if it's included, $(PSD)gs_pdfwr.dev should always be one of the last in the list PSI_FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)epsf.dev $(PSD)ttfont.dev \ - $(PSD)jbig2.dev $(PSD)jpx.dev $(PSD)fapi_ps.dev $(GLD)winutf8.dev + $(PSD)jbig2.dev $(PSD)jpx.dev $(PSD)fapi_ps.dev $(GLD)winutf8.dev $(PSD)gs_pdfwr.dev PCL_FEATURE_DEVS=$(PLOBJDIR)/pl.dev $(PLOBJDIR)/pjl.dev $(PXLOBJDIR)/pxl.dev $(PCL5OBJDIR)/pcl5c.dev \ |