[Xorg-commit] xc/extras/freetype2 vms_make.com,NONE,1.1.2.1 ChangeLog,1.1.4.1,1.1.4.2 Jamfile,1.1.4.1,1.1.4.2 Jamfile.in,1.1.4.1,1.1.4.2 Jamrules,1.1.4.1,1.1.4.2 README,1.1.4.1,1.1.4.2 configure,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
- Previous message: [Xorg-commit] xc/extras/freetype2/builds detect.mk,1.1.4.1,1.1.4.2 freetype.mk,1.1.4.1,1.1.4.2 link_dos.mk,1.1.4.1,1.1.4.2 link_std.mk,1.1.4.1,1.1.4.2 modules.mk,1.1.4.1,1.1.4.2 toplevel.mk,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/programs/xfs/os waitfor.c,1.1.4.1,1.1.4.1.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Update of /cvs/xorg/xc/extras/freetype2
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/freetype2
Modified Files:
Tag: XORG-CURRENT
ChangeLog Jamfile Jamfile.in Jamrules README configure
Added Files:
Tag: XORG-CURRENT
vms_make.com
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
--- NEW FILE: vms_make.com ---
$!---------------vms_make.com for Freetype2------------------------------------
$! make Freetype2 under OpenVMS
$!
$! In case of problems with the build you might want to contact me at
$! zinser at decus.de (preferred) or zinser at sysdev.deutsche-boerse.com (Work)
$!
$! This procedure currently does support the following commandline options
$! in arbitrary order
$!
$! * DEBUG - Compile modules with /noopt/debug and link shareable image
$! with /debug
$! * LOPTS - Options to be passed to the link command
$! * CCOPT - Options to be passed to the C compiler
$!------------------------------------------------------------------------------
$!
$! Just some general constants
$!
$ true = 1
$ false = 0
$ Make = ""
$!
$! Setup variables holding "config" information
$!
$ name = "Freetype2"
$ mapfile = name + ".map"
$ optfile = name + ".opt"
$ s_case = false
$ libdefs = ""
$ libincs = ""
$ liblist = ""
$ ccopt = ""
$ lopts = ""
$!
$! Check for MMK/MMS
$!
$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
$!
$! Which command parameters were given
$!
$ gosub check_opts
$!
$! Create option file
$!
$ open/write optf 'optfile'
$!
$! Pull in external libraries
$!
$ create libs.opt
$ gosub check_create_vmslib
$!
$! Create objects
$!
$ if libdefs .nes. "" then ccopt = ccopt + "/define=(" + libdefs + ")"
$!
$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
then s_case = true
$ gosub crea_mms
$!
$ 'Make' /macro=(comp_flags="''ccopt'")
$ purge/nolog [...]descrip.mms
$!
$! Add them to options
$!
$FLOOP:
$ file = f$edit(f$search("[...]*.obj"),"UPCASE")
$ if (file .nes. "")
$ then
$ if f$locate("DEMOS",file) .eqs. f$length(file) then write optf file
$ goto floop
$ endif
$!
$ close optf
$!
$!
$! Alpha gets a shareable image
$!
$ If f$getsyi("HW_MODEL") .gt. 1024
$ Then
$ write sys$output "Creating freetype2shr.exe"
$ call anal_obj_axp 'optfile' _link.opt
$ open/append optf 'optfile'
$ if s_case then WRITE optf "case_sensitive=YES"
$ close optf
$ LINK_/NODEB/SHARE=[.lib]freetype2shr.exe -
'optfile'/opt,libs.opt/opt,_link.opt/opt
$ endif
$!
$ exit
$!
$!------------------------------------------------------------------------------
$!
$! If MMS/MMK are available dump out the descrip.mms if required
$!
$CREA_MMS:
$ write sys$output "Creating descrip.mms files ..."
$ write sys$output "... Main directory"
$ create descrip.mms
$ open/append out descrip.mms
$ copy sys$input: out
$ deck
#
# FreeType 2 build system -- top-level Makefile for OpenVMS
#
# Copyright 2001 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
$ EOD
$ write out "CFLAGS = ", ccopt
$ copy sys$input: out
$ deck
all :
define freetype [--.include.freetype]
define psaux [-.psaux]
define autohint [-.autohint]
define base [-.base]
define cache [-.cache]
define cff [-.cff]
define cid [-.cid]
define pcf [-.pcf]
define psnames [-.psnames]
define raster [-.raster]
define sfnt [-.sfnt]
define smooth [-.smooth]
define truetype [-.truetype]
define type1 [-.type1]
define winfonts [-.winfonts]
if f$search("lib.dir") .eqs. "" then create/directory [.lib]
set default [.builds.vms]
$(MMS)$(MMSQUALIFIERS)
set default [--.src.autohint]
$(MMS)$(MMSQUALIFIERS)
set default [-.base]
$(MMS)$(MMSQUALIFIERS)
set default [-.bdf]
$(MMS)$(MMSQUALIFIERS)
set default [-.cache]
$(MMS)$(MMSQUALIFIERS)
set default [-.cff]
$(MMS)$(MMSQUALIFIERS)
set default [-.cid]
$(MMS)$(MMSQUALIFIERS)
set default [-.gzip]
$(MMS)$(MMSQUALIFIERS)
set default [-.pcf]
$(MMS)$(MMSQUALIFIERS)
set default [-.pfr]
$(MMS)$(MMSQUALIFIERS)
set default [-.psaux]
$(MMS)$(MMSQUALIFIERS)
set default [-.pshinter]
$(MMS)$(MMSQUALIFIERS)
set default [-.psnames]
$(MMS)$(MMSQUALIFIERS)
set default [-.raster]
$(MMS)$(MMSQUALIFIERS)
set default [-.sfnt]
$(MMS)$(MMSQUALIFIERS)
set default [-.smooth]
$(MMS)$(MMSQUALIFIERS)
set default [-.truetype]
$(MMS)$(MMSQUALIFIERS)
set default [-.type1]
$(MMS)$(MMSQUALIFIERS)
set default [-.type42]
$(MMS)$(MMSQUALIFIERS)
set default [-.winfonts]
$(MMS)$(MMSQUALIFIERS)
set default [--]
# EOF
$ eod
$ close out
$ write sys$output "... [.builds.vms] directory"
$ create [.builds.vms]descrip.mms
$ open/append out [.builds.vms]descrip.mms
$ copy sys$input: out
$ deck
#
# FreeType 2 system rules for VMS
#
# Copyright 2001 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([],[--.include],[--.src.base])
OBJS=ftsystem.obj
all : $(OBJS)
library/create [--.lib]freetype.olb $(OBJS)
ftsystem.obj : ftsystem.c ftconfig.h
# EOF
$ eod
$ close out
$ write sys$output "... [.src.autohint] directory"
$ create [.src.autohint]descrip.mms
$ open/append out [.src.autohint]descrip.mms
$ copy sys$input: out
$ deck
#
# FreeType 2 auto-hinter module compilation rules for VMS
#
# Copyright 2001, 2002 Catharon Productions Inc.
#
# This file is part of the Catharon Typography Project and shall only
# be used, modified, and distributed under the terms of the Catharon
# Open Source License that should come with this file under the name
# `CatharonLicense.txt'. By continuing to use, modify, or distribute
# this file you indicate that you have read the license and
# understand and accept it fully.
#
# Note that this license is compatible with the FreeType license.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=([--.include],[--.src.autohint])
OBJS=autohint.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
# EOF
$ eod
$ close out
$ write sys$output "... [.src.gzip] directory"
$ create [.src.gzip]descrip.mms
$ open/append out [.src.gzip]descrip.mms
$ copy sys$input: out
$ deck
#
# FreeType 2 GZip support compilation rules for VMS
#
# Copyright 2002 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
$EOD
$ if libincs .nes. "" then write out "LIBINCS = ", libincs, ","
$ copy sys$input: out
$ deck
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=($(LIBINCS)[--.include],[--.src.gzip])
OBJS=ftgzip.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
# EOF
$ eod
$ close out
$ write sys$output "... [.src.type1] directory"
$ create [.src.type1]descrip.mms
$ open/append out [.src.type1]descrip.mms
$ copy sys$input: out
$ deck
#
# FreeType 2 Type1 driver compilation rules for VMS
#
# Copyright 1996-2000, 2002 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1])
OBJS=type1.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
type1.obj : type1.c t1parse.c t1load.c t1objs.c t1driver.c t1gload.c t1afm.c
# EOF
$ eod
$ close out
$ return
$!------------------------------------------------------------------------------
$!
$! Check command line options and set symbols accordingly
$!
$ CHECK_OPTS:
$ i = 1
$ OPT_LOOP:
$ if i .lt. 9
$ then
$ cparm = f$edit(p'i',"upcase")
$ if cparm .eqs. "DEBUG"
$ then
$ ccopt = ccopt + "/noopt/deb"
$ lopts = lopts + "/deb"
$ endif
$! if cparm .eqs. "LINK" then linkonly = true
$ if f$locate("LOPTS",cparm) .lt. f$length(cparm)
$ then
$ start = f$locate("=",cparm) + 1
$ len = f$length(cparm) - start
$ lopts = lopts + f$extract(start,len,cparm)
$ endif
$ if f$locate("CCOPT",cparm) .lt. f$length(cparm)
$ then
$ start = f$locate("=",cparm) + 1
$ len = f$length(cparm) - start
$ ccopt = ccopt + f$extract(start,len,cparm)
$ endif
$ i = i + 1
$ goto opt_loop
$ endif
$ return
$!------------------------------------------------------------------------------
$!
$! Take care of driver file with information about external libraries
$!
$CHECK_CREATE_VMSLIB:
$!
$ if f$search("VMSLIB.DAT") .eqs. ""
$ then
$ type/out=vmslib.dat sys$input
!
! This is a simple driver file with information used by make.com to
! check if external libraries (like t1lib and freetype) are available on
! the system.
!
! Layout of the file:
!
! - Lines starting with ! are treated as comments
! - Elements in a data line are separated by # signs
! - The elements need to be listed in the following order
! 1.) Name of the Library
! 2.) Location where the object library can be found
! 3.) Location where the include files for the library can be found
! 4.) Include file used to verify library location
! 5.) CPP define to pass to the build to indicate availability of
! the library
!
! Example: The following lines show how definitions
! might look like. They are site specific and the locations of the
! library and include files need almost certainly to be changed.
!
! Location: All of the libaries can be found at the following addresses
!
! ZLIB: http://www.decus.de:8080/www/vms/sw/zlib.htmlx
!
!ZLIB # pubbin:libz.olb # public$Root:[util.libs.zlib] # zlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
$ write sys$output "New driver file vmslib.dat created."
$ write sys$output "Please customize libary locations for your site"
$ write sys$output "and afterwards re-execute vms_make.com"
$ write sys$output "Exiting..."
$ close/nolog optf
$ exit
$ endif
$!
$! Open data file with location of libraries
$!
$ open/read/end=end_lib/err=lib_err libdata VMSLIB.DAT
$ open/append loptf libs.opt
$LIB_LOOP:
$ read/end=end_lib libdata libline
$ libline = f$edit(libline, "UNCOMMENT,COLLAPSE")
$ if libline .eqs. "" then goto LIB_LOOP ! Comment line
$ libname = f$edit(f$element(0,"#",libline),"UPCASE")
$ liblist = liblist + "#" + libname
$ write sys$output "Processing ''libname' setup ..."
$ libloc = f$element(1,"#",libline)
$ libsrc = f$element(2,"#",libline)
$ testinc = f$element(3,"#",libline)
$ cppdef = f$element(4,"#",libline)
$ old_cpp = f$locate("=1",cppdef)
$ if old_cpp.lt.f$length(cppdef) then cppdef = f$extract(0,old_cpp,cppdef)
$ if f$search("''libloc'").eqs. ""
$ then
$ write sys$output "Can not find library ''libloc' - Skipping ''libname'"
$ goto LIB_LOOP
$ endif
$ libsrc_elem = 0
$ libsrc_found = false
$LIBSRC_LOOP:
$ libsrcdir = f$element(libsrc_elem,",",libsrc)
$ if (libsrcdir .eqs. ",") then goto END_LIBSRC
$ if f$search("''libsrcdir'''testinc'") .nes. "" then libsrc_found = true
$ libsrc_elem = libsrc_elem + 1
$ goto LIBSRC_LOOP
$END_LIBSRC:
$ if .not. libsrc_found
$ then
$ write sys$output "Can not find includes at ''libsrc' - Skipping ''libname'"
$ goto LIB_LOOP
$ endif
$ if cppdef .nes. "" then libdefs = libdefs + "," + cppdef
$ libincs = libincs + "," + libsrc
$ lqual = "/lib"
$ libtype = f$parse(libloc,,,"TYPE")
$ if f$locate("EXE",libtype) .lt. f$length(libtype) then lqual = "/share"
$ write loptf libloc , lqual
$ goto LIB_LOOP
$END_LIB:
$ close libdata
$ close loptf
$ libincs = libincs - ","
$ libdefs = libdefs - ","
$ return
$!------------------------------------------------------------------------------
$!
$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
$! information to build a symbol vector for a shareable image
$! All the "brains" of this logic was suggested by Hartmut Becker
$! (Hartmut.Becker at compaq.com). All the bugs were introduced by me
$! (zinser at decus.de), so if you do have problem reports please do not
$! bother Hartmut/HP, but get in touch with me
$!
$ ANAL_OBJ_AXP: Subroutine
$ V = 'F$Verify(0)
$ SAY := "WRITE_ SYS$OUTPUT"
$
$ IF F$SEARCH("''P1'") .EQS. ""
$ THEN
$ SAY "ANAL_OBJ_AXP-E-NOSUCHFILE: Error, inputfile ''p1' not available"
$ goto exit_aa
$ ENDIF
$ IF "''P2'" .EQS. ""
$ THEN
$ SAY "ANAL_OBJ_AXP: Error, no output file provided"
$ goto exit_aa
$ ENDIF
$
$ open/read in 'p1
$ create a.tmp
$ open/append atmp a.tmp
$ loop:
$ read/end=end_loop in line
$ f= f$search(line)
$ if f .eqs. ""
$ then
$ write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"
$ goto loop
$ endif
$ def/user sys$output nl:
$ def/user sys$error nl:
$ anal/obj/gsd 'f /out=x.tmp
$ open/read xtmp x.tmp
$ XLOOP:
$ read/end=end_xloop xtmp xline
$ xline = f$edit(xline,"compress")
$ write atmp xline
$ goto xloop
$ END_XLOOP:
$ close xtmp
$ goto loop
$ end_loop:
$ close in
$ close atmp
$ if f$search("a.tmp") .eqs. "" -
then $ exit
$ ! all global definitions
$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp
$ ! all procedures
$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp
$ search c.tmp "symbol:"/out=d.tmp
$ def/user sys$output nl:
$ edito/edt/command=sys$input d.tmp
sub/symbol: "/symbol_vector=(/whole
sub/"/=procedure)/whole
exit
$ ! all data
$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp
$ search e.tmp "symbol:"/out=f.tmp
$ def/user sys$output nl:
$ edito/edt/command=sys$input f.tmp
sub/symbol: "/symbol_vector=(/whole
sub/"/=data)/whole
exit
$ sort/nodupl d.tmp,f.tmp 'p2'
$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*
$ if f$search("x.tmp") .nes. "" -
then $ delete x.tmp;*
$!
$ EXIT_AA:
$ if V then set verify
$ endsubroutine
Index: ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/ChangeLog,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ChangeLog 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/ChangeLog 23 Feb 2004 21:32:00 -0000 1.1.4.2
@@ -1,188 +1,2429 @@
+2003-11-07 Werner Lemberg <wl at gnu.org>
+
+
+ * Version 2.1.7 released.
+ =========================
+
+
+ * include/freetype/freetype.h (FREETYPE_PATCH): Set to 7.
+
+ * builds/unix/ft2unix.h: Fix comments.
+
[...3040 lines suppressed...]
2001-03-12 Werner Lemberg <wl at gnu.org>
@@ -5180,7 +7561,7 @@
* src/cff/cffparse.c (cff_parse_font_matrix): Added logic to get
the units_per_EM from the FontMatrix.
- (cff_parse_fixed_thousand): New function. Gets a real number from
+ (cff_parse_fixed_thousand): New function. Gets a real number from
the CFF font, but multiplies by 1000 (this is to avoid rounding
errors when placing this real number into a 16.16 fixed number).
@@ -5294,7 +7675,7 @@
* src/cff/cffobjs.c, src/cff/cffobjs.h, src/cff/cffparse.c,
src/cff/cffdrivr.c, src/cff/cff.c, src/cff/cffload.c,
src/cff/cffgload.c, src/cff/cffgload.h: Changed to use
- cffgload.{c,h} instead of t2gload.{c,h}. All occurences of t2_
+ cffgload.{c,h} instead of t2gload.{c,h}. All occurrences of t2_
(T2_) were replaced with cff_ (CFF_, respectively).
* src/cff/t2gload.h: Renamed cffgload.h.
Index: Jamfile
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/Jamfile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Jamfile 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/Jamfile 23 Feb 2004 21:32:00 -0000 1.1.4.2
@@ -1,21 +1,22 @@
-# FreeType 2 top Jamfile (c) 2001-2002 David Turner
+# FreeType 2 top Jamfile (c) 2001, 2002, 2003 David Turner
#
# The HDRMACRO is already defined in FTJam and is used to add
# the content of certain macros to the list of included header
# files.
#
-# we can compile FreeType 2 with classic Jam however thanks to
+# We can compile FreeType 2 with classic Jam however thanks to
# the following code
#
if ! $(JAM_TOOLSET)
{
rule HDRMACRO
{
- # nothing !!
+ # nothing
}
}
+
# We need to invoke a SubDir rule if the FT2 source directory top is not the
# current directory. This allows us to build FreeType 2 as part of a larger
# project easily.
@@ -25,71 +26,83 @@
SubDir FT2_TOP ;
}
-#
-# The following macros define the include directory, the source directory
-# and the final library name (without library extensions). They can be
+
+# The following macros define the include directory, the source directory,
+# and the final library name (without library extensions). They can be
# replaced by other definitions when the library is compiled as part of
# a larger project.
#
-# name of FreeType include directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType include directory during compilation.
+# This is relative to FT2_TOP.
#
FT2_INCLUDE_DIR ?= include ;
-# name of FreeType source directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType source directory during compilation.
+# This is relative to FT2_TOP.
#
FT2_SRC_DIR ?= src ;
-# name of final library, without extension
+# Name of final library, without extension.
#
FT2_LIB ?= $(LIBPREFIX)freetype ;
-# define FT2_BUILD_INCLUDE to point to your build-specific directory
-# this is prepended to FT2_INCLUDE_DIR. This can be used to specify
+# Define FT2_BUILD_INCLUDE to point to your build-specific directory.
+# This is prepended to FT2_INCLUDE_DIR. It can be used to specify
# the location of a custom <ft2build.h> which will point to custom
-# versions of "ftmodule.h" and "ftoption.h", for example
+# versions of "ftmodule.h" and "ftoption.h", for example.
#
FT2_BUILD_INCLUDE ?= ;
-# the list of modules to compile on any given build of the library
-# by default, this will contain _all_ modules defined in FT2_SRC_DIR
+# The list of modules to compile on any given build of the library.
+# By default, this will contain _all_ modules defined in FT2_SRC_DIR.
#
# IMPORTANT: You'll need to change the content of "ftmodule.h" as well
# if you modify this list or provide your own.
#
-FT2_COMPONENTS ?= gzip # support for gzip-compressed files.
+FT2_COMPONENTS ?= gzip # support for gzip-compressed files
autohint # auto-hinter
base # base component (public APIs)
bdf # BDF font driver
cache # cache sub-system
cff # CFF/CEF font driver
- cid # Postscript CID-keyed font driver
+ cid # PostScript CID-keyed font driver
pcf # PCF font driver
pfr # PFR/TrueDoc font driver
- psaux # Common Postscript routines module
- pshinter # Postscript hinter module
- psnames # Postscript names handling
- raster # Monochrome rasterizer
- smooth # Anti-aliased rasterizer
+ psaux # common PostScript routines module
+ pshinter # PostScript hinter module
+ psnames # PostScript names handling
+ raster # monochrome rasterizer
+ smooth # anti-aliased rasterizer
sfnt # SFNT-based format support routines
truetype # TrueType font driver
- type1 # Postscript Type 1 font driver
- type42 # Postscript Type 42 (embedded TrueType) driver
+ type1 # PostScript Type 1 font driver
+ type42 # PostScript Type 42 (embedded TrueType) driver
winfonts # Windows FON/FNT font driver
;
-# don't touch
+# Don't touch.
#
FT2_INCLUDE = $(FT2_BUILD_INCLUDE)
[ FT2_SubDir $(FT2_INCLUDE_DIR) ] ;
FT2_SRC = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
-# only used by FreeType developers
+# Location of API Reference Documentation
+#
+if $(DOC_DIR)
+{
+ DOC_DIR = $(DOCDIR:T) ;
+}
+else
+{
+ DOC_DIR = docs/reference ;
+}
+
+
+# Only used by FreeType developers.
#
if $(DEBUG_HINTER)
{
@@ -104,11 +117,12 @@
# Uncomment the following line if you want to build individual source files
-# for each FreeType 2 module. this is only useful during development, and
-# is better defined as an environment variable anyway !
+# for each FreeType 2 module. This is only useful during development, and
+# is better defined as an environment variable anyway!
#
# FT2_MULTI = true ;
+
# The file <freetype/config/ftheader.h> is used to define macros that are
# later used in #include statements. It needs to be parsed in order to
# record these definitions.
@@ -116,17 +130,26 @@
HDRMACRO [ FT2_SubDir include freetype config ftheader.h ] ;
HDRMACRO [ FT2_SubDir include freetype internal internal.h ] ;
+
# Now include the Jamfile in "freetype2/src", used to drive the compilation
# of each FreeType 2 component and/or module.
#
SubInclude FT2_TOP $(FT2_SRC_DIR) ;
-# tests files (hinter debugging). only used by FreeType developers
+# Test files (hinter debugging). Only used by FreeType developers.
#
if $(DEBUG_HINTER)
{
SubInclude FT2_TOP tests ;
}
+actions RefDoc
+{
+ python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h
+}
+
+RefDoc refdoc ;
+
+
# end of top Jamfile
Index: Jamfile.in
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/Jamfile.in,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Jamfile.in 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/Jamfile.in 23 Feb 2004 21:32:00 -0000 1.1.4.2
@@ -1,21 +1,22 @@
-# FreeType 2 top Jamfile (c) 2001-2002 David Turner
+# FreeType 2 top Jamfile (c) 2001, 2002, 2003 David Turner
#
# The HDRMACRO is already defined in FTJam and is used to add
# the content of certain macros to the list of included header
# files.
#
-# we can compile FreeType 2 with classic Jam however thanks to
+# We can compile FreeType 2 with classic Jam however thanks to
# the following code
#
if ! $(JAM_TOOLSET)
{
rule HDRMACRO
{
- # nothing !!
+ # nothing
}
}
+
# We need to invoke a SubDir rule if the FT2 source directory top is not the
# current directory. This allows us to build FreeType 2 as part of a larger
# project easily.
@@ -25,71 +26,71 @@
SubDir FT2_TOP ;
}
-#
-# The following macros define the include directory, the source directory
-# and the final library name (without library extensions). They can be
+
+# The following macros define the include directory, the source directory,
+# and the final library name (without library extensions). They can be
# replaced by other definitions when the library is compiled as part of
# a larger project.
#
-# name of FreeType include directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType include directory during compilation.
+# This is relative to FT2_TOP.
#
FT2_INCLUDE_DIR ?= include ;
-# name of FreeType source directory during compilation.
-# relative to FT2_TOP
+# Name of FreeType source directory during compilation.
+# This is relative to FT2_TOP.
#
FT2_SRC_DIR ?= src ;
-# name of final library, without extension
+# Name of final library, without extension.
#
FT2_LIB ?= $(LIBPREFIX)freetype ;
-# define FT2_BUILD_INCLUDE to point to your build-specific directory
-# this is prepended to FT2_INCLUDE_DIR. This can be used to specify
+# Define FT2_BUILD_INCLUDE to point to your build-specific directory.
+# This is prepended to FT2_INCLUDE_DIR. It can be used to specify
# the location of a custom <ft2build.h> which will point to custom
-# versions of "ftmodule.h" and "ftoption.h", for example
+# versions of "ftmodule.h" and "ftoption.h", for example.
#
FT2_BUILD_INCLUDE ?= ;
-# the list of modules to compile on any given build of the library
-# by default, this will contain _all_ modules defined in FT2_SRC_DIR
+# The list of modules to compile on any given build of the library.
+# By default, this will contain _all_ modules defined in FT2_SRC_DIR.
#
# IMPORTANT: You'll need to change the content of "ftmodule.h" as well
# if you modify this list or provide your own.
#
-FT2_COMPONENTS ?= gzip # support for gzip-compressed files.
+FT2_COMPONENTS ?= gzip # support for gzip-compressed files
autohint # auto-hinter
base # base component (public APIs)
bdf # BDF font driver
cache # cache sub-system
cff # CFF/CEF font driver
- cid # Postscript CID-keyed font driver
+ cid # PostScript CID-keyed font driver
pcf # PCF font driver
pfr # PFR/TrueDoc font driver
- psaux # Common Postscript routines module
- pshinter # Postscript hinter module
- psnames # Postscript names handling
- raster # Monochrome rasterizer
- smooth # Anti-aliased rasterizer
+ psaux # common PostScript routines module
+ pshinter # PostScript hinter module
+ psnames # PostScript names handling
+ raster # monochrome rasterizer
+ smooth # anti-aliased rasterizer
sfnt # SFNT-based format support routines
truetype # TrueType font driver
- type1 # Postscript Type 1 font driver
- type42 # Postscript Type 42 (embedded TrueType) driver
+ type1 # PostScript Type 1 font driver
+ type42 # PostScript Type 42 (embedded TrueType) driver
winfonts # Windows FON/FNT font driver
;
-# don't touch
+# Don't touch.
#
FT2_INCLUDE = $(FT2_BUILD_INCLUDE)
[ FT2_SubDir $(FT2_INCLUDE_DIR) ] ;
FT2_SRC = [ FT2_SubDir $(FT2_SRC_DIR) ] ;
-# only used by FreeType developers
+# Only used by FreeType developers.
#
if $(DEBUG_HINTER)
{
@@ -103,13 +104,13 @@
HDRS += $(FT2_INCLUDE) ;
-#SubDirHdr += $(FT2_INCLUDE) ;
-
# Uncomment the following line if you want to build individual source files
-# for each FreeType 2 module.
+# for each FreeType 2 module. This is only useful during development, and
+# is better defined as an environment variable anyway!
#
# FT2_MULTI = true ;
+
# The file <freetype/config/ftheader.h> is used to define macros that are
# later used in #include statements. It needs to be parsed in order to
# record these definitions.
@@ -117,13 +118,14 @@
HDRMACRO [ FT2_SubDir include freetype config ftheader.h ] ;
HDRMACRO [ FT2_SubDir include freetype internal internal.h ] ;
+
# Now include the Jamfile in "freetype2/src", used to drive the compilation
# of each FreeType 2 component and/or module.
#
SubInclude FT2_TOP $(FT2_SRC_DIR) ;
-# tests files (hinter debugging). only used by FreeType developers
+# Test files (hinter debugging). Only used by FreeType developers.
#
if $(DEBUG_HINTER)
{
Index: Jamrules
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/Jamrules,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Jamrules 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/Jamrules 23 Feb 2004 21:32:00 -0000 1.1.4.2
@@ -1,4 +1,4 @@
-# FreeType 2 JamRules (c) 2001 David Turner
+# FreeType 2 JamRules (c) 2001, 2002, 2003 David Turner
#
# This file contains the Jam rules needed to build the FreeType 2 library.
# It is shared by all Jamfiles and is included only once in the build
@@ -6,7 +6,7 @@
#
-# call SubDirHdrs on a list of directories
+# Call SubDirHdrs on a list of directories.
#
rule AddSubDirHdrs
{
Index: README
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/README,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/README 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/README 23 Feb 2004 21:32:00 -0000 1.1.4.2
@@ -1,39 +1,36 @@
-
Special notes to Unix users
===========================
- Please read the file "docs/UPGRADE.UNX", it contains important
- information regarding the installation of FreeType on Unix systems,
+ Please read the file "docs/UPGRADE.UNX". It contains important
+ information regarding the installation of FreeType on Unix systems,
especially GNU based operating systems like GNU/Linux.
- FreeType 2's library is called `libfreetype', FreeType 1's library
+ FreeType 2's library is called `libfreetype', FreeType 1's library
is called `libttf'. They are *not* compatible!
- FreeType 2.1.4
+ FreeType 2.1.7
==============
- Please read the docs/CHANGES file, it contains IMPORTANT
- INFORMATION.
+ Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION.
- Read the files "docs/INSTALL" for installation instructions.
+ Read the files "docs/INSTALL" for installation instructions.
- Note that the FreeType 2 documentation is now available as a
+ Note that the FreeType 2 documentation is now available as a
separate package from our sites. See:
- ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.4.tar.bz2
- ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.4.tar.gz
- ftp://ftp.freetype.org/pub/freetype2/ftdoc214.zip
+ ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.7.tar.bz2
+ ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.7.tar.gz
+ ftp://ftp.freetype.org/pub/freetype2/ftdoc216.zip
- Reports
- =======
-
- Please report bugs by e-mail to `devel at freetype.org'. Don't
- forget to send a detailed explanation of the problem -- there is
- nothing worse than receiving a terse message that only says "it
- doesn't work".
+ Bugs
+ ====
+ Please report bugs by e-mail to `devel at freetype.org'. Don't forget
+ to send a detailed explanation of the problem -- there is nothing
+ worse than receiving a terse message that only says "it doesn't
+ work".
Enjoy!
Index: configure
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/configure,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/configure 26 Nov 2003 22:48:21 -0000 1.1.4.1
+++ b/configure 23 Feb 2004 21:32:00 -0000 1.1.4.2
@@ -46,11 +46,13 @@
# build a dummy Makefile if we are not building in the source tree
if test "$abs_curr_dir" != "$abs_ft2_dir"; then
- echo "OBJ_DIR=$abs_curr_dir" > Makefile
- echo "TOP_DIR=$abs_ft2_dir" >> Makefile
- echo "OBJ_BUILD=$abs_curr_dir" >> Makefile
- echo "LIBTOOL=$abs_curr_dir/libtool" >> Makefile
- echo "include $abs_ft2_dir/Makefile" >> Makefile
+ mkdir reference
+ echo "TOP_DIR=$abs_ft2_dir" > Makefile
+ echo "OBJ_DIR=$abs_curr_dir" >> Makefile
+ echo "OBJ_BUILD=$abs_curr_dir" >> Makefile
+ echo "DOC_DIR=$abs_curr_dir/reference" >> Makefile
+ echo "LIBTOOL=$abs_curr_dir/libtool" >> Makefile
+ echo "include $abs_ft2_dir/Makefile" >> Makefile
fi
# call make
- Previous message: [Xorg-commit] xc/extras/freetype2/builds detect.mk,1.1.4.1,1.1.4.2 freetype.mk,1.1.4.1,1.1.4.2 link_dos.mk,1.1.4.1,1.1.4.2 link_std.mk,1.1.4.1,1.1.4.2 modules.mk,1.1.4.1,1.1.4.2 toplevel.mk,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/programs/xfs/os waitfor.c,1.1.4.1,1.1.4.1.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list