Commit Graph

36 Commits

Author SHA1 Message Date
Brendan Shanks 6fb7b7a09d Fix building when freetype is itself a git submodule.
There are situations where .git is not a directory, like when
freetype is a submodule in another repository.
2022-04-26 16:07:42 -07:00
Werner Lemberg d0cfb4e1b2 Update all copyright notices. 2022-01-11 10:54:10 +01:00
Hugh McMaster 467e49e817 Only copy submodules if building from a git branch.
`` fails if building from a standard source tarball.  Firstly, git
expects to be called in a git repository, then `copy_submodule_files`
blindly attempts to copy files.

Debian, Ubuntu, Linux Mint, and other derivatives all run ``
before compiling to regenerate build files.

This patch ensures that various git commands are only called and 'dlg' files
are only copied if `` is called from a git repository.
2021-10-05 19:44:27 +02:00
Werner Lemberg d1d3dc0235 Make it work with old Solaris 10 shell. 2021-09-02 22:12:07 -07:00
Werner Lemberg 92bd99bd25 Move 'dlg' submodule to `subprojects` directory.
This is for future changes with Meson, which doesn't allow a
different name for its `subprojects` directory.  Having both a
`submodules` and a `subprojects` directory is confusing.

* .gitmodules, (copy_submodule_files, DLG_INC_DIR,
DLG_SRC_DIR): Updated.

* builds/ (<top-level>, do-dist),
builds/windows/vc2010/script.bat: Updated.

* src/tools/no-copyright: Updated.
2021-02-16 14:07:18 +01:00
Alexei Podtelezhnikov 8dc311320c * Absorb `version.sed'.
* version.sed: Removed.
2021-01-22 20:27:15 -05:00
Werner Lemberg b6e8a71266 Update all copyright notices. 2021-01-17 07:18:48 +01:00
Alexei Podtelezhnikov 6369058eee [dlg] Move the headers to include/dlg to simplify their use.
*, builds/ Copy headers to incluide/dlg.
* builds/, builds/windows/vc2010/freetype.vcxproj:
Simplify included path.
* include/freetype/internal/ftdebug.h: Simplify #include.
* src/dlg/, .gitignore: Updated.
2021-01-07 00:13:23 -05:00
Werner Lemberg f6b0fd7b79 Improve setup for 'dlg' library.
* (copy_submodule_file), builds/ Redirect
stderr to `/dev/null`.

* builds/ Move code block to handle 'dlg' stuff into
`check_platform` conditional.
Also fix wildcard expressions for guarding `git submodule` commands.
Also make file copying work with non-Unix platforms (untested).
2020-12-05 09:43:45 +01:00
Priyesh Kumar 34b1c897c1 [builds] Necessary changes to make 'dlg' compile.
* (copy_submodule_files): New script to copy all the
necessary source and include files from `submodules/dlg` to

* src/dlg/dlgwrap.c: New wrapper file for `src/dlg.c`.  It enables
the build of 'dlg' if the `FT_LOGGING` macro is defined.

* src/dlg/ New sub-Makefile.

* builds/ (DLG_DIR): New variable to include the
header files of the 'dlg' library.
(FT_CFLAGS): Add `-std=c99' flag.
Include `src/dlg/` file to build 'dlg' library.
(OBJ_S, OBJ_M): Add `DLG_OBJS_M` and `DLG_OBJS_S`.

* builds/ For builds directly from the git repository
we need to copy files from `submodule/dlg` to `src/dlg`.

* include/freetype/config/ftoption.h, devel/ftoption.h (FT_LOGGING):
New macro to enable or disable the logging facility in FreeType.
2020-12-01 09:20:32 +01:00
Werner Lemberg e5038be704 Update all copyright notices. 2020-01-19 17:05:19 +01:00
Werner Lemberg 7585997024 Update all copyright notices. 2019-02-23 10:07:09 +01:00
Werner Lemberg f686ad46a3 Update copyright years. 2019-01-22 20:31:44 +01:00
Werner Lemberg 0a0c22569d Update copyright year. 2018-01-02 09:33:57 +01:00
Werner Lemberg 563ae78022 Update copyright year. 2017-01-04 20:16:34 +01:00
Werner Lemberg 9adeab6452 Update copyright year. 2016-01-13 11:54:10 +01:00
Werner Lemberg ff7d640404 Replace `mkinstalldirs' with AC_PROG_MKDIR_P.
* builds/unix/mkinstalldirs: Removed, no longer needed.

* builds/unix/configure.raw: Call `AC_PROG_MKDIR_P'.
Update pwd call for `$INSTALL'.

* builds/unix/ (MKINSTALLDIRS): Use `@MKDIR_P@'.

* Updated.
2015-09-13 23:53:16 +02:00
Werner Lemberg 392cf22f8a Another adjustment to header locations.
This change is a result of a discussion thread on freetype-devel

Re-introduce the `freetype2' subdirectory for all FreeType header
files after installation, and rename the `freetype2' subdirectory in
the git repository to `freetype'.

* include/freetype2: Renamed to...
* include/freetype: This.

Update creation of `ftconfig.h'.
Install generated `ftconfig.h'.

* Jamfile (HDRMACRO, RefDoc), Updated.

* builds/amiga/include/config/ftconfig.h, builds/
(PUBLIC_DIR), builds/symbian/bld.inf, builds/ (work),
builds/unix/ Updated.

* builds/unix/ Updated.
* builds/unix/configure.raw: Don't check for `rmdir'.
* builds/unix/ (DELDIR): Use `rm -rf', which is portable
according to the autoconf info manual.
* builds/unix/ (install, uninstall,
distclean_project_unix): Update and simplify.

* builds/wince/*, builds/windows/*: Updated.

* devel/ft2build.h, include/ft2build.h: Updated.

* include/freetype2/config/ftheader.h,
include/freetype2/internal/internal.h: Update all header file

* src/tools/ (TRACE_DEF_FILES): Updated.

* docs/*: Updated.
2015-06-26 06:48:00 +02:00
Werner Lemberg 8502c98b15 Fix Savannah bug #45097.
We no longer `pollute' the namespace of possible header file names;
instead we move `ft2build.h' up by one level so that it gets
installed in the default include directory (e.g.,
/usr/local/include).  After this commit, only `ft2build.h' stays in
the compiler's include path.

No visible changes for the user who follows the standard FreeType
header inclusion rules.

* include/*: Move to ...
* include/freetype2/*: This directory, except `ft2build.h'.

PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), Updated.

* builds/amiga/include/config/ftconfig.h, builds/
(PUBLIC_DIR), builds/symbian/bld.inf, builds/ (work),
builds/unix/ (install, uninstall),
builds/unix/ Updated.

* builds/unix/ Updated.
Emit -I directory only if it is not `/usr/include'.

* builds/wince/*, builds/windows/*: Updated.

* devel/ft2build.h, include/ft2build.h: Updated.

* include/freetype2/config/ftheader.h,
include/freetype2/internal/internal.h: Update all header file

* src/tools/ (TRACE_DEF_FILES): Updated.

* docs/*: Updated.
2015-06-22 06:35:23 +02:00
Werner Lemberg f57fc59e01 Run `src/tools/update-copyright'. 2015-01-17 20:41:43 +01:00
Werner Lemberg fae3820764 Simplify header file hierarchy.
This large patch changes the header file directory layout from
`include/freetype/...' to `include/...', effectively removing one
level.  Since the file `ft2build.h' is also located in `include'
(and it stays there even after installation), all FreeType header
files are now in a single directory.

Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler, and
(b) the documented way for header inclusion like

  #include <ft2build.h>
  #include FT_FREETYPE_H

don't need any change to the source code.

* include/freetype/*: Move up to...
* include/*: ... this directory.

* builds/amiga/include/freetype/*: Move up to...
* builds/amiga/include/*: ... this directory.

*/*: Essentially do `s@/freetype/@/@' where appropriate.

* CMakeList.txt: Simplify.
* builds/unix/, builds/unix/ For
`--cflags', return a single directory.
* builds/unix/ (install): No longer try to remove `cache'
and `internal' subdirectories; instead, remove the `freetype'
2013-11-13 08:55:46 +01:00
Werner Lemberg 4cd5fd463e Remove trailing whitespace. 2013-01-24 13:33:06 +01:00
Werner Lemberg 7810fad7d4 Set the executable bit of
Savannah patch #7681.
2011-11-29 23:56:23 +01:00
suzuki toshiya c63c6f7265 [] Reflect environment variable LIBTOOLIZE. 2011-06-19 22:54:40 +09:00
Werner Lemberg b36d4192a3 * Version 2.3.12 released.

Tag sources with `VER-2-3-12'.

* docs/CHANGES: Updated.

* docs/VERSION.DLL: Update documentation and bump version number to

* README, Jamfile (RefDoc),
builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html,
builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html,
builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp,
builds/wince/vc2008-ce/index.html: s/2.3.11/2.3.12/, s/2311/2312/.

* include/freetype/freetype.h (FREETYPE_PATCH): Set to 12.

* builds/unix/configure.raw (version_info): Set to 10:0:4.
2010-02-13 07:57:56 +01:00
suzuki toshiya ad6954a0cb Improve autotool version checking to work with beta releases. 2010-02-13 02:25:04 +09:00
Werner Lemberg c32637222f Don't rely on GNU sed.
* Don't use GNUisms while calling sed.  Problem reported
by Sean McBride.
2009-01-06 21:00:47 +00:00
Werner Lemberg b211651ac9 *, builds/unix/configure.raw,
include/freetype/config/ftconfig.h, builds/unix/ Minor

* include/freetype/ftadvanc.h, include/freetype/ftgasp.h,
include/freetype/ftlcdfil.h: Protect against FreeType 1.
Some other minor fixes.

* devel/ftoption.h: Synchronize with

Formatting, documentation improvements.
2008-09-12 16:27:48 +00:00
David Turner 28534d616b * include/freetype/ftadvanc.h, src/base/ftadvanc.c,
include/freetype/config/ftheader.h, include/freetype/freetype.h,
    src/base/Jamfile, src/base/, src/cff/cffdrivr.c,
    src/cff/cffgload.c, src/cff/cffgload.h, src/truetype/ttdriver.c,
    src/truetype/ttgload.h, src/truetype/ttgload.c, src/type1/t1driver.c,
    src/type1/t1gload.h, src/type1/t1gload.c:
    Add a new header named FT_ADVANCES_H declaring some new APIs
    to extract the advances of one or more glyphs without necessarily
    loading their outlines. Also provide 'fast loaders' for the
    TrueType, Type1 and CFF font drivers (more to come later)

    * add checks for minimum version of the 'autotools'
2008-09-01 21:35:21 +00:00
Werner Lemberg b796adb451 * Add option `--install' to libtoolize. 2008-06-10 17:15:35 +00:00
Werner Lemberg 17432b5e37 * src/type1/t1load.c (is_space): Removed.
(parse_encoding, parse_charstrings): Use IS_PS_DELIM.
(parse_charstrings): Use IS_PS_TOKEN.

* Avoid bash specific syntax.
2007-01-12 09:28:44 +00:00
David Turner 038ace28ad small MacOS X fix for 2007-01-11 15:00:59 +00:00
Werner Lemberg 4df5b26fdf Put version information into the configure script. Reported by Paul
Watson <>.

* builds/unix/ Renamed to...
* builds/unix/configure.raw: This which now serves (with appropriate
modifications) as a template for

* version.sed: New script.

* Generate from configure.raw, using
2006-05-08 07:10:29 +00:00
Werner Lemberg 60a04df7b0 Add license. 2005-06-04 23:04:30 +00:00
Werner Lemberg 1ea53e87c8 * docs/TODO: Updated.
* Use `--force' for all commands.
2005-04-13 18:12:36 +00:00
Werner Lemberg b0db0fc2c5 * New script for bootstrapping.
* README.CVS: New file which documents bootstrapping.

* builds/unix/aclocal.m4, builds/unix/config.guess,
builds/unix/config.sub, builds/unix/configure,
builds/unix/ Removed.
2005-03-05 17:05:35 +00:00