-- cgit From 630fb47e531f5a85b0c72d713d61697a1ebae932 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 7 Jul 2009 17:29:53 +0200 Subject: Split build: Automake/autoconf stuff. * .gitignore: * AUTHORS: * COPYING: * ChangeLog: * INSTALL: * Makefile.am: * NEWS: * README: * autogen.sh: * build/prj/build.lst: * build/src/.gitignore: * build/src/OpenOffice.org-libs-extern-sys.pc.in: * build/stamp/.gitignore: * build/stamp/README.txt: * buildenv.in: * configure.in: --- .gitignore | 21 +++ AUTHORS | 1 + COPYING | 165 +++++++++++++++++ ChangeLog | 1 + INSTALL | 237 +++++++++++++++++++++++++ Makefile.am | 34 ++++ NEWS | 0 README | 12 ++ autogen.sh | 11 ++ build/prj/build.lst | 1 + build/src/.gitignore | 1 + build/src/OpenOffice.org-libs-extern-sys.pc.in | 7 + build/stamp/.gitignore | 3 + build/stamp/README.txt | 1 + buildenv.in | 10 ++ configure.in | 19 ++ 16 files changed, 524 insertions(+) create mode 100644 .gitignore create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 README create mode 100755 autogen.sh create mode 100644 build/prj/build.lst create mode 100644 build/src/.gitignore create mode 100644 build/src/OpenOffice.org-libs-extern-sys.pc.in create mode 100644 build/stamp/.gitignore create mode 100644 build/stamp/README.txt create mode 100644 buildenv.in create mode 100644 configure.in diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..7a7ce93da047 --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache +/buildenv +/config.log +/config.parms +/config.status +/configure +/install-sh +/logfile.log +/missing +/OpenOffice +/solver + +/*/unxlng??.pro + +localize.sdf + +# temp files +.*.swp diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000000..120da2f2d9ec --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +http://www.openoffice.org/welcome/credits.html diff --git a/COPYING b/COPYING new file mode 100644 index 000000000000..cca7fc278f5c --- /dev/null +++ b/COPYING @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000000000000..73c8beb9f16d --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +Please see the output of git log. diff --git a/INSTALL b/INSTALL new file mode 100644 index 000000000000..d3c5b40a9409 --- /dev/null +++ b/INSTALL @@ -0,0 +1,237 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000000..da90ca2b495e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,34 @@ +# few needed variables + +stampdir = $(top_builddir)/build/stamp +pkgconfigdir = $(libdir)/pkgconfig +ooo_prefix = @OOO_PREFIX@ +solenvdir = $(ooo_prefix)/solenv +solverdir = $(ooo_prefix)/solver +buildsolverdir = "@abs_builddir@/solver" + +# the predefined rules + +include $(solverdir)/Makefile.common + +# what to add to the package + +# TODO +EXTRA_DIST = + +dist-hook: dist-hook-common + +# rules to execute + +all-local: $(stampdir)/all + +# TODO +clean-local: + +# TODO +distclean-local: + +install-data-local: $(stampdir)/all install-data-common + $(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-libs-extern-sys.pc $(DESTDIR)$(pkgconfigdir)/ + +$(stampdir)/all: buildenv all-common diff --git a/NEWS b/NEWS new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/README b/README new file mode 100644 index 000000000000..138a8283539c --- /dev/null +++ b/README @@ -0,0 +1,12 @@ +OpenOffice.org - split build +============================ + +This package provides the possibility to build OpenOffice.org by pieces. This +one contains the 3rd party libraries that are usually available in the Linux +systems. + +To build, do the usual + +./autogen.sh or ./configure +make +make install diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 000000000000..8183a7fb3151 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +aclocal $ACLOCAL_FLAGS || exit 1 +automake --gnu --add-missing --copy || exit 1 +autoconf || exit 1 + +if test "x$NOCONFIGURE" = "x"; then + ./configure "$@" +else + echo "Skipping configure process." +fi diff --git a/build/prj/build.lst b/build/prj/build.lst new file mode 100644 index 000000000000..0e8a41302233 --- /dev/null +++ b/build/prj/build.lst @@ -0,0 +1 @@ +bs build : BERKELEYDB:berkeleydb BITSTREAM_VERA_FONTS:bitstream_vera_fonts BOOST:boost CAIRO:cairo CURL:curl DICTIONARIES:dictionaries EXPAT:expat HUNSPELL:hunspell ICU:icu JPEG:jpeg LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NEON:neon PYTHON:python SAXON:saxon stax ZLIB:zlib NULL diff --git a/build/src/.gitignore b/build/src/.gitignore new file mode 100644 index 000000000000..840ea15df3d4 --- /dev/null +++ b/build/src/.gitignore @@ -0,0 +1 @@ +/OpenOffice.org-*.pc diff --git a/build/src/OpenOffice.org-libs-extern-sys.pc.in b/build/src/OpenOffice.org-libs-extern-sys.pc.in new file mode 100644 index 000000000000..e7aeeca6188e --- /dev/null +++ b/build/src/OpenOffice.org-libs-extern-sys.pc.in @@ -0,0 +1,7 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ + +Name: OpenOffice.org 3rd party system libraries +Description: OpenOffice.org 3rd party system libraries package +Version: @PACKAGE_VERSION@ diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore new file mode 100644 index 000000000000..a9a95e9fb014 --- /dev/null +++ b/build/stamp/.gitignore @@ -0,0 +1,3 @@ +/* +!/README.txt +!/.gitignore diff --git a/build/stamp/README.txt b/build/stamp/README.txt new file mode 100644 index 000000000000..a28c9d7c578e --- /dev/null +++ b/build/stamp/README.txt @@ -0,0 +1 @@ +This directory is for storing the stamps generated by the toplevel Makefile. diff --git a/buildenv.in b/buildenv.in new file mode 100644 index 000000000000..6c6c26e28a95 --- /dev/null +++ b/buildenv.in @@ -0,0 +1,10 @@ +# Source this if you want to use build.pl directly, like: +# . buildenv +# or +# source buildenv + +ooo_prefix="@OOO_PREFIX@" +solverdir="$ooo_prefix/solver" +buildsolverdir="@abs_builddir@/solver" + +. "$solverdir"/buildenv-common diff --git a/configure.in b/configure.in new file mode 100644 index 000000000000..12b735870013 --- /dev/null +++ b/configure.in @@ -0,0 +1,19 @@ +dnl Version X.Y.A.M +dnl X.Y - version +dnl A - minor, or 97 for devel, 98 for alpha, 99 for beta +dnl M - milestone, or micro version +AC_INIT(OpenOffice.org-libs-extern-sys,3.1.97.50) + +AM_INIT_AUTOMAKE([1.8b tar-ustar]) +PKG_PROG_PKG_CONFIG + +dnl Where should be the OOo installed +PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap) +OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap) +AC_SUBST(OOO_PREFIX) + +dnl OpenOffice.org build dependencies +PKG_CHECK_MODULES(OOO_URE,OpenOffice.org-ure) + +dnl Create what is necessary +AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-libs-extern-sys.pc]) -- cgit From 3b8c6379e355f6b9e5355ee17e380d2db7cba7c1 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 7 Jul 2009 17:30:19 +0200 Subject: Split build: build.lst updates so that everything builds. * berkeleydb/prj/build.lst: * bitstream_vera_fonts/prj/build.lst: * boost/prj/build.lst: * curl/prj/build.lst: * hunspell/prj/build.lst: * icu/icuversion.mk: Moved to solenv/bin/. * icu/prj/build.lst: * moz/prj/build.lst: * neon/prj/build.lst: * python/prj/build.lst: * saxon/prj/build.lst: * stax/prj/build.lst: --- berkeleydb/prj/build.lst | 2 +- bitstream_vera_fonts/prj/build.lst | 2 +- boost/prj/build.lst | 2 +- curl/prj/build.lst | 2 +- hunspell/prj/build.lst | 2 +- icu/icuversion.mk | 37 ------------------------------------- icu/prj/build.lst | 2 +- moz/prj/build.lst | 2 +- neon/prj/build.lst | 2 +- python/prj/build.lst | 2 +- saxon/prj/build.lst | 2 +- stax/prj/build.lst | 2 +- 12 files changed, 11 insertions(+), 48 deletions(-) delete mode 100755 icu/icuversion.mk diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst index 4631e5605f51..4019bbede12b 100644 --- a/berkeleydb/prj/build.lst +++ b/berkeleydb/prj/build.lst @@ -1,3 +1,3 @@ -db berkeleydb : external xml2cmp sal NULL +db berkeleydb : xml2cmp NULL db berkeleydb nmake - u as_mkout NULL db berkeleydb nmake - w,vc7 as_mkout NULL diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst index 93449f04515c..72bb59025c86 100644 --- a/bitstream_vera_fonts/prj/build.lst +++ b/bitstream_vera_fonts/prj/build.lst @@ -1,4 +1,4 @@ -bs bitstream_vera_fonts : solenv NULL +bs bitstream_vera_fonts : NULL bs bitstream_vera_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs bitstream_vera_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL diff --git a/boost/prj/build.lst b/boost/prj/build.lst index 50762576e06d..d5692a16c8f2 100644 --- a/boost/prj/build.lst +++ b/boost/prj/build.lst @@ -1,4 +1,4 @@ -bo boost : SO:so_prereq solenv NULL +bo boost : SO:so_prereq NULL bo boost usr1 - all bo_mkout NULL bo boost nmake - all bo_boost NULL bo boost\spirit nmake - all bo_spirit NULL diff --git a/curl/prj/build.lst b/curl/prj/build.lst index 0c9a91717ecb..af4e35faad2c 100644 --- a/curl/prj/build.lst +++ b/curl/prj/build.lst @@ -1,3 +1,3 @@ -xc curl : external NULL +xc curl : NULL xc curl usr1 - all xc_mkout NULL xc curl nmake - all xc_curl NULL diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst index ac3a882e88a9..83a2c8ef764d 100644 --- a/hunspell/prj/build.lst +++ b/hunspell/prj/build.lst @@ -1,3 +1,3 @@ -hun hunspell : solenv ICU:icu sal NULL +hun hunspell : ICU:icu NULL hun hunspell usr1 - all hun_mkout NULL hun hunspell nmake - all hun_hunspell NULL diff --git a/icu/icuversion.mk b/icu/icuversion.mk deleted file mode 100755 index 7c0389093fb3..000000000000 --- a/icu/icuversion.mk +++ /dev/null @@ -1,37 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: icuversion.mk,v $ -# -# $Revision: 1.5 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -# major -ICU_MAJOR=4 -# minor -ICU_MINOR=0 -# micro -ICU_MICRO=0 - diff --git a/icu/prj/build.lst b/icu/prj/build.lst index c633589000c6..81ea915fc78e 100644 --- a/icu/prj/build.lst +++ b/icu/prj/build.lst @@ -1,4 +1,4 @@ -ic icu : solenv external NULL +ic icu : NULL ic icu usr1 - all ic_mkout NULL ic icu nmake - u ic_icu NULL ic icu nmake - w,vc7 ic_icu NULL diff --git a/moz/prj/build.lst b/moz/prj/build.lst index f5593fae6d42..30fccd3b28a5 100644 --- a/moz/prj/build.lst +++ b/moz/prj/build.lst @@ -1,4 +1,4 @@ -moz moz : solenv SO:so_prereq NULL +moz moz : SO:so_prereq NULL moz moz usr1 - all moz_mkout NULL moz moz nmake - all moz_mozilla NULL moz moz\zipped nmake - all moz_zipped moz_mozilla NULL diff --git a/neon/prj/build.lst b/neon/prj/build.lst index 2a133605b11e..2a9078a67ed9 100755 --- a/neon/prj/build.lst +++ b/neon/prj/build.lst @@ -1,3 +1,3 @@ -xh neon : OPENSSL:openssl soltools external EXPAT:expat LIBXML2:libxml2 NULL +xh neon : OPENSSL:openssl soltools EXPAT:expat LIBXML2:libxml2 NULL xh neon usr1 - all xh_mkout NULL xh neon nmake - all xh_neon NULL diff --git a/python/prj/build.lst b/python/prj/build.lst index e7421332a750..deff51713a3b 100644 --- a/python/prj/build.lst +++ b/python/prj/build.lst @@ -1,3 +1,3 @@ -py python : SO:so_prereq solenv NULL +py python : SO:so_prereq NULL py python nmake - w,vc7 py_mkout NULL py python nmake - u py_mkout NULL diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst index 813097c66d90..493828c3e771 100644 --- a/saxon/prj/build.lst +++ b/saxon/prj/build.lst @@ -1,2 +1,2 @@ -xx saxon : solenv stax NULL +xx saxon : stax NULL xx saxon nmake - all xx_saxon NULL diff --git a/stax/prj/build.lst b/stax/prj/build.lst index cbfc6ea3ba6a..c76a30c65da7 100644 --- a/stax/prj/build.lst +++ b/stax/prj/build.lst @@ -1,2 +1,2 @@ -tx stax : solenv NULL +tx stax : NULL tx stax nmake - all tx_stax NULL -- cgit From 35d062d82d3eb370a621b978370dbbcda52aedb1 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 18 Aug 2010 18:09:06 +0200 Subject: Split build: Revert it for now. --- .gitignore | 21 --- AUTHORS | 1 - COPYING | 165 ----------------- ChangeLog | 1 - INSTALL | 237 ------------------------- Makefile.am | 34 ---- NEWS | 0 README | 12 -- autogen.sh | 11 -- berkeleydb/prj/build.lst | 2 +- bitstream_vera_fonts/prj/build.lst | 2 +- boost/prj/build.lst | 2 +- build/prj/build.lst | 1 - build/src/.gitignore | 1 - build/src/OpenOffice.org-libs-extern-sys.pc.in | 7 - build/stamp/.gitignore | 3 - build/stamp/README.txt | 1 - buildenv.in | 10 -- configure.in | 19 -- curl/prj/build.lst | 2 +- hunspell/prj/build.lst | 2 +- icu/icuversion.mk | 37 ++++ icu/prj/build.lst | 2 +- moz/prj/build.lst | 2 +- neon/prj/build.lst | 2 +- python/prj/build.lst | 2 +- saxon/prj/build.lst | 2 +- stax/prj/build.lst | 2 +- 28 files changed, 48 insertions(+), 535 deletions(-) delete mode 100644 .gitignore delete mode 100644 AUTHORS delete mode 100644 COPYING delete mode 100644 ChangeLog delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100644 NEWS delete mode 100644 README delete mode 100755 autogen.sh delete mode 100644 build/prj/build.lst delete mode 100644 build/src/.gitignore delete mode 100644 build/src/OpenOffice.org-libs-extern-sys.pc.in delete mode 100644 build/stamp/.gitignore delete mode 100644 build/stamp/README.txt delete mode 100644 buildenv.in delete mode 100644 configure.in create mode 100755 icu/icuversion.mk diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7a7ce93da047..000000000000 --- a/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -/Makefile -/Makefile.in -/aclocal.m4 -/autom4te.cache -/buildenv -/config.log -/config.parms -/config.status -/configure -/install-sh -/logfile.log -/missing -/OpenOffice -/solver - -/*/unxlng??.pro - -localize.sdf - -# temp files -.*.swp diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 120da2f2d9ec..000000000000 --- a/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -http://www.openoffice.org/welcome/credits.html diff --git a/COPYING b/COPYING deleted file mode 100644 index cca7fc278f5c..000000000000 --- a/COPYING +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 73c8beb9f16d..000000000000 --- a/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -Please see the output of git log. diff --git a/INSTALL b/INSTALL deleted file mode 100644 index d3c5b40a9409..000000000000 --- a/INSTALL +++ /dev/null @@ -1,237 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 6. Often, you can also type `make uninstall' to remove the installed - files again. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index da90ca2b495e..000000000000 --- a/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# few needed variables - -stampdir = $(top_builddir)/build/stamp -pkgconfigdir = $(libdir)/pkgconfig -ooo_prefix = @OOO_PREFIX@ -solenvdir = $(ooo_prefix)/solenv -solverdir = $(ooo_prefix)/solver -buildsolverdir = "@abs_builddir@/solver" - -# the predefined rules - -include $(solverdir)/Makefile.common - -# what to add to the package - -# TODO -EXTRA_DIST = - -dist-hook: dist-hook-common - -# rules to execute - -all-local: $(stampdir)/all - -# TODO -clean-local: - -# TODO -distclean-local: - -install-data-local: $(stampdir)/all install-data-common - $(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-libs-extern-sys.pc $(DESTDIR)$(pkgconfigdir)/ - -$(stampdir)/all: buildenv all-common diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/README b/README deleted file mode 100644 index 138a8283539c..000000000000 --- a/README +++ /dev/null @@ -1,12 +0,0 @@ -OpenOffice.org - split build -============================ - -This package provides the possibility to build OpenOffice.org by pieces. This -one contains the 3rd party libraries that are usually available in the Linux -systems. - -To build, do the usual - -./autogen.sh or ./configure -make -make install diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 8183a7fb3151..000000000000 --- a/autogen.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -aclocal $ACLOCAL_FLAGS || exit 1 -automake --gnu --add-missing --copy || exit 1 -autoconf || exit 1 - -if test "x$NOCONFIGURE" = "x"; then - ./configure "$@" -else - echo "Skipping configure process." -fi diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst index 4019bbede12b..4631e5605f51 100644 --- a/berkeleydb/prj/build.lst +++ b/berkeleydb/prj/build.lst @@ -1,3 +1,3 @@ -db berkeleydb : xml2cmp NULL +db berkeleydb : external xml2cmp sal NULL db berkeleydb nmake - u as_mkout NULL db berkeleydb nmake - w,vc7 as_mkout NULL diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst index 72bb59025c86..93449f04515c 100644 --- a/bitstream_vera_fonts/prj/build.lst +++ b/bitstream_vera_fonts/prj/build.lst @@ -1,4 +1,4 @@ -bs bitstream_vera_fonts : NULL +bs bitstream_vera_fonts : solenv NULL bs bitstream_vera_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs bitstream_vera_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL diff --git a/boost/prj/build.lst b/boost/prj/build.lst index d5692a16c8f2..50762576e06d 100644 --- a/boost/prj/build.lst +++ b/boost/prj/build.lst @@ -1,4 +1,4 @@ -bo boost : SO:so_prereq NULL +bo boost : SO:so_prereq solenv NULL bo boost usr1 - all bo_mkout NULL bo boost nmake - all bo_boost NULL bo boost\spirit nmake - all bo_spirit NULL diff --git a/build/prj/build.lst b/build/prj/build.lst deleted file mode 100644 index 0e8a41302233..000000000000 --- a/build/prj/build.lst +++ /dev/null @@ -1 +0,0 @@ -bs build : BERKELEYDB:berkeleydb BITSTREAM_VERA_FONTS:bitstream_vera_fonts BOOST:boost CAIRO:cairo CURL:curl DICTIONARIES:dictionaries EXPAT:expat HUNSPELL:hunspell ICU:icu JPEG:jpeg LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NEON:neon PYTHON:python SAXON:saxon stax ZLIB:zlib NULL diff --git a/build/src/.gitignore b/build/src/.gitignore deleted file mode 100644 index 840ea15df3d4..000000000000 --- a/build/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/OpenOffice.org-*.pc diff --git a/build/src/OpenOffice.org-libs-extern-sys.pc.in b/build/src/OpenOffice.org-libs-extern-sys.pc.in deleted file mode 100644 index e7aeeca6188e..000000000000 --- a/build/src/OpenOffice.org-libs-extern-sys.pc.in +++ /dev/null @@ -1,7 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ - -Name: OpenOffice.org 3rd party system libraries -Description: OpenOffice.org 3rd party system libraries package -Version: @PACKAGE_VERSION@ diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore deleted file mode 100644 index a9a95e9fb014..000000000000 --- a/build/stamp/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/* -!/README.txt -!/.gitignore diff --git a/build/stamp/README.txt b/build/stamp/README.txt deleted file mode 100644 index a28c9d7c578e..000000000000 --- a/build/stamp/README.txt +++ /dev/null @@ -1 +0,0 @@ -This directory is for storing the stamps generated by the toplevel Makefile. diff --git a/buildenv.in b/buildenv.in deleted file mode 100644 index 6c6c26e28a95..000000000000 --- a/buildenv.in +++ /dev/null @@ -1,10 +0,0 @@ -# Source this if you want to use build.pl directly, like: -# . buildenv -# or -# source buildenv - -ooo_prefix="@OOO_PREFIX@" -solverdir="$ooo_prefix/solver" -buildsolverdir="@abs_builddir@/solver" - -. "$solverdir"/buildenv-common diff --git a/configure.in b/configure.in deleted file mode 100644 index 12b735870013..000000000000 --- a/configure.in +++ /dev/null @@ -1,19 +0,0 @@ -dnl Version X.Y.A.M -dnl X.Y - version -dnl A - minor, or 97 for devel, 98 for alpha, 99 for beta -dnl M - milestone, or micro version -AC_INIT(OpenOffice.org-libs-extern-sys,3.1.97.50) - -AM_INIT_AUTOMAKE([1.8b tar-ustar]) -PKG_PROG_PKG_CONFIG - -dnl Where should be the OOo installed -PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap) -OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap) -AC_SUBST(OOO_PREFIX) - -dnl OpenOffice.org build dependencies -PKG_CHECK_MODULES(OOO_URE,OpenOffice.org-ure) - -dnl Create what is necessary -AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-libs-extern-sys.pc]) diff --git a/curl/prj/build.lst b/curl/prj/build.lst index af4e35faad2c..0c9a91717ecb 100644 --- a/curl/prj/build.lst +++ b/curl/prj/build.lst @@ -1,3 +1,3 @@ -xc curl : NULL +xc curl : external NULL xc curl usr1 - all xc_mkout NULL xc curl nmake - all xc_curl NULL diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst index 83a2c8ef764d..ac3a882e88a9 100644 --- a/hunspell/prj/build.lst +++ b/hunspell/prj/build.lst @@ -1,3 +1,3 @@ -hun hunspell : ICU:icu NULL +hun hunspell : solenv ICU:icu sal NULL hun hunspell usr1 - all hun_mkout NULL hun hunspell nmake - all hun_hunspell NULL diff --git a/icu/icuversion.mk b/icu/icuversion.mk new file mode 100755 index 000000000000..7c0389093fb3 --- /dev/null +++ b/icu/icuversion.mk @@ -0,0 +1,37 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: icuversion.mk,v $ +# +# $Revision: 1.5 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* +# major +ICU_MAJOR=4 +# minor +ICU_MINOR=0 +# micro +ICU_MICRO=0 + diff --git a/icu/prj/build.lst b/icu/prj/build.lst index 81ea915fc78e..c633589000c6 100644 --- a/icu/prj/build.lst +++ b/icu/prj/build.lst @@ -1,4 +1,4 @@ -ic icu : NULL +ic icu : solenv external NULL ic icu usr1 - all ic_mkout NULL ic icu nmake - u ic_icu NULL ic icu nmake - w,vc7 ic_icu NULL diff --git a/moz/prj/build.lst b/moz/prj/build.lst index 30fccd3b28a5..f5593fae6d42 100644 --- a/moz/prj/build.lst +++ b/moz/prj/build.lst @@ -1,4 +1,4 @@ -moz moz : SO:so_prereq NULL +moz moz : solenv SO:so_prereq NULL moz moz usr1 - all moz_mkout NULL moz moz nmake - all moz_mozilla NULL moz moz\zipped nmake - all moz_zipped moz_mozilla NULL diff --git a/neon/prj/build.lst b/neon/prj/build.lst index 2a9078a67ed9..2a133605b11e 100755 --- a/neon/prj/build.lst +++ b/neon/prj/build.lst @@ -1,3 +1,3 @@ -xh neon : OPENSSL:openssl soltools EXPAT:expat LIBXML2:libxml2 NULL +xh neon : OPENSSL:openssl soltools external EXPAT:expat LIBXML2:libxml2 NULL xh neon usr1 - all xh_mkout NULL xh neon nmake - all xh_neon NULL diff --git a/python/prj/build.lst b/python/prj/build.lst index deff51713a3b..e7421332a750 100644 --- a/python/prj/build.lst +++ b/python/prj/build.lst @@ -1,3 +1,3 @@ -py python : SO:so_prereq NULL +py python : SO:so_prereq solenv NULL py python nmake - w,vc7 py_mkout NULL py python nmake - u py_mkout NULL diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst index 493828c3e771..813097c66d90 100644 --- a/saxon/prj/build.lst +++ b/saxon/prj/build.lst @@ -1,2 +1,2 @@ -xx saxon : stax NULL +xx saxon : solenv stax NULL xx saxon nmake - all xx_saxon NULL diff --git a/stax/prj/build.lst b/stax/prj/build.lst index c76a30c65da7..cbfc6ea3ba6a 100644 --- a/stax/prj/build.lst +++ b/stax/prj/build.lst @@ -1,2 +1,2 @@ -tx stax : NULL +tx stax : solenv NULL tx stax nmake - all tx_stax NULL -- cgit From f5513de7595ea5484f0afbce835f13657a9e8b8e Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 20 Aug 2010 00:19:00 +0200 Subject: Create .gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..f9ff7e2edb24 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/*/unxlng?? +/*/unxlng??.pro -- cgit From 03e9321ad26aa6893fdfb8f261e3ef1377a5155d Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 24 Aug 2010 17:01:39 +0200 Subject: Update .gitignore. --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index f9ff7e2edb24..def767e59215 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,11 @@ +# backup and temporary files +*~ +.*.sw[op] + +# the build directories /*/unxlng?? /*/unxlng??.pro + +# autoconf generated stuff +/ChangeLog +/configure -- cgit From f15d64297c9139bc218de7ac09fbb04bdc1e4fab Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 14 Sep 2010 10:01:31 +0200 Subject: svg-import-boost.diff: deliver requrired boost headers. --- boost/makefile.mk | 1 + boost/prj/d.lst | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/boost/makefile.mk b/boost/makefile.mk index fdc1dfd2a44c..7e1ce34e43ea 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -80,6 +80,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME) diff --git a/boost/prj/d.lst b/boost/prj/d.lst index 6b9ebcaf6d66..6d7103928977 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -1,5 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\boost mkdir: %_DEST%\inc%_EXT%\boost\bind +mkdir: %_DEST%\inc%_EXT%\boost\concept +mkdir: %_DEST%\inc%_EXT%\boost\concept\detail mkdir: %_DEST%\inc%_EXT%\boost\config mkdir: %_DEST%\inc%_EXT%\boost\config\compiler mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1 @@ -110,8 +112,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core @@ -128,6 +134,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset @@ -157,6 +167,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost ..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind +..\%__SRC%\inc\boost\concept\* %_DEST%\inc%_EXT%\boost\concept +..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc%_EXT%\boost\concept\detail ..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config ..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler ..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1 @@ -266,8 +278,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic ..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor ..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl +..\%__SRC%\inc\boost\spirit\home\classic\attribute\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute +..\%__SRC%\inc\boost\spirit\home\classic\attribute\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl ..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug ..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl +..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic +..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl ..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta ..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl ..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core @@ -284,6 +300,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl ..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator ..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl +..\%__SRC%\inc\boost\spirit\home\classic\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix +..\%__SRC%\inc\boost\spirit\home\classic\phoenix\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl +..\%__SRC%\inc\boost\spirit\home\classic\symbols\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols +..\%__SRC%\inc\boost\spirit\home\classic\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl ..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility ..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl ..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset -- cgit From 29ef0ee01df5a2042bdb7544d602718b5689329f Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 14 Sep 2010 10:57:34 +0200 Subject: upgrade-zlib-to-1.2.3.diff: Upgrade to newer zlib. --- zlib/makefile.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zlib/makefile.mk b/zlib/makefile.mk index 389a68eb9c52..b928c82ddae1 100644 --- a/zlib/makefile.mk +++ b/zlib/makefile.mk @@ -44,10 +44,10 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=zlib-1.1.4 -TARFILE_MD5=abc405d0bdd3ee22782d7aa20e440f08 +TARFILE_NAME=zlib-1.2.3 +TARFILE_MD5=debc62758716a169df9f62e6ab2bc634 -PATCH_FILES=zlib-1.1.4.patch +PATCH_FILES=zlib-1.2.3.patch ADDITIONAL_FILES=makefile.mk #relative to CONFIGURE_DIR -- cgit From 399cb3be848ab06592cf5eb6951787701b2b801d Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 14 Sep 2010 12:27:12 +0200 Subject: cairo-pixman-makefile-mk.diff: Build pixman as shared library on x86_64 too --- cairo/pixman/makefile.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index f3c1c091639c..6d2504b6fbb8 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" @@ -120,13 +120,7 @@ pixman_CFLAGS+=-fPIC CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -.IF "$(CPUNAME)"=="X86_64" -# static builds tend to fail on 64bit CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes -.ELSE -# use static lib to avoid linking problems with older system pixman libs -CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no -.ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) @@ -149,11 +143,7 @@ OUT2LIB+=pixman$/.libs$/*.a OUT2LIB+=pixman$/release$/*.lib .ENDIF .ELSE -.IF "$(CPUNAME)"=="X86_64" -OUT2LIB+=pixman$/.libs$/libpixman-1.so -.ELSE -OUT2LIB+=pixman$/.libs$/libpixman-1.a -.ENDIF +OUT2LIB+=pixman$/.libs$/libpixman-1.so* .ENDIF # --- Targets ------------------------------------------------------ -- cgit From 8f44f0d5f0b56226fc5bee4fcae8a1c7cc143aa8 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 14 Sep 2010 12:31:24 +0200 Subject: cairo-cairo-makefile-mk.diff: Fix linking of internal cairo library --- cairo/cairo/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index a29012892576..88953d03b46c 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -120,7 +120,7 @@ OUT2INC+=src$/cairo-quartz.h .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack .ELIF "$(OS)$(COM)"=="SOLARISC52" cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" @@ -169,6 +169,11 @@ OUT2INC+=src$/cairo-xlib.h \ CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1" .ENDIF +.IF "$(debug)"!="" +cairo_CFLAGS+=-g +CONFIGURE_FLAGS+= STRIP=" " +.ENDIF + CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" .ENDIF -- cgit From b5b8138aac4308de952f0fbf2d56336205b20047 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 14 Sep 2010 12:49:54 +0200 Subject: python-win32-buildfix.diff: make python build properly on win32 --- python/Python-2.6.1.patch | 174 ++++++++++++++++++++++++++++++++++++++++++++++ python/Python-ssl.patch | 162 ++++++++++++++++++++++++++++++++++++++++++ python/makefile.mk | 12 ++-- python/prj/d.lst | 42 +++++++++++ 4 files changed, 386 insertions(+), 4 deletions(-) diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index 661334cae3bb..e762c6201c0f 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -116,6 +116,180 @@ +# ProjectSection(ProjectDependencies) = postProject +# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +--- misc/Python-2.6.1/PC/VS7.1/pcbuild.sln 2007-06-10 23:01:17.000000000 +0200 ++++ misc/build/Python-2.6.1/PC/VS7.1/pcbuild.sln 2010-02-16 01:49:18.810375000 +0100 +@@ -1,36 +1,36 @@ + Microsoft Visual Studio Solution File, Format Version 8.00 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{324F66C2-44D0-4D50-B979-F9DAE7FD36DB}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}" +- ProjectSection(ProjectDependencies) = postProject +- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}" ++# ProjectSection(ProjectDependencies) = postProject ++# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{59CBF474-9E06-4C50-9142-C44A118BB447}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +@@ -99,11 +99,11 @@ + {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug +--- misc/Python-2.6.1/PC/VS8.0/pcbuild.sln 2008-09-02 23:17:05.000000000 +0200 ++++ misc/build/Python-2.6.1/PC/VS8.0/pcbuild.sln 2010-02-16 01:33:51.185375000 +0100 +@@ -38,12 +38,12 @@ + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" +- ProjectSection(ProjectDependencies) = postProject +- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" ++# ProjectSection(ProjectDependencies) = postProject ++# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +@@ -69,12 +69,12 @@ + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" + ProjectSection(ProjectDependencies) = postProject + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +@@ -87,16 +87,16 @@ + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +@@ -114,17 +114,17 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" +- ProjectSection(ProjectDependencies) = postProject +- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" +- ProjectSection(ProjectDependencies) = postProject +- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" ++# ProjectSection(ProjectDependencies) = postProject ++# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" ++# ProjectSection(ProjectDependencies) = postProject ++# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} ++# EndProjectSection +#EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" ProjectSection(ProjectDependencies) = postProject diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch index 642586f31584..5d41797c28ee 100644 --- a/python/Python-ssl.patch +++ b/python/Python-ssl.patch @@ -208,3 +208,165 @@ # SGI IRIX specific modules -- off by default. +--- misc/Python-2.6.1/PC/VS7.1/build_ssl.py 2007-12-31 15:59:26.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS7.1/build_ssl.py 2010-02-16 01:43:48.872875000 +0100 +@@ -178,4 +178,4 @@ + sys.exit(rc) + + if __name__=='__main__': +- main() ++ sys.exit(0) +--- misc/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2008-06-14 00:38:33.000000000 +0200 ++++ misc/build/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2010-02-16 01:38:22.044750000 +0100 +@@ -43,7 +43,7 @@ + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = "001500000000" BUILD_DIR=PCbuild +.ELIF "$(CCNUMVER)" >= "001400000000" +BUILD_DIR=PC/VS8.0 +.ELIF "$(CCNUMVER)" >= "001310000000" +BUILD_DIR=PC/VS7.1 +.ELSE +BUILD_DIR=PC/VC6 +.ENDIF # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native -.IF "$(SYSBASE)" != "" -BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32" -.ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" -.ENDIF # "$(SYSBASE)" != "" .ENDIF .ENDIF diff --git a/python/prj/d.lst b/python/prj/d.lst index def1bb84a414..3c7c3f8baac7 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -104,6 +104,48 @@ symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.dll %_DEST%\bin%_EXT%\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.lib %_DEST%\lib%_EXT%\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.dll %_DEST%\bin%_EXT%\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.lib %_DEST%\lib%_EXT%\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.dll %_DEST%\bin%_EXT%\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.lib %_DEST%\lib%_EXT%\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd #linklib: libpython.so.*.*.* -- cgit From ee79f056a41c5833b9f245d127ff4fe86ced69ca Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 15 Sep 2010 08:32:52 +0200 Subject: Add zlib patch that I forgot to add yesterday --- zlib/zlib-1.2.3.patch | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 zlib/zlib-1.2.3.patch diff --git a/zlib/zlib-1.2.3.patch b/zlib/zlib-1.2.3.patch new file mode 100644 index 000000000000..5e2b69535e5e --- /dev/null +++ b/zlib/zlib-1.2.3.patch @@ -0,0 +1,92 @@ +--- misc/zlib-1.2.3/makefile.mk Fri Mar 14 10:17:06 2008 ++++ misc/build/zlib-1.2.3/makefile.mk Fri Mar 14 10:16:56 2008 +@@ -1 +1,73 @@ +-dummy ++#************************************************************************* ++# ++# Copyright according the GNU Public License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/.. ++ ++PRJNAME=zlib ++TARGET=zlib ++LIBTARGET=NO ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++# --- Settings ----------------------------------------------------- ++ ++.INCLUDE : settings.mk ++ ++# --- Files -------------------------------------------------------- ++ ++INCEXT=contrib$/minizip ++ ++SLOFILES= $(SLO)$/adler32.obj \ ++ $(SLO)$/compress.obj \ ++ $(SLO)$/deflate.obj \ ++ $(SLO)$/crc32.obj \ ++ $(SLO)$/inffast.obj \ ++ $(SLO)$/inflate.obj \ ++ $(SLO)$/inftrees.obj \ ++ $(SLO)$/infback.obj \ ++ $(SLO)$/trees.obj \ ++ $(SLO)$/zutil.obj \ ++ $(SLO)$/uncompr.obj \ ++ $(SLO)$/gzio.obj \ ++ $(SLO)$/unzip.obj \ ++ $(SLO)$/ioapi.obj ++ ++ ++LIB1TARGET=$(SLB)$/$(TARGET).lib ++LIB1ARCHIV=$(LB)$/lib$(TARGET).a ++LIB1OBJFILES=$(SLOFILES) ++ ++.IF "$(BUILD_X64)"!="" ++SLOFILES_X64= $(SLO_X64)$/adler32.obj \ ++ $(SLO_X64)$/compress.obj \ ++ $(SLO_X64)$/deflate.obj \ ++ $(SLO_X64)$/crc32.obj \ ++ $(SLO_X64)$/inffast.obj \ ++ $(SLO_X64)$/inflate.obj \ ++ $(SLO_X64)$/inftrees.obj \ ++ $(SLO_X64)$/infback.obj \ ++ $(SLO_X64)$/trees.obj \ ++ $(SLO_X64)$/zutil.obj \ ++ $(SLO_X64)$/uncompr.obj \ ++ $(SLO_X64)$/gzio.obj \ ++ $(SLO_X64)$/unzip.obj \ ++ $(SLO_X64)$/ioapi.obj ++ ++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib ++LIB1OBJFILES_X64=$(SLOFILES_X64) ++.ENDIF # "$(BUILD_X64)"!="" ++ ++ ++# --- Targets ------------------------------------------------------ ++ ++$(MISC)$/%.c : contrib$/minizip$/%.c ++ @echo ------------------------------ ++ @echo Making: $@ ++ @$(COPY) $< $@ ++ ++.INCLUDE : set_wntx64.mk ++.INCLUDE : target.mk ++.INCLUDE : tg_wntx64.mk ++ +--- misc/zlib-1.2.3/zconf.h 2010-07-15 09:33:48.921875000 +0200 ++++ misc/build/zlib-1.2.3/zconf.h 2010-07-15 09:39:27.000000000 +0200 +@@ -12,6 +12,12 @@ + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + */ ++/* ++ * we need the prefix to get the same names as in 1.1.3 ++*/ ++ ++#define Z_PREFIX ++ + #ifdef Z_PREFIX + # define deflateInit_ z_deflateInit_ + # define deflate z_deflate -- cgit From ecf5e35de34d53c22bb256546fa1ed5d64b9eed7 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 15 Sep 2010 08:34:02 +0200 Subject: Removing unnecessary zlib patch --- zlib/zlib-1.1.4.patch | 3244 ------------------------------------------------- 1 file changed, 3244 deletions(-) delete mode 100644 zlib/zlib-1.1.4.patch diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch deleted file mode 100644 index 19d1cd5904ea..000000000000 --- a/zlib/zlib-1.1.4.patch +++ /dev/null @@ -1,3244 +0,0 @@ ---- misc/zlib-1.1.4/makefile.mk Fri Mar 14 10:17:06 2008 -+++ misc/build/zlib-1.1.4/makefile.mk Fri Mar 14 10:16:56 2008 -@@ -1 +1,73 @@ --dummy -+#************************************************************************* -+# -+# Copyright according the GNU Public License. -+# -+#************************************************************************* -+ -+PRJ=..$/..$/..$/.. -+ -+PRJNAME=zlib -+TARGET=zlib -+LIBTARGET=NO -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+# --- Files -------------------------------------------------------- -+ -+INCEXT=contrib$/minizip -+ -+SLOFILES= $(SLO)$/adler32.obj \ -+ $(SLO)$/compress.obj \ -+ $(SLO)$/deflate.obj \ -+ $(SLO)$/crc32.obj \ -+ $(SLO)$/infblock.obj \ -+ $(SLO)$/infcodes.obj \ -+ $(SLO)$/inffast.obj \ -+ $(SLO)$/inflate.obj \ -+ $(SLO)$/inftrees.obj \ -+ $(SLO)$/infutil.obj \ -+ $(SLO)$/trees.obj \ -+ $(SLO)$/zutil.obj \ -+ $(SLO)$/unzip.obj \ -+ $(SLO)$/ioapi.obj -+ -+ -+LIB1TARGET=$(SLB)$/$(TARGET).lib -+LIB1ARCHIV=$(LB)$/lib$(TARGET).a -+LIB1OBJFILES=$(SLOFILES) -+ -+.IF "$(BUILD_X64)"!="" -+SLOFILES_X64= $(SLO_X64)$/adler32.obj \ -+ $(SLO_X64)$/compress.obj \ -+ $(SLO_X64)$/deflate.obj \ -+ $(SLO_X64)$/crc32.obj \ -+ $(SLO_X64)$/infblock.obj \ -+ $(SLO_X64)$/infcodes.obj \ -+ $(SLO_X64)$/inffast.obj \ -+ $(SLO_X64)$/inflate.obj \ -+ $(SLO_X64)$/inftrees.obj \ -+ $(SLO_X64)$/infutil.obj \ -+ $(SLO_X64)$/trees.obj \ -+ $(SLO_X64)$/zutil.obj \ -+ $(SLO_X64)$/unzip.obj \ -+ $(SLO_X64)$/ioapi.obj -+ -+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib -+LIB1OBJFILES_X64=$(SLOFILES_X64) -+.ENDIF # "$(BUILD_X64)"!="" -+ -+ -+# --- Targets ------------------------------------------------------ -+ -+$(MISC)$/%.c : contrib$/minizip$/%.c -+ @echo ------------------------------ -+ @echo Making: $@ -+ @$(COPY) $< $@ -+ -+.INCLUDE : set_wntx64.mk -+.INCLUDE : target.mk -+.INCLUDE : tg_wntx64.mk -+ ---- misc/zlib-1.1.4/zconf.h Mon Mar 11 14:16:01 2002 -+++ misc/build/zlib-1.1.4/zconf.h Fri Mar 14 10:15:45 2008 -@@ -12,6 +12,12 @@ - * If you *really* need a unique prefix for all types and library functions, - * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. - */ -+/* -+ * we need the prefix to get the same names as in 1.1.3 -+*/ -+ -+#define Z_PREFIX -+ - #ifdef Z_PREFIX - # define deflateInit_ z_deflateInit_ - # define deflate z_deflate -@@ -36,10 +42,26 @@ - # define crc32 z_crc32 - # define get_crc_table z_get_crc_table - -+# define inflate_blocks z_inflate_blocks -+# define inflate_blocks_new z_inflate_blocks_new -+# define inflate_blocks_free z_inflate_blocks_free -+# define inflate_blocks_reset z_inflate_blocks_reset -+# define inflate_codes_free z_inflate_codes_free -+# define inflate_codes z_inflate_codes -+# define inflate_fast z_inflate_fast -+# define inflate_flush z_inflate_flush -+# define inflate_mask z_inflate_mask -+# define inflate_set_dictionary z_inflate_set_dictionary -+# define inflate_copyright z_inflate_copyright -+# define inflate_trees_bits z_inflate_trees_bits -+# define inflate_trees_dynamic z_inflate_trees_dynamic -+# define inflate_trees_fixed z_inflate_trees_fixed -+# define inflate_trees_free z_inflate_trees_free -+ - # define Byte z_Byte - # define uInt z_uInt - # define uLong z_uLong --# define Bytef z_Bytef -+# define Bytef z_Bytef - # define charf z_charf - # define intf z_intf - # define uIntf z_uIntf ---- misc/zlib-1.1.4/zlib.h Mon Mar 11 14:56:38 2002 -+++ misc/build/zlib-1.1.4/zlib.h Fri Mar 14 10:15:45 2008 -@@ -27,7 +27,6 @@ - Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt - (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). - */ -- - #ifndef _ZLIB_H - #define _ZLIB_H - -@@ -168,7 +167,9 @@ - - /* basic functions */ - -+#if !defined(ZUTIL_PROTOS_OFF) - ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -+#endif - /* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is - not compatible with the zlib.h header file used by the application. -@@ -882,7 +883,9 @@ - struct internal_state {int dummy;}; /* hack for buggy compilers */ - #endif - -+#if !defined(ZUTIL_PROTOS_OFF) - ZEXTERN const char * ZEXPORT zError OF((int err)); -+#endif - ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); - ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); - ---- misc/zlib-1.1.4/zutil.c Mon Mar 11 14:16:01 2002 -+++ misc/build/zlib-1.1.4/zutil.c Fri Mar 14 10:15:45 2008 -@@ -5,6 +5,9 @@ - - /* @(#) $Id$ */ - -+#ifdef MACOSX -+#define ZUTIL_PROTOS_OFF -+#endif - #include "zutil.h" - - struct internal_state {int dummy;}; /* for buggy compilers */ ---- misc/zlib-1.1.4/contrib/minizip/unzip.c 1998-06-15 17:34:20.000000000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/unzip.c 2009-07-17 10:15:05.156250000 +0200 -@@ -1,9 +1,39 @@ --/* unzip.c -- IO on .zip files using zlib -- Version 0.15 beta, Mar 19th, 1998, -+/* unzip.c -- IO for uncompress .zip files using zlib -+ Version 1.01e, February 12th, 2005 -+ -+ Copyright (C) 1998-2005 Gilles Vollant - - Read unzip.h for more info - */ - -+/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of -+compatibility with older software. The following is from the original crypt.c. Code -+woven in by Terry Thorsen 1/2003. -+*/ -+/* -+ Copyright (c) 1990-2000 Info-ZIP. All rights reserved. -+ -+ See the accompanying file LICENSE, version 2000-Apr-09 or later -+ (the contents of which are also included in zip.h) for terms of use. -+ If, for some reason, all these files are missing, the Info-ZIP license -+ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html -+*/ -+/* -+ crypt.c (full version) by Info-ZIP. Last revised: [see info_zip_crypt.h] -+ -+ The encryption/decryption parts of this source code (as opposed to the -+ non-echoing password parts) were originally written in Europe. The -+ whole source package can be freely distributed, including from the USA. -+ (Prior to January 2000, re-export from the US was a violation of US law.) -+ */ -+ -+/* -+ This encryption code is a direct transcription of the algorithm from -+ Roger Schlafly, described by Phil Katz in the file appnote.txt. This -+ file (appnote.txt) is distributed with the PKZIP program (even in the -+ version without encryption capabilities). -+ */ -+ - - #include - #include -@@ -29,10 +59,10 @@ - /* compile with -Dlocal if your debugger can't find static symbols */ - - -- --#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \ -- !defined(CASESENSITIVITYDEFAULT_NO) --#define CASESENSITIVITYDEFAULT_NO -+#ifndef CASESENSITIVITYDEFAULT_NO -+# if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) -+# define CASESENSITIVITYDEFAULT_NO -+# endif - #endif - - -@@ -55,22 +85,10 @@ - #define SIZEZIPLOCALHEADER (0x1e) - - --/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */ -- --#ifndef SEEK_CUR --#define SEEK_CUR 1 --#endif -- --#ifndef SEEK_END --#define SEEK_END 2 --#endif - --#ifndef SEEK_SET --#define SEEK_SET 0 --#endif - - const char unz_copyright[] = -- " unzip 0.15 Copyright 1998 Gilles Vollant "; -+ " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll"; - - /* unz_file_info_interntal contain internal info about a file in zipfile*/ - typedef struct unz_file_info_internal_s -@@ -83,23 +101,25 @@ - when reading and decompress it */ - typedef struct - { -- char *read_buffer; /* internal buffer for compressed data */ -- z_stream stream; /* zLib stream structure for inflate */ -+ char *read_buffer; /* internal buffer for compressed data */ -+ z_stream stream; /* zLib stream structure for inflate */ - -- uLong pos_in_zipfile; /* position in byte on the zipfile, for fseek*/ -- uLong stream_initialised; /* flag set if stream structure is initialised*/ -+ uLong pos_in_zipfile; /* position in byte on the zipfile, for fseek*/ -+ uLong stream_initialised; /* flag set if stream structure is initialised*/ - -- uLong offset_local_extrafield;/* offset of the local extra field */ -- uInt size_local_extrafield;/* size of the local extra field */ -- uLong pos_local_extrafield; /* position in the local extra field in read*/ -- -- uLong crc32; /* crc32 of all data uncompressed */ -- uLong crc32_wait; /* crc32 we must obtain after decompress all */ -- uLong rest_read_compressed; /* number of byte to be decompressed */ -- uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/ -- FILE* file; /* io structore of the zipfile */ -- uLong compression_method; /* compression method (0==store) */ -- uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ -+ uLong offset_local_extrafield;/* offset of the local extra field */ -+ uInt size_local_extrafield;/* size of the local extra field */ -+ uLong pos_local_extrafield; /* position in the local extra field in read*/ -+ -+ uLong crc32; /* crc32 of all data uncompressed */ -+ uLong crc32_wait; /* crc32 we must obtain after decompress all */ -+ uLong rest_read_compressed; /* number of byte to be decompressed */ -+ uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/ -+ zlib_filefunc_def z_filefunc; -+ voidpf filestream; /* io structore of the zipfile */ -+ uLong compression_method; /* compression method (0==store) */ -+ uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ -+ int raw; - } file_in_zip_read_info_s; - - -@@ -107,25 +127,35 @@ - */ - typedef struct - { -- FILE* file; /* io structore of the zipfile */ -- unz_global_info gi; /* public global information */ -- uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ -- uLong num_file; /* number of the current file in the zipfile*/ -- uLong pos_in_central_dir; /* pos of the current file in the central dir*/ -- uLong current_file_ok; /* flag about the usability of the current file*/ -- uLong central_pos; /* position of the beginning of the central dir*/ -- -- uLong size_central_dir; /* size of the central directory */ -- uLong offset_central_dir; /* offset of start of central directory with -- respect to the starting disk number */ -+ zlib_filefunc_def z_filefunc; -+ voidpf filestream; /* io structore of the zipfile */ -+ unz_global_info gi; /* public global information */ -+ uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ -+ uLong num_file; /* number of the current file in the zipfile*/ -+ uLong pos_in_central_dir; /* pos of the current file in the central dir*/ -+ uLong current_file_ok; /* flag about the usability of the current file*/ -+ uLong central_pos; /* position of the beginning of the central dir*/ -+ -+ uLong size_central_dir; /* size of the central directory */ -+ uLong offset_central_dir; /* offset of start of central directory with -+ respect to the starting disk number */ - -- unz_file_info cur_file_info; /* public info about the current file in zip*/ -- unz_file_info_internal cur_file_info_internal; /* private info about it*/ -+ unz_file_info cur_file_info; /* public info about the current file in zip*/ -+ unz_file_info_internal cur_file_info_internal; /* private info about it*/ - file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current -- file if we are decompressing it */ -+ file if we are decompressing it */ -+ int encrypted; -+# ifndef NOUNCRYPT -+ unsigned long keys[3]; /* keys defining the pseudo-random sequence */ -+ const unsigned long* pcrc_32_tab; -+# endif - } unz_s; - - -+#ifndef NOUNCRYPT -+#include "info_zip_crypt.h" -+#endif -+ - /* =========================================================================== - Read a byte from a gz_stream; update next_in and avail_in. Return EOF - for end of file. -@@ -133,12 +163,18 @@ - */ - - --local int unzlocal_getByte(fin,pi) -- FILE *fin; -- int *pi; -+local int unzlocal_getByte OF(( -+ const zlib_filefunc_def* pzlib_filefunc_def, -+ voidpf filestream, -+ int *pi)); -+ -+local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) -+ const zlib_filefunc_def* pzlib_filefunc_def; -+ voidpf filestream; -+ int *pi; - { - unsigned char c; -- int err = fread(&c, 1, 1, fin); -+ int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); - if (err==1) - { - *pi = (int)c; -@@ -146,7 +182,7 @@ - } - else - { -- if (ferror(fin)) -+ if (ZERROR(*pzlib_filefunc_def,filestream)) - return UNZ_ERRNO; - else - return UNZ_EOF; -@@ -155,23 +191,29 @@ - - - /* =========================================================================== -- Reads a long in LSB order from the given gz_stream. Sets -+ Reads a long in LSB order from the given gz_stream. Sets - */ --local int unzlocal_getShort (fin,pX) -- FILE* fin; -+local int unzlocal_getShort OF(( -+ const zlib_filefunc_def* pzlib_filefunc_def, -+ voidpf filestream, -+ uLong *pX)); -+ -+local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) -+ const zlib_filefunc_def* pzlib_filefunc_def; -+ voidpf filestream; - uLong *pX; - { - uLong x ; - int i; - int err; - -- err = unzlocal_getByte(fin,&i); -+ err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); - x = (uLong)i; -- -+ - if (err==UNZ_OK) -- err = unzlocal_getByte(fin,&i); -+ err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); - x += ((uLong)i)<<8; -- -+ - if (err==UNZ_OK) - *pX = x; - else -@@ -179,29 +221,35 @@ - return err; - } - --local int unzlocal_getLong (fin,pX) -- FILE* fin; -+local int unzlocal_getLong OF(( -+ const zlib_filefunc_def* pzlib_filefunc_def, -+ voidpf filestream, -+ uLong *pX)); -+ -+local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) -+ const zlib_filefunc_def* pzlib_filefunc_def; -+ voidpf filestream; - uLong *pX; - { - uLong x ; - int i; - int err; - -- err = unzlocal_getByte(fin,&i); -+ err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); - x = (uLong)i; -- -+ - if (err==UNZ_OK) -- err = unzlocal_getByte(fin,&i); -+ err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); - x += ((uLong)i)<<8; - - if (err==UNZ_OK) -- err = unzlocal_getByte(fin,&i); -+ err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); - x += ((uLong)i)<<16; - - if (err==UNZ_OK) -- err = unzlocal_getByte(fin,&i); -+ err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); - x += ((uLong)i)<<24; -- -+ - if (err==UNZ_OK) - *pX = x; - else -@@ -212,26 +260,26 @@ - - /* My own strcmpi / strcasecmp */ - local int strcmpcasenosensitive_internal (fileName1,fileName2) -- const char* fileName1; -- const char* fileName2; -+ const char* fileName1; -+ const char* fileName2; - { -- for (;;) -- { -- char c1=*(fileName1++); -- char c2=*(fileName2++); -- if ((c1>='a') && (c1<='z')) -- c1 -= 0x20; -- if ((c2>='a') && (c2<='z')) -- c2 -= 0x20; -- if (c1=='\0') -- return ((c2=='\0') ? 0 : -1); -- if (c2=='\0') -- return 1; -- if (c1c2) -- return 1; -- } -+ for (;;) -+ { -+ char c1=*(fileName1++); -+ char c2=*(fileName2++); -+ if ((c1>='a') && (c1<='z')) -+ c1 -= 0x20; -+ if ((c2>='a') && (c2<='z')) -+ c2 -= 0x20; -+ if (c1=='\0') -+ return ((c2=='\0') ? 0 : -1); -+ if (c2=='\0') -+ return 1; -+ if (c1c2) -+ return 1; -+ } - } - - -@@ -245,7 +293,7 @@ - #define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal - #endif - --/* -+/* - Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi -@@ -255,203 +303,225 @@ - - */ - extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity) -- const char* fileName1; -- const char* fileName2; -- int iCaseSensitivity; -+ const char* fileName1; -+ const char* fileName2; -+ int iCaseSensitivity; - { -- if (iCaseSensitivity==0) -- iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; -+ if (iCaseSensitivity==0) -+ iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; - -- if (iCaseSensitivity==1) -- return strcmp(fileName1,fileName2); -+ if (iCaseSensitivity==1) -+ return strcmp(fileName1,fileName2); - -- return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2); --} -+ return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2); -+} - -+#ifndef BUFREADCOMMENT - #define BUFREADCOMMENT (0x400) -+#endif - - /* - Locate the Central directory of a zipfile (at the end, just before - the global comment) - */ --local uLong unzlocal_SearchCentralDir(fin) -- FILE *fin; -+local uLong unzlocal_SearchCentralDir OF(( -+ const zlib_filefunc_def* pzlib_filefunc_def, -+ voidpf filestream)); -+ -+local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) -+ const zlib_filefunc_def* pzlib_filefunc_def; -+ voidpf filestream; - { -- unsigned char* buf; -- uLong uSizeFile; -- uLong uBackRead; -- uLong uMaxBack=0xffff; /* maximum size of global comment */ -- uLong uPosFound=0; -- -- if (fseek(fin,0,SEEK_END) != 0) -- return 0; -- -- -- uSizeFile = ftell( fin ); -- -- if (uMaxBack>uSizeFile) -- uMaxBack = uSizeFile; -- -- buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4); -- if (buf==NULL) -- return 0; -- -- uBackRead = 4; -- while (uBackReaduMaxBack) -- uBackRead = uMaxBack; -- else -- uBackRead+=BUFREADCOMMENT; -- uReadPos = uSizeFile-uBackRead ; -- -- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? -+ unsigned char* buf; -+ uLong uSizeFile; -+ uLong uBackRead; -+ uLong uMaxBack=0xffff; /* maximum size of global comment */ -+ uLong uPosFound=0; -+ -+ if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) -+ return 0; -+ -+ -+ uSizeFile = ZTELL(*pzlib_filefunc_def,filestream); -+ -+ if (uMaxBack>uSizeFile) -+ uMaxBack = uSizeFile; -+ -+ buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4); -+ if (buf==NULL) -+ return 0; -+ -+ uBackRead = 4; -+ while (uBackReaduMaxBack) -+ uBackRead = uMaxBack; -+ else -+ uBackRead+=BUFREADCOMMENT; -+ uReadPos = uSizeFile-uBackRead ; -+ -+ uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? - (BUFREADCOMMENT+4) : (uSizeFile-uReadPos); -- if (fseek(fin,uReadPos,SEEK_SET)!=0) -- break; -+ if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0) -+ break; - -- if (fread(buf,(uInt)uReadSize,1,fin)!=1) -- break; -+ if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize) -+ break; - -- for (i=(int)uReadSize-3; (i--)>0;) -- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && -- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) -- { -- uPosFound = uReadPos+i; -- break; -- } -- -- if (uPosFound!=0) -- break; -- } -- TRYFREE(buf); -- return uPosFound; -+ for (i=(int)uReadSize-3; (i--)>0;) -+ if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && -+ ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) -+ { -+ uPosFound = uReadPos+i; -+ break; -+ } -+ -+ if (uPosFound!=0) -+ break; -+ } -+ TRYFREE(buf); -+ return uPosFound; - } - - /* - Open a Zip file. path contain the full pathname (by example, -- on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer -- "zlib/zlib109.zip". -- If the zipfile cannot be opened (file don't exist or in not valid), the -- return value is NULL. -+ on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer -+ "zlib/zlib114.zip". -+ If the zipfile cannot be opened (file doesn't exist or in not valid), the -+ return value is NULL. - Else, the return value is a unzFile Handle, usable with other function -- of this unzip package. -+ of this unzip package. - */ --extern unzFile ZEXPORT unzOpen (path) -- const char *path; --{ -- unz_s us; -- unz_s *s; -- uLong central_pos,uL; -- FILE * fin ; -- -- uLong number_disk; /* number of the current dist, used for -- spaning ZIP, unsupported, always 0*/ -- uLong number_disk_with_CD; /* number the the disk with central dir, used -- for spaning ZIP, unsupported, always 0*/ -- uLong number_entry_CD; /* total number of entries in -- the central dir -- (same than number_entry on nospan) */ -+extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def) -+ const char *path; -+ zlib_filefunc_def* pzlib_filefunc_def; -+{ -+ unz_s us; -+ unz_s *s; -+ uLong central_pos,uL; -+ -+ uLong number_disk; /* number of the current dist, used for -+ spaning ZIP, unsupported, always 0*/ -+ uLong number_disk_with_CD; /* number the the disk with central dir, used -+ for spaning ZIP, unsupported, always 0*/ -+ uLong number_entry_CD; /* total number of entries in -+ the central dir -+ (same than number_entry on nospan) */ - -- int err=UNZ_OK; -+ int err=UNZ_OK; - - if (unz_copyright[0]!=' ') - return NULL; - -- fin=fopen(path,"rb"); -- if (fin==NULL) -- return NULL; -- -- central_pos = unzlocal_SearchCentralDir(fin); -- if (central_pos==0) -- err=UNZ_ERRNO; -- -- if (fseek(fin,central_pos,SEEK_SET)!=0) -- err=UNZ_ERRNO; -- -- /* the signature, already checked */ -- if (unzlocal_getLong(fin,&uL)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- /* number of this disk */ -- if (unzlocal_getShort(fin,&number_disk)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- /* number of the disk with the start of the central directory */ -- if (unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- /* total number of entries in the central dir on this disk */ -- if (unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- /* total number of entries in the central dir */ -- if (unzlocal_getShort(fin,&number_entry_CD)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- if ((number_entry_CD!=us.gi.number_entry) || -- (number_disk_with_CD!=0) || -- (number_disk!=0)) -- err=UNZ_BADZIPFILE; -- -- /* size of the central directory */ -- if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- /* offset of start of central directory with respect to the -- starting disk number */ -- if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- /* zipfile comment length */ -- if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK) -- err=UNZ_ERRNO; -- -- if ((central_pospfile_in_zip_read!=NULL) - unzCloseCurrentFile(file); - -- fclose(s->file); -- TRYFREE(s); -- return UNZ_OK; -+ ZCLOSE(s->z_filefunc, s->filestream); -+ TRYFREE(s); -+ return UNZ_OK; - } - - -@@ -460,15 +530,15 @@ - No preparation of the structure is needed - return UNZ_OK if there is no problem. */ - extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info) -- unzFile file; -- unz_global_info *pglobal_info; -+ unzFile file; -+ unz_global_info *pglobal_info; - { -- unz_s* s; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -- *pglobal_info=s->gi; -- return UNZ_OK; -+ unz_s* s; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ *pglobal_info=s->gi; -+ return UNZ_OK; - } - - -@@ -495,14 +565,14 @@ - */ - local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, - unz_file_info *pfile_info, -- unz_file_info_internal -+ unz_file_info_internal - *pfile_info_internal, - char *szFileName, -- uLong fileNameBufferSize, -+ uLong fileNameBufferSize, - void *extraField, -- uLong extraFieldBufferSize, -+ uLong extraFieldBufferSize, - char *szComment, -- uLong commentBufferSize)); -+ uLong commentBufferSize)); - - local int unzlocal_GetCurrentFileInfoInternal (file, - pfile_info, -@@ -510,156 +580,158 @@ - szFileName, fileNameBufferSize, - extraField, extraFieldBufferSize, - szComment, commentBufferSize) -- unzFile file; -- unz_file_info *pfile_info; -- unz_file_info_internal *pfile_info_internal; -- char *szFileName; -- uLong fileNameBufferSize; -- void *extraField; -- uLong extraFieldBufferSize; -- char *szComment; -- uLong commentBufferSize; --{ -- unz_s* s; -- unz_file_info file_info; -- unz_file_info_internal file_info_internal; -- int err=UNZ_OK; -- uLong uMagic; -- long lSeek=0; -- -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -- if (fseek(s->file,s->pos_in_central_dir+s->byte_before_the_zipfile,SEEK_SET)!=0) -- err=UNZ_ERRNO; -- -- -- /* we check the magic */ -- if (err==UNZ_OK) -- if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) -- err=UNZ_ERRNO; -- else if (uMagic!=0x02014b50) -- err=UNZ_BADZIPFILE; -- -- if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getShort(s->file,&file_info.version_needed) != UNZ_OK) -- err=UNZ_ERRNO; -+ unzFile file; -+ unz_file_info *pfile_info; -+ unz_file_info_internal *pfile_info_internal; -+ char *szFileName; -+ uLong fileNameBufferSize; -+ void *extraField; -+ uLong extraFieldBufferSize; -+ char *szComment; -+ uLong commentBufferSize; -+{ -+ unz_s* s; -+ unz_file_info file_info; -+ unz_file_info_internal file_info_internal; -+ int err=UNZ_OK; -+ uLong uMagic; -+ long lSeek=0; -+ -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ if (ZSEEK(s->z_filefunc, s->filestream, -+ s->pos_in_central_dir+s->byte_before_the_zipfile, -+ ZLIB_FILEFUNC_SEEK_SET)!=0) -+ err=UNZ_ERRNO; -+ -+ -+ /* we check the magic */ -+ if (err==UNZ_OK) -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) -+ err=UNZ_ERRNO; -+ else if (uMagic!=0x02014b50) -+ err=UNZ_BADZIPFILE; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK) -+ err=UNZ_ERRNO; - -- if (unzlocal_getShort(s->file,&file_info.flag) != UNZ_OK) -- err=UNZ_ERRNO; -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK) -+ err=UNZ_ERRNO; - -- if (unzlocal_getShort(s->file,&file_info.compression_method) != UNZ_OK) -- err=UNZ_ERRNO; -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK) -+ err=UNZ_ERRNO; - -- if (unzlocal_getLong(s->file,&file_info.dosDate) != UNZ_OK) -- err=UNZ_ERRNO; -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK) -+ err=UNZ_ERRNO; - - unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date); - -- if (unzlocal_getLong(s->file,&file_info.crc) != UNZ_OK) -- err=UNZ_ERRNO; -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ lSeek+=file_info.size_filename; -+ if ((err==UNZ_OK) && (szFileName!=NULL)) -+ { -+ uLong uSizeRead ; -+ if (file_info.size_filename0) && (fileNameBufferSize>0)) -+ if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead) -+ err=UNZ_ERRNO; -+ lSeek -= uSizeRead; -+ } -+ -+ -+ if ((err==UNZ_OK) && (extraField!=NULL)) -+ { -+ uLong uSizeRead ; -+ if (file_info.size_file_extraz_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) -+ lSeek=0; -+ else -+ err=UNZ_ERRNO; -+ if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) -+ if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) -+ err=UNZ_ERRNO; -+ lSeek += file_info.size_file_extra - uSizeRead; -+ } -+ else -+ lSeek+=file_info.size_file_extra; - -- if (unzlocal_getLong(s->file,&file_info.compressed_size) != UNZ_OK) -- err=UNZ_ERRNO; - -- if (unzlocal_getLong(s->file,&file_info.uncompressed_size) != UNZ_OK) -- err=UNZ_ERRNO; -+ if ((err==UNZ_OK) && (szComment!=NULL)) -+ { -+ uLong uSizeRead ; -+ if (file_info.size_file_commentfile,&file_info.size_filename) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getShort(s->file,&file_info.size_file_extra) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getShort(s->file,&file_info.size_file_comment) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getShort(s->file,&file_info.disk_num_start) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getShort(s->file,&file_info.internal_fa) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getLong(s->file,&file_info.external_fa) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK) -- err=UNZ_ERRNO; -- -- lSeek+=file_info.size_filename; -- if ((err==UNZ_OK) && (szFileName!=NULL)) -- { -- uLong uSizeRead ; -- if (file_info.size_filename0) && (fileNameBufferSize>0)) -- if (fread(szFileName,(uInt)uSizeRead,1,s->file)!=1) -- err=UNZ_ERRNO; -- lSeek -= uSizeRead; -- } -- -- -- if ((err==UNZ_OK) && (extraField!=NULL)) -- { -- uLong uSizeRead ; -- if (file_info.size_file_extrafile,lSeek,SEEK_CUR)==0) -- lSeek=0; -- else -- err=UNZ_ERRNO; -- if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) -- if (fread(extraField,(uInt)uSizeRead,1,s->file)!=1) -- err=UNZ_ERRNO; -- lSeek += file_info.size_file_extra - uSizeRead; -- } -- else -- lSeek+=file_info.size_file_extra; -- -- -- if ((err==UNZ_OK) && (szComment!=NULL)) -- { -- uLong uSizeRead ; -- if (file_info.size_file_commentfile,lSeek,SEEK_CUR)==0) -- lSeek=0; -- else -- err=UNZ_ERRNO; -- if ((file_info.size_file_comment>0) && (commentBufferSize>0)) -- if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1) -- err=UNZ_ERRNO; -- lSeek+=file_info.size_file_comment - uSizeRead; -- } -- else -- lSeek+=file_info.size_file_comment; -+ if (lSeek!=0) -+ if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0) -+ lSeek=0; -+ else -+ err=UNZ_ERRNO; -+ if ((file_info.size_file_comment>0) && (commentBufferSize>0)) -+ if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead) -+ err=UNZ_ERRNO; -+ lSeek+=file_info.size_file_comment - uSizeRead; -+ } -+ else -+ lSeek+=file_info.size_file_comment; - -- if ((err==UNZ_OK) && (pfile_info!=NULL)) -- *pfile_info=file_info; -+ if ((err==UNZ_OK) && (pfile_info!=NULL)) -+ *pfile_info=file_info; - -- if ((err==UNZ_OK) && (pfile_info_internal!=NULL)) -- *pfile_info_internal=file_info_internal; -+ if ((err==UNZ_OK) && (pfile_info_internal!=NULL)) -+ *pfile_info_internal=file_info_internal; - -- return err; -+ return err; - } - - -@@ -670,23 +742,23 @@ - return UNZ_OK if there is no problem. - */ - extern int ZEXPORT unzGetCurrentFileInfo (file, -- pfile_info, -- szFileName, fileNameBufferSize, -- extraField, extraFieldBufferSize, -- szComment, commentBufferSize) -- unzFile file; -- unz_file_info *pfile_info; -- char *szFileName; -- uLong fileNameBufferSize; -- void *extraField; -- uLong extraFieldBufferSize; -- char *szComment; -- uLong commentBufferSize; --{ -- return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL, -- szFileName,fileNameBufferSize, -- extraField,extraFieldBufferSize, -- szComment,commentBufferSize); -+ pfile_info, -+ szFileName, fileNameBufferSize, -+ extraField, extraFieldBufferSize, -+ szComment, commentBufferSize) -+ unzFile file; -+ unz_file_info *pfile_info; -+ char *szFileName; -+ uLong fileNameBufferSize; -+ void *extraField; -+ uLong extraFieldBufferSize; -+ char *szComment; -+ uLong commentBufferSize; -+{ -+ return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL, -+ szFileName,fileNameBufferSize, -+ extraField,extraFieldBufferSize, -+ szComment,commentBufferSize); - } - - /* -@@ -694,50 +766,50 @@ - return UNZ_OK if there is no problem - */ - extern int ZEXPORT unzGoToFirstFile (file) -- unzFile file; -+ unzFile file; - { -- int err=UNZ_OK; -- unz_s* s; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -- s->pos_in_central_dir=s->offset_central_dir; -- s->num_file=0; -- err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, -- &s->cur_file_info_internal, -- NULL,0,NULL,0,NULL,0); -- s->current_file_ok = (err == UNZ_OK); -- return err; -+ int err=UNZ_OK; -+ unz_s* s; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ s->pos_in_central_dir=s->offset_central_dir; -+ s->num_file=0; -+ err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, -+ &s->cur_file_info_internal, -+ NULL,0,NULL,0,NULL,0); -+ s->current_file_ok = (err == UNZ_OK); -+ return err; - } - -- - /* - Set the current file of the zipfile to the next file. - return UNZ_OK if there is no problem - return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. - */ - extern int ZEXPORT unzGoToNextFile (file) -- unzFile file; -+ unzFile file; - { -- unz_s* s; -- int err; -+ unz_s* s; -+ int err; - -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -- if (!s->current_file_ok) -- return UNZ_END_OF_LIST_OF_FILE; -- if (s->num_file+1==s->gi.number_entry) -- return UNZ_END_OF_LIST_OF_FILE; -- -- s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename + -- s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ; -- s->num_file++; -- err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, -- &s->cur_file_info_internal, -- NULL,0,NULL,0,NULL,0); -- s->current_file_ok = (err == UNZ_OK); -- return err; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ if (!s->current_file_ok) -+ return UNZ_END_OF_LIST_OF_FILE; -+ if (s->gi.number_entry != 0xffff) /* 2^16 files overflow hack */ -+ if (s->num_file+1==s->gi.number_entry) -+ return UNZ_END_OF_LIST_OF_FILE; -+ -+ s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename + -+ s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ; -+ s->num_file++; -+ err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, -+ &s->cur_file_info_internal, -+ NULL,0,NULL,0,NULL,0); -+ s->current_file_ok = (err == UNZ_OK); -+ return err; - } - - -@@ -750,50 +822,130 @@ - UNZ_END_OF_LIST_OF_FILE if the file is not found - */ - extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity) -- unzFile file; -- const char *szFileName; -- int iCaseSensitivity; -+ unzFile file; -+ const char *szFileName; -+ int iCaseSensitivity; - { -- unz_s* s; -- int err; -+ unz_s* s; -+ int err; - -- -- uLong num_fileSaved; -- uLong pos_in_central_dirSaved; -+ /* We remember the 'current' position in the file so that we can jump -+ * back there if we fail. -+ */ -+ unz_file_info cur_file_infoSaved; -+ unz_file_info_internal cur_file_info_internalSaved; -+ uLong num_fileSaved; -+ uLong pos_in_central_dirSaved; - - -- if (file==NULL) -- return UNZ_PARAMERROR; -+ if (file==NULL) -+ return UNZ_PARAMERROR; - - if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP) - return UNZ_PARAMERROR; - -- s=(unz_s*)file; -- if (!s->current_file_ok) -- return UNZ_END_OF_LIST_OF_FILE; -- -- num_fileSaved = s->num_file; -- pos_in_central_dirSaved = s->pos_in_central_dir; -- -- err = unzGoToFirstFile(file); -- -- while (err == UNZ_OK) -- { -- char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1]; -- unzGetCurrentFileInfo(file,NULL, -- szCurrentFileName,sizeof(szCurrentFileName)-1, -- NULL,0,NULL,0); -- if (unzStringFileNameCompare(szCurrentFileName, -- szFileName,iCaseSensitivity)==0) -- return UNZ_OK; -- err = unzGoToNextFile(file); -- } -- -- s->num_file = num_fileSaved ; -- s->pos_in_central_dir = pos_in_central_dirSaved ; -- return err; -+ s=(unz_s*)file; -+ if (!s->current_file_ok) -+ return UNZ_END_OF_LIST_OF_FILE; -+ -+ /* Save the current state */ -+ num_fileSaved = s->num_file; -+ pos_in_central_dirSaved = s->pos_in_central_dir; -+ cur_file_infoSaved = s->cur_file_info; -+ cur_file_info_internalSaved = s->cur_file_info_internal; -+ -+ err = unzGoToFirstFile(file); -+ -+ while (err == UNZ_OK) -+ { -+ char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1]; -+ err = unzGetCurrentFileInfo(file,NULL, -+ szCurrentFileName,sizeof(szCurrentFileName)-1, -+ NULL,0,NULL,0); -+ if (err == UNZ_OK) -+ { -+ if (unzStringFileNameCompare(szCurrentFileName, -+ szFileName,iCaseSensitivity)==0) -+ return UNZ_OK; -+ err = unzGoToNextFile(file); -+ } -+ } -+ -+ /* We failed, so restore the state of the 'current file' to where we -+ * were. -+ */ -+ s->num_file = num_fileSaved ; -+ s->pos_in_central_dir = pos_in_central_dirSaved ; -+ s->cur_file_info = cur_file_infoSaved; -+ s->cur_file_info_internal = cur_file_info_internalSaved; -+ return err; -+} -+ -+ -+/* -+/////////////////////////////////////////// -+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net) -+// I need random access -+// -+// Further optimization could be realized by adding an ability -+// to cache the directory in memory. The goal being a single -+// comprehensive file read to put the file I need in a memory. -+*/ -+ -+/* -+typedef struct unz_file_pos_s -+{ -+ uLong pos_in_zip_directory; // offset in file -+ uLong num_of_file; // # of file -+} unz_file_pos; -+*/ -+ -+extern int ZEXPORT unzGetFilePos(file, file_pos) -+ unzFile file; -+ unz_file_pos* file_pos; -+{ -+ unz_s* s; -+ -+ if (file==NULL || file_pos==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ if (!s->current_file_ok) -+ return UNZ_END_OF_LIST_OF_FILE; -+ -+ file_pos->pos_in_zip_directory = s->pos_in_central_dir; -+ file_pos->num_of_file = s->num_file; -+ -+ return UNZ_OK; -+} -+ -+extern int ZEXPORT unzGoToFilePos(file, file_pos) -+ unzFile file; -+ unz_file_pos* file_pos; -+{ -+ unz_s* s; -+ int err; -+ -+ if (file==NULL || file_pos==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ -+ /* jump to the right spot */ -+ s->pos_in_central_dir = file_pos->pos_in_zip_directory; -+ s->num_file = file_pos->num_of_file; -+ -+ /* set the current file */ -+ err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, -+ &s->cur_file_info_internal, -+ NULL,0,NULL,0,NULL,0); -+ /* return results */ -+ s->current_file_ok = (err == UNZ_OK); -+ return err; - } - -+/* -+// Unzip Helper Functions - should be here? -+/////////////////////////////////////////// -+*/ - - /* - Read the local header of the current zipfile -@@ -803,185 +955,261 @@ - (filename and size of extra field data) - */ - local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar, -- poffset_local_extrafield, -- psize_local_extrafield) -- unz_s* s; -- uInt* piSizeVar; -- uLong *poffset_local_extrafield; -- uInt *psize_local_extrafield; --{ -- uLong uMagic,uData,uFlags; -- uLong size_filename; -- uLong size_extra_field; -- int err=UNZ_OK; -- -- *piSizeVar = 0; -- *poffset_local_extrafield = 0; -- *psize_local_extrafield = 0; -- -- if (fseek(s->file,s->cur_file_info_internal.offset_curfile + -- s->byte_before_the_zipfile,SEEK_SET)!=0) -- return UNZ_ERRNO; -- -- -- if (err==UNZ_OK) -- if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK) -- err=UNZ_ERRNO; -- else if (uMagic!=0x04034b50) -- err=UNZ_BADZIPFILE; -- -- if (unzlocal_getShort(s->file,&uData) != UNZ_OK) -- err=UNZ_ERRNO; --/* -- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion)) -- err=UNZ_BADZIPFILE; --*/ -- if (unzlocal_getShort(s->file,&uFlags) != UNZ_OK) -- err=UNZ_ERRNO; -- -- if (unzlocal_getShort(s->file,&uData) != UNZ_OK) -- err=UNZ_ERRNO; -- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method)) -- err=UNZ_BADZIPFILE; -+ poffset_local_extrafield, -+ psize_local_extrafield) -+ unz_s* s; -+ uInt* piSizeVar; -+ uLong *poffset_local_extrafield; -+ uInt *psize_local_extrafield; -+{ -+ uLong uMagic,uData,uFlags; -+ uLong size_filename; -+ uLong size_extra_field; -+ int err=UNZ_OK; -+ -+ *piSizeVar = 0; -+ *poffset_local_extrafield = 0; -+ *psize_local_extrafield = 0; -+ -+ if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile + -+ s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0) -+ return UNZ_ERRNO; -+ -+ -+ if (err==UNZ_OK) -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK) -+ err=UNZ_ERRNO; -+ else if (uMagic!=0x04034b50) -+ err=UNZ_BADZIPFILE; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) -+ err=UNZ_ERRNO; -+/* -+ else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion)) -+ err=UNZ_BADZIPFILE; -+*/ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK) -+ err=UNZ_ERRNO; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) -+ err=UNZ_ERRNO; -+ else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method)) -+ err=UNZ_BADZIPFILE; - - if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) && - (s->cur_file_info.compression_method!=Z_DEFLATED)) - err=UNZ_BADZIPFILE; - -- if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* date/time */ -- err=UNZ_ERRNO; -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */ -+ err=UNZ_ERRNO; - -- if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* crc */ -- err=UNZ_ERRNO; -- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && -- ((uFlags & 8)==0)) -- err=UNZ_BADZIPFILE; -- -- if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size compr */ -- err=UNZ_ERRNO; -- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && -- ((uFlags & 8)==0)) -- err=UNZ_BADZIPFILE; -- -- if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size uncompr */ -- err=UNZ_ERRNO; -- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && -- ((uFlags & 8)==0)) -- err=UNZ_BADZIPFILE; -- -- -- if (unzlocal_getShort(s->file,&size_filename) != UNZ_OK) -- err=UNZ_ERRNO; -- else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename)) -- err=UNZ_BADZIPFILE; -- -- *piSizeVar += (uInt)size_filename; -- -- if (unzlocal_getShort(s->file,&size_extra_field) != UNZ_OK) -- err=UNZ_ERRNO; -- *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile + -- SIZEZIPLOCALHEADER + size_filename; -- *psize_local_extrafield = (uInt)size_extra_field; -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */ -+ err=UNZ_ERRNO; -+ else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && -+ ((uFlags & 8)==0)) -+ err=UNZ_BADZIPFILE; -+ -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */ -+ err=UNZ_ERRNO; -+ else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && -+ ((uFlags & 8)==0)) -+ err=UNZ_BADZIPFILE; - -- *piSizeVar += (uInt)size_extra_field; -+ if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */ -+ err=UNZ_ERRNO; -+ else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && -+ ((uFlags & 8)==0)) -+ err=UNZ_BADZIPFILE; -+ -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK) -+ err=UNZ_ERRNO; -+ else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename)) -+ err=UNZ_BADZIPFILE; - -- return err; -+ *piSizeVar += (uInt)size_filename; -+ -+ if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK) -+ err=UNZ_ERRNO; -+ *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile + -+ SIZEZIPLOCALHEADER + size_filename; -+ *psize_local_extrafield = (uInt)size_extra_field; -+ -+ *piSizeVar += (uInt)size_extra_field; -+ -+ return err; - } -- -+ - /* - Open for reading data the current file in the zipfile. - If there is no error and the file is opened, the return value is UNZ_OK. - */ --extern int ZEXPORT unzOpenCurrentFile (file) -- unzFile file; --{ -- int err=UNZ_OK; -- int Store; -- uInt iSizeVar; -- unz_s* s; -- file_in_zip_read_info_s* pfile_in_zip_read_info; -- uLong offset_local_extrafield; /* offset of the local extra field */ -- uInt size_local_extrafield; /* size of the local extra field */ -- -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -- if (!s->current_file_ok) -- return UNZ_PARAMERROR; -+extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) -+ unzFile file; -+ int* method; -+ int* level; -+ int raw; -+ const char* password; -+{ -+ int err=UNZ_OK; -+ uInt iSizeVar; -+ unz_s* s; -+ file_in_zip_read_info_s* pfile_in_zip_read_info; -+ uLong offset_local_extrafield; /* offset of the local extra field */ -+ uInt size_local_extrafield; /* size of the local extra field */ -+# ifndef NOUNCRYPT -+ char source[12]; -+# else -+ if (password != NULL) -+ return UNZ_PARAMERROR; -+# endif -+ -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ if (!s->current_file_ok) -+ return UNZ_PARAMERROR; - - if (s->pfile_in_zip_read != NULL) - unzCloseCurrentFile(file); - -- if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar, -- &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK) -- return UNZ_BADZIPFILE; -- -- pfile_in_zip_read_info = (file_in_zip_read_info_s*) -- ALLOC(sizeof(file_in_zip_read_info_s)); -- if (pfile_in_zip_read_info==NULL) -- return UNZ_INTERNALERROR; -- -- pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE); -- pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield; -- pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield; -- pfile_in_zip_read_info->pos_local_extrafield=0; -- -- if (pfile_in_zip_read_info->read_buffer==NULL) -- { -- TRYFREE(pfile_in_zip_read_info); -- return UNZ_INTERNALERROR; -- } -- -- pfile_in_zip_read_info->stream_initialised=0; -- -- if ((s->cur_file_info.compression_method!=0) && -+ if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar, -+ &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK) -+ return UNZ_BADZIPFILE; -+ -+ pfile_in_zip_read_info = (file_in_zip_read_info_s*) -+ ALLOC(sizeof(file_in_zip_read_info_s)); -+ if (pfile_in_zip_read_info==NULL) -+ return UNZ_INTERNALERROR; -+ -+ pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE); -+ pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield; -+ pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield; -+ pfile_in_zip_read_info->pos_local_extrafield=0; -+ pfile_in_zip_read_info->raw=raw; -+ -+ if (pfile_in_zip_read_info->read_buffer==NULL) -+ { -+ TRYFREE(pfile_in_zip_read_info); -+ return UNZ_INTERNALERROR; -+ } -+ -+ pfile_in_zip_read_info->stream_initialised=0; -+ -+ if (method!=NULL) -+ *method = (int)s->cur_file_info.compression_method; -+ -+ if (level!=NULL) -+ { -+ *level = 6; -+ switch (s->cur_file_info.flag & 0x06) -+ { -+ case 6 : *level = 1; break; -+ case 4 : *level = 2; break; -+ case 2 : *level = 9; break; -+ } -+ } -+ -+ if ((s->cur_file_info.compression_method!=0) && - (s->cur_file_info.compression_method!=Z_DEFLATED)) -- err=UNZ_BADZIPFILE; -- Store = s->cur_file_info.compression_method==0; -+ err=UNZ_BADZIPFILE; - -- pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; -- pfile_in_zip_read_info->crc32=0; -- pfile_in_zip_read_info->compression_method = -+ pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; -+ pfile_in_zip_read_info->crc32=0; -+ pfile_in_zip_read_info->compression_method = - s->cur_file_info.compression_method; -- pfile_in_zip_read_info->file=s->file; -- pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile; -+ pfile_in_zip_read_info->filestream=s->filestream; -+ pfile_in_zip_read_info->z_filefunc=s->z_filefunc; -+ pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile; - - pfile_in_zip_read_info->stream.total_out = 0; - -- if (!Store) -- { -- pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; -- pfile_in_zip_read_info->stream.zfree = (free_func)0; -- pfile_in_zip_read_info->stream.opaque = (voidpf)0; -- -- err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); -- if (err == Z_OK) -- pfile_in_zip_read_info->stream_initialised=1; -+ if ((s->cur_file_info.compression_method==Z_DEFLATED) && -+ (!raw)) -+ { -+ pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; -+ pfile_in_zip_read_info->stream.zfree = (free_func)0; -+ pfile_in_zip_read_info->stream.opaque = (voidpf)0; -+ pfile_in_zip_read_info->stream.next_in = (voidpf)0; -+ pfile_in_zip_read_info->stream.avail_in = 0; -+ -+ err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS); -+ if (err == Z_OK) -+ pfile_in_zip_read_info->stream_initialised=1; -+ else -+ { -+ TRYFREE(pfile_in_zip_read_info); -+ return err; -+ } - /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *requires* an extra "dummy" byte - * after the compressed stream in order to complete decompression and -- * return Z_STREAM_END. -- * In unzip, i don't wait absolutely Z_STREAM_END because I known the -+ * return Z_STREAM_END. -+ * In unzip, i don't wait absolutely Z_STREAM_END because I known the - * size of both compressed and uncompressed data - */ -- } -- pfile_in_zip_read_info->rest_read_compressed = -+ } -+ pfile_in_zip_read_info->rest_read_compressed = - s->cur_file_info.compressed_size ; -- pfile_in_zip_read_info->rest_read_uncompressed = -+ pfile_in_zip_read_info->rest_read_uncompressed = - s->cur_file_info.uncompressed_size ; - -- -- pfile_in_zip_read_info->pos_in_zipfile = -- s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + -- iSizeVar; -- -- pfile_in_zip_read_info->stream.avail_in = (uInt)0; -+ -+ pfile_in_zip_read_info->pos_in_zipfile = -+ s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + -+ iSizeVar; -+ -+ pfile_in_zip_read_info->stream.avail_in = (uInt)0; -+ -+ s->pfile_in_zip_read = pfile_in_zip_read_info; -+ -+# ifndef NOUNCRYPT -+ if (password != NULL) -+ { -+ int i; -+ s->pcrc_32_tab = get_crc_table(); -+ init_keys(password,s->keys,s->pcrc_32_tab); -+ if (ZSEEK(s->z_filefunc, s->filestream, -+ s->pfile_in_zip_read->pos_in_zipfile + -+ s->pfile_in_zip_read->byte_before_the_zipfile, -+ SEEK_SET)!=0) -+ return UNZ_INTERNALERROR; -+ if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12) -+ return UNZ_INTERNALERROR; -+ -+ for (i = 0; i<12; i++) -+ zdecode(s->keys,s->pcrc_32_tab,source[i]); -+ -+ s->pfile_in_zip_read->pos_in_zipfile+=12; -+ s->encrypted=1; -+ } -+# endif - - -- s->pfile_in_zip_read = pfile_in_zip_read_info; - return UNZ_OK; - } - -+extern int ZEXPORT unzOpenCurrentFile (file) -+ unzFile file; -+{ -+ return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL); -+} -+ -+extern int ZEXPORT unzOpenCurrentFilePassword (file, password) -+ unzFile file; -+ const char* password; -+{ -+ return unzOpenCurrentFile3(file, NULL, NULL, 0, password); -+} -+ -+extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw) -+ unzFile file; -+ int* method; -+ int* level; -+ int raw; -+{ -+ return unzOpenCurrentFile3(file, method, level, raw, NULL); -+} - - /* - Read bytes from the current file. -@@ -994,126 +1222,160 @@ - (UNZ_ERRNO for IO error, or zLib error for uncompress error) - */ - extern int ZEXPORT unzReadCurrentFile (file, buf, len) -- unzFile file; -- voidp buf; -- unsigned len; --{ -- int err=UNZ_OK; -- uInt iRead = 0; -- unz_s* s; -- file_in_zip_read_info_s* pfile_in_zip_read_info; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -+ unzFile file; -+ voidp buf; -+ unsigned len; -+{ -+ int err=UNZ_OK; -+ uInt iRead = 0; -+ unz_s* s; -+ file_in_zip_read_info_s* pfile_in_zip_read_info; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - -- if (pfile_in_zip_read_info==NULL) -- return UNZ_PARAMERROR; -+ if (pfile_in_zip_read_info==NULL) -+ return UNZ_PARAMERROR; - - -- if ((pfile_in_zip_read_info->read_buffer == NULL)) -- return UNZ_END_OF_LIST_OF_FILE; -- if (len==0) -- return 0; -- -- pfile_in_zip_read_info->stream.next_out = (Bytef*)buf; -- -- pfile_in_zip_read_info->stream.avail_out = (uInt)len; -- -- if (len>pfile_in_zip_read_info->rest_read_uncompressed) -- pfile_in_zip_read_info->stream.avail_out = -- (uInt)pfile_in_zip_read_info->rest_read_uncompressed; -- -- while (pfile_in_zip_read_info->stream.avail_out>0) -- { -- if ((pfile_in_zip_read_info->stream.avail_in==0) && -+ if ((pfile_in_zip_read_info->read_buffer == NULL)) -+ return UNZ_END_OF_LIST_OF_FILE; -+ if (len==0) -+ return 0; -+ -+ pfile_in_zip_read_info->stream.next_out = (Bytef*)buf; -+ -+ pfile_in_zip_read_info->stream.avail_out = (uInt)len; -+ -+ if ((len>pfile_in_zip_read_info->rest_read_uncompressed) && -+ (!(pfile_in_zip_read_info->raw))) -+ pfile_in_zip_read_info->stream.avail_out = -+ (uInt)pfile_in_zip_read_info->rest_read_uncompressed; -+ -+ if ((len>pfile_in_zip_read_info->rest_read_compressed+ -+ pfile_in_zip_read_info->stream.avail_in) && -+ (pfile_in_zip_read_info->raw)) -+ pfile_in_zip_read_info->stream.avail_out = -+ (uInt)pfile_in_zip_read_info->rest_read_compressed+ -+ pfile_in_zip_read_info->stream.avail_in; -+ -+ while (pfile_in_zip_read_info->stream.avail_out>0) -+ { -+ if ((pfile_in_zip_read_info->stream.avail_in==0) && - (pfile_in_zip_read_info->rest_read_compressed>0)) -- { -- uInt uReadThis = UNZ_BUFSIZE; -- if (pfile_in_zip_read_info->rest_read_compressedrest_read_compressed; -- if (uReadThis == 0) -- return UNZ_EOF; -- if (fseek(pfile_in_zip_read_info->file, -- pfile_in_zip_read_info->pos_in_zipfile + -- pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0) -- return UNZ_ERRNO; -- if (fread(pfile_in_zip_read_info->read_buffer,uReadThis,1, -- pfile_in_zip_read_info->file)!=1) -- return UNZ_ERRNO; -- pfile_in_zip_read_info->pos_in_zipfile += uReadThis; -- -- pfile_in_zip_read_info->rest_read_compressed-=uReadThis; -- -- pfile_in_zip_read_info->stream.next_in = -+ { -+ uInt uReadThis = UNZ_BUFSIZE; -+ if (pfile_in_zip_read_info->rest_read_compressedrest_read_compressed; -+ if (uReadThis == 0) -+ return UNZ_EOF; -+ if (ZSEEK(pfile_in_zip_read_info->z_filefunc, -+ pfile_in_zip_read_info->filestream, -+ pfile_in_zip_read_info->pos_in_zipfile + -+ pfile_in_zip_read_info->byte_before_the_zipfile, -+ ZLIB_FILEFUNC_SEEK_SET)!=0) -+ return UNZ_ERRNO; -+ if (ZREAD(pfile_in_zip_read_info->z_filefunc, -+ pfile_in_zip_read_info->filestream, -+ pfile_in_zip_read_info->read_buffer, -+ uReadThis)!=uReadThis) -+ return UNZ_ERRNO; -+ -+ -+# ifndef NOUNCRYPT -+ if(s->encrypted) -+ { -+ uInt i; -+ for(i=0;iread_buffer[i] = -+ zdecode(s->keys,s->pcrc_32_tab, -+ pfile_in_zip_read_info->read_buffer[i]); -+ } -+# endif -+ -+ -+ pfile_in_zip_read_info->pos_in_zipfile += uReadThis; -+ -+ pfile_in_zip_read_info->rest_read_compressed-=uReadThis; -+ -+ pfile_in_zip_read_info->stream.next_in = - (Bytef*)pfile_in_zip_read_info->read_buffer; -- pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis; -- } -+ pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis; -+ } -+ -+ if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw)) -+ { -+ uInt uDoCopy,i ; -+ -+ if ((pfile_in_zip_read_info->stream.avail_in == 0) && -+ (pfile_in_zip_read_info->rest_read_compressed == 0)) -+ return (iRead==0) ? UNZ_EOF : iRead; - -- if (pfile_in_zip_read_info->compression_method==0) -- { -- uInt uDoCopy,i ; -- if (pfile_in_zip_read_info->stream.avail_out < -+ if (pfile_in_zip_read_info->stream.avail_out < - pfile_in_zip_read_info->stream.avail_in) -- uDoCopy = pfile_in_zip_read_info->stream.avail_out ; -- else -- uDoCopy = pfile_in_zip_read_info->stream.avail_in ; -- -- for (i=0;istream.next_out+i) = -+ uDoCopy = pfile_in_zip_read_info->stream.avail_out ; -+ else -+ uDoCopy = pfile_in_zip_read_info->stream.avail_in ; -+ -+ for (i=0;istream.next_out+i) = - *(pfile_in_zip_read_info->stream.next_in+i); -- -- pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32, -- pfile_in_zip_read_info->stream.next_out, -- uDoCopy); -- pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy; -- pfile_in_zip_read_info->stream.avail_in -= uDoCopy; -- pfile_in_zip_read_info->stream.avail_out -= uDoCopy; -- pfile_in_zip_read_info->stream.next_out += uDoCopy; -- pfile_in_zip_read_info->stream.next_in += uDoCopy; -+ -+ pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32, -+ pfile_in_zip_read_info->stream.next_out, -+ uDoCopy); -+ pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy; -+ pfile_in_zip_read_info->stream.avail_in -= uDoCopy; -+ pfile_in_zip_read_info->stream.avail_out -= uDoCopy; -+ pfile_in_zip_read_info->stream.next_out += uDoCopy; -+ pfile_in_zip_read_info->stream.next_in += uDoCopy; - pfile_in_zip_read_info->stream.total_out += uDoCopy; -- iRead += uDoCopy; -- } -- else -- { -- uLong uTotalOutBefore,uTotalOutAfter; -- const Bytef *bufBefore; -- uLong uOutThis; -- int flush=Z_SYNC_FLUSH; -- -- uTotalOutBefore = pfile_in_zip_read_info->stream.total_out; -- bufBefore = pfile_in_zip_read_info->stream.next_out; -- -- /* -- if ((pfile_in_zip_read_info->rest_read_uncompressed == -- pfile_in_zip_read_info->stream.avail_out) && -- (pfile_in_zip_read_info->rest_read_compressed == 0)) -- flush = Z_FINISH; -- */ -- err=inflate(&pfile_in_zip_read_info->stream,flush); -- -- uTotalOutAfter = pfile_in_zip_read_info->stream.total_out; -- uOutThis = uTotalOutAfter-uTotalOutBefore; -- -- pfile_in_zip_read_info->crc32 = -+ iRead += uDoCopy; -+ } -+ else -+ { -+ uLong uTotalOutBefore,uTotalOutAfter; -+ const Bytef *bufBefore; -+ uLong uOutThis; -+ int flush=Z_SYNC_FLUSH; -+ -+ uTotalOutBefore = pfile_in_zip_read_info->stream.total_out; -+ bufBefore = pfile_in_zip_read_info->stream.next_out; -+ -+ /* -+ if ((pfile_in_zip_read_info->rest_read_uncompressed == -+ pfile_in_zip_read_info->stream.avail_out) && -+ (pfile_in_zip_read_info->rest_read_compressed == 0)) -+ flush = Z_FINISH; -+ */ -+ err=inflate(&pfile_in_zip_read_info->stream,flush); -+ -+ if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL)) -+ err = Z_DATA_ERROR; -+ -+ uTotalOutAfter = pfile_in_zip_read_info->stream.total_out; -+ uOutThis = uTotalOutAfter-uTotalOutBefore; -+ -+ pfile_in_zip_read_info->crc32 = - crc32(pfile_in_zip_read_info->crc32,bufBefore, - (uInt)(uOutThis)); - -- pfile_in_zip_read_info->rest_read_uncompressed -= -+ pfile_in_zip_read_info->rest_read_uncompressed -= - uOutThis; - -- iRead += (uInt)(uTotalOutAfter - uTotalOutBefore); -- -- if (err==Z_STREAM_END) -- return (iRead==0) ? UNZ_EOF : iRead; -- if (err!=Z_OK) -- break; -- } -- } -- -- if (err==Z_OK) -- return iRead; -- return err; -+ iRead += (uInt)(uTotalOutAfter - uTotalOutBefore); -+ -+ if (err==Z_STREAM_END) -+ return (iRead==0) ? UNZ_EOF : iRead; -+ if (err!=Z_OK) -+ break; -+ } -+ } -+ -+ if (err==Z_OK) -+ return iRead; -+ return err; - } - - -@@ -1121,42 +1383,42 @@ - Give the current position in uncompressed data - */ - extern z_off_t ZEXPORT unztell (file) -- unzFile file; -+ unzFile file; - { -- unz_s* s; -- file_in_zip_read_info_s* pfile_in_zip_read_info; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -+ unz_s* s; -+ file_in_zip_read_info_s* pfile_in_zip_read_info; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - -- if (pfile_in_zip_read_info==NULL) -- return UNZ_PARAMERROR; -+ if (pfile_in_zip_read_info==NULL) -+ return UNZ_PARAMERROR; - -- return (z_off_t)pfile_in_zip_read_info->stream.total_out; -+ return (z_off_t)pfile_in_zip_read_info->stream.total_out; - } - - - /* -- return 1 if the end of file was reached, 0 elsewhere -+ return 1 if the end of file was reached, 0 elsewhere - */ - extern int ZEXPORT unzeof (file) -- unzFile file; -+ unzFile file; - { -- unz_s* s; -- file_in_zip_read_info_s* pfile_in_zip_read_info; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -+ unz_s* s; -+ file_in_zip_read_info_s* pfile_in_zip_read_info; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - -- if (pfile_in_zip_read_info==NULL) -- return UNZ_PARAMERROR; -- -- if (pfile_in_zip_read_info->rest_read_uncompressed == 0) -- return 1; -- else -- return 0; -+ if (pfile_in_zip_read_info==NULL) -+ return UNZ_PARAMERROR; -+ -+ if (pfile_in_zip_read_info->rest_read_uncompressed == 0) -+ return 1; -+ else -+ return 0; - } - - -@@ -1169,51 +1431,55 @@ - if buf==NULL, it return the size of the local extra field that can be read - - if buf!=NULL, len is the size of the buffer, the extra header is copied in -- buf. -- the return value is the number of bytes copied in buf, or (if <0) -- the error code -+ buf. -+ the return value is the number of bytes copied in buf, or (if <0) -+ the error code - */ - extern int ZEXPORT unzGetLocalExtrafield (file,buf,len) -- unzFile file; -- voidp buf; -- unsigned len; --{ -- unz_s* s; -- file_in_zip_read_info_s* pfile_in_zip_read_info; -- uInt read_now; -- uLong size_to_read; -- -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -+ unzFile file; -+ voidp buf; -+ unsigned len; -+{ -+ unz_s* s; -+ file_in_zip_read_info_s* pfile_in_zip_read_info; -+ uInt read_now; -+ uLong size_to_read; -+ -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - -- if (pfile_in_zip_read_info==NULL) -- return UNZ_PARAMERROR; -+ if (pfile_in_zip_read_info==NULL) -+ return UNZ_PARAMERROR; - -- size_to_read = (pfile_in_zip_read_info->size_local_extrafield - -- pfile_in_zip_read_info->pos_local_extrafield); -+ size_to_read = (pfile_in_zip_read_info->size_local_extrafield - -+ pfile_in_zip_read_info->pos_local_extrafield); - -- if (buf==NULL) -- return (int)size_to_read; -- -- if (len>size_to_read) -- read_now = (uInt)size_to_read; -- else -- read_now = (uInt)len ; -- -- if (read_now==0) -- return 0; -- -- if (fseek(pfile_in_zip_read_info->file, -- pfile_in_zip_read_info->offset_local_extrafield + -- pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0) -- return UNZ_ERRNO; -+ if (buf==NULL) -+ return (int)size_to_read; - -- if (fread(buf,(uInt)size_to_read,1,pfile_in_zip_read_info->file)!=1) -- return UNZ_ERRNO; -+ if (len>size_to_read) -+ read_now = (uInt)size_to_read; -+ else -+ read_now = (uInt)len ; -+ -+ if (read_now==0) -+ return 0; - -- return (int)read_now; -+ if (ZSEEK(pfile_in_zip_read_info->z_filefunc, -+ pfile_in_zip_read_info->filestream, -+ pfile_in_zip_read_info->offset_local_extrafield + -+ pfile_in_zip_read_info->pos_local_extrafield, -+ ZLIB_FILEFUNC_SEEK_SET)!=0) -+ return UNZ_ERRNO; -+ -+ if (ZREAD(pfile_in_zip_read_info->z_filefunc, -+ pfile_in_zip_read_info->filestream, -+ buf,read_now)!=read_now) -+ return UNZ_ERRNO; -+ -+ return (int)read_now; - } - - /* -@@ -1221,39 +1487,40 @@ - Return UNZ_CRCERROR if all the file was read but the CRC is not good - */ - extern int ZEXPORT unzCloseCurrentFile (file) -- unzFile file; -+ unzFile file; - { -- int err=UNZ_OK; -+ int err=UNZ_OK; - -- unz_s* s; -- file_in_zip_read_info_s* pfile_in_zip_read_info; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -+ unz_s* s; -+ file_in_zip_read_info_s* pfile_in_zip_read_info; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; - pfile_in_zip_read_info=s->pfile_in_zip_read; - -- if (pfile_in_zip_read_info==NULL) -- return UNZ_PARAMERROR; -+ if (pfile_in_zip_read_info==NULL) -+ return UNZ_PARAMERROR; - - -- if (pfile_in_zip_read_info->rest_read_uncompressed == 0) -- { -- if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait) -- err=UNZ_CRCERROR; -- } -+ if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) && -+ (!pfile_in_zip_read_info->raw)) -+ { -+ if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait) -+ err=UNZ_CRCERROR; -+ } - - -- TRYFREE(pfile_in_zip_read_info->read_buffer); -- pfile_in_zip_read_info->read_buffer = NULL; -- if (pfile_in_zip_read_info->stream_initialised) -- inflateEnd(&pfile_in_zip_read_info->stream); -+ TRYFREE(pfile_in_zip_read_info->read_buffer); -+ pfile_in_zip_read_info->read_buffer = NULL; -+ if (pfile_in_zip_read_info->stream_initialised) -+ inflateEnd(&pfile_in_zip_read_info->stream); - -- pfile_in_zip_read_info->stream_initialised = 0; -- TRYFREE(pfile_in_zip_read_info); -+ pfile_in_zip_read_info->stream_initialised = 0; -+ TRYFREE(pfile_in_zip_read_info); - - s->pfile_in_zip_read=NULL; - -- return err; -+ return err; - } - - -@@ -1263,32 +1530,69 @@ - return the number of byte copied or an error code <0 - */ - extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf) -- unzFile file; -- char *szComment; -- uLong uSizeBuf; --{ -- int err=UNZ_OK; -- unz_s* s; -- uLong uReadThis ; -- if (file==NULL) -- return UNZ_PARAMERROR; -- s=(unz_s*)file; -- -- uReadThis = uSizeBuf; -- if (uReadThis>s->gi.size_comment) -- uReadThis = s->gi.size_comment; -+ unzFile file; -+ char *szComment; -+ uLong uSizeBuf; -+{ -+ int err=UNZ_OK; -+ unz_s* s; -+ uLong uReadThis ; -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; - -- if (fseek(s->file,s->central_pos+22,SEEK_SET)!=0) -- return UNZ_ERRNO; -+ uReadThis = uSizeBuf; -+ if (uReadThis>s->gi.size_comment) -+ uReadThis = s->gi.size_comment; - -- if (uReadThis>0) -+ if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0) -+ return UNZ_ERRNO; -+ -+ if (uReadThis>0) - { - *szComment='\0'; -- if (fread(szComment,(uInt)uReadThis,1,s->file)!=1) -- return UNZ_ERRNO; -+ if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis) -+ return UNZ_ERRNO; - } - -- if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment)) -- *(szComment+s->gi.size_comment)='\0'; -- return (int)uReadThis; -+ if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment)) -+ *(szComment+s->gi.size_comment)='\0'; -+ return (int)uReadThis; -+} -+ -+/* Additions by RX '2004 */ -+extern uLong ZEXPORT unzGetOffset (file) -+ unzFile file; -+{ -+ unz_s* s; -+ -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ if (!s->current_file_ok) -+ return 0; -+ if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff) -+ if (s->num_file==s->gi.number_entry) -+ return 0; -+ return s->pos_in_central_dir; -+} -+ -+extern int ZEXPORT unzSetOffset (file, pos) -+ unzFile file; -+ uLong pos; -+{ -+ unz_s* s; -+ int err; -+ -+ if (file==NULL) -+ return UNZ_PARAMERROR; -+ s=(unz_s*)file; -+ -+ s->pos_in_central_dir = pos; -+ s->num_file = s->gi.number_entry; /* hack */ -+ err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info, -+ &s->cur_file_info_internal, -+ NULL,0,NULL,0,NULL,0); -+ s->current_file_ok = (err == UNZ_OK); -+ return err; - } ---- misc/zlib-1.1.4/contrib/minizip/unzip.h 1998-03-19 00:15:00.000000000 +0100 -+++ misc/build/zlib-1.1.4/contrib/minizip/unzip.h 2009-07-17 10:15:15.609375000 +0200 -@@ -1,15 +1,16 @@ --/* unzip.h -- IO for uncompress .zip files using zlib -- Version 0.15 beta, Mar 19th, 1998, -+/* unzip.h -- IO for uncompress .zip files using zlib -+ Version 1.01e, February 12th, 2005 - -- Copyright (C) 1998 Gilles Vollant -+ Copyright (C) 1998-2005 Gilles Vollant - - This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g - WinZip, InfoZip tools and compatible. -- Encryption and multi volume ZipFile (span) are not supported. -+ -+ Multi volume ZipFile (span) are not supported. -+ Encryption compatible with pkzip 2.04g only supported - Old compressions used by old PKZip 1.x are not supported - -- THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE -- CAN CHANGE IN FUTURE VERSION !! -+ - I WAIT FEEDBACK at mail info@winimage.com - Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution - -@@ -33,10 +34,13 @@ - - - */ --/* for more info about .ZIP format, see -- ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip -+ -+/* for more info about .ZIP format, see -+ http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip -+ http://www.info-zip.org/pub/infozip/doc/ - PkWare has also a specification at : -- ftp://ftp.pkware.com/probdesc.zip */ -+ ftp://ftp.pkware.com/probdesc.zip -+*/ - - #ifndef _unz_H - #define _unz_H -@@ -46,46 +50,50 @@ - #endif - - #ifndef _ZLIB_H --#include "zlib.h" -+#include "zlib/zlib.h" -+#endif -+ -+#ifndef _ZLIBIOAPI_H -+#include "ioapi.h" - #endif - - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted - from (void*) without cast */ --typedef struct TagunzFile__ { int unused; } unzFile__; -+typedef struct TagunzFile__ { int unused; } unzFile__; - typedef unzFile__ *unzFile; - #else - typedef voidp unzFile; - #endif - - --#define UNZ_OK (0) --#define UNZ_END_OF_LIST_OF_FILE (-100) --#define UNZ_ERRNO (Z_ERRNO) --#define UNZ_EOF (0) -+#define UNZ_OK (0) -+#define UNZ_END_OF_LIST_OF_FILE (-100) -+#define UNZ_ERRNO (Z_ERRNO) -+#define UNZ_EOF (0) - #define UNZ_PARAMERROR (-102) - #define UNZ_BADZIPFILE (-103) - #define UNZ_INTERNALERROR (-104) - #define UNZ_CRCERROR (-105) - - /* tm_unz contain date/time info */ --typedef struct tm_unz_s -+typedef struct tm_unz_s - { -- uInt tm_sec; /* seconds after the minute - [0,59] */ -- uInt tm_min; /* minutes after the hour - [0,59] */ -- uInt tm_hour; /* hours since midnight - [0,23] */ -- uInt tm_mday; /* day of the month - [1,31] */ -- uInt tm_mon; /* months since January - [0,11] */ -- uInt tm_year; /* years - [1980..2044] */ -+ uInt tm_sec; /* seconds after the minute - [0,59] */ -+ uInt tm_min; /* minutes after the hour - [0,59] */ -+ uInt tm_hour; /* hours since midnight - [0,23] */ -+ uInt tm_mday; /* day of the month - [1,31] */ -+ uInt tm_mon; /* months since January - [0,11] */ -+ uInt tm_year; /* years - [1980..2044] */ - } tm_unz; - - /* unz_global_info structure contain global data about the ZIPfile - These data comes from the end of central dir */ - typedef struct unz_global_info_s - { -- uLong number_entry; /* total number of entries in -- the central dir on this disk */ -- uLong size_comment; /* size of the global comment of the zipfile */ -+ uLong number_entry; /* total number of entries in -+ the central dir on this disk */ -+ uLong size_comment; /* size of the global comment of the zipfile */ - } unz_global_info; - - -@@ -98,8 +106,8 @@ - uLong compression_method; /* compression method 2 bytes */ - uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ - uLong crc; /* crc-32 4 bytes */ -- uLong compressed_size; /* compressed size 4 bytes */ -- uLong uncompressed_size; /* uncompressed size 4 bytes */ -+ uLong compressed_size; /* compressed size 4 bytes */ -+ uLong uncompressed_size; /* uncompressed size 4 bytes */ - uLong size_filename; /* filename length 2 bytes */ - uLong size_file_extra; /* extra field length 2 bytes */ - uLong size_file_comment; /* file comment length 2 bytes */ -@@ -112,27 +120,34 @@ - } unz_file_info; - - extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, -- const char* fileName2, -- int iCaseSensitivity)); -+ const char* fileName2, -+ int iCaseSensitivity)); - /* - Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi -- or strcasecmp) -+ or strcasecmp) - If iCaseSenisivity = 0, case sensitivity is defaut of your operating system -- (like 1 on Unix, 2 on Windows) -+ (like 1 on Unix, 2 on Windows) - */ - - - extern unzFile ZEXPORT unzOpen OF((const char *path)); - /* - Open a Zip file. path contain the full pathname (by example, -- on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer -- "zlib/zlib111.zip". -- If the zipfile cannot be opened (file don't exist or in not valid), the -- return value is NULL. -+ on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer -+ "zlib/zlib113.zip". -+ If the zipfile cannot be opened (file don't exist or in not valid), the -+ return value is NULL. - Else, the return value is a unzFile Handle, usable with other function -- of this unzip package. -+ of this unzip package. -+*/ -+ -+extern unzFile ZEXPORT unzOpen2 OF((const char *path, -+ zlib_filefunc_def* pzlib_filefunc_def)); -+/* -+ Open a Zip file, like unzOpen, but provide a set of file low level API -+ for read/write the zip file (see ioapi.h) - */ - - extern int ZEXPORT unzClose OF((unzFile file)); -@@ -143,7 +158,7 @@ - return UNZ_OK if there is no problem. */ - - extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, -- unz_global_info *pglobal_info)); -+ unz_global_info *pglobal_info)); - /* - Write info about the ZipFile in the *pglobal_info structure. - No preparation of the structure is needed -@@ -151,8 +166,8 @@ - - - extern int ZEXPORT unzGetGlobalComment OF((unzFile file, -- char *szComment, -- uLong uSizeBuf)); -+ char *szComment, -+ uLong uSizeBuf)); - /* - Get the global comment string of the ZipFile, in the szComment buffer. - uSizeBuf is the size of the szComment buffer. -@@ -176,9 +191,9 @@ - return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. - */ - --extern int ZEXPORT unzLocateFile OF((unzFile file, -- const char *szFileName, -- int iCaseSensitivity)); -+extern int ZEXPORT unzLocateFile OF((unzFile file, -+ const char *szFileName, -+ int iCaseSensitivity)); - /* - Try locate the file szFileName in the zipfile. - For the iCaseSensitivity signification, see unzStringFileNameCompare -@@ -189,25 +204,44 @@ - */ - - -+/* ****************************************** */ -+/* Ryan supplied functions */ -+/* unz_file_info contain information about a file in the zipfile */ -+typedef struct unz_file_pos_s -+{ -+ uLong pos_in_zip_directory; /* offset in zip file directory */ -+ uLong num_of_file; /* # of file */ -+} unz_file_pos; -+ -+extern int ZEXPORT unzGetFilePos( -+ unzFile file, -+ unz_file_pos* file_pos); -+ -+extern int ZEXPORT unzGoToFilePos( -+ unzFile file, -+ unz_file_pos* file_pos); -+ -+/* ****************************************** */ -+ - extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, -- unz_file_info *pfile_info, -- char *szFileName, -- uLong fileNameBufferSize, -- void *extraField, -- uLong extraFieldBufferSize, -- char *szComment, -- uLong commentBufferSize)); -+ unz_file_info *pfile_info, -+ char *szFileName, -+ uLong fileNameBufferSize, -+ void *extraField, -+ uLong extraFieldBufferSize, -+ char *szComment, -+ uLong commentBufferSize)); - /* - Get Info about the current file - if pfile_info!=NULL, the *pfile_info structure will contain somes info about -- the current file -+ the current file - if szFileName!=NULL, the filemane string will be copied in szFileName -- (fileNameBufferSize is the size of the buffer) -+ (fileNameBufferSize is the size of the buffer) - if extraField!=NULL, the extra field information will be copied in extraField -- (extraFieldBufferSize is the size of the buffer). -- This is the Central-header version of the extra field -+ (extraFieldBufferSize is the size of the buffer). -+ This is the Central-header version of the extra field - if szComment!=NULL, the comment string of the file will be copied in szComment -- (commentBufferSize is the size of the buffer) -+ (commentBufferSize is the size of the buffer) - */ - - /***************************************************************************/ -@@ -221,16 +255,51 @@ - If there is no error, the return value is UNZ_OK. - */ - -+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file, -+ const char* password)); -+/* -+ Open for reading data the current file in the zipfile. -+ password is a crypting password -+ If there is no error, the return value is UNZ_OK. -+*/ -+ -+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file, -+ int* method, -+ int* level, -+ int raw)); -+/* -+ Same than unzOpenCurrentFile, but open for read raw the file (not uncompress) -+ if raw==1 -+ *method will receive method of compression, *level will receive level of -+ compression -+ note : you can set level parameter as NULL (if you did not want known level, -+ but you CANNOT set method parameter as NULL -+*/ -+ -+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file, -+ int* method, -+ int* level, -+ int raw, -+ const char* password)); -+/* -+ Same than unzOpenCurrentFile, but open for read raw the file (not uncompress) -+ if raw==1 -+ *method will receive method of compression, *level will receive level of -+ compression -+ note : you can set level parameter as NULL (if you did not want known level, -+ but you CANNOT set method parameter as NULL -+*/ -+ -+ - extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); - /* - Close the file in zip opened with unzOpenCurrentFile - Return UNZ_CRCERROR if all the file was read but the CRC is not good - */ - -- --extern int ZEXPORT unzReadCurrentFile OF((unzFile file, -- voidp buf, -- unsigned len)); -+extern int ZEXPORT unzReadCurrentFile OF((unzFile file, -+ voidp buf, -+ unsigned len)); - /* - Read bytes from the current file (opened by unzOpenCurrentFile) - buf contain buffer where data must be copied -@@ -249,12 +318,12 @@ - - extern int ZEXPORT unzeof OF((unzFile file)); - /* -- return 1 if the end of file was reached, 0 elsewhere -+ return 1 if the end of file was reached, 0 elsewhere - */ - - extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, -- voidp buf, -- unsigned len)); -+ voidp buf, -+ unsigned len)); - /* - Read extra field from the current file (opened by unzOpenCurrentFile) - This is the local-header version of the extra field (sometimes, there is -@@ -263,11 +332,21 @@ - if buf==NULL, it return the size of the local extra field - - if buf!=NULL, len is the size of the buffer, the extra header is copied in -- buf. -- the return value is the number of bytes copied in buf, or (if <0) -- the error code -+ buf. -+ the return value is the number of bytes copied in buf, or (if <0) -+ the error code - */ - -+/***************************************************************************/ -+ -+/* Get the current file offset */ -+extern uLong ZEXPORT unzGetOffset (unzFile file); -+ -+/* Set the current file offset */ -+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); -+ -+ -+ - #ifdef __cplusplus - } - #endif ---- misc/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 11:13:37.281250000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 10:58:41.843750000 +0200 -@@ -0,0 +1,132 @@ -+/* info_zip_crypt.h -- base code for crypt/uncrypt ZIPfile -+ -+ -+ Version 1.01e, February 12th, 2005 -+ -+ Copyright (C) 1998-2005 Gilles Vollant -+ -+ This code is a modified version of crypting code in Infozip distribution -+ -+ The encryption/decryption parts of this source code (as opposed to the -+ non-echoing password parts) were originally written in Europe. The -+ whole source package can be freely distributed, including from the USA. -+ (Prior to January 2000, re-export from the US was a violation of US law.) -+ -+ This encryption code is a direct transcription of the algorithm from -+ Roger Schlafly, described by Phil Katz in the file appnote.txt. This -+ file (appnote.txt) is distributed with the PKZIP program (even in the -+ version without encryption capabilities). -+ -+ If you don't need crypting in your application, just define symbols -+ NOCRYPT and NOUNCRYPT. -+ -+ This code support the "Traditional PKWARE Encryption". -+ -+ The new AES encryption added on Zip format by Winzip (see the page -+ http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong -+ Encryption is not supported. -+*/ -+ -+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) -+ -+/*********************************************************************** -+ * Return the next byte in the pseudo-random sequence -+ */ -+static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) -+{ -+ unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an -+ * unpredictable manner on 16-bit systems; not a problem -+ * with any known compiler so far, though */ -+ -+ temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; -+ return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); -+} -+ -+/*********************************************************************** -+ * Update the encryption keys with the next byte of plain text -+ */ -+static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) -+{ -+ (*(pkeys+0)) = CRC32((*(pkeys+0)), c); -+ (*(pkeys+1)) += (*(pkeys+0)) & 0xff; -+ (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; -+ { -+ register int keyshift = (int)((*(pkeys+1)) >> 24); -+ (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); -+ } -+ return c; -+} -+ -+ -+/*********************************************************************** -+ * Initialize the encryption keys and the random header according to -+ * the given password. -+ */ -+static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) -+{ -+ *(pkeys+0) = 305419896L; -+ *(pkeys+1) = 591751049L; -+ *(pkeys+2) = 878082192L; -+ while (*passwd != '\0') { -+ update_keys(pkeys,pcrc_32_tab,(int)*passwd); -+ passwd++; -+ } -+} -+ -+#define zdecode(pkeys,pcrc_32_tab,c) \ -+ (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab))) -+ -+#define zencode(pkeys,pcrc_32_tab,c,t) \ -+ (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c)) -+ -+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED -+ -+#define RAND_HEAD_LEN 12 -+ /* "last resort" source for second part of crypt seed pattern */ -+# ifndef ZCR_SEED2 -+# define ZCR_SEED2 3141592654UL /* use PI as default pattern */ -+# endif -+ -+static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) -+ const char *passwd; /* password string */ -+ unsigned char *buf; /* where to write header */ -+ int bufSize; -+ unsigned long* pkeys; -+ const unsigned long* pcrc_32_tab; -+ unsigned long crcForCrypting; -+{ -+ int n; /* index in random header */ -+ int t; /* temporary */ -+ int c; /* random byte */ -+ unsigned char header[RAND_HEAD_LEN-2]; /* random header */ -+ static unsigned calls = 0; /* ensure different random header each time */ -+ -+ if (bufSize> 7) & 0xff; -+ header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t); -+ } -+ /* Encrypt random header (last two bytes is high word of crc) */ -+ init_keys(passwd, pkeys, pcrc_32_tab); -+ for (n = 0; n < RAND_HEAD_LEN-2; n++) -+ { -+ buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); -+ } -+ buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); -+ buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); -+ return n; -+} -+ -+#endif ---- misc/zlib-1.1.4/contrib/minizip/ioapi.c 2009-07-17 11:13:18.593750000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/ioapi.c 2009-07-17 10:58:56.718750000 +0200 -@@ -0,0 +1,177 @@ -+/* ioapi.c -- IO base function header for compress/uncompress .zip -+ files using zlib + zip or unzip API -+ -+ Version 1.01e, February 12th, 2005 -+ -+ Copyright (C) 1998-2005 Gilles Vollant -+*/ -+ -+#include -+#include -+#include -+ -+#include "zlib.h" -+#include "ioapi.h" -+ -+ -+ -+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */ -+ -+#ifndef SEEK_CUR -+#define SEEK_CUR 1 -+#endif -+ -+#ifndef SEEK_END -+#define SEEK_END 2 -+#endif -+ -+#ifndef SEEK_SET -+#define SEEK_SET 0 -+#endif -+ -+voidpf ZCALLBACK fopen_file_func OF(( -+ voidpf opaque, -+ const char* filename, -+ int mode)); -+ -+uLong ZCALLBACK fread_file_func OF(( -+ voidpf opaque, -+ voidpf stream, -+ void* buf, -+ uLong size)); -+ -+uLong ZCALLBACK fwrite_file_func OF(( -+ voidpf opaque, -+ voidpf stream, -+ const void* buf, -+ uLong size)); -+ -+long ZCALLBACK ftell_file_func OF(( -+ voidpf opaque, -+ voidpf stream)); -+ -+long ZCALLBACK fseek_file_func OF(( -+ voidpf opaque, -+ voidpf stream, -+ uLong offset, -+ int origin)); -+ -+int ZCALLBACK fclose_file_func OF(( -+ voidpf opaque, -+ voidpf stream)); -+ -+int ZCALLBACK ferror_file_func OF(( -+ voidpf opaque, -+ voidpf stream)); -+ -+ -+voidpf ZCALLBACK fopen_file_func (opaque, filename, mode) -+ voidpf opaque; -+ const char* filename; -+ int mode; -+{ -+ FILE* file = NULL; -+ const char* mode_fopen = NULL; -+ if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) -+ mode_fopen = "rb"; -+ else -+ if (mode & ZLIB_FILEFUNC_MODE_EXISTING) -+ mode_fopen = "r+b"; -+ else -+ if (mode & ZLIB_FILEFUNC_MODE_CREATE) -+ mode_fopen = "wb"; -+ -+ if ((filename!=NULL) && (mode_fopen != NULL)) -+ file = fopen(filename, mode_fopen); -+ return file; -+} -+ -+ -+uLong ZCALLBACK fread_file_func (opaque, stream, buf, size) -+ voidpf opaque; -+ voidpf stream; -+ void* buf; -+ uLong size; -+{ -+ uLong ret; -+ ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); -+ return ret; -+} -+ -+ -+uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size) -+ voidpf opaque; -+ voidpf stream; -+ const void* buf; -+ uLong size; -+{ -+ uLong ret; -+ ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); -+ return ret; -+} -+ -+long ZCALLBACK ftell_file_func (opaque, stream) -+ voidpf opaque; -+ voidpf stream; -+{ -+ long ret; -+ ret = ftell((FILE *)stream); -+ return ret; -+} -+ -+long ZCALLBACK fseek_file_func (opaque, stream, offset, origin) -+ voidpf opaque; -+ voidpf stream; -+ uLong offset; -+ int origin; -+{ -+ int fseek_origin=0; -+ long ret; -+ switch (origin) -+ { -+ case ZLIB_FILEFUNC_SEEK_CUR : -+ fseek_origin = SEEK_CUR; -+ break; -+ case ZLIB_FILEFUNC_SEEK_END : -+ fseek_origin = SEEK_END; -+ break; -+ case ZLIB_FILEFUNC_SEEK_SET : -+ fseek_origin = SEEK_SET; -+ break; -+ default: return -1; -+ } -+ ret = 0; -+ fseek((FILE *)stream, offset, fseek_origin); -+ return ret; -+} -+ -+int ZCALLBACK fclose_file_func (opaque, stream) -+ voidpf opaque; -+ voidpf stream; -+{ -+ int ret; -+ ret = fclose((FILE *)stream); -+ return ret; -+} -+ -+int ZCALLBACK ferror_file_func (opaque, stream) -+ voidpf opaque; -+ voidpf stream; -+{ -+ int ret; -+ ret = ferror((FILE *)stream); -+ return ret; -+} -+ -+void fill_fopen_filefunc (pzlib_filefunc_def) -+ zlib_filefunc_def* pzlib_filefunc_def; -+{ -+ pzlib_filefunc_def->zopen_file = fopen_file_func; -+ pzlib_filefunc_def->zread_file = fread_file_func; -+ pzlib_filefunc_def->zwrite_file = fwrite_file_func; -+ pzlib_filefunc_def->ztell_file = ftell_file_func; -+ pzlib_filefunc_def->zseek_file = fseek_file_func; -+ pzlib_filefunc_def->zclose_file = fclose_file_func; -+ pzlib_filefunc_def->zerror_file = ferror_file_func; -+ pzlib_filefunc_def->opaque = NULL; -+} ---- misc/zlib-1.1.4/contrib/minizip/ioapi.h 2009-07-17 11:13:30.109375000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/ioapi.h 2009-07-17 10:59:06.375000000 +0200 -@@ -0,0 +1,75 @@ -+/* ioapi.h -- IO base function header for compress/uncompress .zip -+ files using zlib + zip or unzip API -+ -+ Version 1.01e, February 12th, 2005 -+ -+ Copyright (C) 1998-2005 Gilles Vollant -+*/ -+ -+#ifndef _ZLIBIOAPI_H -+#define _ZLIBIOAPI_H -+ -+ -+#define ZLIB_FILEFUNC_SEEK_CUR (1) -+#define ZLIB_FILEFUNC_SEEK_END (2) -+#define ZLIB_FILEFUNC_SEEK_SET (0) -+ -+#define ZLIB_FILEFUNC_MODE_READ (1) -+#define ZLIB_FILEFUNC_MODE_WRITE (2) -+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) -+ -+#define ZLIB_FILEFUNC_MODE_EXISTING (4) -+#define ZLIB_FILEFUNC_MODE_CREATE (8) -+ -+ -+#ifndef ZCALLBACK -+ -+#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) -+#define ZCALLBACK CALLBACK -+#else -+#define ZCALLBACK -+#endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); -+typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); -+typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); -+typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); -+typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); -+typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); -+typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); -+ -+typedef struct zlib_filefunc_def_s -+{ -+ open_file_func zopen_file; -+ read_file_func zread_file; -+ write_file_func zwrite_file; -+ tell_file_func ztell_file; -+ seek_file_func zseek_file; -+ close_file_func zclose_file; -+ testerror_file_func zerror_file; -+ voidpf opaque; -+} zlib_filefunc_def; -+ -+ -+ -+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); -+ -+#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size)) -+#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size)) -+#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream)) -+#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode)) -+#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream)) -+#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream)) -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -+ -- cgit -- cgit From 2a5ea30d1f2566d684ce4542c616ff8b7e96fc60 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 16 Sep 2010 21:18:22 +0300 Subject: Update .gitignore for Windows builds --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 .gitignore diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index def767e59215..bcb73e55aa01 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ # the build directories /*/unxlng?? /*/unxlng??.pro +/*/wntmsci?? +/*/wntmsci??.pro -# autoconf generated stuff -/ChangeLog -/configure +/moz/zipped/*.zip -- cgit -- cgit From 52ca037af1c56b34bbe016f230303bb6264c2bd5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 29 Sep 2010 15:10:51 +0300 Subject: Remove leftover unneeded and buggy debugging printout From seamonkey-source-1.1.14.patch.diff. See http://qa.openoffice.org/issues/show_bug.cgi?id=84961 . --- moz/seamonkey-source-1.1.14.patch | 8 -------- 1 file changed, 8 deletions(-) diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch index 3aabbe1a5f44..566a0445e313 100644 --- a/moz/seamonkey-source-1.1.14.patch +++ b/moz/seamonkey-source-1.1.14.patch @@ -195,14 +195,6 @@ mv $(_MDDEPFILE) $(_MDDEPFILE).old && \ cat $(_MDDEPFILE).old | sed -e "s|^$( $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \ fi -@@ -1325,6 +1352,7 @@ - - $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done - $(REPORT_BUILD) -+ echo "PATH=" $(PATH) - $(ELOG) $(XPIDL_COMPILE) -m header -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS) - @if test -n "$(findstring $*.h, $(EXPORTS) $(SDK_HEADERS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi @@ -1696,14 +1724,14 @@ define MAKE_DEPS_NOAUTO set -e ; \ -- cgit From fb348bddc0a97985b0b72de703ee5271514f0348 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 30 Sep 2010 11:55:19 +0100 Subject: #i114323# fix broken makefile, won't build under >= f14 otherwise --- moz/makefile.mk | 3 ++- moz/patches/brokenmakefile.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 moz/patches/brokenmakefile.patch diff --git a/moz/makefile.mk b/moz/makefile.mk index 9629f7138b74..feb2c50343ee 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -86,7 +86,8 @@ PATCH_FILES = \ patches/dtoa.patch \ patches/respect_disable_pango.patch \ patches/arm_build_fix.patch \ - patches/link_fontconfig.patch + patches/link_fontconfig.patch \ + patches/brokenmakefile.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/brokenmakefile.patch b/moz/patches/brokenmakefile.patch new file mode 100644 index 000000000000..20d88014b932 --- /dev/null +++ b/moz/patches/brokenmakefile.patch @@ -0,0 +1,13 @@ +--- misc/mozilla/mailnews/extensions/smime/build/Makefile.in 2010-09-04 16:00:38.000000000 +0100 ++++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in 2010-09-04 16:02:24.000000000 +0100 +@@ -79,10 +79,6 @@ + $(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \ + $(NULL) + +-ifndef MOZ_STATIC_MAIL_BUILD +-SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) +-endif +- + EXTRA_DSO_LDOPTS = \ + $(LIBS_DIR) \ + $(EXTRA_DSO_LIBS) \ -- cgit From 536726c8a319e953c6b8d30b91c9953b1391fa5a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 30 Sep 2010 13:55:40 +0300 Subject: Deliver also the unordered/* headers --- boost/makefile.mk | 1 + boost/prj/d.lst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/boost/makefile.mk b/boost/makefile.mk index 7e1ce34e43ea..51d79855f4c6 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -98,6 +98,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/unordered $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/utility $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/variant $(INCCOM)$/$(PRJNAME) @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) diff --git a/boost/prj/d.lst b/boost/prj/d.lst index 6d7103928977..fe6d011ce0ea 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -160,6 +160,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\tuple mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail mkdir: %_DEST%\inc%_EXT%\boost\type_traits mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail +mkdir: %_DEST%\inc%_EXT%\boost\unordered mkdir: %_DEST%\inc%_EXT%\boost\utility mkdir: %_DEST%\inc%_EXT%\boost\utility\detail mkdir: %_DEST%\inc%_EXT%\boost\variant @@ -326,6 +327,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail ..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits ..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail +..\%__SRC%\inc\boost\unordered\* %_DEST%\inc%_EXT%\boost\unordered ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant -- cgit From f7cefa123e655c73ddd656658fcca421b641b280 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 30 Sep 2010 13:44:59 +0200 Subject: Don't build pixman/test to prevent build failure when wrong cairo is linked --- cairo/pixman-0.12.0.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch index 4aa06811fbfc..c3d21459828d 100644 --- a/cairo/pixman-0.12.0.patch +++ b/cairo/pixman-0.12.0.patch @@ -23,3 +23,14 @@ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } if test "${ac_cv_c_bigendian+set}" = set; then +--- misc/pixman-0.12.0/Makefile.in 2008-09-17 19:14:38.000000000 +0200 ++++ misc/build/pixman-0.12.0/Makefile.in 2010-09-28 14:27:47.000000000 +0200 +@@ -203,7 +203,7 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = pixman test ++SUBDIRS = pixman + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = pixman-1.pc + GPGKEY = 6FF7C1A8 -- cgit From 1b5c8615c8634024e8312b3ad38f8996bb6094c4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 30 Sep 2010 15:40:14 +0300 Subject: Intensify boost delivery --- boost/makefile.mk | 7 +++++++ boost/prj/d.lst | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/boost/makefile.mk b/boost/makefile.mk index 51d79855f4c6..bf3da7a6234d 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -79,12 +79,18 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME) @@ -96,6 +102,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/thread $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/unordered $(INCCOM)$/$(PRJNAME) diff --git a/boost/prj/d.lst b/boost/prj/d.lst index fe6d011ce0ea..f25224b7645f 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -1,20 +1,34 @@ mkdir: %_DEST%\inc%_EXT%\boost +mkdir: %_DEST%\inc%_EXT%\boost\algorithm +mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string +mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\detail +mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\std +mkdir: %_DEST%\inc%_EXT%\boost\assign +mkdir: %_DEST%\inc%_EXT%\boost\assign\std mkdir: %_DEST%\inc%_EXT%\boost\bind mkdir: %_DEST%\inc%_EXT%\boost\concept mkdir: %_DEST%\inc%_EXT%\boost\concept\detail mkdir: %_DEST%\inc%_EXT%\boost\config +mkdir: %_DEST%\inc%_EXT%\boost\config\abi mkdir: %_DEST%\inc%_EXT%\boost\config\compiler mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1 mkdir: %_DEST%\inc%_EXT%\boost\config\platform mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib +mkdir: %_DEST%\inc%_EXT%\boost\date_time +mkdir: %_DEST%\inc%_EXT%\boost\date_time\gregorian +mkdir: %_DEST%\inc%_EXT%\boost\date_time\local_time +mkdir: %_DEST%\inc%_EXT%\boost\date_time\posix_time mkdir: %_DEST%\inc%_EXT%\boost\detail mkdir: %_DEST%\inc%_EXT%\boost\function mkdir: %_DEST%\inc%_EXT%\boost\function\detail +mkdir: %_DEST%\inc%_EXT%\boost\functional +mkdir: %_DEST%\inc%_EXT%\boost\functional\hash\detail +mkdir: %_DEST%\inc%_EXT%\boost\io +mkdir: %_DEST%\inc%_EXT%\boost\integer mkdir: %_DEST%\inc%_EXT%\boost\iterator mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail mkdir: %_DEST%\inc%_EXT%\boost\exception mkdir: %_DEST%\inc%_EXT%\boost\exception\detail -mkdir: %_DEST%\inc%_EXT%\boost\function mkdir: %_DEST%\inc%_EXT%\boost\mpl mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_ mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config @@ -156,28 +170,49 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail +mkdir: %_DEST%\inc%_EXT%\boost\thread +mkdir: %_DEST%\inc%_EXT%\boost\thread\detail +mkdir: %_DEST%\inc%_EXT%\boost\thread\pthread +mkdir: %_DEST%\inc%_EXT%\boost\thread\win32 mkdir: %_DEST%\inc%_EXT%\boost\tuple mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail mkdir: %_DEST%\inc%_EXT%\boost\type_traits mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail mkdir: %_DEST%\inc%_EXT%\boost\unordered +mkdir: %_DEST%\inc%_EXT%\boost\unordered\detail mkdir: %_DEST%\inc%_EXT%\boost\utility mkdir: %_DEST%\inc%_EXT%\boost\utility\detail mkdir: %_DEST%\inc%_EXT%\boost\variant mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost +..\%__SRC%\inc\boost\algorithm\* %_DEST%\inc%_EXT%\boost\algorithm +..\%__SRC%\inc\boost\algorithm\string\* %_DEST%\inc%_EXT%\boost\algorithm\string +..\%__SRC%\inc\boost\algorithm\string\detail\* %_DEST%\inc%_EXT%\boost\algorithm\string\detail +..\%__SRC%\inc\boost\algorithm\string\std\* %_DEST%\inc%_EXT%\boost\algorithm\string\std +..\%__SRC%\inc\boost\assign\* %_DEST%\inc%_EXT%\boost\assign +..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc%_EXT%\boost\assign\std ..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind ..\%__SRC%\inc\boost\concept\* %_DEST%\inc%_EXT%\boost\concept ..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc%_EXT%\boost\concept\detail ..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config +..\%__SRC%\inc\boost\config\abi\* %_DEST%\inc%_EXT%\boost\config\abi ..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler ..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1 ..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform ..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib +..\%__SRC%\inc\boost\date_time\* %_DEST%\inc%_EXT%\boost\date_time +..\%__SRC%\inc\boost\date_time\gregorian\* %_DEST%\inc%_EXT%\boost\date_time\gregorian +..\%__SRC%\inc\boost\date_time\local_time\* %_DEST%\inc%_EXT%\boost\date_time\local_time +..\%__SRC%\inc\boost\date_time\posix_time\* %_DEST%\inc%_EXT%\boost\date_time\posix_time ..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail ..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function ..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail +..\%__SRC%\inc\boost\functional\* %_DEST%\inc%_EXT%\boost\functional +..\%__SRC%\inc\boost\functional\hash\* %_DEST%\inc%_EXT%\boost\functional\hash +..\%__SRC%\inc\boost\functional\hash\detail\* %_DEST%\inc%_EXT%\boost\functional\hash\detail +..\%__SRC%\inc\boost\io\* %_DEST%\inc%_EXT%\boost\io +..\%__SRC%\inc\boost\integer\* %_DEST%\inc%_EXT%\boost\integer ..\%__SRC%\inc\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator ..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail ..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception @@ -323,11 +358,16 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset ..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr ..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail +..\%__SRC%\inc\boost\thread\* %_DEST%\inc%_EXT%\boost\thread +..\%__SRC%\inc\boost\thread\detail\* %_DEST%\inc%_EXT%\boost\thread\detail +..\%__SRC%\inc\boost\thread\pthread\* %_DEST%\inc%_EXT%\boost\thread\pthread +..\%__SRC%\inc\boost\thread\win32\* %_DEST%\inc%_EXT%\boost\thread\win32 ..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple ..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail ..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits ..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail ..\%__SRC%\inc\boost\unordered\* %_DEST%\inc%_EXT%\boost\unordered +..\%__SRC%\inc\boost\unordered\detail\* %_DEST%\inc%_EXT%\boost\unordered\detail ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant -- cgit From 8bdbd582db6e032a83dc669d7b9eeb3187998756 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 2 Oct 2010 00:39:37 +0300 Subject: Build the thread-related code on Windows into a library Needed by ixion. --- boost/boost_1_39_0.patch | 24 ++++++++++++++++++++++++ boost/makefile.mk | 11 +++++++---- boost/prj/d.lst | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch index d837246a83bf..db4dba4ddf84 100644 --- a/boost/boost_1_39_0.patch +++ b/boost/boost_1_39_0.patch @@ -285,3 +285,27 @@ index 5d75be2..730cf0c 100644 ).second; } +--- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk ++++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk +@@ -0,0 +1,21 @@ ++PRJ=..$/..$/..$/..$/..$/..$/..$/.. ++ ++PRJNAME=boostthread ++TARGET=boostthread ++LIBTARGET=NO ++ ++.IF "$(GUI)"=="WNT" ++ ++.INCLUDE : settings.mk ++ ++SLOFILES= $(SLO)$/exceptions.obj \ ++ $(SLO)$/thread.obj \ ++ $(SLO)$/tss_dll.obj \ ++ $(SLO)$/tss_pe.obj ++ ++LIB1TARGET=$(SLB)$/$(TARGET).lib ++LIB1ARCHIV=$(LB)$/lib$(TARGET).a ++LIB1OBJFILES=$(SLOFILES) ++ ++.INCLUDE : target.mk ++.ENDIF diff --git a/boost/makefile.mk b/boost/makefile.mk index bf3da7a6234d..ac605a8df54e 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -55,16 +55,13 @@ PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_DIR= CONFIGURE_ACTION= -BUILD_DIR= -BUILD_ACTION= -BUILD_FLAGS= - # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk + # --- post-build --------------------------------------------------- # "normalize" the output structure, in that the C++ headers are @@ -113,4 +110,10 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize + +$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : boostthreadlib + +boostthreadlib : + cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS) + .ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC") diff --git a/boost/prj/d.lst b/boost/prj/d.lst index f25224b7645f..185ac0fd8477 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -372,3 +372,4 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant ..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail +..\%__SRC%\slb\boostthread.lib %_DEST%\lib%_EXT%\boostthread.lib -- cgit From 44cc667e3fabe746448420fbc746e0721c8c2425 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 2 Oct 2010 11:26:32 +0300 Subject: Build the boostthread library only on Windows --- boost/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boost/makefile.mk b/boost/makefile.mk index ac605a8df54e..7ae57305e55d 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -111,9 +111,13 @@ normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize +.IF "$(GUI)"=="WNT" + $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : boostthreadlib boostthreadlib : cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS) +.ENDIF + .ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC") -- cgit From 7f5ec5fb9bd8f7e487b46b81c1dfbd9c7fde9298 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 4 Oct 2010 14:01:10 +0300 Subject: Make createion of new file in boost_1_39_0.patch more reliable --- boost/boost_1_39_0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch index db4dba4ddf84..4f1059ac1c98 100644 --- a/boost/boost_1_39_0.patch +++ b/boost/boost_1_39_0.patch @@ -285,7 +285,7 @@ index 5d75be2..730cf0c 100644 ).second; } ---- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk +--- /dev/null +++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk @@ -0,0 +1,21 @@ +PRJ=..$/..$/..$/..$/..$/..$/..$/.. -- cgit From c4a8c2671db750856976fbc6c39f3859ede26455 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 4 Oct 2010 17:38:24 +0300 Subject: Restore three BUILD_* definitions that apparently are needed --- boost/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boost/makefile.mk b/boost/makefile.mk index 7ae57305e55d..2747a551e4d5 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -55,6 +55,10 @@ PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_DIR= CONFIGURE_ACTION= +BUILD_DIR= +BUILD_ACTION= +BUILD_FLAGS= + # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk -- cgit From 20612b2243dcff16137aee81b389338ba9be2bcb Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 4 Oct 2010 22:04:38 +0200 Subject: Fix boost build Normal libreoffice way to add a file is to put that in makefile.mk into ADDITIONAL_FILES list which creates a file with "dummy" as content and then to patch that file with the real content. This prevents a patching hell if timestamps change and boost is unpacked again --- boost/boost_1_39_0.patch | 5 +++-- boost/makefile.mk | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch index 4f1059ac1c98..46395dda2f83 100644 --- a/boost/boost_1_39_0.patch +++ b/boost/boost_1_39_0.patch @@ -285,9 +285,10 @@ index 5d75be2..730cf0c 100644 ).second; } ---- /dev/null +--- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk +++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk -@@ -0,0 +1,21 @@ +@@ -1,1 +1,21 @@ +-dummy +PRJ=..$/..$/..$/..$/..$/..$/..$/.. + +PRJNAME=boostthread diff --git a/boost/makefile.mk b/boost/makefile.mk index 2747a551e4d5..3d80a8943143 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -52,6 +52,9 @@ TARFILE_NAME=boost_1_39_0 TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7 PATCH_FILES=$(TARFILE_NAME).patch +ADDITIONAL_FILES= \ + libs/thread/src/win32/makefile.mk + CONFIGURE_DIR= CONFIGURE_ACTION= -- cgit From 6ef1ccbc9d527a5de335a66bd2b196f83a7d898f Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 4 Oct 2010 23:27:51 +0200 Subject: Introducing Linux Libertine G and Linux Biolinum G fonts More info: http://ow.ly/2Omoh --- more_fonts/fonts/ttf_linlibertineg/makefile.mk | 60 ++++++++++++++++++++++++++ more_fonts/prj/build.lst | 2 +- more_fonts/prj/d.lst | 3 +- 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 more_fonts/fonts/ttf_linlibertineg/makefile.mk diff --git a/more_fonts/fonts/ttf_linlibertineg/makefile.mk b/more_fonts/fonts/ttf_linlibertineg/makefile.mk new file mode 100644 index 000000000000..911497cd2966 --- /dev/null +++ b/more_fonts/fonts/ttf_linlibertineg/makefile.mk @@ -0,0 +1,60 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=more_fonts +TARGET=ttf_linlibertineg + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=LinLibertineG-20101004.zip +TARFILE_MD5=f20f67d1715c7be81688a2ad58d8291d +TARFILE_ROOTDIR=LinLibertineG + +PATCH_FILES= + + +CONFIGURE_DIR= +CONFIGURE_ACTION= + +BUILD_DIR= +BUILD_ACTION= +BUILD_FLAGS= + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.IF "$(WITH_FONTS)"!="NO" +.INCLUDE : tg_ext.mk +.ENDIF diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst index eb567e7527f5..ffa98aee6181 100644 --- a/more_fonts/prj/build.lst +++ b/more_fonts/prj/build.lst @@ -2,4 +2,4 @@ bs more_fonts : solenv NULL bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs more_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL - +bs more_fonts\fonts\ttf_linlibertineg nmake - all linl_fonts NULL diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 261aae0b2d28..b1a534d8d2e1 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -7,4 +7,5 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium - +..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\LinLibertineG\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_LinLibertineG -- cgit From 5311eb8d47ef194d7b211ab683093f17555b84ae Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 4 Oct 2010 23:37:47 +0200 Subject: typo fix --- more_fonts/fonts/ttf_linlibertineg/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/more_fonts/fonts/ttf_linlibertineg/makefile.mk b/more_fonts/fonts/ttf_linlibertineg/makefile.mk index 911497cd2966..98cf2b4fe204 100644 --- a/more_fonts/fonts/ttf_linlibertineg/makefile.mk +++ b/more_fonts/fonts/ttf_linlibertineg/makefile.mk @@ -36,7 +36,7 @@ TARGET=ttf_linlibertineg # --- Files -------------------------------------------------------- -TARFILE_NAME=LinLibertineG-20101004.zip +TARFILE_NAME=LinLibertineG-20101004 TARFILE_MD5=f20f67d1715c7be81688a2ad58d8291d TARFILE_ROOTDIR=LinLibertineG -- cgit -- cgit From cad37f247cb28791ce2bd3fed0d93f05fd0c5e40 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Wed, 6 Oct 2010 00:36:17 +0200 Subject: Fix broken win32 build in boost Make boostthreadlib depend on PREDELIVER_FLAG_FILE, otherwise the whole include path goodness is not working (i.e. first do the predeliver to wntmsci12/inc, then build thread lib) --- boost/makefile.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/boost/makefile.mk b/boost/makefile.mk index 3d80a8943143..691fdff5fd1b 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -116,13 +116,15 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) +.IF "$(GUI)"!="WNT" + $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize -.IF "$(GUI)"=="WNT" +.ELSE -$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : boostthreadlib +$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : boostthreadlib -boostthreadlib : +boostthreadlib : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS) .ENDIF -- cgit From f17f2e55ad37874904d754fe64350b2549093635 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 5 Oct 2010 13:36:11 +0100 Subject: fix various boost shadow warnings --- boost/boost.4713.warnings.patch | 108 ++++++++++++++++++++++++++++++++++++++++ boost/makefile.mk | 3 ++ 2 files changed, 111 insertions(+) create mode 100644 boost/boost.4713.warnings.patch diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch new file mode 100644 index 000000000000..32554c818a14 --- /dev/null +++ b/boost/boost.4713.warnings.patch @@ -0,0 +1,108 @@ +--- misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp +@@ -126,8 +126,8 @@ + typedef unary > base_t; + typedef unary_parser_category parser_category_t; + +- assertive_parser(ParserT const& parser, ErrorDescrT descriptor) +- : base_t(parser), descriptor(descriptor) {} ++ assertive_parser(ParserT const& parser, ErrorDescrT descriptor_) ++ : base_t(parser), descriptor(descriptor_) {} + + template + struct result +@@ -222,9 +222,9 @@ + + error_status( + result_t result_ = fail, +- std::ptrdiff_t length = -1, ++ std::ptrdiff_t length_ = -1, + T const& value_ = T()) +- : result(result_), length(length), value(value_) {} ++ : result(result_), length(length_), value(value_) {} + + result_t result; + std::ptrdiff_t length; +--- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp +@@ -54,13 +54,13 @@ + typedef typename ScannerT::iterator_t iterator_t; + + iterator_t const s(scan.first); +- functor_result_t result; +- std::ptrdiff_t len = functor(scan, result); ++ functor_result_t functor_result; ++ std::ptrdiff_t len = functor(scan, functor_result); + + if (len < 0) + return scan.no_match(); + else +- return scan.create_match(std::size_t(len), result, s, scan.first); ++ return scan.create_match(std::size_t(len), functor_result, s, scan.first); + } + }; + +--- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp +@@ -47,8 +47,8 @@ + typedef fixed_loop self_t; + typedef unary > base_t; + +- fixed_loop (ParserT const & subject, ExactT const & exact) +- : base_t(subject), m_exact(exact) {} ++ fixed_loop (ParserT const & subject_, ExactT const & exact) ++ : base_t(subject_), m_exact(exact) {} + + template + typename parser_result ::type +@@ -112,8 +112,8 @@ + typedef finite_loop self_t; + typedef unary > base_t; + +- finite_loop (ParserT const & subject, MinT const & min, MaxT const & max) +- : base_t(subject), m_min(min), m_max(max) {} ++ finite_loop (ParserT const & subject_, MinT const & min, MaxT const & max) ++ : base_t(subject_), m_min(min), m_max(max) {} + + template + typename parser_result ::type +@@ -196,11 +196,11 @@ + typedef unary > base_t; + + infinite_loop ( +- ParserT const& subject, ++ ParserT const& subject_, + MinT const& min, + more_t const& + ) +- : base_t(subject), m_min(min) {} ++ : base_t(subject_), m_min(min) {} + + template + typename parser_result ::type +@@ -253,9 +253,9 @@ + + template + fixed_loop +- operator[](parser const & subject) const ++ operator[](parser const & subject_) const + { +- return fixed_loop (subject.derived (), m_exact); ++ return fixed_loop (subject_.derived (), m_exact); + } + + ExactT m_exact; +@@ -283,11 +283,11 @@ + + template + typename impl::loop_traits::type +- operator[](parser const & subject) const ++ operator[](parser const & subject_) const + { + typedef typename impl::loop_traits::type ret_t; + return ret_t( +- subject.derived(), ++ subject_.derived(), + m_min, + m_max); + } diff --git a/boost/makefile.mk b/boost/makefile.mk index 691fdff5fd1b..1f430d7045db 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -52,6 +52,9 @@ TARFILE_NAME=boost_1_39_0 TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7 PATCH_FILES=$(TARFILE_NAME).patch +#https://svn.boost.org/trac/boost/ticket/4713 +PATCH_FILES+=boost.4713.warnings.patch + ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk -- cgit -- cgit -- cgit From d9cee7d3f364cf68524e1ec1d1dcaa2074edcbfc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 12:54:48 +0100 Subject: update libtooling and config.guess for aix 7 --- berkeleydb/db-aix.patch | 205 ++++++++++++++++++++++++++++++++++++++++++++++++ berkeleydb/makefile.mk | 4 +- 2 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 berkeleydb/db-aix.patch diff --git a/berkeleydb/db-aix.patch b/berkeleydb/db-aix.patch new file mode 100644 index 000000000000..3a2c21f1cf62 --- /dev/null +++ b/berkeleydb/db-aix.patch @@ -0,0 +1,205 @@ +--- misc/db-4.7.25.NC/dist/config.guess 2010-08-19 03:29:33.000000000 -0500 ++++ misc/build/db-4.7.25.NC/dist/config.guess 2010-08-19 03:32:57.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) +--- misc/db-4.7.25.NC/dist/configure 2010-09-15 10:06:54.000000000 -0500 ++++ misc/build/db-4.7.25.NC/dist/configure 2010-09-15 10:12:41.000000000 -0500 +@@ -3701,7 +3701,7 @@ + # Don't override anything if it's already set from the environment. + optimize_debug="-O" + case "$host_os" in +-aix4.3.*|aix5*) ++aix[4-9]*) + case "$host_os" in + aix4.3.*) + CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";; +@@ -6452,7 +6452,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -9439,7 +9439,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[4-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -9649,7 +9649,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -9669,7 +9669,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -10410,7 +10410,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11826,7 +11826,7 @@ + fi + ;; + +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -12670,7 +12670,7 @@ + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -12683,7 +12683,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -13805,7 +13805,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -14201,7 +14201,7 @@ + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -14334,7 +14334,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15455,7 +15455,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -15966,7 +15966,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no +@@ -16176,7 +16176,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -16917,7 +16917,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18540,7 +18540,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no +@@ -18750,7 +18750,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -19511,7 +19511,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +--- misc/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:06:54.000000000 -0500 ++++ misc/build/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:08:45.000000000 -0500 +@@ -154,7 +154,7 @@ + # Don't override anything if it's already set from the environment. + optimize_debug="-O" + case "$host_os" in +-aix4.3.*|aix5*) ++aix[4-9]*) + case "$host_os" in + aix4.3.*) + CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";; diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 325e8700e7a8..98d52e915da2 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -60,7 +60,9 @@ ADDITIONAL_FILES= \ .IF "$(GUI)$(COM)"=="WNTGCC" PATCH_FILES=db-4.7.25-mingw.patch .ELSE -PATCH_FILES=db-4.7.25.patch +PATCH_FILES=\ + db-4.7.25.patch \ + db-aix.patch .ENDIF # clean compiler flags -- cgit From 37d631a7ef49fff29afa98faf9813a5dfaa3186c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:15:19 +0100 Subject: update libtooling and config.guess for aix 7 --- curl/curl-aix.patch | 21 +++++++++++++++++++++ curl/makefile.mk | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 curl/curl-aix.patch diff --git a/curl/curl-aix.patch b/curl/curl-aix.patch new file mode 100644 index 000000000000..1ee1999c1a46 --- /dev/null +++ b/curl/curl-aix.patch @@ -0,0 +1,21 @@ +--- misc/curl-7.19.7/config.guess 2010-09-15 14:29:17.000000000 -0500 ++++ misc/build/curl-7.19.7/config.guess 2010-09-15 14:32:41.000000000 -0500 +@@ -548,7 +548,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -560,6 +560,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) diff --git a/curl/makefile.mk b/curl/makefile.mk index adab75f41d49..213a887de2cd 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -43,7 +43,9 @@ all: TARFILE_NAME=curl-7.19.7 TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab -PATCH_FILES=curl-7.19.7.patch +PATCH_FILES=\ + curl-7.19.7.patch \ + curl-aix.patch .IF "$(GUI)"=="WNT" PATCH_FILES+=curl-7.19.7_win.patch @@ -74,6 +76,10 @@ curl_CFLAGS+:=$(ARCH_FLAGS) curl_LDFLAGS+:=$(ARCH_FLAGS) .ENDIF +.IF "$(OS)"=="AIX" +curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF + CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -- cgit From d739047a91c294d4e87d09c90401f22b4a716e96 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:21:57 +0100 Subject: fix AIX build --- hunspell/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 253607ab0c0f..a455cce62388 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -54,6 +54,10 @@ CONFIGURE_FLAGS= --disable-shared --with-pic CONFIGURE_FLAGS+= CFLAGS=-xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" +.IF "$(OS)"=="AIX" +CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT +.ENDIF + .IF "$(SYSBASE)"!="" .IF "$(EXTRA_CFLAGS)"!="" CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" -- cgit From c6ab29e5621f30bbb214ad2fb7c6cf5ad159c0d7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:23:48 +0100 Subject: add aix build fixes --- icu/icu4c-aix.patch | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++ icu/makefile.mk | 9 ++- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 icu/icu4c-aix.patch diff --git a/icu/icu4c-aix.patch b/icu/icu4c-aix.patch new file mode 100644 index 000000000000..fa43e8563588 --- /dev/null +++ b/icu/icu4c-aix.patch @@ -0,0 +1,155 @@ +--- misc/icu/source/config/mh-aix-gcc 2009-01-15 01:46:10.000000000 -0600 ++++ misc/build/icu/source/config/mh-aix-gcc 2010-06-24 20:58:16.000000000 -0500 +@@ -1,85 +1,49 @@ + ## -*-makefile-*- +-## Copyright (c) 2003-2007 IBM, Ken Foskey, and others. All rights reserved. +-## +-## Aix-specific setup (for gcc) +-## +-## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). +-## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1 ++## Linux-specific setup ++## Copyright (c) 1999-2006, International Business Machines Corporation and ++## others. All Rights Reserved. + + ## Commands to generate dependency files +-GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) +-GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) ++GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) ++GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) + +-## Commands to link +-## We need to use the C++ linker, even when linking C programs, since +-## our libraries contain C++ code (C++ static init not called) +-LINK.c= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) +-LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) +- +-## Commands to make a shared library +-SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall +-SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall ++## Flags for position independent code ++SHAREDLIBCFLAGS = -fPIC ++SHAREDLIBCXXFLAGS = -fPIC ++SHAREDLIBCPPFLAGS = -DPIC ++ ++## Additional flags when building libraries and with threads ++THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE ++LIBCPPFLAGS = + + ## Compiler switch to embed a runtime search path +-LD_RPATH= -I +-LD_RPATH_PRE= ++LD_RPATH= ++LD_RPATH_PRE = + +-## enable the shared lib loader +-LDFLAGS += -Wl,-bbigtoc ++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH ++## (incl. the C++ runtime libs potentially found in the URE lib dir): ++#ENABLE_RPATH=YES ++#RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' ++ ++#SH# ENABLE_RPATH=YES ++#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" + + ## These are the library specific LDFLAGS + LDFLAGSICUDT=-nodefaultlibs -nostdlib + +-## We need to delete things prior to linking, or else we'll get +-## SEVERE ERROR: output file in use .. on AIX. +-## But, shell script version should NOT delete target as we don't +-## have $@ in that context. (SH = only shell script, icu-config) +-AIX_PREDELETE=rm -f $@ ; +-#SH# AIX_PREDELETE= +- + ## Environment variable to set a runtime search path + LDLIBRARYPATH_ENVVAR = LIBPATH + +-## Override Versioned target for a shared library. +-FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) +-MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) +-SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))) +- +-# The following is for Makefile.inc's use. +-ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) +- +-# this one is for icudefs.mk's use +-ifeq ($(ENABLE_SHARED),YES) +-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) +-endif +- +-## Compiler switch to embed a library name. Not present on AIX. +-LD_SONAME = +- +-## The type of assembly needed when pkgdata is used for generating shared libraries. +-GENCCODE_ASSEMBLY=-a xlc ++## Compiler switch to embed a library name ++# The initial tab in the next line is to prevent icu-config from reading it. ++ #LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++#SH# # We can't depend on MIDDLE_SO_TARGET being set. ++#SH# LD_SONAME= + + ## Shared object suffix +-SOBJ= so +-# without the -brtl option, the library names use .a. AIX is funny that way. +-SO= a +-A= a +- ++SO = so + ## Non-shared intermediate object suffix +-STATIC_O = o +- +-## Special AIX rules +- +-## Build archive from shared object +-%.a : %.so +- $(AR) $(ARFLAGS) $@ $< +-$(LIBDIR)/%.a : %.so +- $(AR) $(ARFLAGS) $@ $< +- +-## Build import list from export list +-%.e : %.exp +- @echo "Building an import list for $<" +- @$(SHELL) -ec "echo '#! $*.a($*.so)' | cat - $< > $@" ++STATIC_O = ao + + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c +@@ -107,16 +71,19 @@ + [ -s $@ ] || rm -f $@' + + ## Versioned libraries rules +-%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) +- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ +-%.$(SO): %$(SO_TARGET_VERSION).$(SO) +- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ + ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) ++ $(RM) $@ && ln -s ${ Date: Wed, 13 Oct 2010 13:45:34 +0100 Subject: update libtooling and config.guess for aix 7 --- libxml2/libxml2-aix.patch | 21 +++++++++++++++++++++ libxml2/makefile.mk | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 libxml2/libxml2-aix.patch diff --git a/libxml2/libxml2-aix.patch b/libxml2/libxml2-aix.patch new file mode 100644 index 000000000000..d187ea0f807f --- /dev/null +++ b/libxml2/libxml2-aix.patch @@ -0,0 +1,21 @@ +--- misc/libxml2-2.7.6/config.guess 2010-09-15 14:53:52.000000000 -0500 ++++ misc/build/libxml2-2.7.6/config.guess 2010-09-15 14:56:09.000000000 -0500 +@@ -548,7 +548,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -560,6 +560,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index bef2d43aa6e3..c9677f0831d9 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -52,7 +52,7 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-mingw.patch \ libxml2-gnome599717.patch \ libxml2-global-symbols.patch \ - + libxml2-aix.patch # This is only for UNX environment now @@ -100,7 +100,7 @@ CONFIGURE_ACTION=sh .$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ELSE CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -- cgit From b57a972d3025770a48601263b967b98737323365 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:46:13 +0100 Subject: update libtooling and config.guess for aix 7 --- libxslt/libxslt-aix.patch | 21 +++++++++++++++++++++ libxslt/makefile.mk | 7 +++++-- libxslt/prj/d.lst | 3 ++- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 libxslt/libxslt-aix.patch diff --git a/libxslt/libxslt-aix.patch b/libxslt/libxslt-aix.patch new file mode 100644 index 000000000000..fe38f7bb7e73 --- /dev/null +++ b/libxslt/libxslt-aix.patch @@ -0,0 +1,21 @@ +--- misc/libxslt-1.1.26/config.guess 2010-09-16 02:40:03.000000000 -0500 ++++ misc/build/libxslt-1.1.26/config.guess 2010-09-16 02:41:43.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[45]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index fd7273b0c6b9..9a7be2e53532 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -55,8 +55,8 @@ TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9 PATCH_FILES=libxslt-configure.patch \ libxslt-win_manifest.patch \ libxslt-mingw.patch \ - libxslt-internal-symbols.patch - + libxslt-internal-symbols.patch \ + libxslt-aix.patch # This is only for UNX environment now .IF "$(OS)"=="WNT" @@ -96,6 +96,9 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include $(EXTRA_CFLAGS) diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index cdb1c1d7dd2e..4913b78c2824 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -3,7 +3,8 @@ mkdir: %_DEST%\inc%_EXT%\external\libxslt ..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so.1 symlink: %_DEST%\lib%_EXT%\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so ..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so.0 -..\%__SRC%\lib\libxslt*.lib %_DEST%\lib%_EXT% +symlink: %_DEST%\lib%_EXT%\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so +..\%__SRC%\lib\libxslt*.* %_DEST%\lib%_EXT%\libxslt*.* ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\bin\lib*.dll %_DEST%\bin%_EXT% ..\%__SRC%\bin\xsltproc* %_DEST%\bin%_EXT% -- cgit From 5e6d84ab73db7064c1e11a567b76e38d690f86ea Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:50:42 +0100 Subject: tweak this to build in AIX --- moz/extractfiles.mk | 2 +- moz/makefile.mk | 8 +- moz/patches/aix_build_fix.patch | 203 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 moz/patches/aix_build_fix.patch diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index dedfade257db..faba88b7822f 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -342,7 +342,7 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip echo >& $(NULLDEV) .IF "$(GUI)"=="UNX" -.IF "$(OS)"!="MACOSX" +.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX" cd $(RUNTIME_DIR) && strip *$(DLLPOST) cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST) .ENDIF diff --git a/moz/makefile.mk b/moz/makefile.mk index feb2c50343ee..49e9b41010ea 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -52,6 +52,11 @@ LD_LIBRARY_PATH!:=$(LD_LIBRARY_PATH)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib DISABLE_MOZ_EXECUTABLE=TRUE .EXPORT : DISABLE_MOZ_EXECUTABLE +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.EXPORT : LDFLAGS +.ENDIF + .IF "$(SYSBASE)"!="" && "$(OS)" == "LINUX" ## hmm... rather gcc specific switches... CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib @@ -87,7 +92,8 @@ PATCH_FILES = \ patches/respect_disable_pango.patch \ patches/arm_build_fix.patch \ patches/link_fontconfig.patch \ - patches/brokenmakefile.patch + patches/brokenmakefile.patch \ + patches/aix_build_fix.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/aix_build_fix.patch b/moz/patches/aix_build_fix.patch new file mode 100644 index 000000000000..d778532eeb44 --- /dev/null +++ b/moz/patches/aix_build_fix.patch @@ -0,0 +1,203 @@ +--- misc/mozilla/nsprpub/configure 2010-08-19 07:05:19.000000000 -0500 ++++ misc/build/mozilla/nsprpub/configure 2010-08-19 07:34:33.000000000 -0500 +@@ -2938,7 +2938,8 @@ + #define SYSV 1 + EOF + +- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@' ++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib' + ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 + echo "configure:2944: checking for sys/atomic_op.h" >&5 +@@ -3067,7 +3068,6 @@ + AIX_LINK_OPTS='-brtl -bnso -berok' + ;; + esac +- CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' + if test -n "$USE_64"; then +--- misc/mozilla/nsprpub/configure.in 2010-08-19 07:05:19.000000000 -0500 ++++ misc/build/mozilla/nsprpub/configure.in 2010-08-19 07:35:35.000000000 -0500 +@@ -811,7 +811,8 @@ + AC_DEFINE(XP_UNIX) + AC_DEFINE(AIX) + AC_DEFINE(SYSV) +- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@' ++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib' + AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)) + case "${target_os}" in + aix3.2*) +@@ -854,7 +855,6 @@ + AIX_LINK_OPTS='-brtl -bnso -berok' + ;; + esac +- CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' + if test -n "$USE_64"; then +--- misc/mozilla/security/coreconf/AIX.mk 2010-08-19 07:04:11.000000000 -0500 ++++ misc/build/mozilla/security/coreconf/AIX.mk 2010-08-19 07:38:42.000000000 -0500 +@@ -62,35 +62,30 @@ + + DEFAULT_COMPILER = xlc_r + +-CC = xlc_r +-CCC = xlC_r ++CCC = $(CXX) + + CPU_ARCH = rs6000 + + RANLIB = ranlib + + OS_CFLAGS = -DAIX -DSYSV +-OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm ++OS_LIBS += -Wl,-blibpath:/usr/lib:/lib -lc -lm + +-DSO_LDOPTS = -brtl -bnortllib -bM:SRE -bnoentry +-MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm ++DSO_LDOPTS = -Wl,-brtl -Wl,-bnortllib ++MKSHLIB = $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm + + AIX_WRAP = $(DIST)/lib/aixwrap.o + AIX_TMP = $(OBJDIR)/_aix_tmp.o + + ifdef MAPFILE +-DSO_LDOPTS += -bexport:$(MAPFILE) ++DSO_LDOPTS += -Wl,-bexport:$(MAPFILE) + else +-DSO_LDOPTS += -bexpall ++DSO_LDOPTS += -Wl,-bexpall + endif + + PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ + sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@ + +-ifdef BUILD_OPT +- OPTIMIZER += -qmaxmem=-1 +-endif +- + ifeq ($(USE_64), 1) + OS_CFLAGS += -DAIX_64BIT + OBJECT_MODE=64 +--- misc/mozilla/security/nss/cmd/platlibs.mk 2010-08-19 07:03:52.000000000 -0500 ++++ misc/build/mozilla/security/nss/cmd/platlibs.mk 2010-08-19 07:39:10.000000000 -0500 +@@ -154,7 +154,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +@@ -207,7 +207,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # If GNU ld is used, we must use the -rpath-link option to tell +--- misc/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-19 07:03:57.000000000 -0500 ++++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-19 07:42:30.000000000 -0500 +@@ -74,6 +74,10 @@ + + include $(CORE_DEPTH)/coreconf/rules.mk + ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif ++ + ####################################################################### + # (6) Execute "component" rules. (OPTIONAL) # + ####################################################################### +--- misc/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-19 07:03:57.000000000 -0500 ++++ misc/build/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-19 07:41:51.000000000 -0500 +@@ -74,6 +74,8 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + include ../../platrules.mk +- +--- misc/mozilla/dbm/include/mcom_db.h 2010-08-19 08:39:18.000000000 -0500 ++++ misc/build/mozilla/dbm/include/mcom_db.h 2010-08-19 08:39:45.000000000 -0500 +@@ -88,7 +88,7 @@ + + #ifdef __DBINTERFACE_PRIVATE + +-#ifdef HAVE_SYS_CDEFS_H ++#if defined(HAVE_SYS_CDEFS_H) && !defined(_AIX) + #include + #else + #include "cdefs.h" +--- misc/mozilla/configure 2010-08-19 09:18:07.000000000 -0500 ++++ misc/build/mozilla/configure 2010-08-19 09:11:35.000000000 -0500 +@@ -5884,6 +5884,9 @@ + CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'` + CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'` + fi ++ else ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' + fi + case "${target_os}" in + aix4.1*) +--- misc/mozilla/configure.in 2010-08-19 09:18:07.000000000 -0500 ++++ misc/build/mozilla/configure.in 2010-08-19 09:10:46.000000000 -0500 +@@ -1489,6 +1489,9 @@ + CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'` + CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'` + fi ++ else ++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' ++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' + fi + case "${target_os}" in + aix4.1*) +--- misc/mozilla/configure 2010-08-19 11:03:27.000000000 -0500 ++++ misc/build/mozilla/configure 2010-08-19 11:05:38.000000000 -0500 +@@ -5887,6 +5887,8 @@ + else + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' + MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' ++ MOZ_FIX_LINK_PATHS= ++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-brtl" + fi + case "${target_os}" in + aix4.1*) +--- misc/mozilla/configure.in 2010-08-19 11:03:36.000000000 -0500 ++++ misc/build/mozilla/configure.in 2010-08-19 11:04:33.000000000 -0500 +@@ -1492,6 +1492,9 @@ + else + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' + MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' ++ AC_MSG_WARN([Clearing MOZ_FIX_LINK_PATHS till we can fix bug 332075.]) ++ MOZ_FIX_LINK_PATHS= ++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-brtl" + fi + case "${target_os}" in + aix4.1*) +--- misc/mozilla/config/rules.mk 2010-08-20 04:09:51.000000000 -0500 ++++ misc/build/mozilla/config/rules.mk 2010-08-20 05:02:37.000000000 -0500 +@@ -488,8 +488,13 @@ + ifeq ($(OS_ARCH),AIX) + ifdef IS_COMPONENT + ifneq ($(HAS_EXTRAEXPORTS),1) ++ifdef GNU_CC ++MKSHLIB += -Wl,-bE:$(MOZILLA_DIR)/build/unix/aix.exp -Wl,-bnoexpall ++MKCSHLIB += -Wl,-bE:$(MOZILLA_DIR)/build/unix/aix.exp -Wl,-bnoexpall ++else + MKSHLIB += -bE:$(MOZILLA_DIR)/build/unix/aix.exp -bnoexpall + MKCSHLIB += -bE:$(MOZILLA_DIR)/build/unix/aix.exp -bnoexpall ++endif # GNU_CXX + endif # HAS_EXTRAEXPORTS + endif # IS_COMPONENT + endif # AIX -- cgit From 535ce8c499e9f53087cb36100d6d956810935e39 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 13:59:28 +0100 Subject: tweak this to build on AIX --- nss/makefile.mk | 2 +- nss/nss.aix.patch | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 nss/nss.aix.patch diff --git a/nss/makefile.mk b/nss/makefile.mk index 22b126a43c57..1797c252051c 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -44,7 +44,7 @@ all: TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4 TARFILE_MD5=b92261a5679276c400555004937af965 TARFILE_ROOTDIR=nss-3.12.6 -PATCH_FILES=nss.patch +PATCH_FILES=nss.patch nss.aix.patch .IF "$(OS)"=="MACOSX" PATCH_FILES+=nss_macosx.patch diff --git a/nss/nss.aix.patch b/nss/nss.aix.patch new file mode 100644 index 000000000000..2f2d28ed33a9 --- /dev/null +++ b/nss/nss.aix.patch @@ -0,0 +1,143 @@ +--- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500 +@@ -2973,7 +2973,8 @@ + #define SYSV 1 + EOF + +- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@' ++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib' + ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 + echo "configure:2980: checking for sys/atomic_op.h" >&5 +@@ -3102,7 +3103,6 @@ + AIX_LINK_OPTS='-brtl -bnso -berok' + ;; + esac +- CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' + if test -n "$USE_64"; then +--- misc/nss-3.12.6/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure.in 2010-08-18 07:32:36.000000000 -0500 +@@ -831,7 +831,8 @@ + AC_DEFINE(XP_UNIX) + AC_DEFINE(AIX) + AC_DEFINE(SYSV) +- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib' ++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@' + AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)) + case "${target_os}" in + aix3.2*) +@@ -871,10 +872,9 @@ + AC_DEFINE(HAVE_SOCKLEN_T) + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) + USE_IPV6=1 +- AIX_LINK_OPTS='-brtl -bnso -berok' ++ AIX_LINK_OPTS='-Wl,-brtl -Wl,-bnso -Wl,-berok' + ;; + esac +- CFLAGS="$CFLAGS -qro -qroconst" + AIX_WRAP='$(DIST)/lib/aixwrap.o' + AIX_TMP='./_aix_tmp.o' + if test -n "$USE_64"; then +--- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500 +@@ -110,7 +110,6 @@ + endif + + ifeq ($(OS_ARCH),AIX) +-DSO_LDOPTS += -binitfini::_PR_Fini + OS_LIBS = -lodm -lcfg + ifeq ($(CLASSIC_NSPR),1) + ifeq ($(OS_RELEASE),4.1) +--- misc/nss-3.12.6/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500 +@@ -62,35 +62,30 @@ + + DEFAULT_COMPILER = xlc_r + +-CC = xlc_r +-CCC = xlC_r ++CCC = $(CXX) + + CPU_ARCH = rs6000 + + RANLIB = ranlib + + OS_CFLAGS = -DAIX -DSYSV +-OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm ++OS_LIBS += -Wl,-blibpath:/usr/lib:/lib -lc -lm + +-DSO_LDOPTS = -brtl -bnortllib -bM:SRE -bnoentry +-MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm ++DSO_LDOPTS = -Wl,-brtl -Wl,-bnortllib ++MKSHLIB = $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm + + AIX_WRAP = $(DIST)/lib/aixwrap.o + AIX_TMP = $(OBJDIR)/_aix_tmp.o + + ifdef MAPFILE +-DSO_LDOPTS += -bexport:$(MAPFILE) ++DSO_LDOPTS += -Wl,-bexport:$(MAPFILE) + else +-DSO_LDOPTS += -bexpall ++DSO_LDOPTS += -Wl,-bexpall + endif + + PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ + sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@ + +-ifdef BUILD_OPT +- OPTIMIZER += -qmaxmem=-1 +-endif +- + ifeq ($(USE_64), 1) + OS_CFLAGS += -DAIX_64BIT + OBJECT_MODE=64 +--- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500 +@@ -173,7 +173,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +@@ -223,7 +223,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500 +@@ -75,7 +75,9 @@ + + endif + +- ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + ####################################################################### + # (5) Execute "global" rules. (OPTIONAL) # +--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500 +@@ -75,6 +75,9 @@ + + endif + ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + # sign any and all shared libraries that contain the word freebl + -- cgit From aab41efc81ec26fcbd4cdeb9c36fbe8cc274523f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 13 Oct 2010 14:42:06 +0100 Subject: get this to build on AIX --- python/Python-aix.patch | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ python/makefile.mk | 10 +++- python/prj/d.lst | 6 ++ 3 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 python/Python-aix.patch diff --git a/python/Python-aix.patch b/python/Python-aix.patch new file mode 100644 index 000000000000..8dae6d1b136b --- /dev/null +++ b/python/Python-aix.patch @@ -0,0 +1,151 @@ +--- misc/Python-2.6.1/Makefile.pre.in 2010-09-10 05:00:44.000000000 -0500 ++++ misc/build/Python-2.6.1/Makefile.pre.in 2010-09-10 05:16:02.000000000 -0500 +@@ -412,7 +412,10 @@ + + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ +- $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ ++ if [ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" != "aix" ]; then \ ++ SONAME="-Wl,-h$(INSTSONAME)"; \ ++ fi; \ ++ $(LDSHARED) $(LDFLAGS) $(SONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + $(LN) -f $(INSTSONAME) $@; \ + else\ + $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ +@@ -907,6 +907,7 @@ + export PATH; PATH="`pwd`:$$PATH"; \ + export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ + export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ ++ export LIBPATH; LIBPATH="`pwd`${LIBPATH:+:$LIBPATH}"; \ + export EXE; EXE="$(BUILDEXE)"; \ + cd $(srcdir)/Lib/$(PLATDIR); ./regen + +--- misc/Python-2.6.1/Modules/Setup.dist 2010-08-19 07:03:46.000000000 -0500 ++++ misc/build/Python-2.6.1/Modules/Setup.dist 2010-08-19 07:04:11.000000000 -0500 +@@ -185,7 +185,7 @@ + #datetime datetimemodule.c # date/time type + #_bisect _bisectmodule.c # Bisection algorithms + +-#unicodedata unicodedata.c # static Unicode character database ++unicodedata unicodedata.c # static Unicode character database + + # access to ISO C locale support + #_locale _localemodule.c # -lintl +--- misc/Python-2.6.1/Modules/_ctypes/libffi/fficonfig.py.in 2010-09-11 08:50:58.000000000 -0500 ++++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/fficonfig.py.in 2010-09-11 08:51:26.000000000 -0500 +@@ -14,7 +14,7 @@ + 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'], + 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'], + 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'], +- 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'], ++ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'], + 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'], + 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'], + 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'], +--- misc/Python-2.6.1/configure.in 2010-09-11 11:06:27.000000000 -0500 ++++ misc/build/Python-2.6.1/configure.in 2010-09-11 11:25:42.000000000 -0500 +@@ -415,8 +415,6 @@ + without_gcc=$withval;; + esac], [ + case $ac_sys_system in +- AIX*) CC=cc_r +- without_gcc=;; + BeOS*) + case $BE_HOST_CPU in + ppc) +@@ -704,10 +702,18 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|AIX*) + LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-L. -lpython$(VERSION)' +- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ case $ac_sys_system in ++ AIX*) ++ BLDLIBRARY='-Wl,-brtl -L. -lpython$(VERSION)' ++ RUNSHARED=LIBPATH=`pwd`:${LIBPATH} ++ ;; ++ *) ++ BLDLIBRARY='-L. -lpython$(VERSION)' ++ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ ;; ++ esac + case $ac_sys_system in + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` +@@ -1607,8 +1613,13 @@ + then + case $ac_sys_system/$ac_sys_release in + AIX*) +- BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp" +- LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" ++ if test "$GCC" = "yes"; then ++ LDSHARED='$(CC) -shared' ++ BLDSHARED='$(CC) -Wl,-brtl -shared' ++ else ++ BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp" ++ LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" ++ fi + ;; + BeOS*) + BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY" +--- misc/Python-2.6.1/configure 2010-09-11 11:06:27.000000000 -0500 ++++ misc/build/Python-2.6.1/configure 2010-09-11 11:26:16.000000000 -0500 +@@ -2266,8 +2266,6 @@ + else + + case $ac_sys_system in +- AIX*) CC=cc_r +- without_gcc=;; + BeOS*) + case $BE_HOST_CPU in + ppc) +@@ -4106,10 +4104,18 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|AIX*) + LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-L. -lpython$(VERSION)' +- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ case $ac_sys_system in ++ AIX*) ++ BLDLIBRARY='-Wl,-brtl -L. -lpython$(VERSION)' ++ RUNSHARED=LIBPATH=`pwd`:${LIBPATH} ++ ;; ++ *) ++ BLDLIBRARY='-L. -lpython$(VERSION)' ++ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ++ ;; ++ esac + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + hp*|HP*) +@@ -4525,7 +4531,7 @@ + # debug builds. + OPT="-g -Wall $STRICT_PROTO" + else +- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" ++ OPT="$WRAP -O0 -Wall $STRICT_PROTO" + fi + ;; + *) +@@ -13012,8 +13018,13 @@ + then + case $ac_sys_system/$ac_sys_release in + AIX*) +- BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp" +- LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" ++ if test "$GCC" = "yes"; then ++ LDSHARED='$(CC) -shared' ++ BLDSHARED='$(CC) -Wl,-brtl -shared' ++ else ++ BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:Modules/python.exp" ++ LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" ++ fi + ;; + BeOS*) + BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY" diff --git a/python/makefile.mk b/python/makefile.mk index ddc386938e45..9250ebca4ca5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -49,7 +49,8 @@ TARFILE_NAME=Python-$(PYVERSION) TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ - Python-ssl.patch + Python-ssl.patch \ + Python-aix.patch CONFIGURE_DIR= @@ -75,10 +76,17 @@ CC+:=$(ARCH_FLAGS) python_LDFLAGS+=$(ARCH_FLAGS) .ENDIF +.IF "$(OS)"=="AIX" +python_CFLAGS=-g0 +.ENDIF + CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" .IF "$(OS)$(CPU)" == "SOLARISI" CONFIGURE_ACTION += --disable-ipv6 .ENDIF +.IF "$(OS)"=="AIX" +CONFIGURE_ACTION += --disable-ipv6 --with-threads +.ENDIF BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include .ELSE # ---------------------------------- diff --git a/python/prj/d.lst b/python/prj/d.lst index 3c7c3f8baac7..075b17e0868b 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -19,6 +19,9 @@ mkdir: %_DEST%\lib%_EXT%\python\xml\sax mkdir: %_DEST%\lib%_EXT%\python\xml\etree mkdir: %_DEST%\lib%_EXT%\python\curses mkdir: %_DEST%\lib%_EXT%\python\plat-linux2 +mkdir: %_DEST%\lib%_EXT%\python\plat-aix5 +mkdir: %_DEST%\lib%_EXT%\python\plat-aix6 +mkdir: %_DEST%\lib%_EXT%\python\plat-aix7 mkdir: %_DEST%\lib%_EXT%\python\config mkdir: %_DEST%\lib%_EXT%\python\lib-dynload mkdir: %_DEST%\lib%_EXT%\python\bsddb @@ -54,6 +57,9 @@ mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib ..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix5\* %_DEST%\lib%_EXT%\python\plat-aix5\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix6\* %_DEST%\lib%_EXT%\python\plat-aix6\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix7\* %_DEST%\lib%_EXT%\python\plat-aix7\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\config\* %_DEST%\lib%_EXT%\python\config\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -- cgit -- cgit -- cgit From 947c04111a1371955f6fee367d3dd6828a887b60 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 18 Oct 2010 16:09:04 +0100 Subject: #i113177# remove strict-aliasing warning from boost headers --- boost/aliasing.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ boost/makefile.mk | 2 ++ 2 files changed, 59 insertions(+) create mode 100644 boost/aliasing.patch diff --git a/boost/aliasing.patch b/boost/aliasing.patch new file mode 100644 index 000000000000..ce6baaf0dbe4 --- /dev/null +++ b/boost/aliasing.patch @@ -0,0 +1,57 @@ +--- misc/boost_1_43_0/boost/function/function_base.hpp ++++ misc/build/boost_1_43_0/boost/function/function_base.hpp +@@ -2,6 +2,7 @@ + + // Copyright Douglas Gregor 2001-2006 + // Copyright Emil Dotchevski 2007 ++// Copyright Dean Michael Berris 2009 + // Use, modification and distribution is subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) +@@ -44,6 +45,13 @@ + # pragma warning( disable : 4127 ) // "conditional expression is constant" + #endif + ++#if defined(__GNUC__) ++// Because GCC complains of strict aliasing problems, we make it ++// treat the header as a system header, becoming more forgiving with ++// treating implementation details that may be potentially harmful. ++# pragma GCC system_header ++#endif ++ + // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. + #ifdef BOOST_NO_STD_TYPEINFO + // Embedded VC++ does not have type_info in namespace std +@@ -314,15 +322,15 @@ + { + if (op == clone_functor_tag || op == move_functor_tag) { + const functor_type* in_functor = +- reinterpret_cast(&in_buffer.data); ++ static_cast(static_cast(&in_buffer.data)); + new ((void*)&out_buffer.data) functor_type(*in_functor); + + if (op == move_functor_tag) { +- reinterpret_cast(&in_buffer.data)->~Functor(); ++ static_cast(static_cast(&in_buffer.data))->~Functor(); + } + } else if (op == destroy_functor_tag) { + // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type. +- reinterpret_cast(&out_buffer.data)->~Functor(); ++ static_cast(static_cast(&out_buffer.data))->~Functor(); + } else if (op == check_functor_type_tag) { + const detail::sp_typeinfo& check_type + = *out_buffer.type.type; +@@ -714,8 +722,11 @@ + + public: // should be protected, but GCC 2.95.3 will fail to allow access + detail::function::vtable_base* get_vtable() const { +- return reinterpret_cast( +- reinterpret_cast(vtable) & ~(std::size_t)0x01); ++ return static_cast( ++ (void*)( ++ (std::size_t(static_cast(vtable)) & ~(std::size_t(0x01))) ++ ) ++ ); + } + + bool has_trivial_copy_and_destroy() const { diff --git a/boost/makefile.mk b/boost/makefile.mk index 1f430d7045db..8602cf9a07c4 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -51,6 +51,8 @@ all: TARFILE_NAME=boost_1_39_0 TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7 PATCH_FILES=$(TARFILE_NAME).patch +# See https://svn.boost.org/trac/boost/ticket/3780 +PATCH_FILES+=aliasing.patch #https://svn.boost.org/trac/boost/ticket/4713 PATCH_FILES+=boost.4713.warnings.patch -- cgit From 4ec08e93f68c9446c64d133f7ca44e4210707841 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 18 Oct 2010 16:25:10 +0100 Subject: tweak this to patch --- boost/aliasing.patch | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/boost/aliasing.patch b/boost/aliasing.patch index ce6baaf0dbe4..07840a445b10 100644 --- a/boost/aliasing.patch +++ b/boost/aliasing.patch @@ -1,5 +1,5 @@ ---- misc/boost_1_43_0/boost/function/function_base.hpp -+++ misc/build/boost_1_43_0/boost/function/function_base.hpp +--- misc/boost_1_39_0/boost/function/function_base.hpp ++++ misc/build/boost_1_39_0/boost/function/function_base.hpp @@ -2,6 +2,7 @@ // Copyright Douglas Gregor 2001-2006 @@ -41,17 +41,3 @@ } else if (op == check_functor_type_tag) { const detail::sp_typeinfo& check_type = *out_buffer.type.type; -@@ -714,8 +722,11 @@ - - public: // should be protected, but GCC 2.95.3 will fail to allow access - detail::function::vtable_base* get_vtable() const { -- return reinterpret_cast( -- reinterpret_cast(vtable) & ~(std::size_t)0x01); -+ return static_cast( -+ (void*)( -+ (std::size_t(static_cast(vtable)) & ~(std::size_t(0x01))) -+ ) -+ ); - } - - bool has_trivial_copy_and_destroy() const { -- cgit -- cgit From 48ace782ff36f8b9615eb25230666035cacf4f71 Mon Sep 17 00:00:00 2001 From: Jesús Corrius Date: Wed, 20 Oct 2010 01:10:02 +0200 Subject: Build fixes for VC++ 10 --- libxml2/libxml2-vc10.patch | 15 +++++++++++++++ libxml2/makefile.mk | 3 ++- libxslt/libxslt-vc10.patch | 15 +++++++++++++++ libxslt/makefile.mk | 3 ++- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100755 libxml2/libxml2-vc10.patch create mode 100644 libxslt/libxslt-vc10.patch diff --git a/libxml2/libxml2-vc10.patch b/libxml2/libxml2-vc10.patch new file mode 100755 index 000000000000..54d12f19c484 --- /dev/null +++ b/libxml2/libxml2-vc10.patch @@ -0,0 +1,15 @@ +--- misc/build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 ++++ misc/build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 +@@ -91,8 +91,12 @@ + LDFLAGS = $(LDFLAGS) /DEBUG + !else + CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 ++!if "$(_NMAKE_VER)" >= "10.00.30319.01" ++LDFLAGS = $(LDFLAGS) ++!else + LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 + !endif ++!endif + + # Libxml object files. + XML_OBJS = $(XML_INTDIR)\c14n.obj\ diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index c9677f0831d9..0c69c36b74a5 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -52,7 +52,8 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-mingw.patch \ libxml2-gnome599717.patch \ libxml2-global-symbols.patch \ - libxml2-aix.patch + libxml2-aix.patch \ + libxml2-vc10.patch # This is only for UNX environment now diff --git a/libxslt/libxslt-vc10.patch b/libxslt/libxslt-vc10.patch new file mode 100644 index 000000000000..3d8b3302c643 --- /dev/null +++ b/libxslt/libxslt-vc10.patch @@ -0,0 +1,15 @@ +--- misc/build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200 ++++ misc/build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200 +@@ -71,8 +71,12 @@ + LDFLAGS = $(LDFLAGS) /DEBUG + !else + CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 ++!if "$(_NMAKE_VER)" >= "10.00.30319.01" ++LDFLAGS = $(LDFLAGS) ++!else + LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 + !endif ++!endif + + # Libxslt object files. + XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\ diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 9a7be2e53532..2e6d1780b1fe 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -56,7 +56,8 @@ PATCH_FILES=libxslt-configure.patch \ libxslt-win_manifest.patch \ libxslt-mingw.patch \ libxslt-internal-symbols.patch \ - libxslt-aix.patch + libxslt-aix.patch \ + libxslt-vc10.patch # This is only for UNX environment now .IF "$(OS)"=="WNT" -- cgit From 1038efa1ce3b50cf0fa6c83ad19a4b09544abeaa Mon Sep 17 00:00:00 2001 From: Jesús Corrius Date: Tue, 19 Oct 2010 23:47:14 +0200 Subject: Fix compilation of icu for VC++ 10 --- icu/icu4c-4_0_1-src.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/icu/icu4c-4_0_1-src.patch b/icu/icu4c-4_0_1-src.patch index 172d6244634c..6d50ca634d4e 100644 --- a/icu/icu4c-4_0_1-src.patch +++ b/icu/icu4c-4_0_1-src.patch @@ -245,3 +245,16 @@ T_FileStream_writeLine(makefile, tmp); if(o->hadStdin == FALSE) { /* shortcut */ +--- misc/build/icu/source/test/intltest/dtifmtts.cpp.old 2010-09-20 20:49:33.953125000 +0200 ++++ misc/build/icu/source/test/intltest/dtifmtts.cpp 2010-09-20 20:51:37.875000000 +0200 +@@ -13,8 +13,9 @@ + //FIXME: define it in compiler flag + //#define DTIFMTTS_DEBUG 1 + +- ++#if defined (_MSC_VER) && (_MSC_VER < 1600) + #include ++#endif + #ifdef DTIFMTTS_DEBUG + #endif + -- cgit From 602c1e59b49849b9bf1d775e7de9ab90a357332f Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 21 Oct 2010 11:58:28 +0200 Subject: Upgrade nss to the latest release --- nss/makefile.mk | 6 +++--- nss/nss.aix.patch | 28 ++++++++++++++-------------- nss/nss.patch | 36 ++++++++++++++++++------------------ nss/nss_macosx.patch | 4 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/nss/makefile.mk b/nss/makefile.mk index 1797c252051c..67e01c5d2d44 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -41,9 +41,9 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4 -TARFILE_MD5=b92261a5679276c400555004937af965 -TARFILE_ROOTDIR=nss-3.12.6 +TARFILE_NAME=nss-3.12.8-with-nspr-4.8.6 +TARFILE_MD5=71474203939fafbe271e1263e61d083e +TARFILE_ROOTDIR=nss-3.12.8 PATCH_FILES=nss.patch nss.aix.patch .IF "$(OS)"=="MACOSX" diff --git a/nss/nss.aix.patch b/nss/nss.aix.patch index 2f2d28ed33a9..430b699150bd 100644 --- a/nss/nss.aix.patch +++ b/nss/nss.aix.patch @@ -1,5 +1,5 @@ ---- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500 +--- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500 @@ -2973,7 +2973,8 @@ #define SYSV 1 EOF @@ -18,8 +18,8 @@ AIX_WRAP='$(DIST)/lib/aixwrap.o' AIX_TMP='./_aix_tmp.o' if test -n "$USE_64"; then ---- misc/nss-3.12.6/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure.in 2010-08-18 07:32:36.000000000 -0500 +--- misc/nss-3.12.8/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/nsprpub/configure.in 2010-08-18 07:32:36.000000000 -0500 @@ -831,7 +831,8 @@ AC_DEFINE(XP_UNIX) AC_DEFINE(AIX) @@ -42,8 +42,8 @@ AIX_WRAP='$(DIST)/lib/aixwrap.o' AIX_TMP='./_aix_tmp.o' if test -n "$USE_64"; then ---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500 +--- misc/nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500 @@ -110,7 +110,6 @@ endif @@ -52,8 +52,8 @@ OS_LIBS = -lodm -lcfg ifeq ($(CLASSIC_NSPR),1) ifeq ($(OS_RELEASE),4.1) ---- misc/nss-3.12.6/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500 +--- misc/nss-3.12.8/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500 @@ -62,35 +62,30 @@ DEFAULT_COMPILER = xlc_r @@ -96,8 +96,8 @@ ifeq ($(USE_64), 1) OS_CFLAGS += -DAIX_64BIT OBJECT_MODE=64 ---- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500 +--- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500 @@ -173,7 +173,7 @@ $(NULL) @@ -116,8 +116,8 @@ endif # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) ---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500 +--- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500 @@ -75,7 +75,9 @@ endif @@ -129,8 +129,8 @@ ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500 +--- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500 ++++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500 @@ -75,6 +75,9 @@ endif diff --git a/nss/nss.patch b/nss/nss.patch index b5f871dd1ecc..6930e6753ac9 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -1,5 +1,5 @@ ---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 +--- misc/nss-3.12.8/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 @@ -345,7 +345,12 @@ ifdef NS_USE_GCC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< @@ -14,8 +14,8 @@ endif # GCC @echo $(RES) finished endif ---- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 +--- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 @@ -3900,7 +3900,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' @@ -25,8 +25,8 @@ _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined ---- misc/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 +--- misc/nss-3.12.8/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 @@ -39,8 +39,12 @@ DEFAULT_COMPILER = cc @@ -42,8 +42,8 @@ RANLIB = ranlib ifndef CPU_ARCH ---- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 +--- misc/nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 @@ -46,8 +46,11 @@ IMPL_STRATEGY = _PTH endif @@ -81,8 +81,8 @@ # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. ---- misc/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 +--- misc/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 @@ -89,8 +89,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif @@ -98,8 +98,8 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- misc/nss-3.12.6/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 +--- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 @@ -324,7 +324,12 @@ # IMPL_STRATEGY may be defined too. # @@ -114,8 +114,8 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) ifndef BUILD_OPT ---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 +--- misc/nss-3.12.8/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 @@ -355,7 +355,12 @@ ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< @@ -130,8 +130,8 @@ endif @echo $(RES) finished endif ---- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 +--- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 @@ -41,27 +41,28 @@ ifeq ($(OS_ARCH), SunOS) ifeq ($(BUILD_SUN_PKG), 1) @@ -168,8 +168,8 @@ endif endif endif ---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 +--- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 ++++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 @@ -78,10 +78,15 @@ # sign any and all shared libraries that contain the word freebl diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch index 5a0228355748..a6ddcd14ac57 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -1,5 +1,5 @@ ---- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 +--- misc/nss-3.12.8/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/nss-3.12.8/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 @@ -104,6 +104,9 @@ ifeq ($(OS_TARGET),WIN95) NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 -- cgit From 4feee8022abcd286b5a05e34534cb16627f9f053 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 21 Oct 2010 21:17:40 +0200 Subject: updated Linux Libertine G font bugfix: hinting (better layout), especially with OOo/LibO without anti-aliasing (eg. on Windows) new feature: nut fractions --- more_fonts/fonts/ttf_linlibertineg/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/more_fonts/fonts/ttf_linlibertineg/makefile.mk b/more_fonts/fonts/ttf_linlibertineg/makefile.mk index 98cf2b4fe204..678a398a2943 100644 --- a/more_fonts/fonts/ttf_linlibertineg/makefile.mk +++ b/more_fonts/fonts/ttf_linlibertineg/makefile.mk @@ -36,8 +36,8 @@ TARGET=ttf_linlibertineg # --- Files -------------------------------------------------------- -TARFILE_NAME=LinLibertineG-20101004 -TARFILE_MD5=f20f67d1715c7be81688a2ad58d8291d +TARFILE_NAME=LinLibertineG-20101021 +TARFILE_MD5=c8fc33ad1efb77155f61e0e4ba8d3e9e TARFILE_ROOTDIR=LinLibertineG PATCH_FILES= -- cgit From 5a816bc42a4b5c43cd07a36a752d2fd14cfa829b Mon Sep 17 00:00:00 2001 From: Jesús Corrius Date: Fri, 29 Oct 2010 01:14:45 +0200 Subject: Visual Studio 2010 project files for Python --- python/Python-2.6.1-vc10.patch | 6367 ++++++++++++++++++++++++++++++++++++++++ python/makefile.mk | 9 +- 2 files changed, 6375 insertions(+), 1 deletion(-) create mode 100755 python/Python-2.6.1-vc10.patch diff --git a/python/Python-2.6.1-vc10.patch b/python/Python-2.6.1-vc10.patch new file mode 100755 index 000000000000..0f4a0d021c6c --- /dev/null +++ b/python/Python-2.6.1-vc10.patch @@ -0,0 +1,6367 @@ +--- misc/build/Python-2.6.1/PCbuild/make_buildinfo.c.orig 2007-12-06 22:13:06.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.c 2010-10-28 23:51:41.312500000 +0200 +@@ -82,8 +82,8 @@ + if ((do_unlink = make_buildinfo2())) + strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV "); + else +- strcat_s(command, CMD_SIZE, "..\\Modules\\getbuildinfo.c"); +- strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\Include -I..\\PC"); ++ strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c"); ++ strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\..\\Include -I..\\..\\PC"); + puts(command); fflush(stdout); + result = system(command); + if (do_unlink) +--- misc/build/Python-2.6.1/PC/msvcrtmodule.c.old 2010-09-24 22:03:40.593750000 +0200 ++++ misc/build/Python-2.6.1/PC/msvcrtmodule.c 2010-09-24 22:04:39.625000000 +0200 +@@ -23,7 +23,7 @@ + #include + + #ifdef _MSC_VER +-#if _MSC_VER >= 1500 ++#if _MSC_VER == 1500 + #include + #endif + #endif +--- /dev/null 2010-10-29 00:42:37.000000000 +0200 ++++ misc/build/Python-2.6.1/PC/VS10.0/build_ssl.py 2010-10-29 00:41:17.250000000 +0200 +@@ -0,0 +1,258 @@ ++# Script for building the _ssl and _hashlib modules for Windows. ++# Uses Perl to setup the OpenSSL environment correctly ++# and build OpenSSL, then invokes a simple nmake session ++# for the actual _ssl.pyd and _hashlib.pyd DLLs. ++ ++# THEORETICALLY, you can: ++# * Unpack the latest SSL release one level above your main Python source ++# directory. It is likely you will already find the zlib library and ++# any other external packages there. ++# * Install ActivePerl and ensure it is somewhere on your path. ++# * Run this script from the PCBuild directory. ++# ++# it should configure and build SSL, then build the _ssl and _hashlib ++# Python extensions without intervention. ++ ++# Modified by Christian Heimes ++# Now this script supports pre-generated makefiles and assembly files. ++# Developers don't need an installation of Perl anymore to build Python. A svn ++# checkout from our svn repository is enough. ++# ++# In Order to create the files in the case of an update you still need Perl. ++# Run build_ssl in this order: ++# python.exe build_ssl.py Release x64 ++# python.exe build_ssl.py Release Win32 ++ ++import os, sys, re, shutil ++ ++# Find all "foo.exe" files on the PATH. ++def find_all_on_path(filename, extras = None): ++ entries = os.environ["PATH"].split(os.pathsep) ++ ret = [] ++ for p in entries: ++ fname = os.path.abspath(os.path.join(p, filename)) ++ if os.path.isfile(fname) and fname not in ret: ++ ret.append(fname) ++ if extras: ++ for p in extras: ++ fname = os.path.abspath(os.path.join(p, filename)) ++ if os.path.isfile(fname) and fname not in ret: ++ ret.append(fname) ++ return ret ++ ++# Find a suitable Perl installation for OpenSSL. ++# cygwin perl does *not* work. ActivePerl does. ++# Being a Perl dummy, the simplest way I can check is if the "Win32" package ++# is available. ++def find_working_perl(perls): ++ for perl in perls: ++ fh = os.popen(perl + ' -e "use Win32;"') ++ fh.read() ++ rc = fh.close() ++ if rc: ++ continue ++ return perl ++ print("Can not find a suitable PERL:") ++ if perls: ++ print(" the following perl interpreters were found:") ++ for p in perls: ++ print(" ", p) ++ print(" None of these versions appear suitable for building OpenSSL") ++ else: ++ print(" NO perl interpreters were found on this machine at all!") ++ print(" Please install ActivePerl and ensure it appears on your path") ++ return None ++ ++# Locate the best SSL directory given a few roots to look into. ++def find_best_ssl_dir(sources): ++ candidates = [] ++ for s in sources: ++ try: ++ # note: do not abspath s; the build will fail if any ++ # higher up directory name has spaces in it. ++ fnames = os.listdir(s) ++ except os.error: ++ fnames = [] ++ for fname in fnames: ++ fqn = os.path.join(s, fname) ++ if os.path.isdir(fqn) and fname.startswith("openssl-"): ++ candidates.append(fqn) ++ # Now we have all the candidates, locate the best. ++ best_parts = [] ++ best_name = None ++ for c in candidates: ++ parts = re.split("[.-]", os.path.basename(c))[1:] ++ # eg - openssl-0.9.7-beta1 - ignore all "beta" or any other qualifiers ++ if len(parts) >= 4: ++ continue ++ if parts > best_parts: ++ best_parts = parts ++ best_name = c ++ if best_name is not None: ++ print("Found an SSL directory at '%s'" % (best_name,)) ++ else: ++ print("Could not find an SSL directory in '%s'" % (sources,)) ++ sys.stdout.flush() ++ return best_name ++ ++def create_makefile64(makefile, m32): ++ """Create and fix makefile for 64bit ++ ++ Replace 32 with 64bit directories ++ """ ++ if not os.path.isfile(m32): ++ return ++ # 2.4 compatibility ++ fin = open(m32) ++ if 1: # with open(m32) as fin: ++ fout = open(makefile, 'w') ++ if 1: # with open(makefile, 'w') as fout: ++ for line in fin: ++ line = line.replace("=tmp32", "=tmp64") ++ line = line.replace("=out32", "=out64") ++ line = line.replace("=inc32", "=inc64") ++ # force 64 bit machine ++ line = line.replace("MKLIB=lib", "MKLIB=lib /MACHINE:X64") ++ line = line.replace("LFLAGS=", "LFLAGS=/MACHINE:X64 ") ++ # don't link against the lib on 64bit systems ++ line = line.replace("bufferoverflowu.lib", "") ++ fout.write(line) ++ os.unlink(m32) ++ ++def fix_makefile(makefile): ++ """Fix some stuff in all makefiles ++ """ ++ if not os.path.isfile(makefile): ++ return ++ # 2.4 compatibility ++ fin = open(makefile) ++ if 1: # with open(makefile) as fin: ++ lines = fin.readlines() ++ fin.close() ++ fout = open(makefile, 'w') ++ if 1: # with open(makefile, 'w') as fout: ++ for line in lines: ++ if line.startswith("PERL="): ++ continue ++ if line.startswith("CP="): ++ line = "CP=copy\n" ++ if line.startswith("MKDIR="): ++ line = "MKDIR=mkdir\n" ++ if line.startswith("CFLAG="): ++ line = line.strip() ++ for algo in ("RC5", "MDC2", "IDEA"): ++ noalgo = " -DOPENSSL_NO_%s" % algo ++ if noalgo not in line: ++ line = line + noalgo ++ line = line + '\n' ++ fout.write(line) ++ fout.close() ++ ++def run_configure(configure, do_script): ++ print("perl Configure "+configure) ++ os.system("perl Configure "+configure) ++ print(do_script) ++ os.system(do_script) ++ ++def main(): ++ build_all = "-a" in sys.argv ++ if sys.argv[1] == "Release": ++ debug = False ++ elif sys.argv[1] == "Debug": ++ debug = True ++ else: ++ raise ValueError(str(sys.argv)) ++ ++ if sys.argv[2] == "Win32": ++ arch = "x86" ++ configure = "VC-WIN32" ++ do_script = "ms\\do_nasm" ++ makefile="ms\\nt.mak" ++ m32 = makefile ++ elif sys.argv[2] == "x64": ++ arch="amd64" ++ configure = "VC-WIN64A" ++ do_script = "ms\\do_win64a" ++ makefile = "ms\\nt64.mak" ++ m32 = makefile.replace('64', '') ++ #os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON" ++ else: ++ raise ValueError(str(sys.argv)) ++ ++ make_flags = "" ++ if build_all: ++ make_flags = "-a" ++ # perl should be on the path, but we also look in "\perl" and "c:\\perl" ++ # as "well known" locations ++ perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"]) ++ perl = find_working_perl(perls) ++ if perl is None: ++ print("No Perl installation was found. Existing Makefiles are used.") ++ ++ print("Found a working perl at '%s'" % (perl,)) ++ sys.stdout.flush() ++ # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live. ++ ssl_dir = find_best_ssl_dir(("..\\..",)) ++ if ssl_dir is None: ++ sys.exit(1) ++ ++ old_cd = os.getcwd() ++ try: ++ os.chdir(ssl_dir) ++ # rebuild makefile when we do the role over from 32 to 64 build ++ if arch == "amd64" and os.path.isfile(m32) and not os.path.isfile(makefile): ++ os.unlink(m32) ++ ++ # If the ssl makefiles do not exist, we invoke Perl to generate them. ++ # Due to a bug in this script, the makefile sometimes ended up empty ++ # Force a regeneration if it is. ++ if not os.path.isfile(makefile) or os.path.getsize(makefile)==0: ++ if perl is None: ++ print("Perl is required to build the makefiles!") ++ sys.exit(1) ++ ++ print("Creating the makefiles...") ++ sys.stdout.flush() ++ # Put our working Perl at the front of our path ++ os.environ["PATH"] = os.path.dirname(perl) + \ ++ os.pathsep + \ ++ os.environ["PATH"] ++ run_configure(configure, do_script) ++ if debug: ++ print("OpenSSL debug builds aren't supported.") ++ #if arch=="x86" and debug: ++ # # the do_masm script in openssl doesn't generate a debug ++ # # build makefile so we generate it here: ++ # os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile) ++ ++ if arch == "amd64": ++ create_makefile64(makefile, m32) ++ fix_makefile(makefile) ++ shutil.copy(r"crypto\buildinf.h", r"crypto\buildinf_%s.h" % arch) ++ shutil.copy(r"crypto\opensslconf.h", r"crypto\opensslconf_%s.h" % arch) ++ ++ # Now run make. ++ if arch == "amd64": ++ rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm") ++ if rc: ++ print("ml64 assembler has failed.") ++ sys.exit(rc) ++ ++ shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") ++ shutil.copy(r"crypto\opensslconf_%s.h" % arch, r"crypto\opensslconf.h") ++ ++ #makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile) ++ makeCommand = "nmake /nologo -f \"%s\"" % makefile ++ print("Executing ssl makefiles:", makeCommand) ++ sys.stdout.flush() ++ rc = os.system(makeCommand) ++ if rc: ++ print("Executing "+makefile+" failed") ++ print(rc) ++ sys.exit(rc) ++ finally: ++ os.chdir(old_cd) ++ sys.exit(rc) ++ ++if __name__=='__main__': ++ sys.exit(0) +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_ctypes.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_ctypes.vcxproj 2010-10-04 12:52:04.859375000 +0200 +@@ -0,0 +1,289 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {0E9791DB-593A-465F-98BC-681011311618} ++ _ctypes ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ 0x1D1A0000 ++ ++ ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ MachineX64 ++ ++ ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ ++ ++ true ++ ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ true ++ ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ true ++ ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ true ++ ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes_test.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_ctypes_test.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_ctypes_test.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_ctypes_test.vcxproj 2010-10-04 12:52:04.875000000 +0200 +@@ -0,0 +1,187 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {9EC7190A-249F-4180-A900-548FDCF3055F} ++ _ctypes_test ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ ++ ++ X64 ++ ++ ++ ++ ++ X64 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_elementtree.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_elementtree.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_elementtree.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_elementtree.vcxproj 2010-10-04 12:52:04.875000000 +0200 +@@ -0,0 +1,264 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {17E1E049-C309-4D79-843F-AE483C264AEA} ++ _elementtree ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ MachineX64 ++ ++ ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_msi.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_msi.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj 2010-10-04 12:52:04.890625000 +0200 +@@ -0,0 +1,220 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C} ++ _msi ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ MachineX64 ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_multiprocessing.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_multiprocessing.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_multiprocessing.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_multiprocessing.vcxproj 2010-10-04 12:52:04.906250000 +0200 +@@ -0,0 +1,228 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {9e48b300-37d1-11dd-8c41-005056c00008} ++ _multiprocessing ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_socket.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_socket.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_socket.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_socket.vcxproj 2010-10-04 12:52:04.906250000 +0200 +@@ -0,0 +1,223 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {86937F53-C189-40EF-8CE8-8759D8E7D480} ++ _socket ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_ssl.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_ssl.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_ssl.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_ssl.vcxproj 2010-10-04 12:52:04.968750000 +0200 +@@ -0,0 +1,308 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {C6E20F84-3247-4AD6-B051-B073268F73BA} ++ _ssl ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ ..;$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//_testcapi.vcxproj misc/build/Python-2.6.1/PC/VS10.0/_testcapi.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//_testcapi.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/_testcapi.vcxproj 2010-10-04 12:52:04.968750000 +0200 +@@ -0,0 +1,212 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D} ++ _testcapi ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ MachineX64 ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//bdist_wininst.vcxproj misc/build/Python-2.6.1/PC/VS10.0/bdist_wininst.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//bdist_wininst.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/bdist_wininst.vcxproj 2010-10-04 12:52:04.984375000 +0200 +@@ -0,0 +1,156 @@ ++ ++ ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C} ++ wininst ++ ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ ..\lib\distutils\command\ ++ false ++ $(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ false ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ true ++ Win32 ++ .\..\lib\distutils\command\wininst.tlb ++ ++ ++ ++ ++ MinSpace ++ OnlyExplicitInline ++ ..;..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Level3 ++ true ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0000 ++ ..;..\..\PC;..\..\PC\bdist_wininst;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ comctl32.lib;imagehlp.lib;%(AdditionalDependencies) ++ ..\lib\distutils\command\wininst-9.0.exe ++ true ++ LIBC;%(IgnoreSpecificDefaultLibraries) ++ ..\lib\distutils\command\wininst-9.0.pdb ++ Windows ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ true ++ X64 ++ .\..\lib\distutils\command\wininst.tlb ++ ++ ++ ++ ++ MinSpace ++ OnlyExplicitInline ++ ..;..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Level3 ++ true ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0000 ++ ..;..\..\PC;..\..\PC\bdist_wininst;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ comctl32.lib;imagehlp.lib;%(AdditionalDependencies) ++ ..\lib\distutils\command\wininst-9.0-amd64.exe ++ true ++ LIBC;%(IgnoreSpecificDefaultLibraries) ++ ..\lib\distutils\command\wininst-9.0-amd64.pdb ++ Windows ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//debug.props misc/build/Python-2.6.1/PC/VS10.0/debug.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//debug.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/debug.props 2010-10-04 12:52:05.187500000 +0200 +@@ -0,0 +1,19 @@ ++ ++ ++ ++ $(OutDir)kill_python_d.exe ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ $(KillPythonExe) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//kill_python.vcxproj misc/build/Python-2.6.1/PC/VS10.0/kill_python.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//kill_python.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/kill_python.vcxproj 2010-10-04 12:52:05.031250000 +0200 +@@ -0,0 +1,120 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} ++ kill_python ++ Win32Proj ++ ++ ++ ++ Application ++ NotSet ++ true ++ ++ ++ Application ++ NotSet ++ ++ ++ Application ++ NotSet ++ true ++ ++ ++ Application ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ $(OutDir)$(ProjectName)_d.exe ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ $(OutDir)$(ProjectName)_d.exe ++ Console ++ ++ ++ ++ ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ Console ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//make_buildinfo.vcxproj misc/build/Python-2.6.1/PC/VS10.0/make_buildinfo.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//make_buildinfo.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/make_buildinfo.vcxproj 2010-10-04 12:52:05.031250000 +0200 +@@ -0,0 +1,74 @@ ++ ++ ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD} ++ make_buildinfo ++ Win32Proj ++ ++ ++ ++ Application ++ NotSet ++ ++ ++ Application ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Disabled ++ OnlyExplicitInline ++ _CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ ++ $(OutDir)make_buildinfo.exe ++ $(TargetDir)$(TargetName).pdb ++ Console ++ ++ ++ ++ ++ _CONSOLE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//make_versioninfo.vcxproj misc/build/Python-2.6.1/PC/VS10.0/make_versioninfo.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//make_versioninfo.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/make_versioninfo.vcxproj 2010-10-04 12:52:05.046875000 +0200 +@@ -0,0 +1,201 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E} ++ make_versioninfo ++ ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ ++ ++ Application ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\..\PC\pythonnt_rc.h ++ ++ $(SolutionDir)..\..\PC\pythonnt_rc.h;%(Outputs) ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ $(SolutionDir)make_versioninfo.exe ++ $(TargetDir)$(TargetName).pdb ++ Console ++ 0x1d000000 ++ ++ ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\..\PC\python_nt.h ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\..\PC\pythonnt_rc.h ++ ++ $(SolutionDir)..\..\PC\pythonnt_rc.h;%(Outputs) ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ _CONSOLE;%(PreprocessorDefinitions) ++ ++ ++ $(SolutionDir)make_versioninfo.exe ++ ++ ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\..\PC\python_nt.h ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\..\PC\pythonnt_rc_d.h ++ ++ $(SolutionDir)..\..\PC\pythonnt_rc_d.h;%(Outputs) ++ ++ ++ Disabled ++ OnlyExplicitInline ++ false ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ $(SolutionDir)make_versioninfo_d.exe ++ $(TargetDir)$(TargetName).pdb ++ Console ++ 0x1d000000 ++ ++ ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\..\PC\python_nt_d.h ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\..\PC\pythonnt_rc_d.h ++ ++ $(SolutionDir)..\..\PC\pythonnt_rc_d.h;%(Outputs) ++ ++ ++ X64 ++ ++ ++ Disabled ++ OnlyExplicitInline ++ false ++ _CONSOLE;%(PreprocessorDefinitions) ++ ++ ++ $(SolutionDir)make_versioninfo_d.exe ++ MachineX64 ++ ++ ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\..\PC\python_nt_d.h ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pcbuild.sln misc/build/Python-2.6.1/PC/VS10.0/pcbuild.sln +--- misc/build/Python-2.6.1/PC/VS10.0.old//pcbuild.sln 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pcbuild.sln 2010-10-04 13:04:31.593750000 +0200 +@@ -0,0 +1,370 @@ ++? ++Microsoft Visual Studio Solution File, Format Version 11.00 ++# Visual Studio 2010 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcxproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcxproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcxproj", "{0E9791DB-593A-465F-98BC-681011311618}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcxproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcxproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcxproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}" ++EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcxproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" ++#EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcxproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcxproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcxproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Win32 = Debug|Win32 ++ Debug|x64 = Debug|x64 ++ PGInstrument|Win32 = PGInstrument|Win32 ++ PGInstrument|x64 = PGInstrument|x64 ++ PGUpdate|Win32 = PGUpdate|Win32 ++ PGUpdate|x64 = PGUpdate|x64 ++ Release|Win32 = Release|Win32 ++ Release|x64 = Release|x64 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.Build.0 = Debug|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.ActiveCfg = Debug|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.Build.0 = Debug|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.ActiveCfg = Release|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.Build.0 = Release|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.ActiveCfg = Release|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.Build.0 = Release|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.Build.0 = Debug|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.ActiveCfg = Release|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.Build.0 = Release|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.ActiveCfg = Release|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.Build.0 = Release|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.Build.0 = Debug|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.ActiveCfg = Debug|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.Build.0 = Debug|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.ActiveCfg = Release|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.Build.0 = Release|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.ActiveCfg = Release|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.Build.0 = Release|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.Build.0 = Debug|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.ActiveCfg = Debug|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.Build.0 = Debug|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.ActiveCfg = Release|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.Build.0 = Release|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.ActiveCfg = Release|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.Build.0 = Release|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.Build.0 = Debug|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.ActiveCfg = Debug|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.Build.0 = Debug|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.ActiveCfg = Release|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.Build.0 = Release|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.ActiveCfg = Release|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.Build.0 = Release|Win32 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.Build.0 = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.Build.0 = Debug|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.Build.0 = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.Build.0 = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.ActiveCfg = Release|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.Build.0 = Release|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.Build.0 = Debug|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.ActiveCfg = Debug|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.Build.0 = Debug|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.ActiveCfg = Release|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.Build.0 = Release|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.Build.0 = Debug|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.ActiveCfg = Debug|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.Build.0 = Debug|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.ActiveCfg = Release|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.Build.0 = Release|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.ActiveCfg = Release|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.Build.0 = Release|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.Build.0 = Debug|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.ActiveCfg = Debug|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.Build.0 = Debug|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.ActiveCfg = Release|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.Build.0 = Release|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.ActiveCfg = Release|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.Build.0 = Release|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.Build.0 = Debug|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.ActiveCfg = Release|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.Build.0 = Release|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.ActiveCfg = Release|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.Build.0 = Release|x64 ++ EndGlobalSection ++ GlobalSection(SolutionProperties) = preSolution ++ HideSolutionNode = FALSE ++ EndGlobalSection ++EndGlobal +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pginstrument.props misc/build/Python-2.6.1/PC/VS10.0/pginstrument.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//pginstrument.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pginstrument.props 2010-10-04 12:52:05.203125000 +0200 +@@ -0,0 +1,38 @@ ++ ++ ++ ++ $(SolutionDir)$(Platform)-pgi\ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(OutDirPGI)\ ++ $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ false ++ Size ++ true ++ false ++ true ++ true ++ ++ ++ false ++ ++ ++ true ++ true ++ PGInstrument ++ $(SolutionDir)$(Platform)-pgi\$(TargetName).pgd ++ $(OutDirPGI)\$(TargetName).lib ++ ++ ++ ++ ++ $(OutDirPGI) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pgupdate.props misc/build/Python-2.6.1/PC/VS10.0/pgupdate.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//pgupdate.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pgupdate.props 2010-10-04 12:52:05.250000000 +0200 +@@ -0,0 +1,16 @@ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(SolutionDir)$(PlatformName)-pgo\ ++ ++ ++ ++ %(AdditionalManifestDependencies) ++ PGUpdate ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pyd.props misc/build/Python-2.6.1/PC/VS10.0/pyd.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//pyd.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pyd.props 2010-10-04 12:52:05.250000000 +0200 +@@ -0,0 +1,27 @@ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ false ++ false ++ ++ ++ ++ Py_BUILD_CORE_MODULE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ $(OutDir)$(ProjectName).pyd ++ $(OutDir)$(ProjectName).pdb ++ $(OutDir)$(TargetName).lib ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pyd_d.props misc/build/Python-2.6.1/PC/VS10.0/pyd_d.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//pyd_d.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pyd_d.props 2010-10-04 12:52:05.265625000 +0200 +@@ -0,0 +1,39 @@ ++ ++ ++ ++ ++ ++ ++ ++ $(SolutionDir)python_d.exe ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ false ++ false ++ false ++ ++ ++ ++ Disabled ++ Default ++ false ++ Py_BUILD_CORE_MODULE;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ $(OutDir)$(ProjectName)_d.pyd ++ $(OutDir)$(ProjectName)_d.pdb ++ $(OutDir)$(TargetName).lib ++ ++ ++ ++ ++ ++ ++ ++ ++ $(PythonExe) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pyexpat.vcxproj misc/build/Python-2.6.1/PC/VS10.0/pyexpat.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//pyexpat.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pyexpat.vcxproj 2010-10-04 12:52:05.046875000 +0200 +@@ -0,0 +1,231 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {D06B6426-4762-44CC-8BAD-D79052507F2F} ++ pyexpat ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;.\..\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pyproject.props misc/build/Python-2.6.1/PC/VS10.0/pyproject.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//pyproject.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pyproject.props 2010-10-04 12:52:05.281250000 +0200 +@@ -0,0 +1,115 @@ ++ ++ ++ ++ python26 ++ $(SolutionDir)\python.exe ++ ..\.. ++ $(bsddb47Dir) ++ $(bsddb47DepLibs) ++ $(externalsDir)\db-4.4.20\build_win32 ++ ++ $(externalsDir)\db-4.7.25.0\build_windows ++ ws2_32.lib ++ $(externalsDir)\sqlite-3.5.9 ++ $(externalsDir)\bzip2-1.0.5 ++ $(externalsDir)\openssl-0.9.8g ++ $(externalsDir)\tcltk ++ $(externalsDir)\tcltk64 ++ $(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib ++ $(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib ++ $(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib ++ $(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(SolutionDir)\ ++ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ ++ false ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ ..;..\..\Include; ..\..\PC;%(AdditionalIncludeDirectories) ++ _WIN32;%(PreprocessorDefinitions) ++ true ++ ++ ++ MultiThreaded ++ true ++ Level3 ++ ProgramDatabase ++ Default ++ ++ ++ $(OutDir);%(AdditionalLibraryDirectories) ++ true ++ $(OutDir)$(TargetName).pdb ++ Windows ++ false ++ ++ ++ MachineX86 ++ ++ ++ ..;..\..\PC;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ $(PyDllName) ++ ++ ++ $(PythonExe) ++ ++ ++ $(externalsDir) ++ ++ ++ $(bsddbDir) ++ ++ ++ $(bsddbDepLibs) ++ ++ ++ $(bsddb44Dir) ++ ++ ++ $(bsddb44DepLibs) ++ ++ ++ $(bsddb47Dir) ++ ++ ++ $(bsddb47DepLibs) ++ ++ ++ $(sqlite3Dir) ++ ++ ++ $(bz2Dir) ++ ++ ++ $(opensslDir) ++ ++ ++ $(tcltkDir) ++ ++ ++ $(tcltk64Dir) ++ ++ ++ $(tcltkLib) ++ ++ ++ $(tcltkLibDebug) ++ ++ ++ $(tcltk64Lib) ++ ++ ++ $(tcltk64LibDebug) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//python.vcxproj misc/build/Python-2.6.1/PC/VS10.0/python.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//python.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/python.vcxproj 2010-10-04 12:52:05.062500000 +0200 +@@ -0,0 +1,358 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} ++ ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ Disabled ++ false ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ true ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ $(OutDir)python_d.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ false ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ true ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ $(OutDir)python_d.exe ++ Console ++ 2100000 ++ 0x1d000000 ++ ++ ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pythoncore.vcxproj misc/build/Python-2.6.1/PC/VS10.0/pythoncore.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//pythoncore.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pythoncore.vcxproj 2010-10-04 12:52:05.078125000 +0200 +@@ -0,0 +1,670 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++ pythoncore ++ ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ NotSet ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName).lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName).lib ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ Disabled ++ Default ++ false ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Debug ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName)_d.dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName)_d.pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName)_d.lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ Disabled ++ Default ++ false ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Debug ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName)_d.dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName)_d.pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName)_d.lib ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ MachineX64 ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..;..\..\Python;..\..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..;..\..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//pythonw.vcxproj misc/build/Python-2.6.1/PC/VS10.0/pythonw.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//pythonw.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/pythonw.vcxproj 2010-10-04 12:52:05.078125000 +0200 +@@ -0,0 +1,340 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A} ++ ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Disabled ++ false ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw_d.exe ++ 2000000 ++ 0x1d000000 ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ false ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw_d.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;%(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//release.props misc/build/Python-2.6.1/PC/VS10.0/release.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//release.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/release.props 2010-10-04 12:52:05.281250000 +0200 +@@ -0,0 +1,19 @@ ++ ++ ++ ++ $(OutDir)kill_python.exe ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ $(KillPythonExe) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//select.vcxproj misc/build/Python-2.6.1/PC/VS10.0/select.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//select.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/select.vcxproj 2010-10-04 12:52:05.093750000 +0200 +@@ -0,0 +1,228 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {18CAE28C-B454-46C1-87A0-493D91D97F03} ++ select ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ MachineX64 ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//sqlite3.vcxproj misc/build/Python-2.6.1/PC/VS10.0/sqlite3.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//sqlite3.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/sqlite3.vcxproj 2010-10-04 12:52:05.093750000 +0200 +@@ -0,0 +1,240 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {A1A295E5-463C-437F-81CA-1F32367685DA} ++ sqlite3 ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName)_d.dll ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName)_d.dll ++ ++ ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ X64 ++ ++ ++ ..;$(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//unicodedata.vcxproj misc/build/Python-2.6.1/PC/VS10.0/unicodedata.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//unicodedata.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/unicodedata.vcxproj 2010-10-04 12:52:05.109375000 +0200 +@@ -0,0 +1,216 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881} ++ unicodedata ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ MachineX64 ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//w9xpopen.vcxproj misc/build/Python-2.6.1/PC/VS10.0/w9xpopen.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//w9xpopen.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/w9xpopen.vcxproj 2010-10-04 12:52:05.109375000 +0200 +@@ -0,0 +1,287 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} ++ w9xpopen ++ ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Console ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//winsound.vcxproj misc/build/Python-2.6.1/PC/VS10.0/winsound.vcxproj +--- misc/build/Python-2.6.1/PC/VS10.0.old//winsound.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/winsound.vcxproj 2010-10-04 12:52:05.140625000 +0200 +@@ -0,0 +1,212 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {28B5D777-DDF2-4B6B-B34F-31D938813856} ++ winsound ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PC/VS10.0.old//x64.props misc/build/Python-2.6.1/PC/VS10.0/x64.props +--- misc/build/Python-2.6.1/PC/VS10.0.old//x64.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PC/VS10.0/x64.props 2010-10-04 12:52:05.296875000 +0200 +@@ -0,0 +1,26 @@ ++ ++ ++ ++ $(HOST_PYTHON) ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ <_PropertySheetDisplayName>amd64 ++ $(SolutionDir)\amd64\ ++ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ ++ ++ ++ ++ /USECL:MS_OPTERON /GS- %(AdditionalOptions) ++ _WIN64;_M_X64;%(PreprocessorDefinitions) ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ $(PythonExe) ++ ++ ++ +\ No newline at end of file \ No newline at end of file diff --git a/python/makefile.mk b/python/makefile.mk index 9250ebca4ca5..22cbe082e8cf 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -119,7 +119,10 @@ BUILD_ACTION=$(ENV_BUILD) make && make install #.ENDIF #"$(WINDOWS_VISTA_PSDK)"!="" #.ENDIF -.IF "$(CCNUMVER)" >= "001500000000" +.IF "$(CCNUMVER)" >= "001600000000" +PATCH_FILES+=Python-$(PYVERSION)-vc10.patch +BUILD_DIR=PC/VS10.0 +.ELIF "$(CCNUMVER)" >= "001500000000" BUILD_DIR=PCbuild .ELIF "$(CCNUMVER)" >= "001400000000" BUILD_DIR=PC/VS8.0 @@ -132,9 +135,13 @@ BUILD_DIR=PC/VC6 # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native +.IF "$(CCNUMVER)" >= "001600000000" +BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 +.ELIF BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" .ENDIF .ENDIF +.ENDIF PYVERSIONFILE=$(MISC)$/pyversion.mk -- cgit From 0ee89b7715ef8848f6cf5ba0a784c3cd1d1c9983 Mon Sep 17 00:00:00 2001 From: Jesús Corrius Date: Fri, 29 Oct 2010 15:05:25 +0200 Subject: Actually deliver VC++ 10 compiled Python --- python/prj/d.lst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/python/prj/d.lst b/python/prj/d.lst index 075b17e0868b..8ad3dd5700b0 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -110,6 +110,20 @@ symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python26.dll %_DEST%\bin%_EXT%\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python26.lib %_DEST%\lib%_EXT%\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd ..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python.exe %_DEST%\bin%_EXT%\python.exe ..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.dll %_DEST%\bin%_EXT%\python26.dll ..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.lib %_DEST%\lib%_EXT%\python26.lib -- cgit -- cgit From 116a68db3e4e4d8cd291efb73844f3a0c5e80bde Mon Sep 17 00:00:00 2001 From: Jesús Corrius Date: Tue, 2 Nov 2010 20:37:12 +0100 Subject: Make sure Python builds for VS2008 again --- python/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/makefile.mk b/python/makefile.mk index 22cbe082e8cf..6f4b7ee5623c 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -137,7 +137,7 @@ BUILD_DIR=PC/VC6 # solver during registration in insetoo_native .IF "$(CCNUMVER)" >= "001600000000" BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 -.ELIF +.ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" .ENDIF .ENDIF -- cgit -- cgit -- cgit From 6f1c374d706db2dd8e1f4637a6684c83e91c0e4c Mon Sep 17 00:00:00 2001 From: Jesús Corrius Date: Tue, 2 Nov 2010 20:37:12 +0100 Subject: Make sure Python builds for VS2008 again --- python/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/makefile.mk b/python/makefile.mk index 22cbe082e8cf..6f4b7ee5623c 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -137,7 +137,7 @@ BUILD_DIR=PC/VC6 # solver during registration in insetoo_native .IF "$(CCNUMVER)" >= "001600000000" BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 -.ELIF +.ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" .ENDIF .ENDIF -- cgit From 630e06a2e256b3bda49ae3017c6fe83e0fb5c729 Mon Sep 17 00:00:00 2001 From: Niko Rönkkö Date: Thu, 4 Nov 2010 23:37:59 +0100 Subject: Elide all "SO:" and "OOo:" build.lst prefixes --- boost/prj/build.lst | 2 +- moz/prj/build.lst | 2 +- python/prj/build.lst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boost/prj/build.lst b/boost/prj/build.lst index 421265b927f7..528d18527208 100644 --- a/boost/prj/build.lst +++ b/boost/prj/build.lst @@ -1,3 +1,3 @@ -bo boost : SO:so_prereq solenv NULL +bo boost : solenv NULL bo boost usr1 - all bo_mkout NULL bo boost nmake - all bo_boost NULL diff --git a/moz/prj/build.lst b/moz/prj/build.lst index 717c309da96e..02c1bae213df 100644 --- a/moz/prj/build.lst +++ b/moz/prj/build.lst @@ -1,4 +1,4 @@ -moz moz : solenv SO:so_prereq NSS:nss NULL +moz moz : solenv NSS:nss NULL moz moz usr1 - all moz_mkout NULL moz moz nmake - all moz_mozilla NULL moz moz\zipped nmake - all moz_zipped moz_mozilla NULL diff --git a/python/prj/build.lst b/python/prj/build.lst index f5ea98adcd4e..d79a8f7cf00d 100644 --- a/python/prj/build.lst +++ b/python/prj/build.lst @@ -1,3 +1,3 @@ -py python : SO:so_prereq solenv OPENSSL:openssl NULL +py python : solenv OPENSSL:openssl NULL py python nmake - w,vc7 py_mkout NULL py python nmake - u py_mkout NULL -- cgit -- cgit -- cgit From c036e339cb70badcfb05811b221b08d2fc37fda0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 17 Nov 2010 09:39:59 +0000 Subject: WaE, remove some shadow warnings from boost --- boost/boost.4713.warnings.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 32554c818a14..23ae4f149238 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -106,3 +106,24 @@ m_min, m_max); } +--- misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp +@@ -102,13 +102,13 @@ + { + typedef typename ScannerT::iterator_t iterator_t; + iterator_t first = scan.first; +- typename SetT::search_info result = SetT::find(scan); ++ typename SetT::search_info result_ = SetT::find(scan); + +- if (result.data) ++ if (result_.data) + return scan. + create_match( +- result.length, +- symbol_ref_t(*result.data), ++ result_.length, ++ symbol_ref_t(*result_.data), + first, + scan.first); + else + -- cgit From d3eff1cbd04eec9c4e540519b244bd174b08497b Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 23 Nov 2010 18:31:36 +0100 Subject: fixed urllib.urlopen in the internal python (fdo#31466) + backported two fixes from newer python: + close the file even if an exception occurs (py#5536) + urllib doesn't correct server returned urls (py#918368) + thanks karolus for analyzing and suggesting the fix --- python/Python-2.6.1-urllib.patch | 93 ++++++++++++++++++++++++++++++++++++++++ python/makefile.mk | 3 +- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 python/Python-2.6.1-urllib.patch diff --git a/python/Python-2.6.1-urllib.patch b/python/Python-2.6.1-urllib.patch new file mode 100644 index 000000000000..6e20390860a4 --- /dev/null +++ b/python/Python-2.6.1-urllib.patch @@ -0,0 +1,93 @@ +--- misc/Python-2.6.1/Lib/urllib.py 2008-09-21 23:27:51.000000000 +0200 ++++ misc/build/Python-2.6.1/Lib/urllib.py 2010-11-23 15:41:08.000000000 +0100 +@@ -176,6 +176,9 @@ class URLopener: + def open(self, fullurl, data=None): + """Use URLopener().open(file) instead of open(file, 'r').""" + fullurl = unwrap(toBytes(fullurl)) ++ # percent encode url. fixing lame server errors like space within url ++ # parts ++ fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|") + if self.tempcache and fullurl in self.tempcache: + filename, headers = self.tempcache[fullurl] + fp = open(filename, 'rb') +@@ -233,41 +236,45 @@ class URLopener: + except IOError, msg: + pass + fp = self.open(url, data) +- headers = fp.info() +- if filename: +- tfp = open(filename, 'wb') +- else: +- import tempfile +- garbage, path = splittype(url) +- garbage, path = splithost(path or "") +- path, garbage = splitquery(path or "") +- path, garbage = splitattr(path or "") +- suffix = os.path.splitext(path)[1] +- (fd, filename) = tempfile.mkstemp(suffix) +- self.__tempfiles.append(filename) +- tfp = os.fdopen(fd, 'wb') +- result = filename, headers +- if self.tempcache is not None: +- self.tempcache[url] = result +- bs = 1024*8 +- size = -1 +- read = 0 +- blocknum = 0 +- if reporthook: +- if "content-length" in headers: +- size = int(headers["Content-Length"]) +- reporthook(blocknum, bs, size) +- while 1: +- block = fp.read(bs) +- if block == "": +- break +- read += len(block) +- tfp.write(block) +- blocknum += 1 +- if reporthook: +- reporthook(blocknum, bs, size) +- fp.close() +- tfp.close() ++ try: ++ headers = fp.info() ++ if filename: ++ tfp = open(filename, 'wb') ++ else: ++ import tempfile ++ garbage, path = splittype(url) ++ garbage, path = splithost(path or "") ++ path, garbage = splitquery(path or "") ++ path, garbage = splitattr(path or "") ++ suffix = os.path.splitext(path)[1] ++ (fd, filename) = tempfile.mkstemp(suffix) ++ self.__tempfiles.append(filename) ++ tfp = os.fdopen(fd, 'wb') ++ try: ++ result = filename, headers ++ if self.tempcache is not None: ++ self.tempcache[url] = result ++ bs = 1024*8 ++ size = -1 ++ read = 0 ++ blocknum = 0 ++ if reporthook: ++ if "content-length" in headers: ++ size = int(headers["Content-Length"]) ++ reporthook(blocknum, bs, size) ++ while 1: ++ block = fp.read(bs) ++ if block == "": ++ break ++ read += len(block) ++ tfp.write(block) ++ blocknum += 1 ++ if reporthook: ++ reporthook(blocknum, bs, size) ++ finally: ++ tfp.close() ++ finally: ++ fp.close() + del fp + del tfp + diff --git a/python/makefile.mk b/python/makefile.mk index 6f4b7ee5623c..d090cdc3932a 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,8 @@ TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ Python-ssl.patch \ - Python-aix.patch + Python-aix.patch \ + Python-2.6.1-urllib.patch CONFIGURE_DIR= -- cgit From 8e443b4c42f2fc7b230fe34319d4045b0e6d67a0 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 23 Nov 2010 18:31:36 +0100 Subject: fixed urllib.urlopen in the internal python (fdo#31466) + backported two fixes from newer python: + close the file even if an exception occurs (py#5536) + urllib doesn't correct server returned urls (py#918368) + thanks karolus for analyzing and suggesting the fix --- python/Python-2.6.1-urllib.patch | 93 ++++++++++++++++++++++++++++++++++++++++ python/makefile.mk | 3 +- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 python/Python-2.6.1-urllib.patch diff --git a/python/Python-2.6.1-urllib.patch b/python/Python-2.6.1-urllib.patch new file mode 100644 index 000000000000..6e20390860a4 --- /dev/null +++ b/python/Python-2.6.1-urllib.patch @@ -0,0 +1,93 @@ +--- misc/Python-2.6.1/Lib/urllib.py 2008-09-21 23:27:51.000000000 +0200 ++++ misc/build/Python-2.6.1/Lib/urllib.py 2010-11-23 15:41:08.000000000 +0100 +@@ -176,6 +176,9 @@ class URLopener: + def open(self, fullurl, data=None): + """Use URLopener().open(file) instead of open(file, 'r').""" + fullurl = unwrap(toBytes(fullurl)) ++ # percent encode url. fixing lame server errors like space within url ++ # parts ++ fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|") + if self.tempcache and fullurl in self.tempcache: + filename, headers = self.tempcache[fullurl] + fp = open(filename, 'rb') +@@ -233,41 +236,45 @@ class URLopener: + except IOError, msg: + pass + fp = self.open(url, data) +- headers = fp.info() +- if filename: +- tfp = open(filename, 'wb') +- else: +- import tempfile +- garbage, path = splittype(url) +- garbage, path = splithost(path or "") +- path, garbage = splitquery(path or "") +- path, garbage = splitattr(path or "") +- suffix = os.path.splitext(path)[1] +- (fd, filename) = tempfile.mkstemp(suffix) +- self.__tempfiles.append(filename) +- tfp = os.fdopen(fd, 'wb') +- result = filename, headers +- if self.tempcache is not None: +- self.tempcache[url] = result +- bs = 1024*8 +- size = -1 +- read = 0 +- blocknum = 0 +- if reporthook: +- if "content-length" in headers: +- size = int(headers["Content-Length"]) +- reporthook(blocknum, bs, size) +- while 1: +- block = fp.read(bs) +- if block == "": +- break +- read += len(block) +- tfp.write(block) +- blocknum += 1 +- if reporthook: +- reporthook(blocknum, bs, size) +- fp.close() +- tfp.close() ++ try: ++ headers = fp.info() ++ if filename: ++ tfp = open(filename, 'wb') ++ else: ++ import tempfile ++ garbage, path = splittype(url) ++ garbage, path = splithost(path or "") ++ path, garbage = splitquery(path or "") ++ path, garbage = splitattr(path or "") ++ suffix = os.path.splitext(path)[1] ++ (fd, filename) = tempfile.mkstemp(suffix) ++ self.__tempfiles.append(filename) ++ tfp = os.fdopen(fd, 'wb') ++ try: ++ result = filename, headers ++ if self.tempcache is not None: ++ self.tempcache[url] = result ++ bs = 1024*8 ++ size = -1 ++ read = 0 ++ blocknum = 0 ++ if reporthook: ++ if "content-length" in headers: ++ size = int(headers["Content-Length"]) ++ reporthook(blocknum, bs, size) ++ while 1: ++ block = fp.read(bs) ++ if block == "": ++ break ++ read += len(block) ++ tfp.write(block) ++ blocknum += 1 ++ if reporthook: ++ reporthook(blocknum, bs, size) ++ finally: ++ tfp.close() ++ finally: ++ fp.close() + del fp + del tfp + diff --git a/python/makefile.mk b/python/makefile.mk index 6f4b7ee5623c..d090cdc3932a 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,8 @@ TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ Python-ssl.patch \ - Python-aix.patch + Python-aix.patch \ + Python-2.6.1-urllib.patch CONFIGURE_DIR= -- cgit From b89a5faa5851cd1fed4c1321f4d5f8188484ff28 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 23 Nov 2010 13:40:38 +0000 Subject: extend patch to remove boost shadow warnings --- boost/boost.4713.warnings.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 23ae4f149238..5587b4b804fd 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -127,3 +127,16 @@ scan.first); else +--- misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp ++++ misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp +@@ -82,8 +82,8 @@ + //Give duration access to ticks constructor -- hide from users + friend class date_time::time_duration; + private: +- explicit time_duration(impl_type ticks) : +- date_time::time_duration(ticks) ++ explicit time_duration(impl_type _ticks) : ++ date_time::time_duration(_ticks) + {} + }; + -- cgit From bd5d223a36ee7ee4621c838e83acd41b39e51fb3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 24 Nov 2010 12:32:25 +0000 Subject: make possible to build with c++0x, remove obsolete method --- graphite/graphite-removeobsolete.patch | 34 ++++++++++++++++++++++++++++++++++ graphite/makefile.mk | 4 +++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 graphite/graphite-removeobsolete.patch diff --git a/graphite/graphite-removeobsolete.patch b/graphite/graphite-removeobsolete.patch new file mode 100644 index 000000000000..3dcfb36a10c3 --- /dev/null +++ b/graphite/graphite-removeobsolete.patch @@ -0,0 +1,34 @@ +--- misc/silgraphite-2.3.1.orig/engine/include/graphite/Segment.h ++++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h +@@ -142,7 +142,6 @@ + LineBrk lbStart, LineBrk lbEnd, SegEnd est, + bool fStartLine, bool fEndLine, bool fWsRtl); + void DestroyContents(); +- void SwapWith(Segment * pgrseg); + void ClearAltEndLineSeg(); + + ITextSource * GetString(); // client is responsible to Release() +--- misc/silgraphite-2.3.1.orig/engine/src/segment/Segment.cpp ++++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp +@@ -569,21 +569,6 @@ + } + + /*---------------------------------------------------------------------------------------------- +- Swap the guts of the two segments. +- OBSOLETE +-----------------------------------------------------------------------------------------------*/ +-void Segment::SwapWith(Segment * pgrseg) +-{ +- int crefThis = m_cref; +- int crefOther = pgrseg->m_cref; +- +- std::swap(*this, *pgrseg); +- +- m_cref = crefThis; +- pgrseg->m_cref = crefOther; +-} +- +-/*---------------------------------------------------------------------------------------------- + Delete the pointer to the alternate-end-of-line segment. + ----------------------------------------------------------------------------------------------*/ + void Segment::ClearAltEndLineSeg() diff --git a/graphite/makefile.mk b/graphite/makefile.mk index b9ecb7aea396..1134a29a4403 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -47,7 +47,9 @@ all: .IF "$(ENABLE_GRAPHITE)"=="TRUE" TARFILE_NAME=silgraphite-2.3.1 TARFILE_MD5=d35724900f6a4105550293686688bbb3 -PATCH_FILES=graphite-2.3.1.patch +PATCH_FILES=\ + graphite-2.3.1.patch \ + graphite-removeobsolete.patch # convert line-endings to avoid problems when patching CONVERTFILES=\ -- cgit -- cgit From 2d94124b1243a8cec416b6e8946db9d14806cc2c Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Tue, 7 Dec 2010 21:59:24 +0100 Subject: Actually build internal libxml2 with debug symbols in debug builds --- libxml2/makefile.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 0c69c36b74a5..c54d00e6f800 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -106,6 +106,9 @@ CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) +.IF "$(debug)"!="" +CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug +.ENDIF .ENDIF -- cgit From b5573a98d0fb8b64455f2a4517087e2b3badf800 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 9 Dec 2010 08:36:16 +0000 Subject: WaE, doubly const return value --- boost/boost.4713.warnings.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 5587b4b804fd..fe9699fb3939 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -140,3 +140,14 @@ {} }; +--- misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp ++++ misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp +@@ -49,7 +49,7 @@ + : first(rp->first), second(rp->second) + { } + +- const ref_pair* const operator->() const ++ const ref_pair* operator->() const + { + return this; + } -- cgit From 2d81ec5e4eafdf4cbb11928559278b0e506d3d3d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 10 Dec 2010 11:54:18 +0000 Subject: valgrind: add this in here for reference --- zlib/zlib-valgrind.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 zlib/zlib-valgrind.patch diff --git a/zlib/zlib-valgrind.patch b/zlib/zlib-valgrind.patch new file mode 100644 index 000000000000..3789ee4b13ec --- /dev/null +++ b/zlib/zlib-valgrind.patch @@ -0,0 +1,78 @@ +--- misc/zlib-1.2.3/deflate.c ++++ misc/build/zlib-1.2.3/deflate.c +@@ -288,6 +288,8 @@ + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + ++ s->high_water = 0; /* nothing written to s->window yet */ ++ + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +@@ -1355,6 +1355,40 @@ + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); ++ ++ /* If the WIN_INIT bytes after the end of the current data have never been ++ * written, then zero those bytes in order to avoid memory check reports of ++ * the use of uninitialized (or uninitialised as Julian writes) bytes by ++ * the longest match routines. Update the high water mark for the next ++ * time through here. WIN_INIT is set to MAX_MATCH since the longest match ++ * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. ++ */ ++ if (s->high_water < s->window_size) { ++ ulg curr = s->strstart + (ulg)(s->lookahead); ++ ulg init; ++ ++ if (s->high_water < curr) { ++ /* Previous high water mark below current data -- zero WIN_INIT ++ * bytes or up to end of window, whichever is less. ++ */ ++ init = s->window_size - curr; ++ if (init > WIN_INIT) ++ init = WIN_INIT; ++ zmemzero(s->window + curr, (unsigned)init); ++ s->high_water = curr + init; ++ } ++ else if (s->high_water < (ulg)curr + WIN_INIT) { ++ /* High water mark at or above current data, but below current data ++ * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up ++ * to end of window, whichever is less. ++ */ ++ init = (ulg)curr + WIN_INIT - s->high_water; ++ if (init > s->window_size - s->high_water) ++ init = s->window_size - s->high_water; ++ zmemzero(s->window + s->high_water, (unsigned)init); ++ s->high_water += init; ++ } ++ } + } + + /* =========================================================================== +--- misc/zlib-1.2.3/deflate.h ++++ misc/build/zlib-1.2.3/deflate.h +@@ -260,6 +260,12 @@ + * are always zero. + */ + ++ ulg high_water; ++ /* High water mark offset in window for initialized bytes -- bytes above ++ * this are set to zero in order to avoid memory check warnings when ++ * longest match routines access bytes past the input. This is then ++ * updated to the new high water mark. ++ */ + } FAR deflate_state; + + /* Output a byte on the stream. +@@ -278,6 +284,10 @@ + * distances are limited to MAX_DIST instead of WSIZE. + */ + ++#define WIN_INIT MAX_MATCH ++/* Number of bytes after end of data in window to initialize in order to avoid ++ memory checker errors from longest match routines */ ++ + /* in trees.c */ + void _tr_init OF((deflate_state *s)); + int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); -- cgit From 60889716192d13bdc37b2375c3c20969de8a9cd8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 10 Dec 2010 12:17:28 +0000 Subject: backport the run valgrind correctly fix --- hunspell/hunspell-valgrind.patch | 13 +++++++++++++ hunspell/makefile.mk | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 hunspell/hunspell-valgrind.patch diff --git a/hunspell/hunspell-valgrind.patch b/hunspell/hunspell-valgrind.patch new file mode 100644 index 000000000000..5ae1a86bdf14 --- /dev/null +++ b/hunspell/hunspell-valgrind.patch @@ -0,0 +1,13 @@ +--- misc/hunspell-1.2.9/tests/test.sh ++++ misc/build/hunspell-1.2.9/tests/test.sh +@@ -41,8 +41,8 @@ + if [ ! -d $TEMPDIR/badlogs ]; then + mkdir $TEMPDIR/badlogs + fi +- alias hunspell='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-hunspell' +- alias analyze='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-analyze' ++ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell' ++ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze' + fi + + # Tests good words diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index a455cce62388..ded4bb691abb 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -43,7 +43,8 @@ ADDITIONAL_FILES+=config.h PATCH_FILES=\ hunspell-wntconfig.patch \ hunspell-solaris.patch \ - hunspell-stacksmash.patch + hunspell-stacksmash.patch \ + hunspell-valgrind.patch .IF "$(GUI)"=="UNX" -- cgit From 49e01d13b5f7af1d259d78bdbe8ee2b600c5777f Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Mon, 13 Dec 2010 19:04:33 +0100 Subject: XPATH handling fix Signed off by Petr Mladek --- libxml2/libxml2-xpath.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++ libxml2/makefile.mk | 1 + 2 files changed, 50 insertions(+) create mode 100644 libxml2/libxml2-xpath.patch diff --git a/libxml2/libxml2-xpath.patch b/libxml2/libxml2-xpath.patch new file mode 100644 index 000000000000..e02982f16efe --- /dev/null +++ b/libxml2/libxml2-xpath.patch @@ -0,0 +1,49 @@ +--- misc/libxml2-2.7.6/xpath.c ++++ misc/build/libxml2-2.7.6/xpath.c +@@ -8104,9 +8104,17 @@ + xmlNodePtr + xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { + if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); +- if (cur != NULL && cur->children != NULL) +- return cur->children ; +- if (cur == NULL) cur = ctxt->context->node; ++ if ((cur != NULL) && (cur->type != XML_ATTRIBUTE_NODE) && ++ (cur->type != XML_NAMESPACE_DECL) && (cur->children != NULL)) ++ return(cur->children); ++ ++ if (cur == NULL) { ++ cur = ctxt->context->node; ++ if (cur->type == XML_NAMESPACE_DECL) ++ return(NULL); ++ if (cur->type == XML_ATTRIBUTE_NODE) ++ cur = cur->parent; ++ } + if (cur == NULL) return(NULL) ; /* ERROR */ + if (cur->next != NULL) return(cur->next) ; + do { +@@ -8160,8 +8168,13 @@ + xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) + { + if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); +- if (cur == NULL) ++ if (cur == NULL) { + cur = ctxt->context->node; ++ if (cur->type == XML_NAMESPACE_DECL) ++ return(NULL); ++ if (cur->type == XML_ATTRIBUTE_NODE) ++ return(cur->parent); ++ } + if (cur == NULL) + return (NULL); + if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) +@@ -8205,8 +8218,8 @@ + cur = ctxt->context->node; + if (cur == NULL) + return (NULL); +- if (cur->type == XML_NAMESPACE_DECL) +- cur = (xmlNodePtr)((xmlNsPtr)cur)->next; ++ if (cur->type == XML_NAMESPACE_DECL) ++ return (NULL); + ctxt->ancestor = cur->parent; + } + if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 0c69c36b74a5..c325747c943b 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -51,6 +51,7 @@ TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2 PATCH_FILES=libxml2-configure.patch \ libxml2-mingw.patch \ libxml2-gnome599717.patch \ + libxml2-xpath.patch \ libxml2-global-symbols.patch \ libxml2-aix.patch \ libxml2-vc10.patch -- cgit -- cgit From 2a2f893b13778fced2ad8e2f7780f6852f46f0cb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 21 Dec 2010 13:37:34 +0000 Subject: WaE: fix boost shadowed warnings --- boost/boost.4713.warnings.patch | 123 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index fe9699fb3939..c5d1c01fa5be 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -151,3 +151,126 @@ { return this; } +--- misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp ++++ misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp +@@ -476,19 +476,19 @@ + public: // C-array support + + void transfer( iterator before, value_type* from, +- size_type size, bool delete_from = true ) // strong ++ size_type size_, bool delete_from = true ) // strong + { + BOOST_ASSERT( from != 0 ); + if( delete_from ) + { + BOOST_DEDUCED_TYPENAME base_type::scoped_deleter +- deleter( from, size ); // nothrow +- this->base().insert( before.base(), from, from + size ); // strong ++ deleter( from, size_ ); // nothrow ++ this->base().insert( before.base(), from, from + size_ ); // strong + deleter.release(); // nothrow + } + else + { +- this->base().insert( before.base(), from, from + size ); // strong ++ this->base().insert( before.base(), from, from + size_ ); // strong + } + } + +@@ -510,72 +510,72 @@ + + public: // resize + +- void resize( size_type size ) // basic ++ void resize( size_type size_ ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { +- this->erase( boost::next( this->begin(), size ), this->end() ); ++ this->erase( boost::next( this->begin(), size_ ), this->end() ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_back( new BOOST_DEDUCED_TYPENAME + boost::remove_pointer::type ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + +- void resize( size_type size, value_type to_clone ) // basic ++ void resize( size_type size_, value_type to_clone ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { +- this->erase( boost::next( this->begin(), size ), this->end() ); ++ this->erase( boost::next( this->begin(), size_ ), this->end() ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_back( this->null_policy_allocate_clone( to_clone ) ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + +- void rresize( size_type size ) // basic ++ void rresize( size_type size_ ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { + this->erase( this->begin(), +- boost::next( this->begin(), old_size - size ) ); ++ boost::next( this->begin(), old_size - size_ ) ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_front( new BOOST_DEDUCED_TYPENAME + boost::remove_pointer::type ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + +- void rresize( size_type size, value_type to_clone ) // basic ++ void rresize( size_type size_, value_type to_clone ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { + this->erase( this->begin(), +- boost::next( this->begin(), old_size - size ) ); ++ boost::next( this->begin(), old_size - size_ ) ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_front( this->null_policy_allocate_clone( to_clone ) ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + + public: // algorithms -- cgit From c9da57d0b914e9c198e8de441591c68b55f41ad6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 21 Dec 2010 14:22:28 +0000 Subject: WaE: fix more boost header warnings --- boost/boost.4713.warnings.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index c5d1c01fa5be..b84b60aff0d8 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -274,3 +274,13 @@ } public: // algorithms +--- misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp ++++ misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp +@@ -477,6 +477,7 @@ + } + + ptr_map_adapter( const ptr_map_adapter& r ) ++ : base_type() + { + map_basic_clone_and_insert( r.begin(), r.end() ); + } -- cgit From eedd0cf67771f3169f6b5095deca82922c8c6544 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Dec 2010 11:40:44 +0000 Subject: WaE: fix some more boost shadowed warnings --- boost/boost.4713.warnings.patch | 459 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 459 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index b84b60aff0d8..805447ceed94 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -284,3 +284,462 @@ { map_basic_clone_and_insert( r.begin(), r.end() ); } +--- misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp ++++ misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp +@@ -423,17 +423,17 @@ + void delete_buckets() + { + if(buckets_) { +- bucket_ptr begin = cached_begin_bucket_; +- bucket_ptr end = buckets_end(); +- while(begin != end) { +- clear_bucket(begin); +- ++begin; ++ bucket_ptr begin_ = cached_begin_bucket_; ++ bucket_ptr end_ = buckets_end(); ++ while(begin_ != end_) { ++ clear_bucket(begin_); ++ ++begin_; + } + + // Destroy an extra bucket for the sentinels. +- ++end; +- for(begin = buckets_; begin != end; ++begin) +- allocators_.bucket_alloc_.destroy(begin); ++ ++end_; ++ for(begin_ = buckets_; begin_ != end_; ++begin_) ++ allocators_.bucket_alloc_.destroy(begin_); + + allocators_.bucket_alloc_.deallocate(buckets_, + bucket_manager_.bucket_count() + 1); +@@ -680,11 +680,11 @@ + // The deleted node is at the end of the group, so the + // first node in the group is pointing to it. + // Find that to change its pointer. +- link_ptr it = n->group_prev_; +- while(prev_in_group(it) != *pos) { +- it = prev_in_group(it); ++ link_ptr it2 = n->group_prev_; ++ while(prev_in_group(it2) != *pos) { ++ it2 = prev_in_group(it2); + } +- prev_in_group(it) = n->group_prev_; ++ prev_in_group(it2) = n->group_prev_; + } + *pos = next; + --size_; +@@ -721,25 +721,25 @@ + size_ -= node_count(n.node_); + } + +- void unlink_nodes(iterator_base begin, iterator_base end) ++ void unlink_nodes(iterator_base begin_, iterator_base end_) + { +- BOOST_ASSERT(begin.bucket_ == end.bucket_); +- size_ -= node_count(begin.node_, end.node_); +- link_ptr* it = get_for_erase(begin); +- split_group(*it, end.node_); +- *it = end.node_; ++ BOOST_ASSERT(begin_.bucket_ == end_.bucket_); ++ size_ -= node_count(begin_.node_, end_.node_); ++ link_ptr* it = get_for_erase(begin_); ++ split_group(*it, end_.node_); ++ *it = end_.node_; + } + +- void unlink_nodes(bucket_ptr base, iterator_base end) ++ void unlink_nodes(bucket_ptr base, iterator_base end_) + { +- BOOST_ASSERT(base == end.bucket_); ++ BOOST_ASSERT(base == end_.bucket_); + +- split_group(end.node_); ++ split_group(end_.node_); + + link_ptr ptr(base->next_); +- base->next_ = end.node_; ++ base->next_ = end_.node_; + +- size_ -= node_count(ptr, end.node_); ++ size_ -= node_count(ptr, end_.node_); + } + + #if BOOST_UNORDERED_EQUIVALENT_KEYS +@@ -797,12 +797,12 @@ + { + node_constructor a(allocators_); + +- link_ptr end = next_group(it); ++ link_ptr end_ = next_group(it); + + a.construct(get_value(it)); // throws + link_ptr n = link_node_in_bucket(a, dst); + +- for(it = it->next_; it != end; it = it->next_) { ++ for(it = it->next_; it != end_; it = it->next_) { + a.construct(get_value(it)); // throws + link_node(a, n); + } +@@ -824,21 +824,21 @@ + // + // no throw + +- void delete_to_bucket_end(link_ptr begin) ++ void delete_to_bucket_end(link_ptr begin_) + { +- while(begin) { +- link_ptr node = begin; +- begin = begin->next_; +- allocators_.destroy(node); ++ while(begin_) { ++ link_ptr node_ = begin_; ++ begin_ = begin_->next_; ++ allocators_.destroy(node_); + } + } + +- void delete_nodes(link_ptr begin, link_ptr end) ++ void delete_nodes(link_ptr begin_, link_ptr end_) + { +- while(begin != end) { +- link_ptr node = begin; +- begin = begin->next_; +- allocators_.destroy(node); ++ while(begin_ != end_) { ++ link_ptr node_ = begin_; ++ begin_ = begin_->next_; ++ allocators_.destroy(node_); + } + } + +@@ -848,9 +848,9 @@ + delete_nodes(first_node, prev_in_group(first_node)->next_); + } + #else +- void delete_group(link_ptr node) ++ void delete_group(link_ptr node_) + { +- allocators_.destroy(node); ++ allocators_.destroy(node_); + } + #endif + +@@ -869,15 +869,15 @@ + + void clear() + { +- bucket_ptr begin = cached_begin_bucket_; +- bucket_ptr end = buckets_end(); ++ bucket_ptr begin_ = cached_begin_bucket_; ++ bucket_ptr end_ = buckets_end(); + + size_ = 0; +- cached_begin_bucket_ = end; ++ cached_begin_bucket_ = end_; + +- while(begin != end) { +- clear_bucket(begin); +- ++begin; ++ while(begin_ != end_) { ++ clear_bucket(begin_); ++ ++begin_; + } + } + +@@ -974,13 +974,13 @@ + cached_begin_bucket_ = b2; + } + +- size_type erase_group(link_ptr* it, bucket_ptr bucket) ++ size_type erase_group(link_ptr* it, bucket_ptr bucket_) + { + link_ptr pos = *it; + size_type count = unlink_group(it); + delete_group(pos); + +- this->recompute_begin_bucket(bucket); ++ this->recompute_begin_bucket(bucket_); + + return count; + } +@@ -1541,8 +1541,8 @@ + hf(extract_key(data::get_value(src_bucket->next_)))); + + link_ptr n = src_bucket->next_; +- size_type count = src.unlink_group(&src_bucket->next_); +- dst.link_group(n, dst_bucket, count); ++ size_type count_ = src.unlink_group(&src_bucket->next_); ++ dst.link_group(n, dst_bucket, count_); + } + } + } +@@ -1651,20 +1651,20 @@ + { + key_type const& k = extract_key(a.get()->value()); + size_type hash_value = hash_function()(k); +- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); +- link_ptr position = find_iterator(bucket, k); ++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); ++ link_ptr position = find_iterator(bucket_, k); + + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(reserve_for_insert(size() + 1)) +- bucket = data_.bucket_ptr_from_hash(hash_value); ++ bucket_ = data_.bucket_ptr_from_hash(hash_value); + + // I'm relying on link_ptr not being invalidated by + // the rehash here. +- return iterator_base(bucket, ++ return iterator_base(bucket_, + (BOOST_UNORDERED_BORLAND_BOOL(position)) ? + data_.link_node(a, position) : +- data_.link_node_in_bucket(a, bucket) ++ data_.link_node_in_bucket(a, bucket_) + ); + } + +@@ -1718,13 +1718,13 @@ + a.construct(*i); + + key_type const& k = extract_key(a.get()->value()); +- bucket_ptr bucket = get_bucket(k); +- link_ptr position = find_iterator(bucket, k); ++ bucket_ptr bucket_ = get_bucket(k); ++ link_ptr position = find_iterator(bucket_, k); + + if(BOOST_UNORDERED_BORLAND_BOOL(position)) + data_.link_node(a, position); + else +- data_.link_node_in_bucket(a, bucket); ++ data_.link_node_in_bucket(a, bucket_); + } + } + } +@@ -1761,8 +1761,8 @@ + typedef BOOST_DEDUCED_TYPENAME value_type::second_type mapped_type; + + size_type hash_value = hash_function()(k); +- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); +- link_ptr pos = find_iterator(bucket, k); ++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); ++ link_ptr pos = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) + return data::get_value(pos); +@@ -1778,11 +1778,11 @@ + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(reserve_for_insert(size() + 1)) +- bucket = data_.bucket_ptr_from_hash(hash_value); ++ bucket_ = data_.bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + +- return data::get_value(data_.link_node_in_bucket(a, bucket)); ++ return data::get_value(data_.link_node_in_bucket(a, bucket_)); + } + } + +@@ -1797,13 +1797,13 @@ + // No side effects in this initial code + key_type const& k = extract_key(v); + size_type hash_value = hash_function()(k); +- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); +- link_ptr pos = find_iterator(bucket, k); ++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); ++ link_ptr pos = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Found an existing key, return it (no throw). + return std::pair( +- iterator_base(bucket, pos), false); ++ iterator_base(bucket_, pos), false); + + } else { + // Doesn't already exist, add to bucket. +@@ -1817,14 +1817,14 @@ + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(reserve_for_insert(size() + 1)) +- bucket = data_.bucket_ptr_from_hash(hash_value); ++ bucket_ = data_.bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + +- link_ptr n = data_.link_node_in_bucket(a, bucket); ++ link_ptr n = data_.link_node_in_bucket(a, bucket_); + + return std::pair( +- iterator_base(bucket, n), true); ++ iterator_base(bucket_, n), true); + } + } + +@@ -1864,13 +1864,13 @@ + { + // No side effects in this initial code + size_type hash_value = hash_function()(k); +- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); +- link_ptr pos = find_iterator(bucket, k); ++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); ++ link_ptr pos = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Found an existing key, return it (no throw). + return std::pair( +- iterator_base(bucket, pos), false); ++ iterator_base(bucket_, pos), false); + + } else { + // Doesn't already exist, add to bucket. +@@ -1884,12 +1884,12 @@ + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(reserve_for_insert(size() + 1)) +- bucket = data_.bucket_ptr_from_hash(hash_value); ++ bucket_ = data_.bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + +- return std::pair(iterator_base(bucket, +- data_.link_node_in_bucket(a, bucket)), true); ++ return std::pair(iterator_base(bucket_, ++ data_.link_node_in_bucket(a, bucket_)), true); + } + } + +@@ -1904,23 +1904,23 @@ + // No side effects in this initial code + key_type const& k = extract_key(a.get()->value()); + size_type hash_value = hash_function()(k); +- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); +- link_ptr pos = find_iterator(bucket, k); ++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); ++ link_ptr pos = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Found an existing key, return it (no throw). + return std::pair( +- iterator_base(bucket, pos), false); ++ iterator_base(bucket_, pos), false); + } else { + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(reserve_for_insert(size() + 1)) +- bucket = data_.bucket_ptr_from_hash(hash_value); ++ bucket_ = data_.bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + +- return std::pair(iterator_base(bucket, +- data_.link_node_in_bucket(a, bucket)), true); ++ return std::pair(iterator_base(bucket_, ++ data_.link_node_in_bucket(a, bucket_)), true); + } + } + +@@ -1969,8 +1969,8 @@ + for (; i != j; ++i) { + // No side effects in this initial code + size_type hash_value = hash_function()(extract_key(*i)); +- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); +- link_ptr pos = find_iterator(bucket, extract_key(*i)); ++ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); ++ link_ptr pos = find_iterator(bucket_, extract_key(*i)); + + if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Doesn't already exist, add to bucket. +@@ -1984,11 +1984,11 @@ + // throws, strong otherwise. + if(size() + 1 >= max_load_) { + reserve_for_insert(size() + insert_size(i, j)); +- bucket = data_.bucket_ptr_from_hash(hash_value); ++ bucket_ = data_.bucket_ptr_from_hash(hash_value); + } + + // Nothing after this point can throw. +- data_.link_node_in_bucket(a, bucket); ++ data_.link_node_in_bucket(a, bucket_); + } + } + } +@@ -2001,11 +2001,11 @@ + size_type erase_key(key_type const& k) + { + // No side effects in initial section +- bucket_ptr bucket = get_bucket(k); +- link_ptr* it = find_for_erase(bucket, k); ++ bucket_ptr bucket_ = get_bucket(k); ++ link_ptr* it = find_for_erase(bucket_, k); + + // No throw. +- return *it ? data_.erase_group(it, bucket) : 0; ++ return *it ? data_.erase_group(it, bucket_) : 0; + } + + // count +@@ -2022,19 +2022,19 @@ + // strong exception safety, no side effects + iterator_base find(key_type const& k) const + { +- bucket_ptr bucket = get_bucket(k); +- link_ptr it = find_iterator(bucket, k); ++ bucket_ptr bucket_ = get_bucket(k); ++ link_ptr it = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(it)) +- return iterator_base(bucket, it); ++ return iterator_base(bucket_, it); + else + return data_.end(); + } + + value_type& at(key_type const& k) const + { +- bucket_ptr bucket = get_bucket(k); +- link_ptr it = find_iterator(bucket, k); ++ bucket_ptr bucket_ = get_bucket(k); ++ link_ptr it = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(it)) + return data::get_value(it); +@@ -2047,10 +2047,10 @@ + // strong exception safety, no side effects + std::pair equal_range(key_type const& k) const + { +- bucket_ptr bucket = get_bucket(k); +- link_ptr it = find_iterator(bucket, k); ++ bucket_ptr bucket_ = get_bucket(k); ++ link_ptr it = find_iterator(bucket_, k); + if (BOOST_UNORDERED_BORLAND_BOOL(it)) { +- iterator_base first(iterator_base(bucket, it)); ++ iterator_base first(iterator_base(bucket_, it)); + iterator_base second(first); + second.increment_group(); + return std::pair(first, second); +@@ -2074,10 +2074,10 @@ + } + + // strong exception safety, no side effects +- link_ptr find_iterator(bucket_ptr bucket, ++ link_ptr find_iterator(bucket_ptr bucket_, + key_type const& k) const + { +- link_ptr it = data_.begin(bucket); ++ link_ptr it = data_.begin(bucket_); + while (BOOST_UNORDERED_BORLAND_BOOL(it) && !equal(k, data::get_value(it))) + it = data::next_group(it); + +@@ -2085,9 +2085,9 @@ + } + + // strong exception safety, no side effects +- link_ptr* find_for_erase(bucket_ptr bucket, key_type const& k) const ++ link_ptr* find_for_erase(bucket_ptr bucket_, key_type const& k) const + { +- link_ptr* it = &bucket->next_; ++ link_ptr* it = &bucket_->next_; + while(BOOST_UNORDERED_BORLAND_BOOL(*it) && !equal(k, data::get_value(*it))) + it = &data::next_group(*it); + -- cgit From 9a066526c54171f97836d4aa650021ef518a2f8d Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sun, 2 Jan 2011 15:42:17 +0100 Subject: New release of Linux Libertine G fonts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ChangeLog 2011-01-01: - fix for Acrobat Reader (bad layout with non-canonical glyph of cursive ligature ffj), the bug was reported by bolond from hup.hu 2010-12-29: - NEWS.pdf, doc/NEWS.odt - feature cpsp: capital spacing - feature sa01..sa99: single items of feature salt, suggested by Kim Bastin. - extended uppercase feature (caps=2): - default feature "case" (normalized parenthesis and digits) - default feature "cpsp" (capital kerning) - new cursive glyph "gj" as default ligature - new cursive glyph "gy" as default ligature in Hungarian texts - modified and extended feature dlig: - cursive ligature ch, ck, tz are default only in German - added ligated ligature ij for Dutch, also handling a few exceptions (bijoux, bijectie) - fix for Linux Libertin G Italic: - ch and ck are default ligatures only for German - Fixes for Dutch: - Casing of letter IJ - Limited ligature fi for words containing "fij", with short f usage for prettier layout - default J.alt in Italics - Caps fix for Qu - short f for fi, ffi, fj, ffj, when liga=0 - kerning fixes: - guillemets, bad kerning with feature fbsp reported by Joachim Köstler - cursive ffj - proportional old figures after slash Signed-off-by: Kalman Szalai - KAMI --- more_fonts/fonts/ttf_linlibertineg/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/more_fonts/fonts/ttf_linlibertineg/makefile.mk b/more_fonts/fonts/ttf_linlibertineg/makefile.mk index 678a398a2943..2849af332adf 100644 --- a/more_fonts/fonts/ttf_linlibertineg/makefile.mk +++ b/more_fonts/fonts/ttf_linlibertineg/makefile.mk @@ -36,8 +36,8 @@ TARGET=ttf_linlibertineg # --- Files -------------------------------------------------------- -TARFILE_NAME=LinLibertineG-20101021 -TARFILE_MD5=c8fc33ad1efb77155f61e0e4ba8d3e9e +TARFILE_NAME=LinLibertineG-20110101 +TARFILE_MD5=881af2b7dca9b8259abbca00bbbc004d TARFILE_ROOTDIR=LinLibertineG PATCH_FILES= -- cgit From fcf118007512b5f311b8786e8d381875bfe48a55 Mon Sep 17 00:00:00 2001 From: Laszlo Nemeth Date: Thu, 6 Jan 2011 23:48:55 +0100 Subject: fixed a crash - fdo#32850 --- hunspell/hunspell-1.2.9-crashfix.patch | 11 +++++++++++ hunspell/makefile.mk | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 hunspell/hunspell-1.2.9-crashfix.patch diff --git a/hunspell/hunspell-1.2.9-crashfix.patch b/hunspell/hunspell-1.2.9-crashfix.patch new file mode 100644 index 000000000000..73244d21a99b --- /dev/null +++ b/hunspell/hunspell-1.2.9-crashfix.patch @@ -0,0 +1,11 @@ +--- misc/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2010-02-27 12:59:53.000000000 +0100 ++++ misc/build/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2011-01-06 16:18:23.361159724 +0100 +@@ -1542,7 +1542,7 @@ + } + + if (!rv) { +- if (compoundflag && ++ if (compoundflag && !words && + !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN, compoundflag))) { + if ((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL, + FLAG_NULL, compoundflag, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN)) && !hu_mov_rule && diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index ded4bb691abb..a61f4e596e16 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -44,7 +44,8 @@ PATCH_FILES=\ hunspell-wntconfig.patch \ hunspell-solaris.patch \ hunspell-stacksmash.patch \ - hunspell-valgrind.patch + hunspell-valgrind.patch \ + hunspell-1.2.9-crashfix.patch .IF "$(GUI)"=="UNX" -- cgit From ee8a47bfbb40932a6f29d9c2dad8796bf9570441 Mon Sep 17 00:00:00 2001 From: Laszlo Nemeth Date: Thu, 6 Jan 2011 23:48:55 +0100 Subject: fixed a crash - fdo#32850 --- hunspell/hunspell-1.2.9-crashfix.patch | 11 +++++++++++ hunspell/makefile.mk | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 hunspell/hunspell-1.2.9-crashfix.patch diff --git a/hunspell/hunspell-1.2.9-crashfix.patch b/hunspell/hunspell-1.2.9-crashfix.patch new file mode 100644 index 000000000000..73244d21a99b --- /dev/null +++ b/hunspell/hunspell-1.2.9-crashfix.patch @@ -0,0 +1,11 @@ +--- misc/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2010-02-27 12:59:53.000000000 +0100 ++++ misc/build/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2011-01-06 16:18:23.361159724 +0100 +@@ -1542,7 +1542,7 @@ + } + + if (!rv) { +- if (compoundflag && ++ if (compoundflag && !words && + !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN, compoundflag))) { + if ((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL, + FLAG_NULL, compoundflag, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN)) && !hu_mov_rule && diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index a455cce62388..78680892edc9 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -43,7 +43,8 @@ ADDITIONAL_FILES+=config.h PATCH_FILES=\ hunspell-wntconfig.patch \ hunspell-solaris.patch \ - hunspell-stacksmash.patch + hunspell-stacksmash.patch \ + hunspell-1.2.9-crashfix.patch .IF "$(GUI)"=="UNX" -- cgit From bd21f2d99411a3145fe2ed570d58815164a9a3ff Mon Sep 17 00:00:00 2001 From: Christian Lippka ORACLE Date: Mon, 3 Jan 2011 17:59:57 +0100 Subject: impress208: #164350# better xpath handling --- libxml2/libxml2-xpath.patch | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/libxml2/libxml2-xpath.patch b/libxml2/libxml2-xpath.patch index e02982f16efe..107de91ed862 100644 --- a/libxml2/libxml2-xpath.patch +++ b/libxml2/libxml2-xpath.patch @@ -1,6 +1,6 @@ ---- misc/libxml2-2.7.6/xpath.c -+++ misc/build/libxml2-2.7.6/xpath.c -@@ -8104,9 +8104,17 @@ +--- misc/libxml2-2.7.6/xpath.c 2009-09-24 17:32:00.000000000 +0200 ++++ misc/build/libxml2-2.7.6/xpath.c 2011-01-03 17:21:08.788256100 +0100 +@@ -8106,9 +8106,17 @@ xmlNodePtr xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); @@ -21,7 +21,7 @@ if (cur == NULL) return(NULL) ; /* ERROR */ if (cur->next != NULL) return(cur->next) ; do { -@@ -8160,8 +8168,13 @@ +@@ -8162,8 +8170,13 @@ xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); @@ -36,7 +36,7 @@ if (cur == NULL) return (NULL); if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) -@@ -8205,8 +8218,8 @@ +@@ -8207,8 +8220,8 @@ cur = ctxt->context->node; if (cur == NULL) return (NULL); @@ -47,3 +47,24 @@ ctxt->ancestor = cur->parent; } if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) +@@ -11737,11 +11750,16 @@ + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { + xmlXPathObjectPtr tmp; +- /* pop the result */ ++ /* pop the result if any */ + tmp = valuePop(ctxt); +- xmlXPathReleaseObject(xpctxt, tmp); +- /* then pop off contextObj, which will be freed later */ +- valuePop(ctxt); ++ if (tmp != contextObj) { ++ /* ++ * Free up the result ++ * then pop off contextObj, which will be freed later ++ */ ++ xmlXPathReleaseObject(xpctxt, tmp); ++ valuePop(ctxt); ++ } + goto evaluation_error; + } + -- cgit -- cgit -- cgit -- cgit From 09b6be8237a3a39dc8def7b348a7008bd23951f1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 15 Jan 2011 20:14:53 +0000 Subject: sync configure's -Werror logic with configure.ac --- graphite/graphite-updatewerror.patch | 11 +++++++++++ graphite/makefile.mk | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 graphite/graphite-updatewerror.patch diff --git a/graphite/graphite-updatewerror.patch b/graphite/graphite-updatewerror.patch new file mode 100644 index 000000000000..6d812b6f254a --- /dev/null +++ b/graphite/graphite-updatewerror.patch @@ -0,0 +1,11 @@ +--- misc/silgraphite-2.3.1.orig/engine/configure ++++ misc/build/silgraphite-2.3.1/engine/configure +@@ -16877,7 +16877,7 @@ + # (note: the flags here are gcc-specific and may fail with other compilers) + build_flags="" + if test "$enable_debug" = yes; then +- build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses -Werror" ++ build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses" + elif test "$enable_strict" = yes; then + build_flags="$build_flags -DNDEBUG -Wall -Wno-unknown-pragmas -Wparentheses -Werror" + else diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 1134a29a4403..181d70b27728 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -47,9 +47,13 @@ all: .IF "$(ENABLE_GRAPHITE)"=="TRUE" TARFILE_NAME=silgraphite-2.3.1 TARFILE_MD5=d35724900f6a4105550293686688bbb3 +#graphite-updatewerror.patch -Werror passed to CFLAGS configure for +#--enable-debug, but not in configure.ac, so update configure to +#match PATCH_FILES=\ graphite-2.3.1.patch \ - graphite-removeobsolete.patch + graphite-removeobsolete.patch \ + graphite-updatewerror.patch # convert line-endings to avoid problems when patching CONVERTFILES=\ -- cgit From 5c145d3cfc47be75c3b8d8b27eb28301f06ffec7 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Thu, 20 Jan 2011 13:02:11 +0200 Subject: Fix libpr0n Makefile Bug is discussed here: http://permalink.gmane.org/gmane.linux.mandrake.cooker.devel/304002 Fix: http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/songbird/current/SOURCES/Songbird1.4.3-fix-build.patch?revision=537683&view=markup Signed-off-by: Tor Lillqvist --- moz/makefile.mk | 3 ++- moz/patches/libpr0n_build_fix.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 moz/patches/libpr0n_build_fix.patch diff --git a/moz/makefile.mk b/moz/makefile.mk index 49e9b41010ea..aefd5b8c3a87 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -93,7 +93,8 @@ PATCH_FILES = \ patches/arm_build_fix.patch \ patches/link_fontconfig.patch \ patches/brokenmakefile.patch \ - patches/aix_build_fix.patch + patches/aix_build_fix.patch \ + patches/libpr0n_build_fix.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/libpr0n_build_fix.patch b/moz/patches/libpr0n_build_fix.patch new file mode 100644 index 000000000000..083e493fe782 --- /dev/null +++ b/moz/patches/libpr0n_build_fix.patch @@ -0,0 +1,14 @@ +--- misc/mozilla/modules/libpr0n/build/Makefile.in 2006-05-20 19:20:48.000000000 +0200 ++++ misc/build/mozilla/modules/libpr0n/build/Makefile.in 2011-01-19 05:18:01.318000024 +0100 +@@ -106,9 +106,9 @@ + export:: + @{ \ + $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \ +- echo "#define IMG_BUILD_DECODER_${d}";) \ ++ echo "#define IMG_BUILD_DECODER_${d}" ; ) \ + $(foreach d,$(MOZ_IMG_ENCODERS), \ +- echo "#define IMG_BUILD_ENCODER_${d}";) \ ++ echo "#define IMG_BUILD_ENCODER_${d}" ; ) \ + } > nsImgBuildDefines.tmp + @if `cmp -s nsImgBuildDefines.h nsImgBuildDefines.tmp`; then \ + rm -f nsImgBuildDefines.tmp; \ -- cgit -- cgit From 492cb2d85ba42385c00adccaedb9f737674b80f1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 22 Jan 2011 03:42:25 +0200 Subject: Don't use pointless and obsolete switches when building ICU Don't use the /machine:i386 switch. The defaults work fine: the 32-bit linker will produce i386 executables, the 64-bit linker will produce x64 ones. Don't use the /Op compiler switch, it doesn't exist in MSVC 2008. --- icu/createmak.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/icu/createmak.cfg b/icu/createmak.cfg index 19ef708cca40..1b47c0f76570 100644 --- a/icu/createmak.cfg +++ b/icu/createmak.cfg @@ -33,10 +33,10 @@ CDEF1FLAGS= -D "_WINDOWS" -D "_MBCS" CPP_PROJ=-nologo -MD -Za -Zi -W3 -GF -O2 -Ob2 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c [CFlags_i18n] -CPP_PROJ=-MD -W3 -Oi -Op -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c +CPP_PROJ=-MD -W3 -Oi -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c [CFlags_extra_uconv] -CPP_PROJ=-MD -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/uconv.pch" $(CPDBOBJ) -c +CPP_PROJ=-MD -W3 -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/uconv.pch" $(CPDBOBJ) -c [CFlags_layout] CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c @@ -45,10 +45,10 @@ CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D CPP_PROJ=-Za -GF -Gy -W3 $(EXCEPTIONSWITCH) -O2 $(CPP_PROJ_INCLUDES) $(CDEFS) -D "LAYOUT_EXPORTS" -D "_WINDOWS" -D "_MBCS" -D "_USRDLL" $(CPDBOBJ) -c [CFlags_layoutex] -CPP_PROJ=-MT -W3 -Op -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/layoutex.pch" $(CPDBOBJ) -c +CPP_PROJ=-MT -W3 -GF -Gy $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/layoutex.pch" $(CPDBOBJ) -c [CFlags_stubdata] -CPP_PROJ=-MD -W3 -Op -GF -Gy -Za $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/stubdata.pch" $(CPDBOBJ) -c +CPP_PROJ=-MD -W3 -GF -Gy -Za $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/stubdata.pch" $(CPDBOBJ) -c [CFlags_test_cintltst] CPP_PROJ=-MT -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c @@ -63,7 +63,7 @@ CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c [CFlags_tools_ctestfw] -CPP_PROJ=-nologo -MD -O2 -Op -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/icutest.pch" $(CPDBOBJ) -c +CPP_PROJ=-nologo -MD -O2 -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/icutest.pch" $(CPDBOBJ) -c [CFlags_tools_genbrk] CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c @@ -133,7 +133,7 @@ CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) [CommonLinkFlags] PDBOUT=/pdb:"" /out:"" -COMMONLINKFLAGS=/incremental:no /machine:I386 /nologo $(PDBOUT) +COMMONLINKFLAGS=/incremental:no /nologo $(PDBOUT) COMMONLINKFLAGS_CONSOLE=$(COMMONLINKFLAGS) /subsystem:console COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll @@ -156,7 +156,7 @@ LINK32_FLAGS=icuuc.lib icuin.lib $(COMMONLINKFLAGS_DLL) /libpath:"..\..\lib" /im LINK32_FLAGS=..\..\lib\icuuc.lib ..\..\lib\icule.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\iculx.lib" [LinkFlags_stubdata] -LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:I386 $(PDBOUT) /implib:"..\..\lib\icudata.lib" +LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes $(PDBOUT) /implib:"..\..\lib\icudata.lib" [LinkFlags_test_cintltst] LINK32_FLAGS=icuuc.lib icuin.lib icutest.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib\\" -- cgit -- cgit From 047e32a694fba1b1e5a7f30bfd3268cb08180364 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 23 Jan 2011 03:22:53 +0200 Subject: Define HAVE_VSNPRINTF for MSVC --- zlib/zlib-1.2.3.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/zlib/zlib-1.2.3.patch b/zlib/zlib-1.2.3.patch index 5e2b69535e5e..4bfad287c231 100644 --- a/zlib/zlib-1.2.3.patch +++ b/zlib/zlib-1.2.3.patch @@ -90,3 +90,14 @@ #ifdef Z_PREFIX # define deflateInit_ z_deflateInit_ # define deflate z_deflate +--- misc/zlib-1.2.3/zutil.h ++++ misc/build/zlib-1.2.3/zutil.h +@@ -175,7 +175,7 @@ + + /* functions */ + +-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) ++#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) || defined(_MSC_VER) + # ifndef HAVE_VSNPRINTF + # define HAVE_VSNPRINTF + # endif -- cgit From 631f331d3c53a0fa0bce20ede1aae14de3670c7e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 23 Jan 2011 20:55:04 +0200 Subject: Fix Python build for x64 Windows --- python/Python-2.6.1.patch | 129 ++++++++++++++++++++++++++++++++++++++++++++++ python/makefile.mk | 8 ++- 2 files changed, 136 insertions(+), 1 deletion(-) diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index e762c6201c0f..b9a9c2a132e1 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -120,6 +120,135 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +@@ -162,20 +162,20 @@ + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 +@@ -226,20 +226,20 @@ + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 +--- misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj ++++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj +@@ -124,6 +124,8 @@ + InlineFunctionExpansion="1" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="_CONSOLE" ++ RuntimeLibrary="2" ++ CompileAs="0" + /> + + + + + + + +- + --- misc/Python-2.6.1/PC/VS7.1/pcbuild.sln 2007-06-10 23:01:17.000000000 +0200 +++ misc/build/Python-2.6.1/PC/VS7.1/pcbuild.sln 2010-02-16 01:49:18.810375000 +0100 @@ -1,36 +1,36 @@ diff --git a/python/makefile.mk b/python/makefile.mk index d090cdc3932a..651a8a0c3c29 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -133,13 +133,19 @@ BUILD_DIR=PC/VS7.1 BUILD_DIR=PC/VC6 .ENDIF +.IF "$(CPU)" == "I" +ARCH=Win32 +.ELSE +ARCH=x64 +.ENDIF + # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native .IF "$(CCNUMVER)" >= "001600000000" BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 .ELSE -BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|$(ARCH)" .ENDIF .ENDIF .ENDIF -- cgit From 13f646d1aefdf6937062d2b4fe639a3f3d7030f7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 24 Jan 2011 00:18:00 +0200 Subject: Interpret any non-empty value of $(debug) as true, like elsewhere Also, avoid double slash when redirecting the pdb file just for cleanliness. --- graphite/makefile.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 181d70b27728..0e7b81cd7897 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -77,9 +77,9 @@ VCNUM=8 # make use of stlport headerfiles EXT_USE_STLPORT=TRUE BUILD_ACTION=nmake VERBOSE=1 -.IF "$(debug)"=="true" +.IF "$(debug)"!="" BUILD_FLAGS= "CFG=DEBUG" -CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!) +CFLAGSWITHPATH= $(CFLAGS:s!-Fd./!-Fd../../../../../!) .ELSE # Speed Optimization is really needed for Graphite CFLAGSWITHPATH= $(CFLAGS) /O2 @@ -96,7 +96,7 @@ BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll .IF "$(COM)"=="GCC" # Does linux want --disable-shared? -.IF "$(debug)"=="true" +.IF "$(debug)"!="" GR_CONFIGURE_FLAGS= --enable-debug=yes --disable-final --enable-static --disable-shared .ELSE GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared @@ -129,7 +129,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #OUT2LIB=win32$/bin.msvc$/*.lib -.IF "$(debug)"=="true" +.IF "$(debug)"!="" OUT2LIB=engine$/debug$/*.lib .ELSE OUT2LIB=engine$/release$/*.lib @@ -147,7 +147,7 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib .ELSE .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll -.IF "$(debug)"=="true" +.IF "$(debug)"!="" OUT2BIN= \ # engine$/debug$/*.dll \ engine$/debug$/*.pdb -- cgit From 597850ed084dab256cc98c83aec9d7de7024c193 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 24 Jan 2011 12:04:25 +0200 Subject: Fix curl build on x64 Windows --- curl/makefile.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/curl/makefile.mk b/curl/makefile.mk index 213a887de2cd..31abb8d85485 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -122,6 +122,13 @@ EXCFLAGS="/EHsc /YX" .ENDIF BUILD_DIR=.$/lib + +.IF "$(CPU)" == "I" +MACHINE=X86 +.ELSE +MACHINE=X64 +.ENDIF + .IF "$(debug)"=="" BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) .ELSE -- cgit From e8ebdd67c4997fe6633ca105fec1445ad2539ea1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 24 Jan 2011 12:26:44 +0200 Subject: Actually pass the MACHINE parameter to nmake --- curl/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/curl/makefile.mk b/curl/makefile.mk index 31abb8d85485..8e95621896d7 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -130,9 +130,9 @@ MACHINE=X64 .ENDIF .IF "$(debug)"=="" -BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) .ELSE -BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) .ENDIF OUT2BIN=$(BUILD_DIR)$/libcurl.dll -- cgit From 71a9b97cf7851a29e1fcef862c939e531c559a03 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 24 Jan 2011 10:40:45 +0000 Subject: WaE: gcc 4.6.0 various warnings --- moz/makefile.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/moz/makefile.mk b/moz/makefile.mk index aefd5b8c3a87..e34770527f9c 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -188,10 +188,14 @@ CXXFLAGS+=-m64 .ENDIF .EXPORT : CXXFLAGS .ENDIF # "$(COMNAME)"=="sunpro5" -.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64" -CXXFLAGS:=-mminimal-toc -.EXPORT : CXXFLAGS .ENDIF + +.IF "$(COM)" == "GCC" +CXXFLAGS+=-fpermissive +.IF "$(OS)$(CPUNAME)" == "LINUXPOWERPC64" +CXXFLAGS+=-mminimal-toc +.ENDIF +.EXPORT : CXXFLAGS .ENDIF .IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U" -- cgit From 1dbe1a81f505edb9aa019c00221a765b2db3bcc3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 24 Jan 2011 13:56:06 +0200 Subject: Include the wntmscx build directories --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 .gitignore diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index bcb73e55aa01..ad966da44344 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ # the build directories /*/unxlng?? /*/unxlng??.pro -/*/wntmsci?? -/*/wntmsci??.pro +/*/wntmsc??? +/*/wntmsc???.pro /moz/zipped/*.zip -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit From 66cf7e478e79e3d83a8ec4c6005393190f97ede1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 29 Jan 2011 12:51:46 +0000 Subject: Resolves: fdo#31271 wrong line break with ( --- icu/icuversion.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icu/icuversion.mk b/icu/icuversion.mk index eedf6276e598..a170642b276c 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -25,9 +25,9 @@ # #************************************************************************* # major -ICU_MAJOR=4 +ICU_MAJOR*=4 # minor -ICU_MINOR=0 +ICU_MINOR*=0 # micro -ICU_MICRO=1 +ICU_MICRO*=1 -- cgit From d09a0b3b48e160e29dd45b9d0cb36fc563e83747 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 29 Jan 2011 12:51:46 +0000 Subject: Resolves: fdo#31271 wrong line break with ( (cherry picked from commit 6f1fa58123900aaeb68bc869ddf8e24503c590c0) --- icu/icuversion.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icu/icuversion.mk b/icu/icuversion.mk index eedf6276e598..a170642b276c 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -25,9 +25,9 @@ # #************************************************************************* # major -ICU_MAJOR=4 +ICU_MAJOR*=4 # minor -ICU_MINOR=0 +ICU_MINOR*=0 # micro -ICU_MICRO=1 +ICU_MICRO*=1 -- cgit From e6c3f83362045bea22ea7c1aa9c0772c7738f764 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Sun, 30 Jan 2011 18:19:17 +0100 Subject: boost needs makedepend delivered by soltools --- boost/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boost/prj/build.lst b/boost/prj/build.lst index 528d18527208..957da005305d 100644 --- a/boost/prj/build.lst +++ b/boost/prj/build.lst @@ -1,3 +1,3 @@ -bo boost : solenv NULL +bo boost : solenv soltools NULL bo boost usr1 - all bo_mkout NULL bo boost nmake - all bo_boost NULL -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit From 074034a79ef6ebf5bb3c0353dbde5ad134d4b3a8 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 2 Feb 2011 11:50:57 +0100 Subject: Clean up makefiles --- berkeleydb/makefile.mk | 7 ------- graphite/makefile.mk | 18 ++---------------- icu/makefile.mk | 10 ---------- moz/makefile.mk | 5 +---- python/makefile.mk | 15 --------------- 5 files changed, 3 insertions(+), 52 deletions(-) diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 98d52e915da2..dc5cbad417db 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -86,10 +86,6 @@ LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map .EXPORT: LDFLAGSVERSION .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" -#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -#CC:=$(COMPATH)$/bin$/cc -#CXX:=$(COMPATH)$/bin$/CC -#.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\' .EXPORT: LDFLAGS .ENDIF # "$(OS)$(COM)"=="SOLARISC52" @@ -167,9 +163,6 @@ BUILD_DIR= BUILD_ACTION=dmake BUILD_DIR_OUT=build_windows -#OUT2LIB= \ -# $(BUILD_DIR_OUT)$/Release$/libdb42.lib -#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll OUT2INC= \ $(BUILD_DIR_OUT)$/db.h .ENDIF diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 0e7b81cd7897..53bb99ba8973 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -60,12 +60,6 @@ CONVERTFILES=\ engine/makefile.vc8 \ engine/test/RegressionTest/RtTextSrc.h -#.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" -#CONFIGURE_DIR=win32 -#.ELSE -#CONFIGURE_DIR=engine -#.ENDIF - CONFIGURE_DIR=engine .IF "$(COM)"=="MSC" @@ -128,7 +122,6 @@ CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEF BUILD_DIR=$(CONFIGURE_DIR) .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" -#OUT2LIB=win32$/bin.msvc$/*.lib .IF "$(debug)"!="" OUT2LIB=engine$/debug$/*.lib .ELSE @@ -146,18 +139,11 @@ BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB+=src$/.libs$/libgraphite.*.dylib .ELSE .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" -#OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll .IF "$(debug)"!="" -OUT2BIN= \ -# engine$/debug$/*.dll \ - engine$/debug$/*.pdb +OUT2BIN=engine$/debug$/*.pdb .ELSE OUT2BIN= -# engine$/release$/*.dll -# engine$/release$/*.pdb .ENDIF -.ELSE -#OUT2LIB+=engine$/src$/.libs$/libgraphite.so.*.*.* .ENDIF .ENDIF @@ -172,8 +158,8 @@ OUT2INC=wrappers$/win32$/WinFont.h dddd: @echo Nothing to do .ENDIF -# --- Targets ------------------------------------------------------ +# --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk .INCLUDE : target.mk diff --git a/icu/makefile.mk b/icu/makefile.mk index 82e74bd455ba..01610dc4cbbc 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -50,15 +50,7 @@ PATCH_FILES=\ ${TARFILE_NAME}.patch \ icu4c-aix.patch -# ADDITIONAL_FILES= - .IF "$(GUI)"=="UNX" -.IF "$(COMNAME)"=="sunpro5" -#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -#CC:=$(COMPATH)$/bin$/cc -#CXX:=$(COMPATH)$/bin$/CC -#.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -.ENDIF # "$(COMNAME)"=="sunpro5" .IF "$(SYSBASE)"!="" icu_CFLAGS+=-I$(SYSBASE)$/usr$/include @@ -114,7 +106,6 @@ CONFIGURE_DIR=source CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' -#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no CONFIGURE_FLAGS= # Use of @@ -168,7 +159,6 @@ icu_LIBS+=-lstdc++_s icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' -#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no CONFIGURE_FLAGS= # Use of diff --git a/moz/makefile.mk b/moz/makefile.mk index e34770527f9c..94d693580ccd 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -35,6 +35,7 @@ TARGET=ooo_mozab .INCLUDE : settings.mk # --- Files -------------------------------------------------------- + # ----- pkg-config start ------- .INCLUDE .IGNORE : pkgroot.mk .IF "$(PKGCONFIG_ROOT)"!="" @@ -144,10 +145,6 @@ MOZILLA_CONFIGURE_FLAGS += --disable-tests \ --disable-pango \ --enable-extensions="pref" -#.IF "$(GUI)"!="WNT" -#MOZILLA_CONFIGURE_FLAGS += --enable-system-cairo -#.ENDIF - #disable profilelocking to share profile with mozilla #disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h #disable gnomevfs to remove the needed of gnome develop files diff --git a/python/makefile.mk b/python/makefile.mk index 651a8a0c3c29..edf2194f3b49 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -41,10 +41,8 @@ all: @echo "Therefore the version provided here does not need to be built in addition." .ENDIF - # --- Files -------------------------------------------------------- - TARFILE_NAME=Python-$(PYVERSION) TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ @@ -106,19 +104,6 @@ python_LDFLAGS+=-shared-libgcc -Wl,--enable-runtime-pseudo-reloc-v2 CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" BUILD_ACTION=$(ENV_BUILD) make && make install .ELSE -#PYTHONPATH:=..$/Lib -#.EXPORT : PYTHONPATH - -#.IF "$(CCNUMVER)" <= "001400000000" -#EXFLAGS="/GX /YX" -#.ELSE -#.IF "$(WINDOWS_VISTA_PSDK)"!="" -#EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" -#ADDITIONALLIBS=ws2_32.lib -#.ELSE #"$(WINDOWS_VISTA_PSDK)"!="" -#EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" -#.ENDIF #"$(WINDOWS_VISTA_PSDK)"!="" -#.ENDIF .IF "$(CCNUMVER)" >= "001600000000" PATCH_FILES+=Python-$(PYVERSION)-vc10.patch -- cgit From 6bdf7f86b41967cc70260b40c0f9e740890a5909 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 2 Feb 2011 12:48:07 +0000 Subject: Resolves: rhbz#674328 freeserif crashes libicu --- icu/icu4c.8320.freeserif.crash.patch | 13 +++++++++++++ icu/makefile.mk | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 icu/icu4c.8320.freeserif.crash.patch diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch new file mode 100644 index 000000000000..4e4c3da92742 --- /dev/null +++ b/icu/icu4c.8320.freeserif.crash.patch @@ -0,0 +1,13 @@ +--- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000 ++++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000 +@@ -70,6 +70,10 @@ + + if (selectMask != 0) { + const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup); ++ ++ if (!lookupTable) ++ continue; ++ + le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags); + + glyphIterator.reset(lookupFlags, selectMask); diff --git a/icu/makefile.mk b/icu/makefile.mk index 01610dc4cbbc..dfe725231dd9 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,8 +46,12 @@ TARFILE_MD5= .ENDIF TARFILE_ROOTDIR=icu +#icu4c.8320.freeserif.crash.patch, see +#http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif + PATCH_FILES=\ ${TARFILE_NAME}.patch \ + icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch .IF "$(GUI)"=="UNX" -- cgit -- cgit -- cgit From d1e4f11a9638887dfa708bf476d9c4473705dbb7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 3 Feb 2011 01:10:29 +0200 Subject: Don't try to copy nonexistent pdb files --- graphite/makefile.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 53bb99ba8973..4aeb626eeb10 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -137,14 +137,6 @@ BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libgraphite.*.dylib -.ELSE -.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" -.IF "$(debug)"!="" -OUT2BIN=engine$/debug$/*.pdb -.ELSE -OUT2BIN= -.ENDIF -.ENDIF .ENDIF -- cgit -- cgit From 54f2e7cd5ff3898184b639624a380d01324100d2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 3 Feb 2011 09:36:54 +0000 Subject: Resolves: rhbz#674328 more ways for freeserif to crash libicu --- icu/icu4c.8320.freeserif.crash.patch | 40 +++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch index 4e4c3da92742..611fbbd83a69 100644 --- a/icu/icu4c.8320.freeserif.crash.patch +++ b/icu/icu4c.8320.freeserif.crash.patch @@ -1,6 +1,16 @@ +--- misc/icu/source/layout/LookupProcessor.h 2011-02-03 09:20:27.657005678 +0000 ++++ misc/build/icu/source/layout/LookupProcessor.h 2011-02-03 09:25:34.498396208 +0000 +@@ -58,6 +58,7 @@ + const FeatureListTable *featureListTable; + + FeatureMask *lookupSelectArray; ++ le_uint32 lookupSelectCount; + + le_uint16 *lookupOrderArray; + le_uint32 lookupOrderCount; --- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000 +++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000 -@@ -70,6 +70,10 @@ +@@ -62,6 +64,10 @@ if (selectMask != 0) { const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup); @@ -11,3 +21,31 @@ le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags); glyphIterator.reset(lookupFlags, selectMask); +@@ -96,6 +102,9 @@ + for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) { + le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]); + ++ if (lookupListIndex >= lookupSelectCount) ++ continue; ++ + lookupSelectArray[lookupListIndex] |= featureMask; + lookupOrderArray[store++] = lookupListIndex; + } +@@ -106,7 +115,7 @@ + LookupProcessor::LookupProcessor(const char *baseAddress, + Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset, + LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures) +- : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), ++ : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0), + lookupOrderArray(NULL), lookupOrderCount(0) + { + const ScriptListTable *scriptListTable = NULL; +@@ -146,6 +155,8 @@ + lookupSelectArray[i] = 0; + } + ++ lookupSelectCount = lookupListCount; ++ + le_int32 count, order = 0; + le_int32 featureReferences = 0; + const FeatureTable *featureTable = NULL; -- cgit From b9ab0357bb1c8a4e777a6c4c269bb845e01a0c44 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 4 Feb 2011 16:57:37 +0100 Subject: upgrade to boost 1.44.0 to solve some std::forward issues --- boost/aliasing.patch | 43 --- boost/boost.4713.warnings.patch | 725 ++++------------------------------------ boost/boost_1_39_0.patch | 312 ----------------- boost/boost_1_44_0.patch | 25 ++ boost/makefile.mk | 6 +- 5 files changed, 100 insertions(+), 1011 deletions(-) delete mode 100644 boost/aliasing.patch delete mode 100644 boost/boost_1_39_0.patch create mode 100644 boost/boost_1_44_0.patch diff --git a/boost/aliasing.patch b/boost/aliasing.patch deleted file mode 100644 index 07840a445b10..000000000000 --- a/boost/aliasing.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- misc/boost_1_39_0/boost/function/function_base.hpp -+++ misc/build/boost_1_39_0/boost/function/function_base.hpp -@@ -2,6 +2,7 @@ - - // Copyright Douglas Gregor 2001-2006 - // Copyright Emil Dotchevski 2007 -+// Copyright Dean Michael Berris 2009 - // Use, modification and distribution is subject to the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at - // http://www.boost.org/LICENSE_1_0.txt) -@@ -44,6 +45,13 @@ - # pragma warning( disable : 4127 ) // "conditional expression is constant" - #endif - -+#if defined(__GNUC__) -+// Because GCC complains of strict aliasing problems, we make it -+// treat the header as a system header, becoming more forgiving with -+// treating implementation details that may be potentially harmful. -+# pragma GCC system_header -+#endif -+ - // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. - #ifdef BOOST_NO_STD_TYPEINFO - // Embedded VC++ does not have type_info in namespace std -@@ -314,15 +322,15 @@ - { - if (op == clone_functor_tag || op == move_functor_tag) { - const functor_type* in_functor = -- reinterpret_cast(&in_buffer.data); -+ static_cast(static_cast(&in_buffer.data)); - new ((void*)&out_buffer.data) functor_type(*in_functor); - - if (op == move_functor_tag) { -- reinterpret_cast(&in_buffer.data)->~Functor(); -+ static_cast(static_cast(&in_buffer.data))->~Functor(); - } - } else if (op == destroy_functor_tag) { - // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type. -- reinterpret_cast(&out_buffer.data)->~Functor(); -+ static_cast(static_cast(&out_buffer.data))->~Functor(); - } else if (op == check_functor_type_tag) { - const detail::sp_typeinfo& check_type - = *out_buffer.type.type; diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 805447ceed94..458bb02f1abe 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -1,16 +1,52 @@ ---- misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/error_handling/exceptions.hpp -@@ -126,8 +126,8 @@ - typedef unary > base_t; - typedef unary_parser_category parser_category_t; - -- assertive_parser(ParserT const& parser, ErrorDescrT descriptor) -- : base_t(parser), descriptor(descriptor) {} -+ assertive_parser(ParserT const& parser, ErrorDescrT descriptor_) -+ : base_t(parser), descriptor(descriptor_) {} +--- misc/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp 2008-06-24 22:37:35.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/ptr_container/detail/map_iterator.hpp 2011-02-04 16:39:19.000000000 +0100 +@@ -49,7 +49,7 @@ + : first(rp->first), second(rp->second) + { } + +- const ref_pair* const operator->() const ++ const ref_pair* operator->() const + { + return this; + } +--- misc/boost_1_44_0/boost/ptr_container/ptr_map_adapter.hpp 2008-06-24 22:37:35.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/ptr_container/ptr_map_adapter.hpp 2011-02-04 16:39:19.000000000 +0100 +@@ -477,6 +477,7 @@ + } + + ptr_map_adapter( const ptr_map_adapter& r ) ++ : base_type() + { + map_basic_clone_and_insert( r.begin(), r.end() ); + } +--- misc/boost_1_44_0/boost/ptr_container/ptr_sequence_adapter.hpp 2009-11-01 12:07:12.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/ptr_container/ptr_sequence_adapter.hpp 2011-02-04 16:39:19.000000000 +0100 +@@ -476,19 +476,19 @@ + public: // C-array support + + void transfer( iterator before, value_type* from, +- size_type size, bool delete_from = true ) // strong ++ size_type size_, bool delete_from = true ) // strong + { + BOOST_ASSERT( from != 0 ); + if( delete_from ) + { + BOOST_DEDUCED_TYPENAME base_type::scoped_deleter +- deleter( from, size ); // nothrow +- this->base().insert( before.base(), from, from + size ); // strong ++ deleter( from, size_ ); // nothrow ++ this->base().insert( before.base(), from, from + size_ ); // strong + deleter.release(); // nothrow + } + else + { +- this->base().insert( before.base(), from, from + size ); // strong ++ this->base().insert( before.base(), from, from + size_ ); // strong + } + } - template - struct result +--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp 2010-04-07 02:41:42.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp 2011-02-04 16:39:19.000000000 +0100 @@ -222,9 +222,9 @@ error_status( @@ -23,8 +59,28 @@ result_t result; std::ptrdiff_t length; ---- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/functor_parser.hpp +--- misc/boost_1_44_0/boost/spirit/home/classic/symbols/symbols.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/symbols/symbols.hpp 2011-02-04 16:39:19.000000000 +0100 +@@ -102,13 +102,13 @@ + { + typedef typename ScannerT::iterator_t iterator_t; + iterator_t first = scan.first; +- typename SetT::search_info result = SetT::find(scan); ++ typename SetT::search_info result_ = SetT::find(scan); + +- if (result.data) ++ if (result_.data) + return scan. + create_match( +- result.length, +- symbol_ref_t(*result.data), ++ result_.length, ++ symbol_ref_t(*result_.data), + first, + scan.first); + else +--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp 2011-02-04 16:39:19.000000000 +0100 @@ -54,13 +54,13 @@ typedef typename ScannerT::iterator_t iterator_t; @@ -42,8 +98,8 @@ } }; ---- misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/utility/loops.hpp +--- misc/boost_1_44_0/boost/spirit/home/classic/utility/loops.hpp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/loops.hpp 2011-02-04 16:39:19.000000000 +0100 @@ -47,8 +47,8 @@ typedef fixed_loop self_t; typedef unary > base_t; @@ -106,640 +162,3 @@ m_min, m_max); } ---- misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp -@@ -102,13 +102,13 @@ - { - typedef typename ScannerT::iterator_t iterator_t; - iterator_t first = scan.first; -- typename SetT::search_info result = SetT::find(scan); -+ typename SetT::search_info result_ = SetT::find(scan); - -- if (result.data) -+ if (result_.data) - return scan. - create_match( -- result.length, -- symbol_ref_t(*result.data), -+ result_.length, -+ symbol_ref_t(*result_.data), - first, - scan.first); - else - ---- misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp -+++ misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp -@@ -82,8 +82,8 @@ - //Give duration access to ticks constructor -- hide from users - friend class date_time::time_duration; - private: -- explicit time_duration(impl_type ticks) : -- date_time::time_duration(ticks) -+ explicit time_duration(impl_type _ticks) : -+ date_time::time_duration(_ticks) - {} - }; - ---- misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/detail/map_iterator.hpp -@@ -49,7 +49,7 @@ - : first(rp->first), second(rp->second) - { } - -- const ref_pair* const operator->() const -+ const ref_pair* operator->() const - { - return this; - } ---- misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/ptr_sequence_adapter.hpp -@@ -476,19 +476,19 @@ - public: // C-array support - - void transfer( iterator before, value_type* from, -- size_type size, bool delete_from = true ) // strong -+ size_type size_, bool delete_from = true ) // strong - { - BOOST_ASSERT( from != 0 ); - if( delete_from ) - { - BOOST_DEDUCED_TYPENAME base_type::scoped_deleter -- deleter( from, size ); // nothrow -- this->base().insert( before.base(), from, from + size ); // strong -+ deleter( from, size_ ); // nothrow -+ this->base().insert( before.base(), from, from + size_ ); // strong - deleter.release(); // nothrow - } - else - { -- this->base().insert( before.base(), from, from + size ); // strong -+ this->base().insert( before.base(), from, from + size_ ); // strong - } - } - -@@ -510,72 +510,72 @@ - - public: // resize - -- void resize( size_type size ) // basic -+ void resize( size_type size_ ) // basic - { - size_type old_size = this->size(); -- if( old_size > size ) -+ if( old_size > size_ ) - { -- this->erase( boost::next( this->begin(), size ), this->end() ); -+ this->erase( boost::next( this->begin(), size_ ), this->end() ); - } -- else if( size > old_size ) -+ else if( size_ > old_size ) - { -- for( ; old_size != size; ++old_size ) -+ for( ; old_size != size_; ++old_size ) - this->push_back( new BOOST_DEDUCED_TYPENAME - boost::remove_pointer::type ); - } - -- BOOST_ASSERT( this->size() == size ); -+ BOOST_ASSERT( this->size() == size_ ); - } - -- void resize( size_type size, value_type to_clone ) // basic -+ void resize( size_type size_, value_type to_clone ) // basic - { - size_type old_size = this->size(); -- if( old_size > size ) -+ if( old_size > size_ ) - { -- this->erase( boost::next( this->begin(), size ), this->end() ); -+ this->erase( boost::next( this->begin(), size_ ), this->end() ); - } -- else if( size > old_size ) -+ else if( size_ > old_size ) - { -- for( ; old_size != size; ++old_size ) -+ for( ; old_size != size_; ++old_size ) - this->push_back( this->null_policy_allocate_clone( to_clone ) ); - } - -- BOOST_ASSERT( this->size() == size ); -+ BOOST_ASSERT( this->size() == size_ ); - } - -- void rresize( size_type size ) // basic -+ void rresize( size_type size_ ) // basic - { - size_type old_size = this->size(); -- if( old_size > size ) -+ if( old_size > size_ ) - { - this->erase( this->begin(), -- boost::next( this->begin(), old_size - size ) ); -+ boost::next( this->begin(), old_size - size_ ) ); - } -- else if( size > old_size ) -+ else if( size_ > old_size ) - { -- for( ; old_size != size; ++old_size ) -+ for( ; old_size != size_; ++old_size ) - this->push_front( new BOOST_DEDUCED_TYPENAME - boost::remove_pointer::type ); - } - -- BOOST_ASSERT( this->size() == size ); -+ BOOST_ASSERT( this->size() == size_ ); - } - -- void rresize( size_type size, value_type to_clone ) // basic -+ void rresize( size_type size_, value_type to_clone ) // basic - { - size_type old_size = this->size(); -- if( old_size > size ) -+ if( old_size > size_ ) - { - this->erase( this->begin(), -- boost::next( this->begin(), old_size - size ) ); -+ boost::next( this->begin(), old_size - size_ ) ); - } -- else if( size > old_size ) -+ else if( size_ > old_size ) - { -- for( ; old_size != size; ++old_size ) -+ for( ; old_size != size_; ++old_size ) - this->push_front( this->null_policy_allocate_clone( to_clone ) ); - } - -- BOOST_ASSERT( this->size() == size ); -+ BOOST_ASSERT( this->size() == size_ ); - } - - public: // algorithms ---- misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/ptr_map_adapter.hpp -@@ -477,6 +477,7 @@ - } - - ptr_map_adapter( const ptr_map_adapter& r ) -+ : base_type() - { - map_basic_clone_and_insert( r.begin(), r.end() ); - } ---- misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp -+++ misc/build/boost_1_39_0/boost/unordered/detail/hash_table_impl.hpp -@@ -423,17 +423,17 @@ - void delete_buckets() - { - if(buckets_) { -- bucket_ptr begin = cached_begin_bucket_; -- bucket_ptr end = buckets_end(); -- while(begin != end) { -- clear_bucket(begin); -- ++begin; -+ bucket_ptr begin_ = cached_begin_bucket_; -+ bucket_ptr end_ = buckets_end(); -+ while(begin_ != end_) { -+ clear_bucket(begin_); -+ ++begin_; - } - - // Destroy an extra bucket for the sentinels. -- ++end; -- for(begin = buckets_; begin != end; ++begin) -- allocators_.bucket_alloc_.destroy(begin); -+ ++end_; -+ for(begin_ = buckets_; begin_ != end_; ++begin_) -+ allocators_.bucket_alloc_.destroy(begin_); - - allocators_.bucket_alloc_.deallocate(buckets_, - bucket_manager_.bucket_count() + 1); -@@ -680,11 +680,11 @@ - // The deleted node is at the end of the group, so the - // first node in the group is pointing to it. - // Find that to change its pointer. -- link_ptr it = n->group_prev_; -- while(prev_in_group(it) != *pos) { -- it = prev_in_group(it); -+ link_ptr it2 = n->group_prev_; -+ while(prev_in_group(it2) != *pos) { -+ it2 = prev_in_group(it2); - } -- prev_in_group(it) = n->group_prev_; -+ prev_in_group(it2) = n->group_prev_; - } - *pos = next; - --size_; -@@ -721,25 +721,25 @@ - size_ -= node_count(n.node_); - } - -- void unlink_nodes(iterator_base begin, iterator_base end) -+ void unlink_nodes(iterator_base begin_, iterator_base end_) - { -- BOOST_ASSERT(begin.bucket_ == end.bucket_); -- size_ -= node_count(begin.node_, end.node_); -- link_ptr* it = get_for_erase(begin); -- split_group(*it, end.node_); -- *it = end.node_; -+ BOOST_ASSERT(begin_.bucket_ == end_.bucket_); -+ size_ -= node_count(begin_.node_, end_.node_); -+ link_ptr* it = get_for_erase(begin_); -+ split_group(*it, end_.node_); -+ *it = end_.node_; - } - -- void unlink_nodes(bucket_ptr base, iterator_base end) -+ void unlink_nodes(bucket_ptr base, iterator_base end_) - { -- BOOST_ASSERT(base == end.bucket_); -+ BOOST_ASSERT(base == end_.bucket_); - -- split_group(end.node_); -+ split_group(end_.node_); - - link_ptr ptr(base->next_); -- base->next_ = end.node_; -+ base->next_ = end_.node_; - -- size_ -= node_count(ptr, end.node_); -+ size_ -= node_count(ptr, end_.node_); - } - - #if BOOST_UNORDERED_EQUIVALENT_KEYS -@@ -797,12 +797,12 @@ - { - node_constructor a(allocators_); - -- link_ptr end = next_group(it); -+ link_ptr end_ = next_group(it); - - a.construct(get_value(it)); // throws - link_ptr n = link_node_in_bucket(a, dst); - -- for(it = it->next_; it != end; it = it->next_) { -+ for(it = it->next_; it != end_; it = it->next_) { - a.construct(get_value(it)); // throws - link_node(a, n); - } -@@ -824,21 +824,21 @@ - // - // no throw - -- void delete_to_bucket_end(link_ptr begin) -+ void delete_to_bucket_end(link_ptr begin_) - { -- while(begin) { -- link_ptr node = begin; -- begin = begin->next_; -- allocators_.destroy(node); -+ while(begin_) { -+ link_ptr node_ = begin_; -+ begin_ = begin_->next_; -+ allocators_.destroy(node_); - } - } - -- void delete_nodes(link_ptr begin, link_ptr end) -+ void delete_nodes(link_ptr begin_, link_ptr end_) - { -- while(begin != end) { -- link_ptr node = begin; -- begin = begin->next_; -- allocators_.destroy(node); -+ while(begin_ != end_) { -+ link_ptr node_ = begin_; -+ begin_ = begin_->next_; -+ allocators_.destroy(node_); - } - } - -@@ -848,9 +848,9 @@ - delete_nodes(first_node, prev_in_group(first_node)->next_); - } - #else -- void delete_group(link_ptr node) -+ void delete_group(link_ptr node_) - { -- allocators_.destroy(node); -+ allocators_.destroy(node_); - } - #endif - -@@ -869,15 +869,15 @@ - - void clear() - { -- bucket_ptr begin = cached_begin_bucket_; -- bucket_ptr end = buckets_end(); -+ bucket_ptr begin_ = cached_begin_bucket_; -+ bucket_ptr end_ = buckets_end(); - - size_ = 0; -- cached_begin_bucket_ = end; -+ cached_begin_bucket_ = end_; - -- while(begin != end) { -- clear_bucket(begin); -- ++begin; -+ while(begin_ != end_) { -+ clear_bucket(begin_); -+ ++begin_; - } - } - -@@ -974,13 +974,13 @@ - cached_begin_bucket_ = b2; - } - -- size_type erase_group(link_ptr* it, bucket_ptr bucket) -+ size_type erase_group(link_ptr* it, bucket_ptr bucket_) - { - link_ptr pos = *it; - size_type count = unlink_group(it); - delete_group(pos); - -- this->recompute_begin_bucket(bucket); -+ this->recompute_begin_bucket(bucket_); - - return count; - } -@@ -1541,8 +1541,8 @@ - hf(extract_key(data::get_value(src_bucket->next_)))); - - link_ptr n = src_bucket->next_; -- size_type count = src.unlink_group(&src_bucket->next_); -- dst.link_group(n, dst_bucket, count); -+ size_type count_ = src.unlink_group(&src_bucket->next_); -+ dst.link_group(n, dst_bucket, count_); - } - } - } -@@ -1651,20 +1651,20 @@ - { - key_type const& k = extract_key(a.get()->value()); - size_type hash_value = hash_function()(k); -- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); -- link_ptr position = find_iterator(bucket, k); -+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); -+ link_ptr position = find_iterator(bucket_, k); - - // reserve has basic exception safety if the hash function - // throws, strong otherwise. - if(reserve_for_insert(size() + 1)) -- bucket = data_.bucket_ptr_from_hash(hash_value); -+ bucket_ = data_.bucket_ptr_from_hash(hash_value); - - // I'm relying on link_ptr not being invalidated by - // the rehash here. -- return iterator_base(bucket, -+ return iterator_base(bucket_, - (BOOST_UNORDERED_BORLAND_BOOL(position)) ? - data_.link_node(a, position) : -- data_.link_node_in_bucket(a, bucket) -+ data_.link_node_in_bucket(a, bucket_) - ); - } - -@@ -1718,13 +1718,13 @@ - a.construct(*i); - - key_type const& k = extract_key(a.get()->value()); -- bucket_ptr bucket = get_bucket(k); -- link_ptr position = find_iterator(bucket, k); -+ bucket_ptr bucket_ = get_bucket(k); -+ link_ptr position = find_iterator(bucket_, k); - - if(BOOST_UNORDERED_BORLAND_BOOL(position)) - data_.link_node(a, position); - else -- data_.link_node_in_bucket(a, bucket); -+ data_.link_node_in_bucket(a, bucket_); - } - } - } -@@ -1761,8 +1761,8 @@ - typedef BOOST_DEDUCED_TYPENAME value_type::second_type mapped_type; - - size_type hash_value = hash_function()(k); -- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); -- link_ptr pos = find_iterator(bucket, k); -+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); -+ link_ptr pos = find_iterator(bucket_, k); - - if (BOOST_UNORDERED_BORLAND_BOOL(pos)) - return data::get_value(pos); -@@ -1778,11 +1778,11 @@ - // reserve has basic exception safety if the hash function - // throws, strong otherwise. - if(reserve_for_insert(size() + 1)) -- bucket = data_.bucket_ptr_from_hash(hash_value); -+ bucket_ = data_.bucket_ptr_from_hash(hash_value); - - // Nothing after this point can throw. - -- return data::get_value(data_.link_node_in_bucket(a, bucket)); -+ return data::get_value(data_.link_node_in_bucket(a, bucket_)); - } - } - -@@ -1797,13 +1797,13 @@ - // No side effects in this initial code - key_type const& k = extract_key(v); - size_type hash_value = hash_function()(k); -- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); -- link_ptr pos = find_iterator(bucket, k); -+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); -+ link_ptr pos = find_iterator(bucket_, k); - - if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { - // Found an existing key, return it (no throw). - return std::pair( -- iterator_base(bucket, pos), false); -+ iterator_base(bucket_, pos), false); - - } else { - // Doesn't already exist, add to bucket. -@@ -1817,14 +1817,14 @@ - // reserve has basic exception safety if the hash function - // throws, strong otherwise. - if(reserve_for_insert(size() + 1)) -- bucket = data_.bucket_ptr_from_hash(hash_value); -+ bucket_ = data_.bucket_ptr_from_hash(hash_value); - - // Nothing after this point can throw. - -- link_ptr n = data_.link_node_in_bucket(a, bucket); -+ link_ptr n = data_.link_node_in_bucket(a, bucket_); - - return std::pair( -- iterator_base(bucket, n), true); -+ iterator_base(bucket_, n), true); - } - } - -@@ -1864,13 +1864,13 @@ - { - // No side effects in this initial code - size_type hash_value = hash_function()(k); -- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); -- link_ptr pos = find_iterator(bucket, k); -+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); -+ link_ptr pos = find_iterator(bucket_, k); - - if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { - // Found an existing key, return it (no throw). - return std::pair( -- iterator_base(bucket, pos), false); -+ iterator_base(bucket_, pos), false); - - } else { - // Doesn't already exist, add to bucket. -@@ -1884,12 +1884,12 @@ - // reserve has basic exception safety if the hash function - // throws, strong otherwise. - if(reserve_for_insert(size() + 1)) -- bucket = data_.bucket_ptr_from_hash(hash_value); -+ bucket_ = data_.bucket_ptr_from_hash(hash_value); - - // Nothing after this point can throw. - -- return std::pair(iterator_base(bucket, -- data_.link_node_in_bucket(a, bucket)), true); -+ return std::pair(iterator_base(bucket_, -+ data_.link_node_in_bucket(a, bucket_)), true); - } - } - -@@ -1904,23 +1904,23 @@ - // No side effects in this initial code - key_type const& k = extract_key(a.get()->value()); - size_type hash_value = hash_function()(k); -- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); -- link_ptr pos = find_iterator(bucket, k); -+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); -+ link_ptr pos = find_iterator(bucket_, k); - - if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { - // Found an existing key, return it (no throw). - return std::pair( -- iterator_base(bucket, pos), false); -+ iterator_base(bucket_, pos), false); - } else { - // reserve has basic exception safety if the hash function - // throws, strong otherwise. - if(reserve_for_insert(size() + 1)) -- bucket = data_.bucket_ptr_from_hash(hash_value); -+ bucket_ = data_.bucket_ptr_from_hash(hash_value); - - // Nothing after this point can throw. - -- return std::pair(iterator_base(bucket, -- data_.link_node_in_bucket(a, bucket)), true); -+ return std::pair(iterator_base(bucket_, -+ data_.link_node_in_bucket(a, bucket_)), true); - } - } - -@@ -1969,8 +1969,8 @@ - for (; i != j; ++i) { - // No side effects in this initial code - size_type hash_value = hash_function()(extract_key(*i)); -- bucket_ptr bucket = data_.bucket_ptr_from_hash(hash_value); -- link_ptr pos = find_iterator(bucket, extract_key(*i)); -+ bucket_ptr bucket_ = data_.bucket_ptr_from_hash(hash_value); -+ link_ptr pos = find_iterator(bucket_, extract_key(*i)); - - if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) { - // Doesn't already exist, add to bucket. -@@ -1984,11 +1984,11 @@ - // throws, strong otherwise. - if(size() + 1 >= max_load_) { - reserve_for_insert(size() + insert_size(i, j)); -- bucket = data_.bucket_ptr_from_hash(hash_value); -+ bucket_ = data_.bucket_ptr_from_hash(hash_value); - } - - // Nothing after this point can throw. -- data_.link_node_in_bucket(a, bucket); -+ data_.link_node_in_bucket(a, bucket_); - } - } - } -@@ -2001,11 +2001,11 @@ - size_type erase_key(key_type const& k) - { - // No side effects in initial section -- bucket_ptr bucket = get_bucket(k); -- link_ptr* it = find_for_erase(bucket, k); -+ bucket_ptr bucket_ = get_bucket(k); -+ link_ptr* it = find_for_erase(bucket_, k); - - // No throw. -- return *it ? data_.erase_group(it, bucket) : 0; -+ return *it ? data_.erase_group(it, bucket_) : 0; - } - - // count -@@ -2022,19 +2022,19 @@ - // strong exception safety, no side effects - iterator_base find(key_type const& k) const - { -- bucket_ptr bucket = get_bucket(k); -- link_ptr it = find_iterator(bucket, k); -+ bucket_ptr bucket_ = get_bucket(k); -+ link_ptr it = find_iterator(bucket_, k); - - if (BOOST_UNORDERED_BORLAND_BOOL(it)) -- return iterator_base(bucket, it); -+ return iterator_base(bucket_, it); - else - return data_.end(); - } - - value_type& at(key_type const& k) const - { -- bucket_ptr bucket = get_bucket(k); -- link_ptr it = find_iterator(bucket, k); -+ bucket_ptr bucket_ = get_bucket(k); -+ link_ptr it = find_iterator(bucket_, k); - - if (BOOST_UNORDERED_BORLAND_BOOL(it)) - return data::get_value(it); -@@ -2047,10 +2047,10 @@ - // strong exception safety, no side effects - std::pair equal_range(key_type const& k) const - { -- bucket_ptr bucket = get_bucket(k); -- link_ptr it = find_iterator(bucket, k); -+ bucket_ptr bucket_ = get_bucket(k); -+ link_ptr it = find_iterator(bucket_, k); - if (BOOST_UNORDERED_BORLAND_BOOL(it)) { -- iterator_base first(iterator_base(bucket, it)); -+ iterator_base first(iterator_base(bucket_, it)); - iterator_base second(first); - second.increment_group(); - return std::pair(first, second); -@@ -2074,10 +2074,10 @@ - } - - // strong exception safety, no side effects -- link_ptr find_iterator(bucket_ptr bucket, -+ link_ptr find_iterator(bucket_ptr bucket_, - key_type const& k) const - { -- link_ptr it = data_.begin(bucket); -+ link_ptr it = data_.begin(bucket_); - while (BOOST_UNORDERED_BORLAND_BOOL(it) && !equal(k, data::get_value(it))) - it = data::next_group(it); - -@@ -2085,9 +2085,9 @@ - } - - // strong exception safety, no side effects -- link_ptr* find_for_erase(bucket_ptr bucket, key_type const& k) const -+ link_ptr* find_for_erase(bucket_ptr bucket_, key_type const& k) const - { -- link_ptr* it = &bucket->next_; -+ link_ptr* it = &bucket_->next_; - while(BOOST_UNORDERED_BORLAND_BOOL(*it) && !equal(k, data::get_value(*it))) - it = &data::next_group(*it); - diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch deleted file mode 100644 index 46395dda2f83..000000000000 --- a/boost/boost_1_39_0.patch +++ /dev/null @@ -1,312 +0,0 @@ -diff --git boost_1_39_0/boost/config/compiler/visualc.hpp boost_1_39_0/boost/config/compiler/visualc.hpp -index 552e5bb..d9f90b2 100644 ---- misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp -+++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp -@@ -138,6 +138,9 @@ - # define BOOST_NO_RTTI - #endif - -+// disable WORKAROUND macro - gives warning for undefined macros -+#define BOOST_STRICT_CONFIG 1 -+ - // - // all versions support __declspec: - // -diff --git boost_1_39_0/boost/function/function_base.hpp boost_1_39_0/boost/function/function_base.hpp -index 6612fb8..35afa16 100644 ---- misc/build/boost_1_39_0/boost/function/function_base.hpp -+++ misc/build/boost_1_39_0/boost/function/function_base.hpp -@@ -42,7 +42,7 @@ - #endif - - // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. --#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE -+#ifdef BOOST_NO_STD_TYPEINFO - // Embedded VC++ does not have type_info in namespace std - # define BOOST_FUNCTION_STD_NS - #else -diff --git boost_1_39_0/boost/function/function_template.hpp boost_1_39_0/boost/function/function_template.hpp -index 584abe9..36b619b 100644 ---- misc/build/boost_1_39_0/boost/function/function_template.hpp -+++ misc/build/boost_1_39_0/boost/function/function_template.hpp -@@ -950,10 +950,10 @@ namespace boost { - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; -diff --git boost_1_39_0/boost/mpl/apply_wrap.hpp boost_1_39_0/boost/mpl/apply_wrap.hpp -index b3cb12b..0bf8e73 100644 ---- misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp -+++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp -@@ -173,8 +173,8 @@ struct BOOST_PP_CAT(apply_wrap,i_) - # undef i_ - - ///// iteration, depth == 2 -- --#elif BOOST_PP_ITERATION_DEPTH() == 2 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 2 - - # define j_ BOOST_PP_FRAME_ITERATION(2) - -@@ -231,4 +231,5 @@ struct BOOST_PP_CAT(apply_wrap_impl,i_)< - # undef j_ - - #endif // BOOST_PP_ITERATION_DEPTH() -+#endif - #endif // BOOST_PP_IS_ITERATING -diff --git boost_1_39_0/boost/mpl/bind.hpp boost_1_39_0/boost/mpl/bind.hpp -index 5d851ef..780e260 100644 ---- misc/build/boost_1_39_0/boost/mpl/bind.hpp -+++ misc/build/boost_1_39_0/boost/mpl/bind.hpp -@@ -531,7 +531,8 @@ struct bind_chooser - - ///// iteration, depth == 2 - --#elif BOOST_PP_ITERATION_DEPTH() == 2 -+#else -+#if BOOST_PP_ITERATION_DEPTH() == 2 - - # define j_ BOOST_PP_FRAME_ITERATION(2) - # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT) -@@ -548,4 +549,5 @@ struct bind_chooser - # undef j_ - - #endif // BOOST_PP_ITERATION_DEPTH() -+#endif - #endif // BOOST_PP_IS_ITERATING -diff --git boost_1_39_0/boost/ptr_container/detail/move.hpp boost_1_39_0/boost/ptr_container/detail/move.hpp -index bf07d5f..6b082a7 100644 ---- misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp -@@ -20,7 +20,7 @@ namespace move_ptrs { - template - class move_source { - public: -- move_source(Ptr& ptr) : ptr_(ptr) {} -+ move_source(Ptr& _ptr) : ptr_(_ptr) {} - Ptr& ptr() const { return ptr_; } - private: - Ptr& ptr_; -diff --git boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp -index 47c3903..3ad2c5c 100644 ---- misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp -@@ -278,9 +278,9 @@ namespace ptr_container_detail - - private: - template< class ForwardIterator > -- ForwardIterator advance( ForwardIterator begin, size_type n ) -+ ForwardIterator advance( ForwardIterator _begin, size_type n ) - { -- ForwardIterator iter = begin; -+ ForwardIterator iter = _begin; - std::advance( iter, n ); - return iter; - } -diff --git boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp -index ba2b9af..9e0d682 100644 ---- misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp -@@ -151,7 +151,7 @@ public: - deleter_const_reference get_deleter() const { return impl_.second(); } - private: - template -- void check(const static_move_ptr& ptr) -+ void check(const static_move_ptr& _ptr) - { - typedef move_ptrs::is_smart_ptr_convertible convertible; - BOOST_STATIC_ASSERT(convertible::value); -diff --git boost_1_39_0/boost/ptr_container/exception.hpp boost_1_39_0/boost/ptr_container/exception.hpp -index d9a5ffe..7837fbb 100644 ---- misc/build/boost_1_39_0/boost/ptr_container/exception.hpp -+++ misc/build/boost_1_39_0/boost/ptr_container/exception.hpp -@@ -24,7 +24,7 @@ namespace boost - { - const char* what_; - public: -- bad_ptr_container_operation( const char* what ) : what_( what ) -+ bad_ptr_container_operation( const char* text ) : what_( text ) - { } - - virtual const char* what() const throw() -@@ -38,7 +38,7 @@ namespace boost - class bad_index : public bad_ptr_container_operation - { - public: -- bad_index( const char* what ) : bad_ptr_container_operation( what ) -+ bad_index( const char* text ) : bad_ptr_container_operation( text ) - { } - }; - -diff --git boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp -index 492bf4b..565fdec 100644 ---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp -@@ -19,12 +19,12 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - : len(-1), val() {} - - template -- inline match::match(std::size_t length) -- : len(length), val() {} -+ inline match::match(std::size_t _length) -+ : len(_length), val() {} - - template -- inline match::match(std::size_t length, ctor_param_t val_) -- : len(length), val(val_) {} -+ inline match::match(std::size_t _length, ctor_param_t val_) -+ : len(_length), val(val_) {} - - template - inline bool -@@ -66,11 +66,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - inline match::match() - : len(-1) {} - -- inline match::match(std::size_t length) -- : len(length) {} -+ inline match::match(std::size_t _length) -+ : len(_length) {} - -- inline match::match(std::size_t length, nil_t) -- : len(length) {} -+ inline match::match(std::size_t _length, nil_t) -+ : len(_length) {} - - inline bool - match::operator!() const -diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp -index ca51bd2..b2282fa 100644 ---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp -@@ -226,7 +226,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - template - struct concrete_parser : abstract_parser - { -- concrete_parser(ParserT const& p) : p(p) {} -+ concrete_parser(ParserT const& _p) : p(_p) {} - virtual ~concrete_parser() {} - - virtual typename match_result::type -diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp -index 2f4b986..b3809da 100644 ---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp -@@ -106,7 +106,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - : parser_id(reinterpret_cast(this)); - } - -- void set_id(parser_id id) { tag = id; } -+ void set_id(parser_id _id) { tag = _id; } - - private: - -diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp -index 73389b4..18d26cc 100644 ---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp -@@ -159,11 +159,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - return ptr.get(); - } - -- rule(abstract_parser_t* ptr) -- : ptr(ptr) {} -+ rule(abstract_parser_t* _ptr) -+ : ptr(_ptr) {} - -- rule(abstract_parser_t const* ptr) -- : ptr(ptr) {} -+ rule(abstract_parser_t const* _ptr) -+ : ptr(_ptr) {} - - scoped_ptr ptr; - }; -diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp -index 5d6761f..b93118a 100644 ---- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp -@@ -210,7 +210,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - subrule_list< - subrule_parser, - nil_t> > -- operator,(subrule_parser const& rhs) const -+ operator,(subrule_parser const& _rhs) const - { - return subrule_list< - self_t, -@@ -220,7 +220,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - *this, - subrule_list< - subrule_parser, nil_t>( -- rhs, nil_t())); -+ _rhs, nil_t())); - } - - typename DefT::embed_t rhs; -@@ -258,10 +258,10 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - parse_main(ScannerT const& scan) const - { - typedef typename parser_result::type result_t; -- result_t result; -+ result_t _result; - impl::parse_subrule:: -- do_(result, scan); -- return result; -+ do_(_result, scan); -+ return _result; - } - - template -diff --git boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp -index 5d75be2..730cf0c 100644 ---- misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp -+++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp -@@ -395,13 +395,13 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - } - - bool register_node(void const *r, char const *name_to_register, -- bool trace_node) -+ bool _trace_node) - { - if (infos.find(r) != infos.end()) - return false; - - return infos.insert(rule_infos::value_type(r, -- rule_info(std::string(name_to_register), trace_node)) -+ rule_info(std::string(name_to_register), _trace_node)) - ).second; - } - ---- misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk -+++ misc/build/boost_1_39_0/libs/thread/src/win32/makefile.mk -@@ -1,1 +1,21 @@ --dummy -+PRJ=..$/..$/..$/..$/..$/..$/..$/.. -+ -+PRJNAME=boostthread -+TARGET=boostthread -+LIBTARGET=NO -+ -+.IF "$(GUI)"=="WNT" -+ -+.INCLUDE : settings.mk -+ -+SLOFILES= $(SLO)$/exceptions.obj \ -+ $(SLO)$/thread.obj \ -+ $(SLO)$/tss_dll.obj \ -+ $(SLO)$/tss_pe.obj -+ -+LIB1TARGET=$(SLB)$/$(TARGET).lib -+LIB1ARCHIV=$(LB)$/lib$(TARGET).a -+LIB1OBJFILES=$(SLOFILES) -+ -+.INCLUDE : target.mk -+.ENDIF diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch new file mode 100644 index 000000000000..99e24de7d878 --- /dev/null +++ b/boost/boost_1_44_0.patch @@ -0,0 +1,25 @@ +--- misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk ++++ misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk +@@ -1,1 +1,21 @@ +-dummy ++PRJ=..$/..$/..$/..$/..$/..$/..$/.. ++ ++PRJNAME=boostthread ++TARGET=boostthread ++LIBTARGET=NO ++ ++.IF "$(GUI)"=="WNT" ++ ++.INCLUDE : settings.mk ++ ++SLOFILES= $(SLO)$/exceptions.obj \ ++ $(SLO)$/thread.obj \ ++ $(SLO)$/tss_dll.obj \ ++ $(SLO)$/tss_pe.obj ++ ++LIB1TARGET=$(SLB)$/$(TARGET).lib ++LIB1ARCHIV=$(LB)$/lib$(TARGET).a ++LIB1OBJFILES=$(SLOFILES) ++ ++.INCLUDE : target.mk ++.ENDIF diff --git a/boost/makefile.mk b/boost/makefile.mk index 8602cf9a07c4..2d25dc3ce81b 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -48,11 +48,11 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=boost_1_39_0 -TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7 +TARFILE_NAME=boost_1_44_0 +TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a PATCH_FILES=$(TARFILE_NAME).patch # See https://svn.boost.org/trac/boost/ticket/3780 -PATCH_FILES+=aliasing.patch +#PATCH_FILES+=aliasing.patch #https://svn.boost.org/trac/boost/ticket/4713 PATCH_FILES+=boost.4713.warnings.patch -- cgit From 85072fc85d2084cdb52e595a58751d58feda29b2 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Sat, 5 Feb 2011 03:47:27 +0100 Subject: silence more boost warnings --- boost/boost.4713.warnings.patch | 389 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 389 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 458bb02f1abe..ce02d66f953f 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -162,3 +162,392 @@ m_min, m_max); } +--- misc/boost_1_44_0/boost/unordered/detail/table.hpp 2011-02-04 16:55:26.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/unordered/detail/table.hpp 2011-02-05 03:34:26.000000000 +0100 +@@ -33,10 +33,10 @@ + template + template + inline BOOST_DEDUCED_TYPENAME T::node_ptr +- hash_table::find_iterator(bucket_ptr bucket, Key const& k, ++ hash_table::find_iterator(bucket_ptr bucket_, Key const& k, + Pred const& eq) const + { +- node_ptr it = bucket->next_; ++ node_ptr it = bucket_->next_; + while (BOOST_UNORDERED_BORLAND_BOOL(it) && + !eq(k, get_key(node::get_value(it)))) + { +@@ -50,9 +50,9 @@ + template + inline BOOST_DEDUCED_TYPENAME T::node_ptr + hash_table::find_iterator( +- bucket_ptr bucket, key_type const& k) const ++ bucket_ptr bucket_, key_type const& k) const + { +- node_ptr it = bucket->next_; ++ node_ptr it = bucket_->next_; + while (BOOST_UNORDERED_BORLAND_BOOL(it) && + !equal(k, node::get_value(it))) + { +@@ -75,9 +75,9 @@ + template + inline BOOST_DEDUCED_TYPENAME T::node_ptr* + hash_table::find_for_erase( +- bucket_ptr bucket, key_type const& k) const ++ bucket_ptr bucket_, key_type const& k) const + { +- node_ptr* it = &bucket->next_; ++ node_ptr* it = &bucket_->next_; + while(BOOST_UNORDERED_BORLAND_BOOL(*it) && + !equal(k, node::get_value(*it))) + { +@@ -475,7 +475,7 @@ + { + hasher const& hf = this->hash_function(); + std::size_t size = this->size_; +- bucket_ptr end = this->get_bucket(this->bucket_count_); ++ bucket_ptr end_ = this->get_bucket(this->bucket_count_); + + buckets dst(this->node_alloc(), num_buckets); + dst.create_buckets(); +@@ -484,10 +484,10 @@ + src.swap(*this); + this->size_ = 0; + +- for(bucket_ptr bucket = this->cached_begin_bucket_; +- bucket != end; ++bucket) ++ for(bucket_ptr bucket_ = this->cached_begin_bucket_; ++ bucket_ != end_; ++bucket_) + { +- node_ptr group = bucket->next_; ++ node_ptr group = bucket_->next_; + while(group) { + // Move the first group of equivalent nodes in bucket to dst. + +@@ -496,10 +496,10 @@ + hf(get_key_from_ptr(group))); + + node_ptr& next_group = node::next_group(group); +- bucket->next_ = next_group; ++ bucket_->next_ = next_group; + next_group = dst_bucket->next_; + dst_bucket->next_ = group; +- group = bucket->next_; ++ group = bucket_->next_; + } + } + +@@ -525,13 +525,13 @@ + BOOST_ASSERT(this->buckets_ && !dst.buckets_); + + hasher const& hf = this->hash_function(); +- bucket_ptr end = this->get_bucket(this->bucket_count_); ++ bucket_ptr end_ = this->get_bucket(this->bucket_count_); + + node_constructor a(dst); + dst.create_buckets(); + + // no throw: +- for(bucket_ptr i = this->cached_begin_bucket_; i != end; ++i) { ++ for(bucket_ptr i = this->cached_begin_bucket_; i != end_; ++i) { + // no throw: + for(node_ptr it = i->next_; it;) { + // hash function can throw. +@@ -579,11 +579,11 @@ + { + if(!this->size_) return this->end(); + +- bucket_ptr bucket = this->get_bucket(this->bucket_index(k)); +- node_ptr it = find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k)); ++ node_ptr it = find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(it)) +- return iterator_base(bucket, it); ++ return iterator_base(bucket_, it); + else + return this->end(); + } +@@ -595,11 +595,11 @@ + { + if(!this->size_) return this->end(); + +- bucket_ptr bucket = this->get_bucket(h(k) % this->bucket_count_); +- node_ptr it = find_iterator(bucket, k, eq); ++ bucket_ptr bucket_ = this->get_bucket(h(k) % this->bucket_count_); ++ node_ptr it = find_iterator(bucket_, k, eq); + + if (BOOST_UNORDERED_BORLAND_BOOL(it)) +- return iterator_base(bucket, it); ++ return iterator_base(bucket_, it); + else + return this->end(); + } +@@ -611,8 +611,8 @@ + if(!this->size_) + boost::throw_exception(std::out_of_range("Unable to find key in unordered_map.")); + +- bucket_ptr bucket = this->get_bucket(this->bucket_index(k)); +- node_ptr it = find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k)); ++ node_ptr it = find_iterator(bucket_, k); + + if (!it) + boost::throw_exception(std::out_of_range("Unable to find key in unordered_map.")); +@@ -630,10 +630,10 @@ + if(!this->size_) + return iterator_pair(this->end(), this->end()); + +- bucket_ptr bucket = this->get_bucket(this->bucket_index(k)); +- node_ptr it = find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k)); ++ node_ptr it = find_iterator(bucket_, k); + if (BOOST_UNORDERED_BORLAND_BOOL(it)) { +- iterator_base first(iterator_base(bucket, it)); ++ iterator_base first(iterator_base(bucket_, it)); + iterator_base second(first); + second.increment_bucket(node::next_group(second.node_)); + return iterator_pair(first, second); +@@ -651,26 +651,26 @@ + { + if(!this->size_) return; + +- bucket_ptr end = this->get_bucket(this->bucket_count_); +- for(bucket_ptr begin = this->buckets_; begin != end; ++begin) { +- this->clear_bucket(begin); ++ bucket_ptr end_ = this->get_bucket(this->bucket_count_); ++ for(bucket_ptr begin_ = this->buckets_; begin_ != end_; ++begin_) { ++ this->clear_bucket(begin_); + } + + this->size_ = 0; +- this->cached_begin_bucket_ = end; ++ this->cached_begin_bucket_ = end_; + } + + template + inline std::size_t hash_table::erase_group( +- node_ptr* it, bucket_ptr bucket) ++ node_ptr* it, bucket_ptr bucket_) + { + node_ptr pos = *it; +- node_ptr end = node::next_group(pos); +- *it = end; +- std::size_t count = this->delete_nodes(pos, end); +- this->size_ -= count; +- this->recompute_begin_bucket(bucket); +- return count; ++ node_ptr end_ = node::next_group(pos); ++ *it = end_; ++ std::size_t count_ = this->delete_nodes(pos, end_); ++ this->size_ -= count_; ++ this->recompute_begin_bucket(bucket_); ++ return count_; + } + + template +@@ -679,11 +679,11 @@ + if(!this->size_) return 0; + + // No side effects in initial section +- bucket_ptr bucket = this->get_bucket(this->bucket_index(k)); +- node_ptr* it = this->find_for_erase(bucket, k); ++ bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k)); ++ node_ptr* it = this->find_for_erase(bucket_, k); + + // No throw. +- return *it ? this->erase_group(it, bucket) : 0; ++ return *it ? this->erase_group(it, bucket_) : 0; + } + + template +@@ -766,12 +766,12 @@ + std::size_t hash_value = this->hash_function()(k); + if(this->buckets_) this->reserve_for_insert(size); + else this->create_for_insert(size); +- bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value); + node_ptr n = a.release(); +- node::add_to_bucket(n, *bucket); ++ node::add_to_bucket(n, *bucket_); + ++this->size_; +- this->cached_begin_bucket_ = bucket; +- return iterator_base(bucket, n); ++ this->cached_begin_bucket_ = bucket_; ++ return iterator_base(bucket_, n); + } + }} + +--- misc/boost_1_44_0/boost/unordered/detail/unique.hpp 2011-02-05 03:28:39.000000000 +0100 ++++ misc/build/boost_1_44_0/boost/unordered/detail/unique.hpp 2011-02-05 03:36:54.000000000 +0100 +@@ -57,7 +57,7 @@ + + bool equals(hash_unique_table const&) const; + +- node_ptr add_node(node_constructor& a, bucket_ptr bucket); ++ node_ptr add_node(node_constructor& a, bucket_ptr bucket_); + + #if defined(BOOST_UNORDERED_STD_FORWARD) + +@@ -159,13 +159,13 @@ + template + inline BOOST_DEDUCED_TYPENAME hash_unique_table::node_ptr + hash_unique_table::add_node(node_constructor& a, +- bucket_ptr bucket) ++ bucket_ptr bucket_) + { + node_ptr n = a.release(); +- node::add_to_bucket(n, *bucket); ++ node::add_to_bucket(n, *bucket_); + ++this->size_; +- if(bucket < this->cached_begin_bucket_) +- this->cached_begin_bucket_ = bucket; ++ if(bucket_ < this->cached_begin_bucket_) ++ this->cached_begin_bucket_ = bucket_; + return n; + } + +@@ -181,7 +181,7 @@ + typedef BOOST_DEDUCED_TYPENAME value_type::second_type mapped_type; + + std::size_t hash_value = this->hash_function()(k); +- bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value); + + if(!this->buckets_) { + node_constructor a(*this); +@@ -189,7 +189,7 @@ + return *this->emplace_empty_impl_with_node(a, 1); + } + +- node_ptr pos = this->find_iterator(bucket, k); ++ node_ptr pos = this->find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { + return node::get_value(pos); +@@ -205,11 +205,11 @@ + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(this->reserve_for_insert(this->size_ + 1)) +- bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ = this->bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + +- return node::get_value(add_node(a, bucket)); ++ return node::get_value(add_node(a, bucket_)); + } + } + +@@ -220,22 +220,22 @@ + // No side effects in this initial code + key_type const& k = this->get_key(a.value()); + std::size_t hash_value = this->hash_function()(k); +- bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value); +- node_ptr pos = this->find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value); ++ node_ptr pos = this->find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Found an existing key, return it (no throw). +- return emplace_return(iterator_base(bucket, pos), false); ++ return emplace_return(iterator_base(bucket_, pos), false); + } else { + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(this->reserve_for_insert(this->size_ + 1)) +- bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ = this->bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + + return emplace_return( +- iterator_base(bucket, add_node(a, bucket)), ++ iterator_base(bucket_, add_node(a, bucket_)), + true); + } + } +@@ -250,12 +250,12 @@ + { + // No side effects in this initial code + std::size_t hash_value = this->hash_function()(k); +- bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value); +- node_ptr pos = this->find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value); ++ node_ptr pos = this->find_iterator(bucket_, k); + + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Found an existing key, return it (no throw). +- return emplace_return(iterator_base(bucket, pos), false); ++ return emplace_return(iterator_base(bucket_, pos), false); + + } else { + // Doesn't already exist, add to bucket. +@@ -269,12 +269,12 @@ + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(this->reserve_for_insert(this->size_ + 1)) +- bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ = this->bucket_ptr_from_hash(hash_value); + + // Nothing after this point can throw. + + return emplace_return( +- iterator_base(bucket, add_node(a, bucket)), ++ iterator_base(bucket_, add_node(a, bucket_)), + true); + } + } +@@ -313,21 +313,21 @@ + BOOST_UNORDERED_FUNCTION_PARAMS(z, num_params)) \ + { \ + std::size_t hash_value = this->hash_function()(k); \ +- bucket_ptr bucket \ ++ bucket_ptr bucket_ \ + = this->bucket_ptr_from_hash(hash_value); \ +- node_ptr pos = this->find_iterator(bucket, k); \ ++ node_ptr pos = this->find_iterator(bucket_, k); \ + \ + if (BOOST_UNORDERED_BORLAND_BOOL(pos)) { \ +- return emplace_return(iterator_base(bucket, pos), false); \ ++ return emplace_return(iterator_base(bucket_, pos), false); \ + } else { \ + node_constructor a(*this); \ + a.construct(BOOST_UNORDERED_CALL_PARAMS(z, num_params)); \ + \ + if(this->reserve_for_insert(this->size_ + 1)) \ +- bucket = this->bucket_ptr_from_hash(hash_value); \ ++ bucket_ = this->bucket_ptr_from_hash(hash_value); \ + \ +- return emplace_return(iterator_base(bucket, \ +- add_node(a, bucket)), true); \ ++ return emplace_return(iterator_base(bucket_, \ ++ add_node(a, bucket_)), true); \ + } \ + } \ + \ +@@ -441,8 +441,8 @@ + // different second_type. + key_type const& k = extractor::extract(*i); + std::size_t hash_value = this->hash_function()(k); +- bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value); +- node_ptr pos = this->find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value); ++ node_ptr pos = this->find_iterator(bucket_, k); + + if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) { + // Doesn't already exist, add to bucket. +@@ -456,11 +456,11 @@ + // throws, strong otherwise. + if(this->size_ + 1 >= this->max_load_) { + this->reserve_for_insert(this->size_ + insert_size(i, j)); +- bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ = this->bucket_ptr_from_hash(hash_value); + } + + // Nothing after this point can throw. +- add_node(a, bucket); ++ add_node(a, bucket_); + } + } while(++i != j); + } -- cgit From edbb520d6b4d3743eab03cd8420e97f794926e29 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Sat, 5 Feb 2011 04:22:32 +0100 Subject: some more warnings gone --- boost/boost.4713.warnings.patch | 85 +++++++++++++++++++++++++++++++++++++++++ boost/makefile.mk | 3 -- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index ce02d66f953f..0dc8494649e6 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -389,6 +389,17 @@ #if defined(BOOST_UNORDERED_STD_FORWARD) +@@ -135,8 +135,8 @@ + if(this->size_ != other.size_) return false; + if(!this->size_) return true; + +- bucket_ptr end = this->get_bucket(this->bucket_count_); +- for(bucket_ptr i = this->cached_begin_bucket_; i != end; ++i) ++ bucket_ptr end_ = this->get_bucket(this->bucket_count_); ++ for(bucket_ptr i = this->cached_begin_bucket_; i != end_; ++i) + { + node_ptr it1 = i->next_; + while(BOOST_UNORDERED_BORLAND_BOOL(it1)) @@ -159,13 +159,13 @@ template inline BOOST_DEDUCED_TYPENAME hash_unique_table::node_ptr @@ -551,3 +562,77 @@ } } while(++i != j); } +--- misc/boost_1_44_0/boost/unordered/detail/equivalent.hpp 2010-06-09 01:23:43.000000000 +0200 ++++ misc/build/boost_1_44_0/boost/unordered/detail/equivalent.hpp 2011-02-05 04:15:47.000000000 +0100 +@@ -57,7 +57,7 @@ + bool equals(hash_equivalent_table const&) const; + + inline node_ptr add_node(node_constructor& a, +- bucket_ptr bucket, node_ptr pos); ++ bucket_ptr bucket_, node_ptr pos); + + #if defined(BOOST_UNORDERED_STD_FORWARD) + +@@ -117,8 +117,8 @@ + if(this->size_ != other.size_) return false; + if(!this->size_) return true; + +- bucket_ptr end = this->get_bucket(this->bucket_count_); +- for(bucket_ptr i = this->cached_begin_bucket_; i != end; ++i) ++ bucket_ptr end_ = this->get_bucket(this->bucket_count_); ++ for(bucket_ptr i = this->cached_begin_bucket_; i != end_; ++i) + { + node_ptr it1 = i->next_; + while(BOOST_UNORDERED_BORLAND_BOOL(it1)) +@@ -149,16 +149,16 @@ + template + inline BOOST_DEDUCED_TYPENAME hash_equivalent_table::node_ptr + hash_equivalent_table +- ::add_node(node_constructor& a, bucket_ptr bucket, node_ptr pos) ++ ::add_node(node_constructor& a, bucket_ptr bucket_, node_ptr pos) + { + node_ptr n = a.release(); + if(BOOST_UNORDERED_BORLAND_BOOL(pos)) { + node::add_after_node(n, pos); + } + else { +- node::add_to_bucket(n, *bucket); +- if(bucket < this->cached_begin_bucket_) +- this->cached_begin_bucket_ = bucket; ++ node::add_to_bucket(n, *bucket_); ++ if(bucket_ < this->cached_begin_bucket_) ++ this->cached_begin_bucket_ = bucket_; + } + ++this->size_; + return n; +@@ -179,15 +179,15 @@ + return this->emplace_empty_impl_with_node(a, 1); + } + else { +- bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value); +- node_ptr position = this->find_iterator(bucket, k); ++ bucket_ptr bucket_ = this->bucket_ptr_from_hash(hash_value); ++ node_ptr position = this->find_iterator(bucket_, k); + + // reserve has basic exception safety if the hash function + // throws, strong otherwise. + if(this->reserve_for_insert(this->size_ + 1)) +- bucket = this->bucket_ptr_from_hash(hash_value); ++ bucket_ = this->bucket_ptr_from_hash(hash_value); + +- return iterator_base(bucket, add_node(a, bucket, position)); ++ return iterator_base(bucket_, add_node(a, bucket_, position)); + } + } + +@@ -196,8 +196,8 @@ + ::emplace_impl_no_rehash(node_constructor& a) + { + key_type const& k = this->get_key(a.value()); +- bucket_ptr bucket = this->get_bucket(this->bucket_index(k)); +- add_node(a, bucket, this->find_iterator(bucket, k)); ++ bucket_ptr bucket_ = this->get_bucket(this->bucket_index(k)); ++ add_node(a, bucket_, this->find_iterator(bucket_, k)); + } + + #if defined(BOOST_UNORDERED_STD_FORWARD) diff --git a/boost/makefile.mk b/boost/makefile.mk index 2d25dc3ce81b..b9912d2ac3a2 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -51,9 +51,6 @@ all: TARFILE_NAME=boost_1_44_0 TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a PATCH_FILES=$(TARFILE_NAME).patch -# See https://svn.boost.org/trac/boost/ticket/3780 -#PATCH_FILES+=aliasing.patch - #https://svn.boost.org/trac/boost/ticket/4713 PATCH_FILES+=boost.4713.warnings.patch -- cgit From 20d5eb8b2c1b722bc14f8ffd6938636566d2f4e3 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Fri, 4 Feb 2011 20:48:55 -0800 Subject: Deliver \boost\range\algorithm that is needed for sc --- boost/prj/d.lst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boost/prj/d.lst b/boost/prj/d.lst index 185ac0fd8477..b44c3cda12eb 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -100,6 +100,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple mkdir: %_DEST%\inc%_EXT%\boost\ptr_container mkdir: %_DEST%\inc%_EXT%\boost\ptr_container\detail mkdir: %_DEST%\inc%_EXT%\boost\range +mkdir: %_DEST%\inc%_EXT%\boost\range\algorithm mkdir: %_DEST%\inc%_EXT%\boost\range\detail mkdir: %_DEST%\inc%_EXT%\boost\spirit mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor @@ -288,6 +289,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc%_EXT%\boost\ptr_container ..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc%_EXT%\boost\ptr_container\detail ..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range +..\%__SRC%\inc\boost\range\algorithm\* %_DEST%\inc%_EXT%\boost\range\algorithm ..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc%_EXT%\boost\range\detail ..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit ..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor -- cgit From da780c6eb3b2f8337d83418e96ada15f0815496d Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Sat, 5 Feb 2011 09:25:07 +0100 Subject: The exception.cpp is not in the win32 thread library in this version --- boost/boost_1_44_0.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch index 99e24de7d878..9d7c526f4b6e 100644 --- a/boost/boost_1_44_0.patch +++ b/boost/boost_1_44_0.patch @@ -1,6 +1,6 @@ --- misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk +++ misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk -@@ -1,1 +1,21 @@ +@@ -1,1 +1,20 @@ -dummy +PRJ=..$/..$/..$/..$/..$/..$/..$/.. + @@ -12,8 +12,7 @@ + +.INCLUDE : settings.mk + -+SLOFILES= $(SLO)$/exceptions.obj \ -+ $(SLO)$/thread.obj \ ++SLOFILES= $(SLO)$/thread.obj \ + $(SLO)$/tss_dll.obj \ + $(SLO)$/tss_pe.obj + -- cgit From 400f1e7334c77cdd8676a9afcd269ecf2eb42815 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 5 Feb 2011 09:44:28 +0100 Subject: define copy ctor for boost::unordered_map/_set Build with gcc 4.6 breaks otherwise. --- boost/makefile.mk | 2 + boost/unordered_map-doesnt-support-cp-ctor.patch | 92 ++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 boost/unordered_map-doesnt-support-cp-ctor.patch diff --git a/boost/makefile.mk b/boost/makefile.mk index b9912d2ac3a2..fb7c1c222dd5 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -53,6 +53,8 @@ TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a PATCH_FILES=$(TARFILE_NAME).patch #https://svn.boost.org/trac/boost/ticket/4713 PATCH_FILES+=boost.4713.warnings.patch +#https://svn.boost.org/trac/boost/ticket/5119 +PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk diff --git a/boost/unordered_map-doesnt-support-cp-ctor.patch b/boost/unordered_map-doesnt-support-cp-ctor.patch new file mode 100644 index 000000000000..740c953d069e --- /dev/null +++ b/boost/unordered_map-doesnt-support-cp-ctor.patch @@ -0,0 +1,92 @@ +Index: /trunk/boost/unordered/unordered_set.hpp +=================================================================== +--- misc/boost_1_44_0/boost/unordered/unordered_set.hpp (revision 60754) ++++ misc/build/boost_1_44_0/boost/unordered/unordered_set.hpp (revision 68445) +@@ -155,4 +155,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_set(unordered_set const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_set(unordered_set&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -163,4 +168,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_set& operator=(unordered_set const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + +@@ -652,4 +663,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_multiset(unordered_multiset const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_multiset(unordered_multiset&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -660,4 +676,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_multiset& operator=(unordered_multiset const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + +Index: /trunk/boost/unordered/unordered_map.hpp +=================================================================== +--- misc/boost_1_44_0/boost/unordered/unordered_map.hpp (revision 60754) ++++ misc/build/boost_1_44_0/boost/unordered/unordered_map.hpp (revision 68445) +@@ -161,4 +161,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_map(unordered_map const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_map(unordered_map&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -169,4 +174,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_map& operator=(unordered_map const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + +@@ -706,4 +717,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_multimap(unordered_multimap const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_multimap(unordered_multimap&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -714,4 +730,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_multimap& operator=(unordered_multimap const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + -- cgit From 176a22eb1df77a31e8d116750ca0cb3a10149fe0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 5 Feb 2011 10:16:08 +0000 Subject: and remove some some warning spam --- boost/boost.4713.warnings.patch | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 0dc8494649e6..5e5dd20cb1bb 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -636,3 +636,59 @@ } #if defined(BOOST_UNORDERED_STD_FORWARD) +--- misc/boost_1_44_0/boost/ptr_container/exception.hpp 2011-02-05 09:42:56.074932485 +0000 ++++ misc/build/boost_1_44_0/boost/ptr_container/exception.hpp 2011-02-05 09:43:00.350931536 +0000 +@@ -24,7 +24,7 @@ + { + const char* what_; + public: +- bad_ptr_container_operation( const char* what ) : what_( what ) ++ bad_ptr_container_operation( const char* _what ) : what_( _what ) + { } + + virtual const char* what() const throw() +@@ -38,7 +38,7 @@ + class bad_index : public bad_ptr_container_operation + { + public: +- bad_index( const char* what ) : bad_ptr_container_operation( what ) ++ bad_index( const char* _what ) : bad_ptr_container_operation( _what ) + { } + }; + +--- misc/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2011-02-05 09:49:30.373931807 +0000 ++++ misc/build/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2011-02-05 09:49:34.804931932 +0000 +@@ -278,9 +278,9 @@ + + private: + template< class ForwardIterator > +- ForwardIterator advance( ForwardIterator begin, size_type n ) ++ ForwardIterator advance( ForwardIterator begin_, size_type n ) + { +- ForwardIterator iter = begin; ++ ForwardIterator iter = begin_; + std::advance( iter, n ); + return iter; + } +--- misc/boost_1_44_0/boost/ptr_container/detail/static_move_ptr.hpp.orig 2011-02-05 09:55:44.846931338 +0000 ++++ misc/build/boost_1_44_0/boost/ptr_container/detail/static_move_ptr.hpp 2011-02-05 09:56:42.760931701 +0000 +@@ -151,7 +151,7 @@ + deleter_const_reference get_deleter() const { return impl_.second(); } + private: + template +- void check(const static_move_ptr& ptr) ++ void check(const static_move_ptr&) + { + typedef move_ptrs::is_smart_ptr_convertible convertible; + BOOST_STATIC_ASSERT(convertible::value); +--- misc/boost_1_44_0/boost/ptr_container/detail/move.hpp 2011-02-05 10:01:21.156931884 +0000 ++++ misc/build/boost_1_44_0/boost/ptr_container/detail/move.hpp 2011-02-05 10:01:14.160931007 +0000 +@@ -20,7 +20,7 @@ + template + class move_source { + public: +- move_source(Ptr& ptr) : ptr_(ptr) {} ++ move_source(Ptr& _ptr) : ptr_(_ptr) {} + Ptr& ptr() const { return ptr_; } + private: + Ptr& ptr_; -- cgit From a1b931cc43089834308a917689702f4a41eb6319 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 5 Feb 2011 16:23:21 +0000 Subject: build without nls, we don't need it --- hunspell/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index a61f4e596e16..a4f7b0662006 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -51,7 +51,7 @@ PATCH_FILES=\ #relative to CONFIGURE_DIR CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure -CONFIGURE_FLAGS= --disable-shared --with-pic +CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic .IF "$(COMNAME)"=="sunpro5" CONFIGURE_FLAGS+= CFLAGS=-xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" @@ -81,7 +81,7 @@ PATCH_FILES=\ hunspell-mingw.patch CONFIGURE_ACTION=configure -CONFIGURE_FLAGS= --disable-shared --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2 +CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2 BUILD_ACTION=make OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a .ELSE -- cgit From 1c0c7b8510d90895bc65323eee5d9b37944e4361 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 7 Feb 2011 14:49:55 +0100 Subject: deliver _all_ boost directories --- boost/prj/d.lst | 1022 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 926 insertions(+), 96 deletions(-) diff --git a/boost/prj/d.lst b/boost/prj/d.lst index b44c3cda12eb..cfdae10219cd 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -1,12 +1,59 @@ mkdir: %_DEST%\inc%_EXT%\boost +mkdir: %_DEST%\inc%_EXT%\boost\accumulators +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\framework +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\framework\accumulators +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\framework\parameters +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\numeric +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\numeric\detail +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\numeric\functional +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\statistics +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\statistics\parameters +mkdir: %_DEST%\inc%_EXT%\boost\accumulators\statistics\variates mkdir: %_DEST%\inc%_EXT%\boost\algorithm mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\detail mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\std +mkdir: %_DEST%\inc%_EXT%\boost\archive +mkdir: %_DEST%\inc%_EXT%\boost\archive\detail +mkdir: %_DEST%\inc%_EXT%\boost\archive\impl +mkdir: %_DEST%\inc%_EXT%\boost\archive\iterators +mkdir: %_DEST%\inc%_EXT%\boost\asio +mkdir: %_DEST%\inc%_EXT%\boost\asio\detail +mkdir: %_DEST%\inc%_EXT%\boost\asio\detail\impl +mkdir: %_DEST%\inc%_EXT%\boost\asio\impl +mkdir: %_DEST%\inc%_EXT%\boost\asio\ip +mkdir: %_DEST%\inc%_EXT%\boost\asio\ip\detail +mkdir: %_DEST%\inc%_EXT%\boost\asio\ip\detail\impl +mkdir: %_DEST%\inc%_EXT%\boost\asio\ip\impl +mkdir: %_DEST%\inc%_EXT%\boost\asio\local +mkdir: %_DEST%\inc%_EXT%\boost\asio\local\detail +mkdir: %_DEST%\inc%_EXT%\boost\asio\local\detail\impl +mkdir: %_DEST%\inc%_EXT%\boost\asio\posix +mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl +mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl\detail +mkdir: %_DEST%\inc%_EXT%\boost\asio\windows mkdir: %_DEST%\inc%_EXT%\boost\assign mkdir: %_DEST%\inc%_EXT%\boost\assign\std +mkdir: %_DEST%\inc%_EXT%\boost\bimap +mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor +mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\detail +mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\support +mkdir: %_DEST%\inc%_EXT%\boost\bimap\detail +mkdir: %_DEST%\inc%_EXT%\boost\bimap\detail\debug +mkdir: %_DEST%\inc%_EXT%\boost\bimap\detail\test +mkdir: %_DEST%\inc%_EXT%\boost\bimap\property_map +mkdir: %_DEST%\inc%_EXT%\boost\bimap\relation +mkdir: %_DEST%\inc%_EXT%\boost\bimap\relation\detail +mkdir: %_DEST%\inc%_EXT%\boost\bimap\relation\support +mkdir: %_DEST%\inc%_EXT%\boost\bimap\support +mkdir: %_DEST%\inc%_EXT%\boost\bimap\tags +mkdir: %_DEST%\inc%_EXT%\boost\bimap\tags\support +mkdir: %_DEST%\inc%_EXT%\boost\bimap\views mkdir: %_DEST%\inc%_EXT%\boost\bind +mkdir: %_DEST%\inc%_EXT%\boost\circular_buffer +mkdir: %_DEST%\inc%_EXT%\boost\compatibility\cpp_c_headers mkdir: %_DEST%\inc%_EXT%\boost\concept +mkdir: %_DEST%\inc%_EXT%\boost\concept_check mkdir: %_DEST%\inc%_EXT%\boost\concept\detail mkdir: %_DEST%\inc%_EXT%\boost\config mkdir: %_DEST%\inc%_EXT%\boost\config\abi @@ -19,22 +66,188 @@ mkdir: %_DEST%\inc%_EXT%\boost\date_time\gregorian mkdir: %_DEST%\inc%_EXT%\boost\date_time\local_time mkdir: %_DEST%\inc%_EXT%\boost\date_time\posix_time mkdir: %_DEST%\inc%_EXT%\boost\detail +mkdir: %_DEST%\inc%_EXT%\boost\dynamic_bitset +mkdir: %_DEST%\inc%_EXT%\boost\exception +mkdir: %_DEST%\inc%_EXT%\boost\exception\detail +mkdir: %_DEST%\inc%_EXT%\boost\filesystem +mkdir: %_DEST%\inc%_EXT%\boost\filesystem\detail +mkdir: %_DEST%\inc%_EXT%\boost\filesystem\v2 +mkdir: %_DEST%\inc%_EXT%\boost\filesystem\v3 +mkdir: %_DEST%\inc%_EXT%\boost\flyweight +mkdir: %_DEST%\inc%_EXT%\boost\flyweight\detail +mkdir: %_DEST%\inc%_EXT%\boost\format +mkdir: %_DEST%\inc%_EXT%\boost\format\detail mkdir: %_DEST%\inc%_EXT%\boost\function -mkdir: %_DEST%\inc%_EXT%\boost\function\detail mkdir: %_DEST%\inc%_EXT%\boost\functional +mkdir: %_DEST%\inc%_EXT%\boost\functional\detail +mkdir: %_DEST%\inc%_EXT%\boost\functional\hash mkdir: %_DEST%\inc%_EXT%\boost\functional\hash\detail -mkdir: %_DEST%\inc%_EXT%\boost\io +mkdir: %_DEST%\inc%_EXT%\boost\function\detail +mkdir: %_DEST%\inc%_EXT%\boost\function_types +mkdir: %_DEST%\inc%_EXT%\boost\function_types\config +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\classifier_impl +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\components_impl +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\encoding +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_cc_loop +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_retag_default_cc +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_tags +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_variate_loop +mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\synthesize_impl +mkdir: %_DEST%\inc%_EXT%\boost\fusion +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\array +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\class +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\class\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\struct +mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\struct\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\ext_ +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\query +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\ext_ +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation +mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\deque +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\deque\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\ext_ +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\generation +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\list +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\list\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\map +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\map\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\set +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\set\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\vector +mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\vector\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\adapter +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\adapter\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\generation +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\generation\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\invocation +mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\invocation\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\include +mkdir: %_DEST%\inc%_EXT%\boost\fusion\iterator +mkdir: %_DEST%\inc%_EXT%\boost\fusion\iterator\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\iterator\mpl +mkdir: %_DEST%\inc%_EXT%\boost\fusion\mpl +mkdir: %_DEST%\inc%_EXT%\boost\fusion\mpl\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic\ext_ +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\io +mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\io\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\support +mkdir: %_DEST%\inc%_EXT%\boost\fusion\support\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\support\ext_ +mkdir: %_DEST%\inc%_EXT%\boost\fusion\tuple +mkdir: %_DEST%\inc%_EXT%\boost\fusion\tuple\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\ext_ +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\filter_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\filter_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\joint_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\joint_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\nview +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\nview\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\single_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\single_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\transform_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\transform_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\zip_view +mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\zip_view\detail +mkdir: %_DEST%\inc%_EXT%\boost\gil +mkdir: %_DEST%\inc%_EXT%\boost\gil\extension\dynamic_image +mkdir: %_DEST%\inc%_EXT%\boost\gil\extension\io +mkdir: %_DEST%\inc%_EXT%\boost\graph +mkdir: %_DEST%\inc%_EXT%\boost\graph\detail +mkdir: %_DEST%\inc%_EXT%\boost\graph\distributed +mkdir: %_DEST%\inc%_EXT%\boost\graph\distributed\adjlist +mkdir: %_DEST%\inc%_EXT%\boost\graph\distributed\detail +mkdir: %_DEST%\inc%_EXT%\boost\graph\parallel +mkdir: %_DEST%\inc%_EXT%\boost\graph\parallel\detail +mkdir: %_DEST%\inc%_EXT%\boost\graph\planar_detail +mkdir: %_DEST%\inc%_EXT%\boost\graph\property_maps mkdir: %_DEST%\inc%_EXT%\boost\integer +mkdir: %_DEST%\inc%_EXT%\boost\interprocess +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\allocators +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\allocators\detail +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\containers +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\containers\container +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\containers\container\detail +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\detail +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\indexes +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\ipc +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\mem_algo +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\mem_algo\detail +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr\detail +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\streams +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync\emulation +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync\posix +mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync\xsi +mkdir: %_DEST%\inc%_EXT%\boost\intrusive +mkdir: %_DEST%\inc%_EXT%\boost\intrusive\detail +mkdir: %_DEST%\inc%_EXT%\boost\io +mkdir: %_DEST%\inc%_EXT%\boost\io\detail +mkdir: %_DEST%\inc%_EXT%\boost\iostreams +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\adapter +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\broken_overload_resolution +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\config +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\streambuf +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\vc6 +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\device +mkdir: %_DEST%\inc%_EXT%\boost\iostreams\filter mkdir: %_DEST%\inc%_EXT%\boost\iterator mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail -mkdir: %_DEST%\inc%_EXT%\boost\exception -mkdir: %_DEST%\inc%_EXT%\boost\exception\detail +mkdir: %_DEST%\inc%_EXT%\boost\lambda +mkdir: %_DEST%\inc%_EXT%\boost\lambda\detail +mkdir: %_DEST%\inc%_EXT%\boost\logic +mkdir: %_DEST%\inc%_EXT%\boost\math +mkdir: %_DEST%\inc%_EXT%\boost\math\bindings +mkdir: %_DEST%\inc%_EXT%\boost\math\bindings\detail +mkdir: %_DEST%\inc%_EXT%\boost\math\complex +mkdir: %_DEST%\inc%_EXT%\boost\math\concepts +mkdir: %_DEST%\inc%_EXT%\boost\math\constants +mkdir: %_DEST%\inc%_EXT%\boost\math\distributions +mkdir: %_DEST%\inc%_EXT%\boost\math\distributions\detail +mkdir: %_DEST%\inc%_EXT%\boost\math\policies +mkdir: %_DEST%\inc%_EXT%\boost\math\special_functions +mkdir: %_DEST%\inc%_EXT%\boost\math\special_functions\detail +mkdir: %_DEST%\inc%_EXT%\boost\math\tools +mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail +mkdir: %_DEST%\inc%_EXT%\boost\mpi +mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives +mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail +mkdir: %_DEST%\inc%_EXT%\boost\mpi\python mkdir: %_DEST%\inc%_EXT%\boost\mpl mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_ mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 +mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc_pre590 +mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\dmc mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 @@ -44,25 +257,56 @@ mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c +mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\test mkdir: %_DEST%\inc%_EXT%\boost\mpl\limits mkdir: %_DEST%\inc%_EXT%\boost\mpl\list mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain +mkdir: %_DEST%\inc%_EXT%\boost\mpl\map +mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_ +mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\no_ctps +mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\plain +mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\typeof_based mkdir: %_DEST%\inc%_EXT%\boost\mpl\math +mkdir: %_DEST%\inc%_EXT%\boost\mpl\multiset +mkdir: %_DEST%\inc%_EXT%\boost\mpl\multiset\aux_ +mkdir: %_DEST%\inc%_EXT%\boost\mpl\set +mkdir: %_DEST%\inc%_EXT%\boost\mpl\set\aux_ +mkdir: %_DEST%\inc%_EXT%\boost\mpl\set\aux_\preprocessed\plain mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based +mkdir: %_DEST%\inc%_EXT%\boost\msm +mkdir: %_DEST%\inc%_EXT%\boost\msm\back +mkdir: %_DEST%\inc%_EXT%\boost\msm\front +mkdir: %_DEST%\inc%_EXT%\boost\msm\front\detail +mkdir: %_DEST%\inc%_EXT%\boost\msm\front\euml +mkdir: %_DEST%\inc%_EXT%\boost\multi_array +mkdir: %_DEST%\inc%_EXT%\boost\multi_index +mkdir: %_DEST%\inc%_EXT%\boost\multi_index\detail mkdir: %_DEST%\inc%_EXT%\boost\numeric mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail +mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval +mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\compare +mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\detail +mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\ext mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail +mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\experimental +mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\operation +mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\traits mkdir: %_DEST%\inc%_EXT%\boost\optional +mkdir: %_DEST%\inc%_EXT%\boost\parameter +mkdir: %_DEST%\inc%_EXT%\boost\parameter\aux_ +mkdir: %_DEST%\inc%_EXT%\boost\parameter\aux_\preprocessor +mkdir: %_DEST%\inc%_EXT%\boost\parameter\aux_\python mkdir: %_DEST%\inc%_EXT%\boost\pending +mkdir: %_DEST%\inc%_EXT%\boost\pending\detail +mkdir: %_DEST%\inc%_EXT%\boost\polygon +mkdir: %_DEST%\inc%_EXT%\boost\polygon\detail mkdir: %_DEST%\inc%_EXT%\boost\pool mkdir: %_DEST%\inc%_EXT%\boost\pool\detail mkdir: %_DEST%\inc%_EXT%\boost\preprocessor @@ -73,10 +317,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\comparison mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\config mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail +mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\dmc mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\debug mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\detail +mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\detail\dmc mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\facilities mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail @@ -84,11 +330,13 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail +mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\dmc mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\logical mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\punctuation mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail +mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\dmc mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\selection @@ -97,108 +345,323 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple +mkdir: %_DEST%\inc%_EXT%\boost\program_options +mkdir: %_DEST%\inc%_EXT%\boost\program_options\detail +mkdir: %_DEST%\inc%_EXT%\boost\property_map +mkdir: %_DEST%\inc%_EXT%\boost\property_map\parallel +mkdir: %_DEST%\inc%_EXT%\boost\property_map\parallel\impl +mkdir: %_DEST%\inc%_EXT%\boost\property_tree +mkdir: %_DEST%\inc%_EXT%\boost\property_tree\detail +mkdir: %_DEST%\inc%_EXT%\boost\proto +mkdir: %_DEST%\inc%_EXT%\boost\proto\context +mkdir: %_DEST%\inc%_EXT%\boost\proto\detail +mkdir: %_DEST%\inc%_EXT%\boost\proto\transform mkdir: %_DEST%\inc%_EXT%\boost\ptr_container mkdir: %_DEST%\inc%_EXT%\boost\ptr_container\detail +mkdir: %_DEST%\inc%_EXT%\boost\python +mkdir: %_DEST%\inc%_EXT%\boost\python\converter +mkdir: %_DEST%\inc%_EXT%\boost\python\detail +mkdir: %_DEST%\inc%_EXT%\boost\python\object +mkdir: %_DEST%\inc%_EXT%\boost\python\suite\indexing +mkdir: %_DEST%\inc%_EXT%\boost\python\suite\indexing\detail +mkdir: %_DEST%\inc%_EXT%\boost\random +mkdir: %_DEST%\inc%_EXT%\boost\random\detail mkdir: %_DEST%\inc%_EXT%\boost\range +mkdir: %_DEST%\inc%_EXT%\boost\range\adaptor mkdir: %_DEST%\inc%_EXT%\boost\range\algorithm +mkdir: %_DEST%\inc%_EXT%\boost\range\algorithm_ext mkdir: %_DEST%\inc%_EXT%\boost\range\detail +mkdir: %_DEST%\inc%_EXT%\boost\range\detail\vc6 +mkdir: %_DEST%\inc%_EXT%\boost\regex +mkdir: %_DEST%\inc%_EXT%\boost\regex\config +mkdir: %_DEST%\inc%_EXT%\boost\regex\pending +mkdir: %_DEST%\inc%_EXT%\boost\regex\v4 +mkdir: %_DEST%\inc%_EXT%\boost\serialization +mkdir: %_DEST%\inc%_EXT%\boost\serialization\detail +mkdir: %_DEST%\inc%_EXT%\boost\signals +mkdir: %_DEST%\inc%_EXT%\boost\signals2 +mkdir: %_DEST%\inc%_EXT%\boost\signals2\detail +mkdir: %_DEST%\inc%_EXT%\boost\signals\detail +mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr +mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail mkdir: %_DEST%\inc%_EXT%\boost\spirit mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute mkdir: %_DEST%\inc%_EXT%\boost\spirit\core mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\meta -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug -mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic -mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling -mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\action +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\auto +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\auxiliary +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\binary +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\char +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\directive +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\operator +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\string +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer\lexertl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\qi +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\fusion +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\action +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\auto +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\auxiliary +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\binary +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\char +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\directive +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\operator +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\string +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\string\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\algorithm +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\auto +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\auxiliary +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding\unicode +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\char_set +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\integer +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\containers +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\conversion +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tokeniser +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tree +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\partition +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators\detail +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\nonterminal mkdir: %_DEST%\inc%_EXT%\boost\spirit\include mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator -mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta -mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\phoenix +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\directive +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\nonterminal +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\directive +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\nonterminal +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\primitive +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\support +mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\include mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols -mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree -mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility -mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset -mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr -mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail +mkdir: %_DEST%\inc%_EXT%\boost\statechart +mkdir: %_DEST%\inc%_EXT%\boost\statechart\detail +mkdir: %_DEST%\inc%_EXT%\boost\system +mkdir: %_DEST%\inc%_EXT%\boost\test +mkdir: %_DEST%\inc%_EXT%\boost\test\detail +mkdir: %_DEST%\inc%_EXT%\boost\test\impl +mkdir: %_DEST%\inc%_EXT%\boost\test\included +mkdir: %_DEST%\inc%_EXT%\boost\test\output +mkdir: %_DEST%\inc%_EXT%\boost\test\utils +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\basic_cstring +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\iterator +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\detail +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\iface +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\env +mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\file mkdir: %_DEST%\inc%_EXT%\boost\thread mkdir: %_DEST%\inc%_EXT%\boost\thread\detail mkdir: %_DEST%\inc%_EXT%\boost\thread\pthread mkdir: %_DEST%\inc%_EXT%\boost\thread\win32 +mkdir: %_DEST%\inc%_EXT%\boost\tr1 +mkdir: %_DEST%\inc%_EXT%\boost\tr1\detail +mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1 +mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1\bcc32 +mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1\sun mkdir: %_DEST%\inc%_EXT%\boost\tuple mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail +mkdir: %_DEST%\inc%_EXT%\boost\typeof +mkdir: %_DEST%\inc%_EXT%\boost\typeof\dmc +mkdir: %_DEST%\inc%_EXT%\boost\typeof\msvc +mkdir: %_DEST%\inc%_EXT%\boost\typeof\std mkdir: %_DEST%\inc%_EXT%\boost\type_traits mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail +mkdir: %_DEST%\inc%_EXT%\boost\type_traits\msvc +mkdir: %_DEST%\inc%_EXT%\boost\units +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\angle +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\astronomical +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\cgs +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\imperial +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\metric +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\si +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\temperature +mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\us +mkdir: %_DEST%\inc%_EXT%\boost\units\detail +mkdir: %_DEST%\inc%_EXT%\boost\units\physical_dimensions +mkdir: %_DEST%\inc%_EXT%\boost\units\systems +mkdir: %_DEST%\inc%_EXT%\boost\units\systems\angle +mkdir: %_DEST%\inc%_EXT%\boost\units\systems\cgs +mkdir: %_DEST%\inc%_EXT%\boost\units\systems\detail +mkdir: %_DEST%\inc%_EXT%\boost\units\systems\si +mkdir: %_DEST%\inc%_EXT%\boost\units\systems\si\codata +mkdir: %_DEST%\inc%_EXT%\boost\units\systems\temperature mkdir: %_DEST%\inc%_EXT%\boost\unordered mkdir: %_DEST%\inc%_EXT%\boost\unordered\detail mkdir: %_DEST%\inc%_EXT%\boost\utility mkdir: %_DEST%\inc%_EXT%\boost\utility\detail +mkdir: %_DEST%\inc%_EXT%\boost\uuid mkdir: %_DEST%\inc%_EXT%\boost\variant mkdir: %_DEST%\inc%_EXT%\boost\variant\detail +mkdir: %_DEST%\inc%_EXT%\boost\wave +mkdir: %_DEST%\inc%_EXT%\boost\wave\cpplexer +mkdir: %_DEST%\inc%_EXT%\boost\wave\cpplexer\re2clex +mkdir: %_DEST%\inc%_EXT%\boost\wave\grammars +mkdir: %_DEST%\inc%_EXT%\boost\wave\util +mkdir: %_DEST%\inc%_EXT%\boost\xpressive +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\core +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\core\matcher +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\dynamic +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\static +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\static\transforms +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\utility +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\utility\chset +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits +mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail ..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost +..\%__SRC%\inc\boost\accumulators\* %_DEST%\inc%_EXT%\boost\accumulators +..\%__SRC%\inc\boost\accumulators\framework\accumulators\* %_DEST%\inc%_EXT%\boost\accumulators\framework\accumulators +..\%__SRC%\inc\boost\accumulators\framework\* %_DEST%\inc%_EXT%\boost\accumulators\framework +..\%__SRC%\inc\boost\accumulators\framework\parameters\* %_DEST%\inc%_EXT%\boost\accumulators\framework\parameters +..\%__SRC%\inc\boost\accumulators\numeric\* %_DEST%\inc%_EXT%\boost\accumulators\numeric +..\%__SRC%\inc\boost\accumulators\numeric\detail\* %_DEST%\inc%_EXT%\boost\accumulators\numeric\detail +..\%__SRC%\inc\boost\accumulators\numeric\functional\* %_DEST%\inc%_EXT%\boost\accumulators\numeric\functional +..\%__SRC%\inc\boost\accumulators\statistics\* %_DEST%\inc%_EXT%\boost\accumulators\statistics +..\%__SRC%\inc\boost\accumulators\statistics\parameters\* %_DEST%\inc%_EXT%\boost\accumulators\statistics\parameters +..\%__SRC%\inc\boost\accumulators\statistics\variates\* %_DEST%\inc%_EXT%\boost\accumulators\statistics\variates ..\%__SRC%\inc\boost\algorithm\* %_DEST%\inc%_EXT%\boost\algorithm ..\%__SRC%\inc\boost\algorithm\string\* %_DEST%\inc%_EXT%\boost\algorithm\string ..\%__SRC%\inc\boost\algorithm\string\detail\* %_DEST%\inc%_EXT%\boost\algorithm\string\detail ..\%__SRC%\inc\boost\algorithm\string\std\* %_DEST%\inc%_EXT%\boost\algorithm\string\std +..\%__SRC%\inc\boost\archive\* %_DEST%\inc%_EXT%\boost\archive +..\%__SRC%\inc\boost\archive\detail\* %_DEST%\inc%_EXT%\boost\archive\detail +..\%__SRC%\inc\boost\archive\impl\* %_DEST%\inc%_EXT%\boost\archive\impl +..\%__SRC%\inc\boost\archive\iterators\* %_DEST%\inc%_EXT%\boost\archive\iterators +..\%__SRC%\inc\boost\asio\* %_DEST%\inc%_EXT%\boost\asio +..\%__SRC%\inc\boost\asio\detail\* %_DEST%\inc%_EXT%\boost\asio\detail +..\%__SRC%\inc\boost\asio\detail\impl\* %_DEST%\inc%_EXT%\boost\asio\detail\impl +..\%__SRC%\inc\boost\asio\impl\* %_DEST%\inc%_EXT%\boost\asio\impl +..\%__SRC%\inc\boost\asio\ip\* %_DEST%\inc%_EXT%\boost\asio\ip +..\%__SRC%\inc\boost\asio\ip\detail\* %_DEST%\inc%_EXT%\boost\asio\ip\detail +..\%__SRC%\inc\boost\asio\ip\detail\impl\* %_DEST%\inc%_EXT%\boost\asio\ip\detail\impl +..\%__SRC%\inc\boost\asio\ip\impl\* %_DEST%\inc%_EXT%\boost\asio\ip\impl +..\%__SRC%\inc\boost\asio\local\* %_DEST%\inc%_EXT%\boost\asio\local +..\%__SRC%\inc\boost\asio\local\detail\* %_DEST%\inc%_EXT%\boost\asio\local\detail +..\%__SRC%\inc\boost\asio\local\detail\impl\* %_DEST%\inc%_EXT%\boost\asio\local\detail\impl +..\%__SRC%\inc\boost\asio\posix\* %_DEST%\inc%_EXT%\boost\asio\posix +..\%__SRC%\inc\boost\asio\ssl\* %_DEST%\inc%_EXT%\boost\asio\ssl +..\%__SRC%\inc\boost\asio\ssl\detail\* %_DEST%\inc%_EXT%\boost\asio\ssl\detail +..\%__SRC%\inc\boost\asio\windows\* %_DEST%\inc%_EXT%\boost\asio\windows ..\%__SRC%\inc\boost\assign\* %_DEST%\inc%_EXT%\boost\assign ..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc%_EXT%\boost\assign\std +..\%__SRC%\inc\boost\bimap\container_adaptor\* %_DEST%\inc%_EXT%\boost\bimap\container_adaptor +..\%__SRC%\inc\boost\bimap\container_adaptor\detail\* %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\detail +..\%__SRC%\inc\boost\bimap\container_adaptor\support\* %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\support +..\%__SRC%\inc\boost\bimap\* %_DEST%\inc%_EXT%\boost\bimap +..\%__SRC%\inc\boost\bimap\detail\debug\* %_DEST%\inc%_EXT%\boost\bimap\detail\debug +..\%__SRC%\inc\boost\bimap\detail\* %_DEST%\inc%_EXT%\boost\bimap\detail +..\%__SRC%\inc\boost\bimap\detail\test\* %_DEST%\inc%_EXT%\boost\bimap\detail\test +..\%__SRC%\inc\boost\bimap\property_map\* %_DEST%\inc%_EXT%\boost\bimap\property_map +..\%__SRC%\inc\boost\bimap\relation\* %_DEST%\inc%_EXT%\boost\bimap\relation +..\%__SRC%\inc\boost\bimap\relation\detail\* %_DEST%\inc%_EXT%\boost\bimap\relation\detail +..\%__SRC%\inc\boost\bimap\relation\support\* %_DEST%\inc%_EXT%\boost\bimap\relation\support +..\%__SRC%\inc\boost\bimap\support\* %_DEST%\inc%_EXT%\boost\bimap\support +..\%__SRC%\inc\boost\bimap\tags\* %_DEST%\inc%_EXT%\boost\bimap\tags +..\%__SRC%\inc\boost\bimap\tags\support\* %_DEST%\inc%_EXT%\boost\bimap\tags\support +..\%__SRC%\inc\boost\bimap\views\* %_DEST%\inc%_EXT%\boost\bimap\views ..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind +..\%__SRC%\inc\boost\circular_buffer\* %_DEST%\inc%_EXT%\boost\circular_buffer +..\%__SRC%\inc\boost\compatibility\cpp_c_headers\* %_DEST%\inc%_EXT%\boost\compatibility\cpp_c_headers +..\%__SRC%\inc\boost\concept_check\* %_DEST%\inc%_EXT%\boost\concept_check ..\%__SRC%\inc\boost\concept\* %_DEST%\inc%_EXT%\boost\concept ..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc%_EXT%\boost\concept\detail -..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config ..\%__SRC%\inc\boost\config\abi\* %_DEST%\inc%_EXT%\boost\config\abi ..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler +..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config ..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1 ..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform ..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib @@ -207,23 +670,187 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\date_time\local_time\* %_DEST%\inc%_EXT%\boost\date_time\local_time ..\%__SRC%\inc\boost\date_time\posix_time\* %_DEST%\inc%_EXT%\boost\date_time\posix_time ..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail -..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function -..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail +..\%__SRC%\inc\boost\dynamic_bitset\* %_DEST%\inc%_EXT%\boost\dynamic_bitset +..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception +..\%__SRC%\inc\boost\exception\detail\* %_DEST%\inc%_EXT%\boost\exception\detail +..\%__SRC%\inc\boost\filesystem\* %_DEST%\inc%_EXT%\boost\filesystem +..\%__SRC%\inc\boost\filesystem\detail\* %_DEST%\inc%_EXT%\boost\filesystem\detail +..\%__SRC%\inc\boost\filesystem\v2\* %_DEST%\inc%_EXT%\boost\filesystem\v2 +..\%__SRC%\inc\boost\filesystem\v3\* %_DEST%\inc%_EXT%\boost\filesystem\v3 +..\%__SRC%\inc\boost\flyweight\* %_DEST%\inc%_EXT%\boost\flyweight +..\%__SRC%\inc\boost\flyweight\detail\* %_DEST%\inc%_EXT%\boost\flyweight\detail +..\%__SRC%\inc\boost\format\* %_DEST%\inc%_EXT%\boost\format +..\%__SRC%\inc\boost\format\detail\* %_DEST%\inc%_EXT%\boost\format\detail ..\%__SRC%\inc\boost\functional\* %_DEST%\inc%_EXT%\boost\functional +..\%__SRC%\inc\boost\functional\detail\* %_DEST%\inc%_EXT%\boost\functional\detail ..\%__SRC%\inc\boost\functional\hash\* %_DEST%\inc%_EXT%\boost\functional\hash ..\%__SRC%\inc\boost\functional\hash\detail\* %_DEST%\inc%_EXT%\boost\functional\hash\detail -..\%__SRC%\inc\boost\io\* %_DEST%\inc%_EXT%\boost\io +..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function +..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail +..\%__SRC%\inc\boost\function_types\config\* %_DEST%\inc%_EXT%\boost\function_types\config +..\%__SRC%\inc\boost\function_types\* %_DEST%\inc%_EXT%\boost\function_types +..\%__SRC%\inc\boost\function_types\detail\classifier_impl\* %_DEST%\inc%_EXT%\boost\function_types\detail\classifier_impl +..\%__SRC%\inc\boost\function_types\detail\components_impl\* %_DEST%\inc%_EXT%\boost\function_types\detail\components_impl +..\%__SRC%\inc\boost\function_types\detail\* %_DEST%\inc%_EXT%\boost\function_types\detail +..\%__SRC%\inc\boost\function_types\detail\encoding\* %_DEST%\inc%_EXT%\boost\function_types\detail\encoding +..\%__SRC%\inc\boost\function_types\detail\pp_cc_loop\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_cc_loop +..\%__SRC%\inc\boost\function_types\detail\pp_retag_default_cc\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_retag_default_cc +..\%__SRC%\inc\boost\function_types\detail\pp_tags\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_tags +..\%__SRC%\inc\boost\function_types\detail\pp_variate_loop\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_variate_loop +..\%__SRC%\inc\boost\function_types\detail\synthesize_impl\* %_DEST%\inc%_EXT%\boost\function_types\detail\synthesize_impl +..\%__SRC%\inc\boost\fusion\adapted\array\* %_DEST%\inc%_EXT%\boost\fusion\adapted\array +..\%__SRC%\inc\boost\fusion\adapted\boost_array\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array +..\%__SRC%\inc\boost\fusion\adapted\boost_array\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array\detail +..\%__SRC%\inc\boost\fusion\adapted\boost_tuple\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple +..\%__SRC%\inc\boost\fusion\adapted\boost_tuple\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple\detail +..\%__SRC%\inc\boost\fusion\adapted\class\* %_DEST%\inc%_EXT%\boost\fusion\adapted\class +..\%__SRC%\inc\boost\fusion\adapted\class\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\class\detail +..\%__SRC%\inc\boost\fusion\adapted\* %_DEST%\inc%_EXT%\boost\fusion\adapted +..\%__SRC%\inc\boost\fusion\adapted\mpl\* %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl +..\%__SRC%\inc\boost\fusion\adapted\mpl\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl\detail +..\%__SRC%\inc\boost\fusion\adapted\struct\* %_DEST%\inc%_EXT%\boost\fusion\adapted\struct +..\%__SRC%\inc\boost\fusion\adapted\struct\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\struct\detail +..\%__SRC%\inc\boost\fusion\algorithm\* %_DEST%\inc%_EXT%\boost\fusion\algorithm +..\%__SRC%\inc\boost\fusion\algorithm\iteration\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration +..\%__SRC%\inc\boost\fusion\algorithm\iteration\detail\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\detail +..\%__SRC%\inc\boost\fusion\algorithm\iteration\ext_\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\ext_ +..\%__SRC%\inc\boost\fusion\algorithm\query\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\query +..\%__SRC%\inc\boost\fusion\algorithm\query\detail\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\detail +..\%__SRC%\inc\boost\fusion\algorithm\query\ext_\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\ext_ +..\%__SRC%\inc\boost\fusion\algorithm\transformation\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation +..\%__SRC%\inc\boost\fusion\algorithm\transformation\detail\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation\detail +..\%__SRC%\inc\boost\fusion\container\deque\* %_DEST%\inc%_EXT%\boost\fusion\container\deque +..\%__SRC%\inc\boost\fusion\container\deque\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\deque\detail +..\%__SRC%\inc\boost\fusion\container\* %_DEST%\inc%_EXT%\boost\fusion\container +..\%__SRC%\inc\boost\fusion\container\ext_\* %_DEST%\inc%_EXT%\boost\fusion\container\ext_ +..\%__SRC%\inc\boost\fusion\container\generation\* %_DEST%\inc%_EXT%\boost\fusion\container\generation +..\%__SRC%\inc\boost\fusion\container\list\* %_DEST%\inc%_EXT%\boost\fusion\container\list +..\%__SRC%\inc\boost\fusion\container\list\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\list\detail +..\%__SRC%\inc\boost\fusion\container\map\* %_DEST%\inc%_EXT%\boost\fusion\container\map +..\%__SRC%\inc\boost\fusion\container\map\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\map\detail +..\%__SRC%\inc\boost\fusion\container\set\* %_DEST%\inc%_EXT%\boost\fusion\container\set +..\%__SRC%\inc\boost\fusion\container\set\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\set\detail +..\%__SRC%\inc\boost\fusion\container\vector\* %_DEST%\inc%_EXT%\boost\fusion\container\vector +..\%__SRC%\inc\boost\fusion\container\vector\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\vector\detail +..\%__SRC%\inc\boost\fusion\* %_DEST%\inc%_EXT%\boost\fusion +..\%__SRC%\inc\boost\fusion\functional\adapter\* %_DEST%\inc%_EXT%\boost\fusion\functional\adapter +..\%__SRC%\inc\boost\fusion\functional\adapter\detail\* %_DEST%\inc%_EXT%\boost\fusion\functional\adapter\detail +..\%__SRC%\inc\boost\fusion\functional\* %_DEST%\inc%_EXT%\boost\fusion\functional +..\%__SRC%\inc\boost\fusion\functional\generation\* %_DEST%\inc%_EXT%\boost\fusion\functional\generation +..\%__SRC%\inc\boost\fusion\functional\generation\detail\* %_DEST%\inc%_EXT%\boost\fusion\functional\generation\detail +..\%__SRC%\inc\boost\fusion\functional\invocation\* %_DEST%\inc%_EXT%\boost\fusion\functional\invocation +..\%__SRC%\inc\boost\fusion\functional\invocation\detail\* %_DEST%\inc%_EXT%\boost\fusion\functional\invocation\detail +..\%__SRC%\inc\boost\fusion\include\* %_DEST%\inc%_EXT%\boost\fusion\include +..\%__SRC%\inc\boost\fusion\iterator\* %_DEST%\inc%_EXT%\boost\fusion\iterator +..\%__SRC%\inc\boost\fusion\iterator\detail\* %_DEST%\inc%_EXT%\boost\fusion\iterator\detail +..\%__SRC%\inc\boost\fusion\iterator\mpl\* %_DEST%\inc%_EXT%\boost\fusion\iterator\mpl +..\%__SRC%\inc\boost\fusion\mpl\* %_DEST%\inc%_EXT%\boost\fusion\mpl +..\%__SRC%\inc\boost\fusion\mpl\detail\* %_DEST%\inc%_EXT%\boost\fusion\mpl\detail +..\%__SRC%\inc\boost\fusion\sequence\comparison\* %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison +..\%__SRC%\inc\boost\fusion\sequence\comparison\detail\* %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison\detail +..\%__SRC%\inc\boost\fusion\sequence\* %_DEST%\inc%_EXT%\boost\fusion\sequence +..\%__SRC%\inc\boost\fusion\sequence\intrinsic\* %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic +..\%__SRC%\inc\boost\fusion\sequence\intrinsic\ext_\* %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic\ext_ +..\%__SRC%\inc\boost\fusion\sequence\io\* %_DEST%\inc%_EXT%\boost\fusion\sequence\io +..\%__SRC%\inc\boost\fusion\sequence\io\detail\* %_DEST%\inc%_EXT%\boost\fusion\sequence\io\detail +..\%__SRC%\inc\boost\fusion\support\* %_DEST%\inc%_EXT%\boost\fusion\support +..\%__SRC%\inc\boost\fusion\support\detail\* %_DEST%\inc%_EXT%\boost\fusion\support\detail +..\%__SRC%\inc\boost\fusion\support\ext_\* %_DEST%\inc%_EXT%\boost\fusion\support\ext_ +..\%__SRC%\inc\boost\fusion\tuple\* %_DEST%\inc%_EXT%\boost\fusion\tuple +..\%__SRC%\inc\boost\fusion\tuple\detail\* %_DEST%\inc%_EXT%\boost\fusion\tuple\detail +..\%__SRC%\inc\boost\fusion\view\* %_DEST%\inc%_EXT%\boost\fusion\view +..\%__SRC%\inc\boost\fusion\view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\detail +..\%__SRC%\inc\boost\fusion\view\ext_\* %_DEST%\inc%_EXT%\boost\fusion\view\ext_ +..\%__SRC%\inc\boost\fusion\view\filter_view\* %_DEST%\inc%_EXT%\boost\fusion\view\filter_view +..\%__SRC%\inc\boost\fusion\view\filter_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\filter_view\detail +..\%__SRC%\inc\boost\fusion\view\iterator_range\* %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range +..\%__SRC%\inc\boost\fusion\view\iterator_range\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range\detail +..\%__SRC%\inc\boost\fusion\view\joint_view\* %_DEST%\inc%_EXT%\boost\fusion\view\joint_view +..\%__SRC%\inc\boost\fusion\view\joint_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\joint_view\detail +..\%__SRC%\inc\boost\fusion\view\nview\* %_DEST%\inc%_EXT%\boost\fusion\view\nview +..\%__SRC%\inc\boost\fusion\view\nview\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\nview\detail +..\%__SRC%\inc\boost\fusion\view\repetitive_view\* %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view +..\%__SRC%\inc\boost\fusion\view\repetitive_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view\detail +..\%__SRC%\inc\boost\fusion\view\reverse_view\* %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view +..\%__SRC%\inc\boost\fusion\view\reverse_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view\detail +..\%__SRC%\inc\boost\fusion\view\single_view\* %_DEST%\inc%_EXT%\boost\fusion\view\single_view +..\%__SRC%\inc\boost\fusion\view\single_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\single_view\detail +..\%__SRC%\inc\boost\fusion\view\transform_view\* %_DEST%\inc%_EXT%\boost\fusion\view\transform_view +..\%__SRC%\inc\boost\fusion\view\transform_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\transform_view\detail +..\%__SRC%\inc\boost\fusion\view\zip_view\* %_DEST%\inc%_EXT%\boost\fusion\view\zip_view +..\%__SRC%\inc\boost\fusion\view\zip_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\zip_view\detail +..\%__SRC%\inc\boost\gil\* %_DEST%\inc%_EXT%\boost\gil +..\%__SRC%\inc\boost\gil\extension\dynamic_image\* %_DEST%\inc%_EXT%\boost\gil\extension\dynamic_image +..\%__SRC%\inc\boost\gil\extension\io\* %_DEST%\inc%_EXT%\boost\gil\extension\io +..\%__SRC%\inc\boost\graph\* %_DEST%\inc%_EXT%\boost\graph +..\%__SRC%\inc\boost\graph\detail\* %_DEST%\inc%_EXT%\boost\graph\detail +..\%__SRC%\inc\boost\graph\distributed\adjlist\* %_DEST%\inc%_EXT%\boost\graph\distributed\adjlist +..\%__SRC%\inc\boost\graph\distributed\* %_DEST%\inc%_EXT%\boost\graph\distributed +..\%__SRC%\inc\boost\graph\distributed\detail\* %_DEST%\inc%_EXT%\boost\graph\distributed\detail +..\%__SRC%\inc\boost\graph\parallel\* %_DEST%\inc%_EXT%\boost\graph\parallel +..\%__SRC%\inc\boost\graph\parallel\detail\* %_DEST%\inc%_EXT%\boost\graph\parallel\detail +..\%__SRC%\inc\boost\graph\planar_detail\* %_DEST%\inc%_EXT%\boost\graph\planar_detail +..\%__SRC%\inc\boost\graph\property_maps\* %_DEST%\inc%_EXT%\boost\graph\property_maps ..\%__SRC%\inc\boost\integer\* %_DEST%\inc%_EXT%\boost\integer +..\%__SRC%\inc\boost\interprocess\allocators\* %_DEST%\inc%_EXT%\boost\interprocess\allocators +..\%__SRC%\inc\boost\interprocess\allocators\detail\* %_DEST%\inc%_EXT%\boost\interprocess\allocators\detail +..\%__SRC%\inc\boost\interprocess\containers\container\* %_DEST%\inc%_EXT%\boost\interprocess\containers\container +..\%__SRC%\inc\boost\interprocess\containers\container\detail\* %_DEST%\inc%_EXT%\boost\interprocess\containers\container\detail +..\%__SRC%\inc\boost\interprocess\containers\* %_DEST%\inc%_EXT%\boost\interprocess\containers +..\%__SRC%\inc\boost\interprocess\* %_DEST%\inc%_EXT%\boost\interprocess +..\%__SRC%\inc\boost\interprocess\detail\* %_DEST%\inc%_EXT%\boost\interprocess\detail +..\%__SRC%\inc\boost\interprocess\indexes\* %_DEST%\inc%_EXT%\boost\interprocess\indexes +..\%__SRC%\inc\boost\interprocess\ipc\* %_DEST%\inc%_EXT%\boost\interprocess\ipc +..\%__SRC%\inc\boost\interprocess\mem_algo\* %_DEST%\inc%_EXT%\boost\interprocess\mem_algo +..\%__SRC%\inc\boost\interprocess\mem_algo\detail\* %_DEST%\inc%_EXT%\boost\interprocess\mem_algo\detail +..\%__SRC%\inc\boost\interprocess\smart_ptr\* %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr +..\%__SRC%\inc\boost\interprocess\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr\detail +..\%__SRC%\inc\boost\interprocess\streams\* %_DEST%\inc%_EXT%\boost\interprocess\streams +..\%__SRC%\inc\boost\interprocess\sync\* %_DEST%\inc%_EXT%\boost\interprocess\sync +..\%__SRC%\inc\boost\interprocess\sync\emulation\* %_DEST%\inc%_EXT%\boost\interprocess\sync\emulation +..\%__SRC%\inc\boost\interprocess\sync\posix\* %_DEST%\inc%_EXT%\boost\interprocess\sync\posix +..\%__SRC%\inc\boost\interprocess\sync\xsi\* %_DEST%\inc%_EXT%\boost\interprocess\sync\xsi +..\%__SRC%\inc\boost\intrusive\* %_DEST%\inc%_EXT%\boost\intrusive +..\%__SRC%\inc\boost\intrusive\detail\* %_DEST%\inc%_EXT%\boost\intrusive\detail +..\%__SRC%\inc\boost\io\* %_DEST%\inc%_EXT%\boost\io +..\%__SRC%\inc\boost\io\detail\* %_DEST%\inc%_EXT%\boost\io\detail +..\%__SRC%\inc\boost\iostreams\* %_DEST%\inc%_EXT%\boost\iostreams +..\%__SRC%\inc\boost\iostreams\detail\adapter\* %_DEST%\inc%_EXT%\boost\iostreams\detail\adapter +..\%__SRC%\inc\boost\iostreams\detail\broken_overload_resolution\* %_DEST%\inc%_EXT%\boost\iostreams\detail\broken_overload_resolution +..\%__SRC%\inc\boost\iostreams\detail\config\* %_DEST%\inc%_EXT%\boost\iostreams\detail\config +..\%__SRC%\inc\boost\iostreams\detail\* %_DEST%\inc%_EXT%\boost\iostreams\detail +..\%__SRC%\inc\boost\iostreams\detail\streambuf\* %_DEST%\inc%_EXT%\boost\iostreams\detail\streambuf +..\%__SRC%\inc\boost\iostreams\detail\vc6\* %_DEST%\inc%_EXT%\boost\iostreams\detail\vc6 +..\%__SRC%\inc\boost\iostreams\device\* %_DEST%\inc%_EXT%\boost\iostreams\device +..\%__SRC%\inc\boost\iostreams\filter\* %_DEST%\inc%_EXT%\boost\iostreams\filter ..\%__SRC%\inc\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator ..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail -..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception -..\%__SRC%\inc\boost\exception\detail\* %_DEST%\inc%_EXT%\boost\exception\detail -..\%__SRC%\inc\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl -..\%__SRC%\inc\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_ +..\%__SRC%\inc\boost\lambda\* %_DEST%\inc%_EXT%\boost\lambda +..\%__SRC%\inc\boost\lambda\detail\* %_DEST%\inc%_EXT%\boost\lambda\detail +..\%__SRC%\inc\boost\logic\* %_DEST%\inc%_EXT%\boost\logic +..\%__SRC%\inc\boost\math\bindings\* %_DEST%\inc%_EXT%\boost\math\bindings +..\%__SRC%\inc\boost\math\bindings\detail\* %_DEST%\inc%_EXT%\boost\math\bindings\detail +..\%__SRC%\inc\boost\math\complex\* %_DEST%\inc%_EXT%\boost\math\complex +..\%__SRC%\inc\boost\math\concepts\* %_DEST%\inc%_EXT%\boost\math\concepts +..\%__SRC%\inc\boost\math\constants\* %_DEST%\inc%_EXT%\boost\math\constants +..\%__SRC%\inc\boost\math\* %_DEST%\inc%_EXT%\boost\math +..\%__SRC%\inc\boost\math\distributions\* %_DEST%\inc%_EXT%\boost\math\distributions +..\%__SRC%\inc\boost\math\distributions\detail\* %_DEST%\inc%_EXT%\boost\math\distributions\detail +..\%__SRC%\inc\boost\math\policies\* %_DEST%\inc%_EXT%\boost\math\policies +..\%__SRC%\inc\boost\math\special_functions\* %_DEST%\inc%_EXT%\boost\math\special_functions +..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail +..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools +..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail +..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives +..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi +..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail +..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python ..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed +..\%__SRC%\inc\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_ ..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 ..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc_pre590\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc_pre590 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\dmc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\dmc ..\%__SRC%\inc\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc ..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 ..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 @@ -233,28 +860,59 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain ..\%__SRC%\inc\boost\mpl\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor ..\%__SRC%\inc\boost\mpl\aux_\range_c\* %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c +..\%__SRC%\inc\boost\mpl\aux_\test\* %_DEST%\inc%_EXT%\boost\mpl\aux_\test +..\%__SRC%\inc\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl ..\%__SRC%\inc\boost\mpl\limits\* %_DEST%\inc%_EXT%\boost\mpl\limits -..\%__SRC%\inc\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list ..\%__SRC%\inc\boost\mpl\list\aux_\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_ -..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed ..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list +..\%__SRC%\inc\boost\mpl\map\aux_\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_ +..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\no_ctps +..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\typeof_based +..\%__SRC%\inc\boost\mpl\map\* %_DEST%\inc%_EXT%\boost\mpl\map ..\%__SRC%\inc\boost\mpl\math\* %_DEST%\inc%_EXT%\boost\mpl\math -..\%__SRC%\inc\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector +..\%__SRC%\inc\boost\mpl\multiset\aux_\* %_DEST%\inc%_EXT%\boost\mpl\multiset\aux_ +..\%__SRC%\inc\boost\mpl\multiset\* %_DEST%\inc%_EXT%\boost\mpl\multiset +..\%__SRC%\inc\boost\mpl\set\aux_\* %_DEST%\inc%_EXT%\boost\mpl\set\aux_ +..\%__SRC%\inc\boost\mpl\set\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\set\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\set\* %_DEST%\inc%_EXT%\boost\mpl\set ..\%__SRC%\inc\boost\mpl\vector\aux_\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ -..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed ..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps ..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain ..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based -..\%__SRC%\inc\boost\numeric\*.hpp %_DEST%\inc%_EXT%\boost\numeric\*.hpp -..\%__SRC%\inc\boost\numeric\conversion\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\*.hpp -..\%__SRC%\inc\boost\numeric\conversion\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\detail\*.hpp -..\%__SRC%\inc\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp -..\%__SRC%\inc\boost\numeric\ublas\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\detail\*.hpp +..\%__SRC%\inc\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector +..\%__SRC%\inc\boost\msm\back\* %_DEST%\inc%_EXT%\boost\msm\back +..\%__SRC%\inc\boost\msm\* %_DEST%\inc%_EXT%\boost\msm +..\%__SRC%\inc\boost\msm\front\* %_DEST%\inc%_EXT%\boost\msm\front +..\%__SRC%\inc\boost\msm\front\detail\* %_DEST%\inc%_EXT%\boost\msm\front\detail +..\%__SRC%\inc\boost\msm\front\euml\* %_DEST%\inc%_EXT%\boost\msm\front\euml +..\%__SRC%\inc\boost\multi_array\* %_DEST%\inc%_EXT%\boost\multi_array +..\%__SRC%\inc\boost\multi_index\* %_DEST%\inc%_EXT%\boost\multi_index +..\%__SRC%\inc\boost\multi_index\detail\* %_DEST%\inc%_EXT%\boost\multi_index\detail +..\%__SRC%\inc\boost\numeric\conversion\* %_DEST%\inc%_EXT%\boost\numeric\conversion +..\%__SRC%\inc\boost\numeric\conversion\detail\* %_DEST%\inc%_EXT%\boost\numeric\conversion\detail +..\%__SRC%\inc\boost\numeric\* %_DEST%\inc%_EXT%\boost\numeric +..\%__SRC%\inc\boost\numeric\interval\compare\* %_DEST%\inc%_EXT%\boost\numeric\interval\compare +..\%__SRC%\inc\boost\numeric\interval\* %_DEST%\inc%_EXT%\boost\numeric\interval +..\%__SRC%\inc\boost\numeric\interval\detail\* %_DEST%\inc%_EXT%\boost\numeric\interval\detail +..\%__SRC%\inc\boost\numeric\interval\ext\* %_DEST%\inc%_EXT%\boost\numeric\interval\ext +..\%__SRC%\inc\boost\numeric\ublas\* %_DEST%\inc%_EXT%\boost\numeric\ublas +..\%__SRC%\inc\boost\numeric\ublas\detail\* %_DEST%\inc%_EXT%\boost\numeric\ublas\detail +..\%__SRC%\inc\boost\numeric\ublas\experimental\* %_DEST%\inc%_EXT%\boost\numeric\ublas\experimental +..\%__SRC%\inc\boost\numeric\ublas\operation\* %_DEST%\inc%_EXT%\boost\numeric\ublas\operation +..\%__SRC%\inc\boost\numeric\ublas\traits\* %_DEST%\inc%_EXT%\boost\numeric\ublas\traits ..\%__SRC%\inc\boost\optional\* %_DEST%\inc%_EXT%\boost\optional +..\%__SRC%\inc\boost\parameter\aux_\* %_DEST%\inc%_EXT%\boost\parameter\aux_ +..\%__SRC%\inc\boost\parameter\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\parameter\aux_\preprocessor +..\%__SRC%\inc\boost\parameter\aux_\python\* %_DEST%\inc%_EXT%\boost\parameter\aux_\python +..\%__SRC%\inc\boost\parameter\* %_DEST%\inc%_EXT%\boost\parameter ..\%__SRC%\inc\boost\pending\* %_DEST%\inc%_EXT%\boost\pending +..\%__SRC%\inc\boost\pending\detail\* %_DEST%\inc%_EXT%\boost\pending\detail +..\%__SRC%\inc\boost\polygon\* %_DEST%\inc%_EXT%\boost\polygon +..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc%_EXT%\boost\polygon\detail ..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool ..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail -..\%__SRC%\inc\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor ..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic ..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail ..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array @@ -262,22 +920,27 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\preprocessor\config\* %_DEST%\inc%_EXT%\boost\preprocessor\config ..\%__SRC%\inc\boost\preprocessor\control\* %_DEST%\inc%_EXT%\boost\preprocessor\control ..\%__SRC%\inc\boost\preprocessor\control\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail +..\%__SRC%\inc\boost\preprocessor\control\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\dmc ..\%__SRC%\inc\boost\preprocessor\control\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg ..\%__SRC%\inc\boost\preprocessor\control\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc ..\%__SRC%\inc\boost\preprocessor\debug\* %_DEST%\inc%_EXT%\boost\preprocessor\debug +..\%__SRC%\inc\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor ..\%__SRC%\inc\boost\preprocessor\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\detail +..\%__SRC%\inc\boost\preprocessor\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\detail\dmc ..\%__SRC%\inc\boost\preprocessor\facilities\* %_DEST%\inc%_EXT%\boost\preprocessor\facilities ..\%__SRC%\inc\boost\preprocessor\iteration\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration -..\%__SRC%\inc\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail ..\%__SRC%\inc\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds +..\%__SRC%\inc\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail ..\%__SRC%\inc\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter ..\%__SRC%\inc\boost\preprocessor\list\* %_DEST%\inc%_EXT%\boost\preprocessor\list ..\%__SRC%\inc\boost\preprocessor\list\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail +..\%__SRC%\inc\boost\preprocessor\list\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\dmc ..\%__SRC%\inc\boost\preprocessor\list\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg ..\%__SRC%\inc\boost\preprocessor\logical\* %_DEST%\inc%_EXT%\boost\preprocessor\logical ..\%__SRC%\inc\boost\preprocessor\punctuation\* %_DEST%\inc%_EXT%\boost\preprocessor\punctuation ..\%__SRC%\inc\boost\preprocessor\repetition\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition ..\%__SRC%\inc\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail +..\%__SRC%\inc\boost\preprocessor\repetition\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\dmc ..\%__SRC%\inc\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg ..\%__SRC%\inc\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc ..\%__SRC%\inc\boost\preprocessor\selection\* %_DEST%\inc%_EXT%\boost\preprocessor\selection @@ -286,92 +949,259 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot ..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail ..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple +..\%__SRC%\inc\boost\program_options\* %_DEST%\inc%_EXT%\boost\program_options +..\%__SRC%\inc\boost\program_options\detail\* %_DEST%\inc%_EXT%\boost\program_options\detail +..\%__SRC%\inc\boost\property_map\* %_DEST%\inc%_EXT%\boost\property_map +..\%__SRC%\inc\boost\property_map\parallel\* %_DEST%\inc%_EXT%\boost\property_map\parallel +..\%__SRC%\inc\boost\property_map\parallel\impl\* %_DEST%\inc%_EXT%\boost\property_map\parallel\impl +..\%__SRC%\inc\boost\property_tree\* %_DEST%\inc%_EXT%\boost\property_tree +..\%__SRC%\inc\boost\property_tree\detail\* %_DEST%\inc%_EXT%\boost\property_tree\detail +..\%__SRC%\inc\boost\proto\context\* %_DEST%\inc%_EXT%\boost\proto\context +..\%__SRC%\inc\boost\proto\* %_DEST%\inc%_EXT%\boost\proto +..\%__SRC%\inc\boost\proto\detail\* %_DEST%\inc%_EXT%\boost\proto\detail +..\%__SRC%\inc\boost\proto\transform\* %_DEST%\inc%_EXT%\boost\proto\transform ..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc%_EXT%\boost\ptr_container ..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc%_EXT%\boost\ptr_container\detail -..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range +..\%__SRC%\inc\boost\python\converter\* %_DEST%\inc%_EXT%\boost\python\converter +..\%__SRC%\inc\boost\python\* %_DEST%\inc%_EXT%\boost\python +..\%__SRC%\inc\boost\python\detail\* %_DEST%\inc%_EXT%\boost\python\detail +..\%__SRC%\inc\boost\python\object\* %_DEST%\inc%_EXT%\boost\python\object +..\%__SRC%\inc\boost\python\suite\indexing\* %_DEST%\inc%_EXT%\boost\python\suite\indexing +..\%__SRC%\inc\boost\python\suite\indexing\detail\* %_DEST%\inc%_EXT%\boost\python\suite\indexing\detail +..\%__SRC%\inc\boost\random\* %_DEST%\inc%_EXT%\boost\random +..\%__SRC%\inc\boost\random\detail\* %_DEST%\inc%_EXT%\boost\random\detail +..\%__SRC%\inc\boost\range\adaptor\* %_DEST%\inc%_EXT%\boost\range\adaptor ..\%__SRC%\inc\boost\range\algorithm\* %_DEST%\inc%_EXT%\boost\range\algorithm +..\%__SRC%\inc\boost\range\algorithm_ext\* %_DEST%\inc%_EXT%\boost\range\algorithm_ext +..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range ..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc%_EXT%\boost\range\detail -..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit +..\%__SRC%\inc\boost\range\detail\vc6\* %_DEST%\inc%_EXT%\boost\range\detail\vc6 +..\%__SRC%\inc\boost\regex\config\* %_DEST%\inc%_EXT%\boost\regex\config +..\%__SRC%\inc\boost\regex\* %_DEST%\inc%_EXT%\boost\regex +..\%__SRC%\inc\boost\regex\pending\* %_DEST%\inc%_EXT%\boost\regex\pending +..\%__SRC%\inc\boost\regex\v4\* %_DEST%\inc%_EXT%\boost\regex\v4 +..\%__SRC%\inc\boost\serialization\* %_DEST%\inc%_EXT%\boost\serialization +..\%__SRC%\inc\boost\serialization\detail\* %_DEST%\inc%_EXT%\boost\serialization\detail +..\%__SRC%\inc\boost\signals2\* %_DEST%\inc%_EXT%\boost\signals2 +..\%__SRC%\inc\boost\signals2\detail\* %_DEST%\inc%_EXT%\boost\signals2\detail +..\%__SRC%\inc\boost\signals\* %_DEST%\inc%_EXT%\boost\signals +..\%__SRC%\inc\boost\signals\detail\* %_DEST%\inc%_EXT%\boost\signals\detail +..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr +..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail ..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor ..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute -..\%__SRC%\inc\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core ..\%__SRC%\inc\boost\spirit\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\core\composite -..\%__SRC%\inc\boost\spirit\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl -..\%__SRC%\inc\boost\spirit\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\impl -..\%__SRC%\inc\boost\spirit\core\meta\* %_DEST%\inc%_EXT%\boost\spirit\core\meta -..\%__SRC%\inc\boost\spirit\core\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl +..\%__SRC%\inc\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core ..\%__SRC%\inc\boost\spirit\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal -..\%__SRC%\inc\boost\spirit\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl ..\%__SRC%\inc\boost\spirit\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives -..\%__SRC%\inc\boost\spirit\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl ..\%__SRC%\inc\boost\spirit\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner -..\%__SRC%\inc\boost\spirit\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl ..\%__SRC%\inc\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug -..\%__SRC%\inc\boost\spirit\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\debug\impl +..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit ..\%__SRC%\inc\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic -..\%__SRC%\inc\boost\spirit\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl ..\%__SRC%\inc\boost\spirit\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\error_handling -..\%__SRC%\inc\boost\spirit\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl -..\%__SRC%\inc\boost\spirit\home\* %_DEST%\inc%_EXT%\boost\spirit\home -..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic ..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor -..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl ..\%__SRC%\inc\boost\spirit\home\classic\attribute\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute -..\%__SRC%\inc\boost\spirit\home\classic\attribute\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute\impl -..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug -..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl -..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic -..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl -..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta -..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite +..\%__SRC%\inc\boost\spirit\home\classic\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl ..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core ..\%__SRC%\inc\boost\spirit\home\classic\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl -..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner -..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl ..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal ..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl ..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives ..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl -..\%__SRC%\inc\boost\spirit\home\classic\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite -..\%__SRC%\inc\boost\spirit\home\classic\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner +..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl +..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug +..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl +..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic +..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic +..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl ..\%__SRC%\inc\boost\spirit\home\classic\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling ..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl ..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator ..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl +..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta +..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl ..\%__SRC%\inc\boost\spirit\home\classic\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix -..\%__SRC%\inc\boost\spirit\home\classic\phoenix\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix\impl ..\%__SRC%\inc\boost\spirit\home\classic\symbols\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols ..\%__SRC%\inc\boost\spirit\home\classic\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl +..\%__SRC%\inc\boost\spirit\home\classic\tree\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree +..\%__SRC%\inc\boost\spirit\home\classic\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree\impl ..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility -..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl ..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset +..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl +..\%__SRC%\inc\boost\spirit\home\* %_DEST%\inc%_EXT%\boost\spirit\home +..\%__SRC%\inc\boost\spirit\home\karma\action\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\action +..\%__SRC%\inc\boost\spirit\home\karma\auto\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\auto +..\%__SRC%\inc\boost\spirit\home\karma\auxiliary\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\auxiliary +..\%__SRC%\inc\boost\spirit\home\karma\binary\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\binary +..\%__SRC%\inc\boost\spirit\home\karma\char\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\char +..\%__SRC%\inc\boost\spirit\home\karma\* %_DEST%\inc%_EXT%\boost\spirit\home\karma +..\%__SRC%\inc\boost\spirit\home\karma\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\detail +..\%__SRC%\inc\boost\spirit\home\karma\directive\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\directive +..\%__SRC%\inc\boost\spirit\home\karma\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal +..\%__SRC%\inc\boost\spirit\home\karma\nonterminal\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal\detail +..\%__SRC%\inc\boost\spirit\home\karma\numeric\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric +..\%__SRC%\inc\boost\spirit\home\karma\numeric\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric\detail +..\%__SRC%\inc\boost\spirit\home\karma\operator\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\operator +..\%__SRC%\inc\boost\spirit\home\karma\stream\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream +..\%__SRC%\inc\boost\spirit\home\karma\stream\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream\detail +..\%__SRC%\inc\boost\spirit\home\karma\string\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\string +..\%__SRC%\inc\boost\spirit\home\lex\* %_DEST%\inc%_EXT%\boost\spirit\home\lex +..\%__SRC%\inc\boost\spirit\home\lex\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\detail +..\%__SRC%\inc\boost\spirit\home\lex\lexer\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer +..\%__SRC%\inc\boost\spirit\home\lex\lexer\lexertl\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer\lexertl +..\%__SRC%\inc\boost\spirit\home\lex\qi\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\qi +..\%__SRC%\inc\boost\spirit\home\phoenix\bind\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind +..\%__SRC%\inc\boost\spirit\home\phoenix\bind\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\core\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core +..\%__SRC%\inc\boost\spirit\home\phoenix\core\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix +..\%__SRC%\inc\boost\spirit\home\phoenix\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\function\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function +..\%__SRC%\inc\boost\spirit\home\phoenix\function\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\fusion\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\fusion +..\%__SRC%\inc\boost\spirit\home\phoenix\object\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object +..\%__SRC%\inc\boost\spirit\home\phoenix\object\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\operator\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator +..\%__SRC%\inc\boost\spirit\home\phoenix\operator\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\scope\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope +..\%__SRC%\inc\boost\spirit\home\phoenix\scope\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\statement\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement +..\%__SRC%\inc\boost\spirit\home\phoenix\statement\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\algorithm\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\algorithm\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\container\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\container\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl +..\%__SRC%\inc\boost\spirit\home\qi\action\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\action +..\%__SRC%\inc\boost\spirit\home\qi\auto\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\auto +..\%__SRC%\inc\boost\spirit\home\qi\auxiliary\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\auxiliary +..\%__SRC%\inc\boost\spirit\home\qi\binary\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\binary +..\%__SRC%\inc\boost\spirit\home\qi\char\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\char +..\%__SRC%\inc\boost\spirit\home\qi\* %_DEST%\inc%_EXT%\boost\spirit\home\qi +..\%__SRC%\inc\boost\spirit\home\qi\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\detail +..\%__SRC%\inc\boost\spirit\home\qi\directive\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\directive +..\%__SRC%\inc\boost\spirit\home\qi\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal +..\%__SRC%\inc\boost\spirit\home\qi\nonterminal\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal\detail +..\%__SRC%\inc\boost\spirit\home\qi\numeric\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric +..\%__SRC%\inc\boost\spirit\home\qi\numeric\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric\detail +..\%__SRC%\inc\boost\spirit\home\qi\operator\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\operator +..\%__SRC%\inc\boost\spirit\home\qi\stream\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream +..\%__SRC%\inc\boost\spirit\home\qi\stream\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream\detail +..\%__SRC%\inc\boost\spirit\home\qi\string\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\string +..\%__SRC%\inc\boost\spirit\home\qi\string\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\string\detail +..\%__SRC%\inc\boost\spirit\home\support\algorithm\* %_DEST%\inc%_EXT%\boost\spirit\home\support\algorithm +..\%__SRC%\inc\boost\spirit\home\support\auto\* %_DEST%\inc%_EXT%\boost\spirit\home\support\auto +..\%__SRC%\inc\boost\spirit\home\support\auxiliary\* %_DEST%\inc%_EXT%\boost\spirit\home\support\auxiliary +..\%__SRC%\inc\boost\spirit\home\support\char_encoding\* %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding +..\%__SRC%\inc\boost\spirit\home\support\char_encoding\unicode\* %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding\unicode +..\%__SRC%\inc\boost\spirit\home\support\char_set\* %_DEST%\inc%_EXT%\boost\spirit\home\support\char_set +..\%__SRC%\inc\boost\spirit\home\support\* %_DEST%\inc%_EXT%\boost\spirit\home\support +..\%__SRC%\inc\boost\spirit\home\support\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail +..\%__SRC%\inc\boost\spirit\home\support\detail\integer\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\integer +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\containers\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\containers +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\conversion\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\conversion +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\tokeniser\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tokeniser +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\tree\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tree +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\partition\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\partition +..\%__SRC%\inc\boost\spirit\home\support\detail\math\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math +..\%__SRC%\inc\boost\spirit\home\support\detail\math\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math\detail +..\%__SRC%\inc\boost\spirit\home\support\iterators\* %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators +..\%__SRC%\inc\boost\spirit\home\support\iterators\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators\detail +..\%__SRC%\inc\boost\spirit\home\support\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\home\support\nonterminal ..\%__SRC%\inc\boost\spirit\include\* %_DEST%\inc%_EXT%\boost\spirit\include ..\%__SRC%\inc\boost\spirit\iterator\* %_DEST%\inc%_EXT%\boost\spirit\iterator -..\%__SRC%\inc\boost\spirit\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\iterator\impl ..\%__SRC%\inc\boost\spirit\meta\* %_DEST%\inc%_EXT%\boost\spirit\meta -..\%__SRC%\inc\boost\spirit\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\meta\impl ..\%__SRC%\inc\boost\spirit\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\phoenix +..\%__SRC%\inc\boost\spirit\repository\home\* %_DEST%\inc%_EXT%\boost\spirit\repository\home +..\%__SRC%\inc\boost\spirit\repository\home\karma\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma +..\%__SRC%\inc\boost\spirit\repository\home\karma\directive\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\directive +..\%__SRC%\inc\boost\spirit\repository\home\karma\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\nonterminal +..\%__SRC%\inc\boost\spirit\repository\home\qi\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi +..\%__SRC%\inc\boost\spirit\repository\home\qi\directive\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\directive +..\%__SRC%\inc\boost\spirit\repository\home\qi\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\nonterminal +..\%__SRC%\inc\boost\spirit\repository\home\qi\primitive\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\primitive +..\%__SRC%\inc\boost\spirit\repository\home\support\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\support +..\%__SRC%\inc\boost\spirit\repository\include\* %_DEST%\inc%_EXT%\boost\spirit\repository\include ..\%__SRC%\inc\boost\spirit\symbols\* %_DEST%\inc%_EXT%\boost\spirit\symbols -..\%__SRC%\inc\boost\spirit\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\symbols\impl ..\%__SRC%\inc\boost\spirit\tree\* %_DEST%\inc%_EXT%\boost\spirit\tree -..\%__SRC%\inc\boost\spirit\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\tree\impl ..\%__SRC%\inc\boost\spirit\utility\* %_DEST%\inc%_EXT%\boost\spirit\utility -..\%__SRC%\inc\boost\spirit\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl -..\%__SRC%\inc\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset -..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr -..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail +..\%__SRC%\inc\boost\statechart\* %_DEST%\inc%_EXT%\boost\statechart +..\%__SRC%\inc\boost\statechart\detail\* %_DEST%\inc%_EXT%\boost\statechart\detail +..\%__SRC%\inc\boost\system\* %_DEST%\inc%_EXT%\boost\system +..\%__SRC%\inc\boost\test\* %_DEST%\inc%_EXT%\boost\test +..\%__SRC%\inc\boost\test\detail\* %_DEST%\inc%_EXT%\boost\test\detail +..\%__SRC%\inc\boost\test\impl\* %_DEST%\inc%_EXT%\boost\test\impl +..\%__SRC%\inc\boost\test\included\* %_DEST%\inc%_EXT%\boost\test\included +..\%__SRC%\inc\boost\test\output\* %_DEST%\inc%_EXT%\boost\test\output +..\%__SRC%\inc\boost\test\utils\basic_cstring\* %_DEST%\inc%_EXT%\boost\test\utils\basic_cstring +..\%__SRC%\inc\boost\test\utils\* %_DEST%\inc%_EXT%\boost\test\utils +..\%__SRC%\inc\boost\test\utils\iterator\* %_DEST%\inc%_EXT%\boost\test\utils\iterator +..\%__SRC%\inc\boost\test\utils\runtime\cla\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla +..\%__SRC%\inc\boost\test\utils\runtime\cla\detail\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\detail +..\%__SRC%\inc\boost\test\utils\runtime\cla\iface\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\iface +..\%__SRC%\inc\boost\test\utils\runtime\* %_DEST%\inc%_EXT%\boost\test\utils\runtime +..\%__SRC%\inc\boost\test\utils\runtime\env\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\env +..\%__SRC%\inc\boost\test\utils\runtime\file\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\file ..\%__SRC%\inc\boost\thread\* %_DEST%\inc%_EXT%\boost\thread ..\%__SRC%\inc\boost\thread\detail\* %_DEST%\inc%_EXT%\boost\thread\detail ..\%__SRC%\inc\boost\thread\pthread\* %_DEST%\inc%_EXT%\boost\thread\pthread ..\%__SRC%\inc\boost\thread\win32\* %_DEST%\inc%_EXT%\boost\thread\win32 +..\%__SRC%\inc\boost\tr1\* %_DEST%\inc%_EXT%\boost\tr1 +..\%__SRC%\inc\boost\tr1\detail\* %_DEST%\inc%_EXT%\boost\tr1\detail +..\%__SRC%\inc\boost\tr1\tr1\bcc32\* %_DEST%\inc%_EXT%\boost\tr1\tr1\bcc32 +..\%__SRC%\inc\boost\tr1\tr1\* %_DEST%\inc%_EXT%\boost\tr1\tr1 +..\%__SRC%\inc\boost\tr1\tr1\sun\* %_DEST%\inc%_EXT%\boost\tr1\tr1\sun ..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple ..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail +..\%__SRC%\inc\boost\typeof\* %_DEST%\inc%_EXT%\boost\typeof +..\%__SRC%\inc\boost\typeof\dmc\* %_DEST%\inc%_EXT%\boost\typeof\dmc +..\%__SRC%\inc\boost\typeof\msvc\* %_DEST%\inc%_EXT%\boost\typeof\msvc +..\%__SRC%\inc\boost\typeof\std\* %_DEST%\inc%_EXT%\boost\typeof\std ..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits ..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail +..\%__SRC%\inc\boost\type_traits\msvc\* %_DEST%\inc%_EXT%\boost\type_traits\msvc +..\%__SRC%\inc\boost\units\base_units\angle\* %_DEST%\inc%_EXT%\boost\units\base_units\angle +..\%__SRC%\inc\boost\units\base_units\astronomical\* %_DEST%\inc%_EXT%\boost\units\base_units\astronomical +..\%__SRC%\inc\boost\units\base_units\cgs\* %_DEST%\inc%_EXT%\boost\units\base_units\cgs +..\%__SRC%\inc\boost\units\base_units\imperial\* %_DEST%\inc%_EXT%\boost\units\base_units\imperial +..\%__SRC%\inc\boost\units\base_units\metric\* %_DEST%\inc%_EXT%\boost\units\base_units\metric +..\%__SRC%\inc\boost\units\base_units\si\* %_DEST%\inc%_EXT%\boost\units\base_units\si +..\%__SRC%\inc\boost\units\base_units\temperature\* %_DEST%\inc%_EXT%\boost\units\base_units\temperature +..\%__SRC%\inc\boost\units\base_units\us\* %_DEST%\inc%_EXT%\boost\units\base_units\us +..\%__SRC%\inc\boost\units\* %_DEST%\inc%_EXT%\boost\units +..\%__SRC%\inc\boost\units\detail\* %_DEST%\inc%_EXT%\boost\units\detail +..\%__SRC%\inc\boost\units\physical_dimensions\* %_DEST%\inc%_EXT%\boost\units\physical_dimensions +..\%__SRC%\inc\boost\units\systems\angle\* %_DEST%\inc%_EXT%\boost\units\systems\angle +..\%__SRC%\inc\boost\units\systems\cgs\* %_DEST%\inc%_EXT%\boost\units\systems\cgs +..\%__SRC%\inc\boost\units\systems\* %_DEST%\inc%_EXT%\boost\units\systems +..\%__SRC%\inc\boost\units\systems\detail\* %_DEST%\inc%_EXT%\boost\units\systems\detail +..\%__SRC%\inc\boost\units\systems\si\codata\* %_DEST%\inc%_EXT%\boost\units\systems\si\codata +..\%__SRC%\inc\boost\units\systems\si\* %_DEST%\inc%_EXT%\boost\units\systems\si +..\%__SRC%\inc\boost\units\systems\temperature\* %_DEST%\inc%_EXT%\boost\units\systems\temperature ..\%__SRC%\inc\boost\unordered\* %_DEST%\inc%_EXT%\boost\unordered ..\%__SRC%\inc\boost\unordered\detail\* %_DEST%\inc%_EXT%\boost\unordered\detail ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail +..\%__SRC%\inc\boost\uuid\* %_DEST%\inc%_EXT%\boost\uuid ..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant ..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail -..\%__SRC%\slb\boostthread.lib %_DEST%\lib%_EXT%\boostthread.lib +..\%__SRC%\inc\boost\wave\cpplexer\* %_DEST%\inc%_EXT%\boost\wave\cpplexer +..\%__SRC%\inc\boost\wave\cpplexer\re2clex\* %_DEST%\inc%_EXT%\boost\wave\cpplexer\re2clex +..\%__SRC%\inc\boost\wave\* %_DEST%\inc%_EXT%\boost\wave +..\%__SRC%\inc\boost\wave\grammars\* %_DEST%\inc%_EXT%\boost\wave\grammars +..\%__SRC%\inc\boost\wave\util\* %_DEST%\inc%_EXT%\boost\wave\util +..\%__SRC%\inc\boost\xpressive\* %_DEST%\inc%_EXT%\boost\xpressive +..\%__SRC%\inc\boost\xpressive\detail\core\* %_DEST%\inc%_EXT%\boost\xpressive\detail\core +..\%__SRC%\inc\boost\xpressive\detail\core\matcher\* %_DEST%\inc%_EXT%\boost\xpressive\detail\core\matcher +..\%__SRC%\inc\boost\xpressive\detail\* %_DEST%\inc%_EXT%\boost\xpressive\detail +..\%__SRC%\inc\boost\xpressive\detail\dynamic\* %_DEST%\inc%_EXT%\boost\xpressive\detail\dynamic +..\%__SRC%\inc\boost\xpressive\detail\static\* %_DEST%\inc%_EXT%\boost\xpressive\detail\static +..\%__SRC%\inc\boost\xpressive\detail\static\transforms\* %_DEST%\inc%_EXT%\boost\xpressive\detail\static\transforms +..\%__SRC%\inc\boost\xpressive\detail\utility\chset\* %_DEST%\inc%_EXT%\boost\xpressive\detail\utility\chset +..\%__SRC%\inc\boost\xpressive\detail\utility\* %_DEST%\inc%_EXT%\boost\xpressive\detail\utility +..\%__SRC%\inc\boost\xpressive\traits\* %_DEST%\inc%_EXT%\boost\xpressive\traits +..\%__SRC%\inc\boost\xpressive\traits\detail\* %_DEST%\inc%_EXT%\boost\xpressive\traits\detail -- cgit From 51d55843333d4cd807a90303054178b229237e9b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 8 Feb 2011 09:27:22 +0000 Subject: WaE: fix some shadowing warnings --- boost/boost.4713.warnings.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 5e5dd20cb1bb..95da4f34400e 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -692,3 +692,23 @@ Ptr& ptr() const { return ptr_; } private: Ptr& ptr_; +--- misc/boost_1_44_0boost/spirit/home/classic/core/non_terminal/subrule.hpp 2011-02-08 09:24:50.817320629 +0000 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2011-02-08 09:25:20.496639901 +0000 +@@ -210,7 +210,7 @@ + subrule_list< + subrule_parser, + nil_t> > +- operator,(subrule_parser const& rhs) const ++ operator,(subrule_parser const& rhs_) const + { + return subrule_list< + self_t, +@@ -220,7 +220,7 @@ + *this, + subrule_list< + subrule_parser, nil_t>( +- rhs, nil_t())); ++ rhs_, nil_t())); + } + + typename DefT::embed_t rhs; -- cgit From 7a0dc5b37f36871184c107ec82672cb673e1a0bd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 8 Feb 2011 09:43:28 +0000 Subject: still need aliasing fixes --- boost/aliasing.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ boost/makefile.mk | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 boost/aliasing.patch diff --git a/boost/aliasing.patch b/boost/aliasing.patch new file mode 100644 index 000000000000..5ca5ed07ba65 --- /dev/null +++ b/boost/aliasing.patch @@ -0,0 +1,43 @@ +--- misc/boost_1_44_0/boost/function/function_base.hpp ++++ misc/build/boost_1_44_0/boost/function/function_base.hpp +@@ -2,6 +2,7 @@ + + // Copyright Douglas Gregor 2001-2006 + // Copyright Emil Dotchevski 2007 ++// Copyright Dean Michael Berris 2009 + // Use, modification and distribution is subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) +@@ -44,6 +45,13 @@ + # pragma warning( disable : 4127 ) // "conditional expression is constant" + #endif + ++#if defined(__GNUC__) ++// Because GCC complains of strict aliasing problems, we make it ++// treat the header as a system header, becoming more forgiving with ++// treating implementation details that may be potentially harmful. ++# pragma GCC system_header ++#endif ++ + // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. + #ifdef BOOST_NO_STD_TYPEINFO + // Embedded VC++ does not have type_info in namespace std +@@ -314,15 +322,15 @@ + { + if (op == clone_functor_tag || op == move_functor_tag) { + const functor_type* in_functor = +- reinterpret_cast(&in_buffer.data); ++ static_cast(static_cast(&in_buffer.data)); + new ((void*)&out_buffer.data) functor_type(*in_functor); + + if (op == move_functor_tag) { +- reinterpret_cast(&in_buffer.data)->~Functor(); ++ static_cast(static_cast(&in_buffer.data))->~Functor(); + } + } else if (op == destroy_functor_tag) { + // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type. +- reinterpret_cast(&out_buffer.data)->~Functor(); ++ static_cast(static_cast(&out_buffer.data))->~Functor(); + } else if (op == check_functor_type_tag) { + const detail::sp_typeinfo& check_type + = *out_buffer.type.type; diff --git a/boost/makefile.mk b/boost/makefile.mk index fb7c1c222dd5..c7cb3d91efa6 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -51,6 +51,8 @@ all: TARFILE_NAME=boost_1_44_0 TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a PATCH_FILES=$(TARFILE_NAME).patch +# See https://svn.boost.org/trac/boost/ticket/3780 +PATCH_FILES+=aliasing.patch #https://svn.boost.org/trac/boost/ticket/4713 PATCH_FILES+=boost.4713.warnings.patch #https://svn.boost.org/trac/boost/ticket/5119 -- cgit From be61838a57776a9c6bb7eefc7b625c38c6050392 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 8 Feb 2011 14:50:08 +0000 Subject: Resolves: fdo#34031 bump to hunspell 1.3.1 --- hunspell/hunspell-1.2.8-thesfix.patch | 28 ---------------------------- hunspell/hunspell-1.2.9-crashfix.patch | 11 ----------- hunspell/hunspell-mingw.patch | 4 ++-- hunspell/hunspell-solaris.patch | 4 ++-- hunspell/hunspell-stacksmash.patch | 28 ---------------------------- hunspell/hunspell-valgrind.patch | 13 ------------- hunspell/hunspell-wntconfig.patch | 4 ++-- hunspell/makefile.mk | 9 +++------ 8 files changed, 9 insertions(+), 92 deletions(-) delete mode 100644 hunspell/hunspell-1.2.8-thesfix.patch delete mode 100644 hunspell/hunspell-1.2.9-crashfix.patch delete mode 100644 hunspell/hunspell-stacksmash.patch delete mode 100644 hunspell/hunspell-valgrind.patch diff --git a/hunspell/hunspell-1.2.8-thesfix.patch b/hunspell/hunspell-1.2.8-thesfix.patch deleted file mode 100644 index c41fde45050f..000000000000 --- a/hunspell/hunspell-1.2.8-thesfix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:36.998879385 +0100 -+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:10.416222464 +0100 -@@ -1666,7 +1666,7 @@ - if (!q2) return 0; // bad XML input - if (check_xml_par(q, "type=", "analyze")) { - int n = 0, s = 0; -- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw); -+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw); - if (n == 0) return 0; - // convert the result to ana1ana2 format - for (int i = 0; i < n; i++) s+= strlen((*slst)[i]); -@@ -1687,13 +1687,13 @@ - (*slst)[0] = r; - return 1; - } else if (check_xml_par(q, "type=", "stem")) { -- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw); -+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw); - } else if (check_xml_par(q, "type=", "generate")) { -- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN); -+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1); - if (n == 0) return 0; - char * q3 = strstr(q2 + 1, "'), MAXWORDUTF8LEN)) { -+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) { - return generate(slst, cw, cw2); - } - } else { diff --git a/hunspell/hunspell-1.2.9-crashfix.patch b/hunspell/hunspell-1.2.9-crashfix.patch deleted file mode 100644 index 73244d21a99b..000000000000 --- a/hunspell/hunspell-1.2.9-crashfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2010-02-27 12:59:53.000000000 +0100 -+++ misc/build/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2011-01-06 16:18:23.361159724 +0100 -@@ -1542,7 +1542,7 @@ - } - - if (!rv) { -- if (compoundflag && -+ if (compoundflag && !words && - !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN, compoundflag))) { - if ((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL, - FLAG_NULL, compoundflag, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN)) && !hu_mov_rule && diff --git a/hunspell/hunspell-mingw.patch b/hunspell/hunspell-mingw.patch index 0120e01ddba1..391aa9220fc1 100644 --- a/hunspell/hunspell-mingw.patch +++ b/hunspell/hunspell-mingw.patch @@ -1,5 +1,5 @@ ---- misc/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:37:14.000000000 +0900 -+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-04-25 07:57:39.233875000 +0900 +--- misc/hunspell-1.3.1/src/tools/hunspell.cxx 2010-02-27 23:37:14.000000000 +0900 ++++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx 2010-04-25 07:57:39.233875000 +0900 @@ -27,7 +27,9 @@ #ifdef WIN32 diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch index 37c5101364b4..3a5146250b99 100644 --- a/hunspell/hunspell-solaris.patch +++ b/hunspell/hunspell-solaris.patch @@ -1,5 +1,5 @@ ---- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000 -+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000 +--- misc/hunspell-1.3.1.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000 ++++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000 @@ -10,6 +10,9 @@ #include "hunspell.hxx" #include "csutil.hxx" diff --git a/hunspell/hunspell-stacksmash.patch b/hunspell/hunspell-stacksmash.patch deleted file mode 100644 index 8765b6d784d3..000000000000 --- a/hunspell/hunspell-stacksmash.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- misc/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:06.000000000 +0000 -+++ misc/build/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:38.000000000 +0000 -@@ -1665,7 +1665,7 @@ - if (!q2) return 0; // bad XML input - if (check_xml_par(q, "type=", "analyze")) { - int n = 0, s = 0; -- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw); -+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw); - if (n == 0) return 0; - // convert the result to ana1ana2 format - for (int i = 0; i < n; i++) s+= strlen((*slst)[i]); -@@ -1686,13 +1686,13 @@ - (*slst)[0] = r; - return 1; - } else if (check_xml_par(q, "type=", "stem")) { -- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw); -+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw); - } else if (check_xml_par(q, "type=", "generate")) { -- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN); -+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1); - if (n == 0) return 0; - char * q3 = strstr(q2 + 1, "'), MAXWORDUTF8LEN)) { -+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) { - return generate(slst, cw, cw2); - } - } else { diff --git a/hunspell/hunspell-valgrind.patch b/hunspell/hunspell-valgrind.patch deleted file mode 100644 index 5ae1a86bdf14..000000000000 --- a/hunspell/hunspell-valgrind.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- misc/hunspell-1.2.9/tests/test.sh -+++ misc/build/hunspell-1.2.9/tests/test.sh -@@ -41,8 +41,8 @@ - if [ ! -d $TEMPDIR/badlogs ]; then - mkdir $TEMPDIR/badlogs - fi -- alias hunspell='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-hunspell' -- alias analyze='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-analyze' -+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell' -+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze' - fi - - # Tests good words diff --git a/hunspell/hunspell-wntconfig.patch b/hunspell/hunspell-wntconfig.patch index 9b6bc9c3fbb2..1d35c362d1fd 100644 --- a/hunspell/hunspell-wntconfig.patch +++ b/hunspell/hunspell-wntconfig.patch @@ -1,4 +1,4 @@ ---- misc/hunspell-1.2.9/config.h 2010-02-25 14:38:38.000000000 +0000 -+++ misc/build/hunspell-1.2.9/config.h 2010-02-25 14:38:42.000000000 +0000 +--- misc/hunspell-1.3.1/config.h 2010-02-25 14:38:38.000000000 +0000 ++++ misc/build/hunspell-1.3.1/config.h 2010-02-25 14:38:42.000000000 +0000 @@ -1 +0,0 @@ -dummy diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index a4f7b0662006..440e63b56ec1 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -36,16 +36,13 @@ TARGET=hunspell # --- Files -------------------------------------------------------- -TARFILE_NAME=hunspell-1.2.9 -TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0 +TARFILE_NAME=hunspell-1.3.1 +TARFILE_MD5=9ed97fce60a9a65852402248a6659492 ADDITIONAL_FILES+=config.h PATCH_FILES=\ hunspell-wntconfig.patch \ - hunspell-solaris.patch \ - hunspell-stacksmash.patch \ - hunspell-valgrind.patch \ - hunspell-1.2.9-crashfix.patch + hunspell-solaris.patch .IF "$(GUI)"=="UNX" -- cgit From 2cce64e4462a3383169381fafffc176e1c685a98 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 8 Feb 2011 17:59:46 +0100 Subject: remove trailing CR from patch --- boost/unordered_map-doesnt-support-cp-ctor.patch | 184 +++++++++++------------ 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/boost/unordered_map-doesnt-support-cp-ctor.patch b/boost/unordered_map-doesnt-support-cp-ctor.patch index 740c953d069e..42e71752f975 100644 --- a/boost/unordered_map-doesnt-support-cp-ctor.patch +++ b/boost/unordered_map-doesnt-support-cp-ctor.patch @@ -1,92 +1,92 @@ -Index: /trunk/boost/unordered/unordered_set.hpp -=================================================================== ---- misc/boost_1_44_0/boost/unordered/unordered_set.hpp (revision 60754) -+++ misc/build/boost_1_44_0/boost/unordered/unordered_set.hpp (revision 68445) -@@ -155,4 +155,9 @@ - - #if !defined(BOOST_NO_RVALUE_REFERENCES) -+ unordered_set(unordered_set const& other) -+ : table_(other.table_) -+ { -+ } -+ - unordered_set(unordered_set&& other) - : table_(other.table_, boost::unordered_detail::move_tag()) -@@ -163,4 +168,10 @@ - : table_(other.table_, a, boost::unordered_detail::move_tag()) - { -+ } -+ -+ unordered_set& operator=(unordered_set const& x) -+ { -+ table_ = x.table_; -+ return *this; - } - -@@ -652,4 +663,9 @@ - - #if !defined(BOOST_NO_RVALUE_REFERENCES) -+ unordered_multiset(unordered_multiset const& other) -+ : table_(other.table_) -+ { -+ } -+ - unordered_multiset(unordered_multiset&& other) - : table_(other.table_, boost::unordered_detail::move_tag()) -@@ -660,4 +676,10 @@ - : table_(other.table_, a, boost::unordered_detail::move_tag()) - { -+ } -+ -+ unordered_multiset& operator=(unordered_multiset const& x) -+ { -+ table_ = x.table_; -+ return *this; - } - -Index: /trunk/boost/unordered/unordered_map.hpp -=================================================================== ---- misc/boost_1_44_0/boost/unordered/unordered_map.hpp (revision 60754) -+++ misc/build/boost_1_44_0/boost/unordered/unordered_map.hpp (revision 68445) -@@ -161,4 +161,9 @@ - - #if !defined(BOOST_NO_RVALUE_REFERENCES) -+ unordered_map(unordered_map const& other) -+ : table_(other.table_) -+ { -+ } -+ - unordered_map(unordered_map&& other) - : table_(other.table_, boost::unordered_detail::move_tag()) -@@ -169,4 +174,10 @@ - : table_(other.table_, a, boost::unordered_detail::move_tag()) - { -+ } -+ -+ unordered_map& operator=(unordered_map const& x) -+ { -+ table_ = x.table_; -+ return *this; - } - -@@ -706,4 +717,9 @@ - - #if !defined(BOOST_NO_RVALUE_REFERENCES) -+ unordered_multimap(unordered_multimap const& other) -+ : table_(other.table_) -+ { -+ } -+ - unordered_multimap(unordered_multimap&& other) - : table_(other.table_, boost::unordered_detail::move_tag()) -@@ -714,4 +730,10 @@ - : table_(other.table_, a, boost::unordered_detail::move_tag()) - { -+ } -+ -+ unordered_multimap& operator=(unordered_multimap const& x) -+ { -+ table_ = x.table_; -+ return *this; - } - +Index: /trunk/boost/unordered/unordered_set.hpp +=================================================================== +--- misc/boost_1_44_0/boost/unordered/unordered_set.hpp (revision 60754) ++++ misc/build/boost_1_44_0/boost/unordered/unordered_set.hpp (revision 68445) +@@ -155,4 +155,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_set(unordered_set const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_set(unordered_set&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -163,4 +168,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_set& operator=(unordered_set const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + +@@ -652,4 +663,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_multiset(unordered_multiset const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_multiset(unordered_multiset&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -660,4 +676,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_multiset& operator=(unordered_multiset const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + +Index: /trunk/boost/unordered/unordered_map.hpp +=================================================================== +--- misc/boost_1_44_0/boost/unordered/unordered_map.hpp (revision 60754) ++++ misc/build/boost_1_44_0/boost/unordered/unordered_map.hpp (revision 68445) +@@ -161,4 +161,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_map(unordered_map const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_map(unordered_map&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -169,4 +174,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_map& operator=(unordered_map const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + +@@ -706,4 +717,9 @@ + + #if !defined(BOOST_NO_RVALUE_REFERENCES) ++ unordered_multimap(unordered_multimap const& other) ++ : table_(other.table_) ++ { ++ } ++ + unordered_multimap(unordered_multimap&& other) + : table_(other.table_, boost::unordered_detail::move_tag()) +@@ -714,4 +730,10 @@ + : table_(other.table_, a, boost::unordered_detail::move_tag()) + { ++ } ++ ++ unordered_multimap& operator=(unordered_multimap const& x) ++ { ++ table_ = x.table_; ++ return *this; + } + -- cgit From c8a5d2ddf55c852de95cf2ab7a9226baebac320e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 8 Feb 2011 20:33:07 +0000 Subject: have to deliver some .h files as well now --- hunspell/makefile.mk | 3 ++- hunspell/prj/d.lst | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 440e63b56ec1..88999ed00f57 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -91,7 +91,8 @@ BUILD_ACTION=cd src/hunspell && dmake .ENDIF # "$(GUI)"=="OS2" OUT2INC= \ - $(BUILD_DIR)$/src$/hunspell$/*.hxx + $(BUILD_DIR)$/src$/hunspell$/*.hxx \ + $(BUILD_DIR)$/src$/hunspell$/*.h # --- Targets ------------------------------------------------------ diff --git a/hunspell/prj/d.lst b/hunspell/prj/d.lst index a323ce9f6344..10f44f4ae96d 100644 --- a/hunspell/prj/d.lst +++ b/hunspell/prj/d.lst @@ -3,3 +3,4 @@ mkdir: %_DEST%\inc%_EXT%\hunspell ..\%__SRC%\inc\*.hxx %_DEST%\inc%_EXT%\hunspell\*.hxx +..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\hunspell\*.h -- cgit From 9aa896fed8fd0fe8b191cacbf9b25b4f9cf927ea Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 9 Feb 2011 08:55:48 +0000 Subject: silence some more warnings --- boost/boost.4713.warnings.patch | 103 +++++++++++++++++++++++++++++++++++++++- boost/makefile.mk | 2 +- 2 files changed, 102 insertions(+), 3 deletions(-) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 95da4f34400e..73b3727aaeae 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -670,7 +670,7 @@ std::advance( iter, n ); return iter; } ---- misc/boost_1_44_0/boost/ptr_container/detail/static_move_ptr.hpp.orig 2011-02-05 09:55:44.846931338 +0000 +--- misc/boost_1_44_0/boost/ptr_container/detail/static_move_ptr.hpp 2011-02-05 09:55:44.846931338 +0000 +++ misc/build/boost_1_44_0/boost/ptr_container/detail/static_move_ptr.hpp 2011-02-05 09:56:42.760931701 +0000 @@ -151,7 +151,7 @@ deleter_const_reference get_deleter() const { return impl_.second(); } @@ -692,7 +692,7 @@ Ptr& ptr() const { return ptr_; } private: Ptr& ptr_; ---- misc/boost_1_44_0boost/spirit/home/classic/core/non_terminal/subrule.hpp 2011-02-08 09:24:50.817320629 +0000 +--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2011-02-08 09:24:50.817320629 +0000 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2011-02-08 09:25:20.496639901 +0000 @@ -210,7 +210,7 @@ subrule_list< @@ -712,3 +712,102 @@ } typename DefT::embed_t rhs; +--- misc/boost_1_44_0/boost/ptr_container/ptr_sequence_adapter.hpp 2011-02-09 08:49:00.416529470 +0000 ++++ misc/build/boost_1_44_0/boost/ptr_container/ptr_sequence_adapter.hpp 2011-02-09 08:50:44.607653864 +0000 +@@ -510,72 +510,72 @@ + + public: // resize + +- void resize( size_type size ) // basic ++ void resize( size_type size_ ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { +- this->erase( boost::next( this->begin(), size ), this->end() ); ++ this->erase( boost::next( this->begin(), size_ ), this->end() ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_back( new BOOST_DEDUCED_TYPENAME + boost::remove_pointer::type() ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + +- void resize( size_type size, value_type to_clone ) // basic ++ void resize( size_type size_, value_type to_clone ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { +- this->erase( boost::next( this->begin(), size ), this->end() ); ++ this->erase( boost::next( this->begin(), size_ ), this->end() ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_back( this->null_policy_allocate_clone( to_clone ) ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + +- void rresize( size_type size ) // basic ++ void rresize( size_type size_ ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { + this->erase( this->begin(), +- boost::next( this->begin(), old_size - size ) ); ++ boost::next( this->begin(), old_size - size_ ) ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_front( new BOOST_DEDUCED_TYPENAME + boost::remove_pointer::type() ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + +- void rresize( size_type size, value_type to_clone ) // basic ++ void rresize( size_type size_, value_type to_clone ) // basic + { + size_type old_size = this->size(); +- if( old_size > size ) ++ if( old_size > size_ ) + { + this->erase( this->begin(), +- boost::next( this->begin(), old_size - size ) ); ++ boost::next( this->begin(), old_size - size_ ) ); + } +- else if( size > old_size ) ++ else if( size_ > old_size ) + { +- for( ; old_size != size; ++old_size ) ++ for( ; old_size != size_; ++old_size ) + this->push_front( this->null_policy_allocate_clone( to_clone ) ); + } + +- BOOST_ASSERT( this->size() == size ); ++ BOOST_ASSERT( this->size() == size_ ); + } + + public: // algorithms diff --git a/boost/makefile.mk b/boost/makefile.mk index c7cb3d91efa6..7617addac0de 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -51,7 +51,7 @@ all: TARFILE_NAME=boost_1_44_0 TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a PATCH_FILES=$(TARFILE_NAME).patch -# See https://svn.boost.org/trac/boost/ticket/3780 +#https://svn.boost.org/trac/boost/ticket/3780 PATCH_FILES+=aliasing.patch #https://svn.boost.org/trac/boost/ticket/4713 PATCH_FILES+=boost.4713.warnings.patch -- cgit From a098b9853aaf81d6bf51818abb2603a832aa06ff Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 04:26:58 +0100 Subject: Make stlport only optional dependency of postprocess --- berkeleydb/prj/build.lst | 2 +- graphite/prj/build.lst | 2 +- neon/prj/build.lst | 2 +- nss/prj/build.lst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst index c74e15efd2fd..55a7bf1a70a6 100644 --- a/berkeleydb/prj/build.lst +++ b/berkeleydb/prj/build.lst @@ -1,3 +1,3 @@ -db berkeleydb : external stlport NULL +db berkeleydb : external NULL db berkeleydb nmake - u as_mkout NULL db berkeleydb nmake - w,vc7 as_mkout NULL diff --git a/graphite/prj/build.lst b/graphite/prj/build.lst index b409ff4da102..cefb762e68a5 100644 --- a/graphite/prj/build.lst +++ b/graphite/prj/build.lst @@ -1,3 +1,3 @@ -gr graphite : stlport solenv NULL +gr graphite : solenv NULL gr graphite usr1 - all gr_mkout NULL gr graphite nmake - all gr_graphite NULL diff --git a/neon/prj/build.lst b/neon/prj/build.lst index a9786c796bd2..5803dc6eca91 100755 --- a/neon/prj/build.lst +++ b/neon/prj/build.lst @@ -1,3 +1,3 @@ -xh neon : OPENSSL:openssl ZLIB:zlib stlport soltools external EXPAT:expat LIBXML2:libxml2 NULL +xh neon : OPENSSL:openssl ZLIB:zlib soltools external EXPAT:expat LIBXML2:libxml2 NULL xh neon usr1 - all xh_mkout NULL xh neon nmake - all xh_neon NULL diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 1465b16be200..14963fff7c8d 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,3 +1,3 @@ -ns nss : solenv stlport NULL +ns nss : solenv NULL ns nss nmake - usr1 ns_mkout NULL ns nss nmake - all ns_nss NULL -- cgit From 93c24cc5b43fae266c99e7b058de3050c3a722fe Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 10:50:44 +0100 Subject: Removing the ext_std masterpiece --- graphite/makefile.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 4aeb626eeb10..1da1d14d69c7 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -68,8 +68,6 @@ VCNUM=7 .ELSE VCNUM=8 .ENDIF -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE BUILD_ACTION=nmake VERBOSE=1 .IF "$(debug)"!="" BUILD_FLAGS= "CFG=DEBUG" @@ -97,14 +95,6 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared .ENDIF EXTRA_GR_CXX_FLAGS=-fPIC -.IF "$(USE_SYSTEM_STL)"!="YES" -# #i112124# STLPort seems to require libstdc++ -EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++ -GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) -.ELSE -GR_LIB_PATH= -.ENDIF - .IF "$(OS)"=="WNT" PATCH_FILES+=graphite-2.3.1.patch.mingw EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc @@ -116,7 +106,7 @@ EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail # -CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' +CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' .ENDIF BUILD_DIR=$(CONFIGURE_DIR) -- cgit From a0c84cafa562960871d8d98f086fefacdb5c784f Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 16:20:19 +0100 Subject: Trying to remove the stlport mention from the code --- berkeleydb/makefile.mk | 5 +---- curl/makefile.mk | 5 ----- graphite/graphite-2.3.1.patch | 2 +- nss/makefile.mk | 3 --- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index dc5cbad417db..4cba974cecc2 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -135,7 +135,7 @@ db_LIBS= CFLAGS+=-D_GLIBCXX_DLL db_LIBS+=-lstdc++_s .ENDIF -db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) +db_LIBXSO_LIBS=$(db_LIBS) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" db_LIBXSO_LIBS+=-lgcc_s .ENDIF @@ -156,9 +156,6 @@ OUT2INC= \ .ENDIF .ELSE -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - BUILD_DIR= BUILD_ACTION=dmake diff --git a/curl/makefile.mk b/curl/makefile.mk index 8e95621896d7..73234469376f 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -112,8 +112,6 @@ BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a .ELSE -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE .IF "$(CCNUMVER)" > "001399999999" EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" @@ -142,9 +140,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - BUILD_DIR=.$/lib .IF "$(debug)"=="" BUILD_ACTION=make -f Makefile.os2 diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch index 934eb8eaad49..c15edb785cdd 100644 --- a/graphite/graphite-2.3.1.patch +++ b/graphite/graphite-2.3.1.patch @@ -66,7 +66,7 @@ +### HDU: disabled building with the normal compile flags +###CPPFLAGS= /Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c +### HDU: because for full binary compatibility with the rest of OOo all compile flags must match exactly -+### which is especially true for template-heavy C++ code with non-default config (e.g. _STLP_DEBUG enabled) ++### which is especially true for template-heavy C++ code with non-default config (e.g. _DEBUG_RUNTIME enabled) +CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /FD /c + # /Wp62 diff --git a/nss/makefile.mk b/nss/makefile.mk index 67e01c5d2d44..61c52961c417 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -146,9 +146,6 @@ PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) OS_TARGET=WIN95 .EXPORT : OS_TARGET -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - #To build nss one has to call "make nss_build_all" in #mozilla/security/nss NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) -- cgit From 438060cd27d23809006b805649fdc937ccde731a Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 10 Feb 2011 20:50:26 +0100 Subject: Static defines when building static hunspell on Windows --- hunspell/hunspell-static.patch | 11 +++++++++++ hunspell/makefile.mk | 1 + 2 files changed, 12 insertions(+) create mode 100644 hunspell/hunspell-static.patch diff --git a/hunspell/hunspell-static.patch b/hunspell/hunspell-static.patch new file mode 100644 index 000000000000..08a23206255e --- /dev/null +++ b/hunspell/hunspell-static.patch @@ -0,0 +1,11 @@ +--- misc/hunspell-1.3.1/src/hunspell/makefile.mk 2010-06-17 15:56:41.000000000 +0200 ++++ misc/build/hunspell-1.3.1/src/hunspell/makefile.mk 2011-02-10 20:47:22.000000000 +0100 +@@ -39,7 +39,7 @@ + + # --- Files -------------------------------------------------------- + +-CFLAGS+=-I..$/..$/ ++CFLAGS+=-I..$/..$/ -DHUNSPELL_STATIC + CDEFS+=-DOPENOFFICEORG + + SLOFILES= \ diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 88999ed00f57..a78dfbdc4f7b 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -41,6 +41,7 @@ TARFILE_MD5=9ed97fce60a9a65852402248a6659492 ADDITIONAL_FILES+=config.h PATCH_FILES=\ + hunspell-static.patch \ hunspell-wntconfig.patch \ hunspell-solaris.patch -- cgit From e44bf622500365c1244febc5d4d8aceb3b0af428 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 10 Feb 2011 16:55:32 +0000 Subject: workaround gcc#47679 --- boost/boost.4713.warnings.patch | 40 ++++++++++++++++++++++++++++++++++++++++ boost/boost.gcc47679.patch | 15 +++++++++++++++ boost/makefile.mk | 2 ++ 3 files changed, 57 insertions(+) create mode 100644 boost/boost.gcc47679.patch diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index 73b3727aaeae..e323c448e492 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -811,3 +811,43 @@ } public: // algorithms +--- misc/boost_1_44_0/boost/unordered/detail/table.hpp 2011-02-10 15:04:57.999046223 +0000 ++++ misc/build/boost_1_44_0/boost/unordered/detail/table.hpp 2011-02-10 15:05:44.260588237 +0000 +@@ -119,7 +119,7 @@ + + // From 6.3.1/13: + // Only resize when size >= mlf_ * count +- return double_to_size_t(ceil((double) mlf_ * this->bucket_count_)); ++ return double_to_size_t(ceil((double)mlf_ * (double)this->bucket_count_)); + } + + template +@@ -145,7 +145,7 @@ + // + // Or from rehash post-condition: + // count > size / mlf_ +- return next_prime(double_to_size_t(floor(size / (double) mlf_)) + 1); ++ return next_prime(double_to_size_t(floor((double)size / (double)mlf_)) + 1); + } + + //////////////////////////////////////////////////////////////////////////// +--- misc/boost_1_44_0/boost/functional/hash/detail/hash_float_generic.hpp 2011-02-10 14:50:52.173229648 +0000 ++++ misc/build/boost_1_44_0/boost/functional/hash/detail/hash_float_generic.hpp 2011-02-10 14:52:36.824433976 +0000 +@@ -53,7 +53,7 @@ + + v = ldexp(v, limits::digits); + std::size_t seed = static_cast(v); +- v -= seed; ++ v -= static_cast(seed); + + // ceiling(digits(T) * log2(radix(T))/ digits(size_t)) - 1; + std::size_t const length +@@ -66,7 +66,7 @@ + { + v = ldexp(v, limits::digits); + std::size_t part = static_cast(v); +- v -= part; ++ v -= static_cast(part); + hash_float_combine(seed, part); + } + diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch new file mode 100644 index 000000000000..4af42b0dc854 --- /dev/null +++ b/boost/boost.gcc47679.patch @@ -0,0 +1,15 @@ +--- misc/boost_1_44_0/compare_pointees.hpp 2011-02-10 16:39:05.960176555 +0000 ++++ misc/build/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:40:59.091423279 +0000 +@@ -29,7 +29,11 @@ + inline + bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y ) + { +- return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ; ++ if ((!x) != (!y)) ++ return false; ++ if (!x) ++ return true; ++ return (*x) == (*y); + } + + template diff --git a/boost/makefile.mk b/boost/makefile.mk index 7617addac0de..f931ac596711 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -57,6 +57,8 @@ PATCH_FILES+=aliasing.patch PATCH_FILES+=boost.4713.warnings.patch #https://svn.boost.org/trac/boost/ticket/5119 PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch +#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679 +PATCH_FILES+=boost.gcc47679.patch ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk -- cgit From bb716aa955f36eea607387ab3d62edbbcfbcd5c5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 10 Feb 2011 20:25:07 +0000 Subject: gcc#47679 needs more magic --- boost/boost.gcc47679.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch index 4af42b0dc854..961234673f40 100644 --- a/boost/boost.gcc47679.patch +++ b/boost/boost.gcc47679.patch @@ -1,14 +1,14 @@ ---- misc/boost_1_44_0/compare_pointees.hpp 2011-02-10 16:39:05.960176555 +0000 +--- misc/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:39:05.960176555 +0000 +++ misc/build/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:40:59.091423279 +0000 @@ -29,7 +29,11 @@ inline bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y ) { - return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ; -+ if ((!x) != (!y)) -+ return false; -+ if (!x) ++ if (!x && !y) + return true; ++ if (!x || !y) ++ return false; + return (*x) == (*y); } -- cgit From 5e677bb910865d675482d9057059c0818a7015f5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 11 Feb 2011 08:59:57 +0000 Subject: icu#8320 even more things wrong with freeserif that can crash icu --- icu/icu4c.8320.freeserif.crash.patch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch index 611fbbd83a69..7e596c033744 100644 --- a/icu/icu4c.8320.freeserif.crash.patch +++ b/icu/icu4c.8320.freeserif.crash.patch @@ -10,7 +10,7 @@ le_uint32 lookupOrderCount; --- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000 +++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000 -@@ -62,6 +64,10 @@ +@@ -62,6 +62,10 @@ if (selectMask != 0) { const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup); @@ -21,7 +21,7 @@ le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags); glyphIterator.reset(lookupFlags, selectMask); -@@ -96,6 +102,9 @@ +@@ -96,6 +100,9 @@ for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) { le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]); @@ -31,7 +31,7 @@ lookupSelectArray[lookupListIndex] |= featureMask; lookupOrderArray[store++] = lookupListIndex; } -@@ -106,7 +115,7 @@ +@@ -106,7 +113,7 @@ LookupProcessor::LookupProcessor(const char *baseAddress, Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset, LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures) @@ -40,7 +40,7 @@ lookupOrderArray(NULL), lookupOrderCount(0) { const ScriptListTable *scriptListTable = NULL; -@@ -146,6 +155,8 @@ +@@ -146,6 +153,8 @@ lookupSelectArray[i] = 0; } @@ -49,3 +49,14 @@ le_int32 count, order = 0; le_int32 featureReferences = 0; const FeatureTable *featureTable = NULL; +@@ -162,6 +171,10 @@ + le_uint16 featureIndex = SWAPW(langSysTable->featureIndexArray[feature]); + + featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag); ++ ++ if (!featureTable) ++ continue; ++ + featureReferences += SWAPW(featureTable->lookupCount); + } + -- cgit -- cgit From aac9fc0eac5ec6da057939ae871baf69ee67aa28 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 14 Feb 2011 01:00:25 +0200 Subject: Clean up Python patches a bit Don't bother commenting out stuff we don't want in the pcbuild.sln file. Instead just remove it. Don't bother patching files specific for older MSVS versions that we don't support any more. --- python/Python-2.6.1.patch | 234 ++-------------------------------------------- python/Python-ssl.patch | 162 -------------------------------- 2 files changed, 10 insertions(+), 386 deletions(-) diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index b9a9c2a132e1..b790919e2041 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -14,7 +14,7 @@ /* It's in the libs, but not the headers... - [cjh] */ --- misc/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200 +++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2009-03-09 22:48:14.546329900 +0100 -@@ -38,12 +38,12 @@ +@@ -38,12 +38,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -24,16 +24,10 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection -EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" -+# ProjectSection(ProjectDependencies) = postProject -+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -69,34 +69,34 @@ +@@ -69,34 +69,18 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -43,26 +37,13 @@ - {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} - EndProjectSection -EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" -- ProjectSection(ProjectDependencies) = postProject -- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -- {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} -+# EndProjectSection -+#EndProject -+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" -+ ProjectSection(ProjectDependencies) = postProject -+ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -+ {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} -+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+ EndProjectSection -+EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" + ProjectSection(ProjectDependencies) = postProject + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} + {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} @@ -78,20 +59,10 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection -EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -114,17 +114,17 @@ +@@ -114,17 +114,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" EndProject @@ -106,17 +77,6 @@ - {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} - EndProjectSection -EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" -+#ProjectSection(ProjectDependencies) = postProject -+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" -+# ProjectSection(ProjectDependencies) = postProject -+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -+# EndProjectSection -+#EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} @@ -249,180 +209,6 @@ - Value="$(HOST_PYTHON)" - /> ---- misc/Python-2.6.1/PC/VS7.1/pcbuild.sln 2007-06-10 23:01:17.000000000 +0200 -+++ misc/build/Python-2.6.1/PC/VS7.1/pcbuild.sln 2010-02-16 01:49:18.810375000 +0100 -@@ -1,36 +1,36 @@ - Microsoft Visual Studio Solution File, Format Version 8.00 --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{324F66C2-44D0-4D50-B979-F9DAE7FD36DB}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}" -- ProjectSection(ProjectDependencies) = postProject -- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}" -+# ProjectSection(ProjectDependencies) = postProject -+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{59CBF474-9E06-4C50-9142-C44A118BB447}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -@@ -99,11 +99,11 @@ - {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject - Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug ---- misc/Python-2.6.1/PC/VS8.0/pcbuild.sln 2008-09-02 23:17:05.000000000 +0200 -+++ misc/build/Python-2.6.1/PC/VS8.0/pcbuild.sln 2010-02-16 01:33:51.185375000 +0100 -@@ -38,12 +38,12 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" -- ProjectSection(ProjectDependencies) = postProject -- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" -+# ProjectSection(ProjectDependencies) = postProject -+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -69,12 +69,12 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" - ProjectSection(ProjectDependencies) = postProject - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -@@ -87,16 +87,16 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" -+# ProjectSection(ProjectDependencies) = postProject -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -114,17 +114,17 @@ - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" -- ProjectSection(ProjectDependencies) = postProject -- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" -- ProjectSection(ProjectDependencies) = postProject -- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -- EndProjectSection --EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" -+# ProjectSection(ProjectDependencies) = postProject -+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" -+# ProjectSection(ProjectDependencies) = postProject -+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -+# EndProjectSection -+#EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} --- misc/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 +++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 @@ -382,7 +382,7 @@ diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch index 5d41797c28ee..642586f31584 100644 --- a/python/Python-ssl.patch +++ b/python/Python-ssl.patch @@ -208,165 +208,3 @@ # SGI IRIX specific modules -- off by default. ---- misc/Python-2.6.1/PC/VS7.1/build_ssl.py 2007-12-31 15:59:26.000000000 +0100 -+++ misc/build/Python-2.6.1/PC/VS7.1/build_ssl.py 2010-02-16 01:43:48.872875000 +0100 -@@ -178,4 +178,4 @@ - sys.exit(rc) - - if __name__=='__main__': -- main() -+ sys.exit(0) ---- misc/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2008-06-14 00:38:33.000000000 +0200 -+++ misc/build/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2010-02-16 01:38:22.044750000 +0100 -@@ -43,7 +43,7 @@ - /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Date: Mon, 14 Feb 2011 02:25:28 +0200 Subject: Make debugging the Python interpreter simpler When building (in the LibreOffice sense) for Windows with debug=t, use the Debug solution configuration, but make the Debug project configutations produce identically named executables as the Release ones, and also use the normal runtime library. Use same executables names --- python/Python-2.6.1.patch | 298 ++++++++++++++++++++++++++++++++++++++++++++-- python/makefile.mk | 10 +- 2 files changed, 295 insertions(+), 13 deletions(-) diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index b790919e2041..0e045c484eef 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -1,4 +1,4 @@ ---- misc/Python-2.6.1/Include/pyport.h Wed Jun 11 09:41:16 2008 +--- misc/build/Python-2.6.1/Include/pyport.h Wed Jun 11 09:41:16 2008 +++ misc/build/Python-2.6.1/Include/pyport.h Fri Apr 17 09:02:52 2009 @@ -449,11 +449,6 @@ in platform-specific #ifdefs. @@ -12,8 +12,25 @@ #ifdef __BEOS__ /* Unchecked */ /* It's in the libs, but not the headers... - [cjh] */ ---- misc/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200 +--- misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200 +++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2009-03-09 22:48:14.546329900 +0100 +@@ -15,16 +15,6 @@ + {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" +- ProjectSection(ProjectDependencies) = postProject +- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +- EndProjectSection +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" + EndProject + Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}" @@ -38,12 +38,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection @@ -62,10 +79,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -114,17 +114,6 @@ - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" +@@ -114,19 +114,6 @@ + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" +-EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" - ProjectSection(ProjectDependencies) = postProject - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} @@ -138,6 +157,15 @@ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 +@@ -448,7 +448,7 @@ + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64 + {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32 +- {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Debug|x64 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64 + {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32 --- misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj +++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj @@ -124,6 +124,8 @@ @@ -209,7 +237,240 @@ - Value="$(HOST_PYTHON)" - /> ---- misc/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 +--- misc/build/Python-2.6.1/PCbuild/debug.vsprops ++++ misc/build/Python-2.6.1/PCbuild/debug.vsprops +@@ -10,6 +10,6 @@ + /> + + +--- misc/build/Python-2.6.1/PCbuild/kill_python.vcproj ++++ misc/build/Python-2.6.1/PCbuild/kill_python.vcproj +@@ -54,7 +54,7 @@ + /> + + + + + + + + + + + +@@ -310,7 +310,7 @@ + /> + + + +--- misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops ++++ misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops +@@ -15,13 +15,13 @@ + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + PreprocessorDefinitions="Py_BUILD_CORE_MODULE" +- RuntimeLibrary="3" ++ RuntimeLibrary="2" + /> + +@@ -31,6 +31,6 @@ + /> + + +--- misc/build/Python-2.6.1/PCbuild/python.vcproj ++++ misc/build/Python-2.6.1/PCbuild/python.vcproj +@@ -191,7 +191,7 @@ + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" +- RuntimeLibrary="3" ++ RuntimeLibrary="2" + BrowseInformation="1" + CompileAs="0" + /> +@@ -209,7 +209,7 @@ + /> + +@@ -284,9 +284,9 @@ + /> + + + + + + = 1400 && defined(__STDC_SECURE_LIB__) + /* Set CRT argument error handler */ + prevCrtHandler = _set_invalid_parameter_handler(InvalidParameterHandler); +- /* turn off assertions in debug mode */ +- prevCrtReportMode = _CrtSetReportMode(_CRT_ASSERT, 0); + #endif + } + +@@ -2170,6 +2170,5 @@ + #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) + /* reset CRT error handling */ + _set_invalid_parameter_handler(prevCrtHandler); +- _CrtSetReportMode(_CRT_ASSERT, prevCrtReportMode); + #endif + } +--- misc/build/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 +++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 @@ -382,7 +382,7 @@ return @@ -221,9 +482,9 @@ ' due to known OS bugs on'), sys.platform return ---- misc/Python-2.6.1/Modules/_ctypes/libffi/configure.orig 2008-05-24 00:06:50.000000000 +0900 +--- misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure.orig 2008-05-24 00:06:50.000000000 +0900 +++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure 2008-10-09 20:24:02.000000000 +0900 -@@ -4725,7 +4725,7 @@ +@@ -4725,6 +4725,6 @@ rm -rf conftest* ;; @@ -232,7 +493,7 @@ s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. ---- misc/Python-2.6.1/Python/thread_pthread.h.orig 2006-06-13 16:04:24.000000000 +0100 +--- misc/build/Python-2.6.1/Python/thread_pthread.h.orig 2006-06-13 16:04:24.000000000 +0100 +++ misc/build/Python-2.6.1/Python/thread_pthread.h 2009-03-12 10:55:49.000000000 +0000 @@ -26,13 +26,18 @@ #endif @@ -294,7 +555,7 @@ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) pthread_attr_destroy(&attrs); #endif ---- misc/Python-2.6.1/configure 2008-11-17 02:57:10.000000000 +0900 +--- misc/build/Python-2.6.1/configure 2008-11-17 02:57:10.000000000 +0900 +++ misc/build/Python-2.6.1/configure 2009-03-23 21:18:42.000000000 +0900 @@ -4110,11 +4110,6 @@ LDLIBRARY='libpython$(VERSION).so' @@ -308,7 +569,7 @@ INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) ---- misc/Python-2.6.1/configure Sun Nov 16 18:57:10 2008 +--- misc/build/Python-2.6.1/configure Sun Nov 16 18:57:10 2008 +++ misc/build/Python-2.6.1/configure Thu Apr 16 15:16:03 2009 @@ -4102,7 +4102,7 @@ ;; @@ -319,3 +580,18 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION ;; +--- misc/build/Python-2.6.1/PC/pyconfig.h ++++ misc/build/Python-2.6.1/PC/pyconfig.h +@@ -322,11 +322,7 @@ + /* So MSVC users need not specify the .lib file in + their Makefile (other compilers are generally + taken care of by distutils.) */ +-# ifdef _DEBUG +-# pragma comment(lib,"python26_d.lib") +-# else +-# pragma comment(lib,"python26.lib") +-# endif /* _DEBUG */ ++# pragma comment(lib,"python26.lib") + # endif /* _MSC_VER */ + # endif /* Py_BUILD_CORE */ + #endif /* MS_COREDLL */ diff --git a/python/makefile.mk b/python/makefile.mk index edf2194f3b49..d401785892c1 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -124,13 +124,19 @@ ARCH=Win32 ARCH=x64 .ENDIF +.IF "$(debug)"!="" +CONF=Debug +.ELSE +CONF=Release +.ENDIF + # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native .IF "$(CCNUMVER)" >= "001600000000" -BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 +BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /ToolsVersion:4.0 .ELSE -BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|$(ARCH)" +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "$(CONF)|$(ARCH)" .ENDIF .ENDIF .ENDIF -- cgit From 138df361fa85bdb418656474a474c490110ba7e2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 14 Feb 2011 15:01:54 +0200 Subject: Py_DEBUG mangling for Windows --- python/makefile.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/python/makefile.mk b/python/makefile.mk index d401785892c1..00f79cee8741 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -161,6 +161,17 @@ $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) : $(PYCONFIG) $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h -rm -f $@ cat $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h > $@ +# We know that the only thing guarded with #ifdef _DEBUG in PC/pyconfig.h is +# the line defining Py_DEBUG. +.IF "$(debug)"!="" +# If Python is built with debugging, then the modules we build need to be built with +# Py_DEBUG defined too because of the Py_InitModule4 redefining magic in modsupport.h + sed -e 's/^#ifdef _DEBUG$/#if 1/' <$@ >$@.new && mv $@.new $@ +.ELSE +# Correspondingly, if Python is not built with debugging, it won't use the Py_InitModule4 redefining +# magic, so our Python modules should not be built to provide that either. + sed -e 's/^#ifdef _DEBUG$/#if 0/' <$@ >$@.new && mv $@.new $@ +.ENDIF .ENDIF .ENDIF -- cgit -- cgit -- cgit -- cgit -- cgit From deb8773d3aedcafb32b82e3bc4a1451900120746 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 28 Feb 2011 17:16:21 +0000 Subject: dynamic_bitset subdir wasn't delivered --- boost/boost.4713.warnings.patch | 15 +++++++++++++++ boost/makefile.mk | 1 + 2 files changed, 16 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index e323c448e492..a096e378fe9e 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -851,3 +851,18 @@ hash_float_combine(seed, part); } +--- misc/boost_1_44_0/boost/dynamic_bitset.hpp 2011-02-28 17:10:13.892131527 +0000 ++++ misc/build/boost_1_44_0/boost/dynamic_bitset/dynamic_bitset.hpp 2011-02-28 17:11:05.868726195 +0000 +@@ -1108,10 +1108,10 @@ + // beyond the "allowed" positions + typedef unsigned long result_type; + +- const size_type max_size = ++ const size_type max_size_ = + (std::min)(m_num_bits, static_cast(ulong_width)); + +- const size_type last_block = block_index( max_size - 1 ); ++ const size_type last_block = block_index( max_size_ - 1 ); + + assert((last_block * bits_per_block) < static_cast(ulong_width)); + diff --git a/boost/makefile.mk b/boost/makefile.mk index f931ac596711..b1f054b64e67 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -98,6 +98,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional $(INCCOM)$/$(PRJNAME) -- cgit From 2fcafe99c534842ed34efb6794458c6b8a8838ed Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 2 Mar 2011 13:18:22 +0000 Subject: silence warning with a specialization --- boost/boost.gcc47679.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch index 961234673f40..1c804aaa998c 100644 --- a/boost/boost.gcc47679.patch +++ b/boost/boost.gcc47679.patch @@ -13,3 +13,26 @@ } template +--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2011-03-02 12:22:47.222870106 +0000 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2011-03-02 12:22:47.222870106 +0000 +@@ -219,6 +219,20 @@ + } + }; + ++ template ++ struct negative_accumulate ++ { ++ // Use this accumulator if number is negative ++ static bool add(unsigned char& n, unsigned digit) ++ { ++ n *= Radix; ++ if (n < digit) ++ return false; ++ n -= digit; ++ return true; ++ } ++ }; ++ + template + inline bool allow_more_digits(std::size_t i) + { -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit From 760b66947374c025d6d543a935e14c2b70f73b07 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 4 Mar 2011 12:55:14 +0000 Subject: WaE: silence warnings --- boost/boost.4713.warnings.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch index a096e378fe9e..29653ca79fdd 100644 --- a/boost/boost.4713.warnings.patch +++ b/boost/boost.4713.warnings.patch @@ -866,3 +866,16 @@ assert((last_block * bits_per_block) < static_cast(ulong_width)); +--- misc/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2011-03-04 11:33:36.269274940 +0000 ++++ misc/build/boost_1_44_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2011-03-04 11:33:36.269274940 +0000 +@@ -259,6 +259,10 @@ + + static void enforce_null_policy( const Ty_* x, const char* msg ) + { ++#ifdef BOOST_PTR_CONTAINER_NO_EXCEPTIONS ++ (void)x; ++ (void)msg; ++#endif + if( !allow_null ) + { + BOOST_PTR_CONTAINER_THROW_EXCEPTION( 0 == x && "null not allowed", -- cgit -- cgit -- cgit From 75981290387b6b6dfcdb4726a1a3fb96d89e2005 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 9 Mar 2011 21:10:53 +0000 Subject: build those with exceptions --- boost/boost_1_44_0.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boost/boost_1_44_0.patch b/boost/boost_1_44_0.patch index 9d7c526f4b6e..4673919450a8 100644 --- a/boost/boost_1_44_0.patch +++ b/boost/boost_1_44_0.patch @@ -1,11 +1,12 @@ --- misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk +++ misc/build/boost_1_44_0/libs/thread/src/win32/makefile.mk -@@ -1,1 +1,20 @@ +@@ -1,1 +1,21 @@ -dummy +PRJ=..$/..$/..$/..$/..$/..$/..$/.. + +PRJNAME=boostthread +TARGET=boostthread ++ENABLE_EXCEPTIONS=TRUE +LIBTARGET=NO + +.IF "$(GUI)"=="WNT" -- cgit From 9dfa2babe6b876fc81b59a4ef44c23c307a7d89c Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Fri, 25 Feb 2011 16:09:53 +0700 Subject: graphite2 consolidated patch --- graphite/graphite-2.3.1.patch | 2396 -------------------------------- graphite/graphite-2.3.1.patch.mingw | 159 --- graphite/graphite-removeobsolete.patch | 34 - graphite/graphite-updatewerror.patch | 11 - graphite/graphite2-0.9.2.patch | 370 +++++ graphite/makefile.mk | 99 +- graphite/prj/d.lst | 11 +- 7 files changed, 406 insertions(+), 2674 deletions(-) delete mode 100644 graphite/graphite-2.3.1.patch delete mode 100644 graphite/graphite-2.3.1.patch.mingw delete mode 100644 graphite/graphite-removeobsolete.patch delete mode 100644 graphite/graphite-updatewerror.patch create mode 100644 graphite/graphite2-0.9.2.patch diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch deleted file mode 100644 index c15edb785cdd..000000000000 --- a/graphite/graphite-2.3.1.patch +++ /dev/null @@ -1,2396 +0,0 @@ ---- misc/silgraphite-2.3.1/engine/include/graphite/GrCommon.h Thu Jan 22 00:36:40 2009 -+++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrCommon.h Sat Aug 22 19:36:32 2009 -@@ -18,6 +18,8 @@ - #ifndef GRCOMMON_INCLUDED - #define GRCOMMON_INCLUDED - -+#define _SECURE_SCL 0 // to allow GlyphSetIterator to work, which points off the end of a vector -+#define _HAS_ITERATOR_DEBUGGING 0 - - // Standard Headers. - -@@ -33,6 +35,7 @@ - #include - #include - #include -+///#include -- possibly needed for std::string Xran and Xlen functions?? - - // Uncomment this to allow multiple versions of gr to coexist - // in the same program e.g. pangographite with gtk uses namespace gr -@@ -41,7 +44,7 @@ - // Provided the client includes GrClient.h first this #define is - // picked up by all files. - --//#define gr gr2 -+#define gr gr3ooo - - // Project headers - #include "GrPlatform.h" ---- misc/silgraphite-2.3.1/engine/include/graphite/GrMstypes.h Thu Jan 22 00:36:40 2009 -+++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrMstypes.h Sat Aug 22 19:36:32 2009 -@@ -24,11 +24,11 @@ - - typedef signed long HRESULT; - --inline const long InterlockedIncrement(long *const intr_lck) { -+inline long InterlockedIncrement(long *const intr_lck) { - return ++*intr_lck; - } - --inline const long InterlockedDecrement(long *const intr_lck) { -+inline long InterlockedDecrement(long *const intr_lck) { - return --*intr_lck; - } - ---- misc/silgraphite-2.3.1/engine/makefile.vc7 Thu Aug 21 16:24:32 2008 -+++ misc/build/silgraphite-2.3.1/engine/makefile.vc7 Sat Aug 22 19:36:32 2009 -@@ -48,11 +48,7 @@ - CPP_DEBUG=/D "TRACING" $(CPP_DEBUG) - !ENDIF - --!IF "$(OS)" == "Windows_NT" - NULL= --!ELSE --NULL=nul --!ENDIF - - clean : - @- rd /s/q .\release_temp ---- misc/silgraphite-2.3.1/engine/makefile.vc8 Sat Aug 22 21:58:25 2009 -+++ misc/build/silgraphite-2.3.1/engine/makefile.vc8 Sat Aug 22 21:57:42 2009 -@@ -2,11 +2,16 @@ - TARGET=graphite - - CPP=cl.exe --CPPFLAGS=/Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c -+### HDU: disabled building with the normal compile flags -+###CPPFLAGS= /Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c -+### HDU: because for full binary compatibility with the rest of OOo all compile flags must match exactly -+### which is especially true for template-heavy C++ code with non-default config (e.g. _DEBUG_RUNTIME enabled) -+CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /FD /c -+ - # /Wp62 - - LINK=link.exe --LINK_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /pdb:"$(OUTDIR)\\graphite.pdb" /machine:I386 /out:"$(OUTDIR)\\$(TARGET).dll" /implib:"$(OUTDIR)\\$(TARGET).lib" -+LINK_FLAGS=$(ADDLIBS) kernel32.lib user32.lib gdi32.lib winspool.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /pdb:"$(OUTDIR)\\graphite.pdb" /machine:I386 /out:"$(OUTDIR)\\$(TARGET).dll" /implib:"$(OUTDIR)\\$(TARGET).lib" - - BSC32=bscmake.exe - BSC32_FLAGS=/nologo /o"$(OUTDIR)\\$(TARGET).bsc" -@@ -24,21 +29,21 @@ - SBREXT = .sbr - - !IF "$(CFG)" == "DEBUG" --CPP_DEBUG=/D "DEBUG" /Gm /GR /ZI /Od /RTC1 /FR"$(INTDIR)\\" /$(MLIB)d -+CPP_DEBUG=/D "DEBUG" /Gm /GR /Od /RTC1 /FR"$(INTDIR)\\" - # CPP_DEBUG=/D "DEBUG" /Gm /GR /ZI /Od /RTC1 /FR"$(INTDIR)\\" /MDd - - OUTDIR=.\debug - INTDIR=.\debug_temp --LINK_DEBUG= MSVCRTD.lib /debug /incremental:yes #/pdbtype:sept -+LINK_DEBUG= /debug - - all : lib lib_dll bsc - - !ELSE --CPP_DEBUG=/D "NDEBUG" /O2 /$(MLIB) -+CPP_DEBUG=/D "NDEBUG" /O2 - # CPP_DEBUG=/D "NDEBUG" /O2 /MD - OUTDIR=.\release - INTDIR=.\release_temp --LINK_DEBUG= MSVCRT.lib /incremental:no /NODEFAULTLIB:libc -+LINK_DEBUG= /incremental:no /NODEFAULTLIB:libc - - all : lib lib_dll - -@@ -48,11 +53,7 @@ - CPP_DEBUG=/D "TRACING" $(CPP_DEBUG) - !ENDIF - --!IF "$(OS)" == "Windows_NT" - NULL= --!ELSE --NULL=nul --!ENDIF - - clean : - @- rd /s/q .\release_temp -@@ -779,7 +780,7 @@ - @- $(CPP) $(CPPFLAGS) $(CPP_DEBUG) /Fo"$(INTDIR)\FileFont$(OBJEXT)" $? - - "$(INTDIR)\FileFont_dll$(OBJEXT)" : "src/font/FileFont.cpp" -- @- $(CPP) $(CPPFLAGS) /D "_DLL" /Fo"$(INTDIR)\FileFont_dll$(OBJEXT)" $? -+ $(CPP) $(CPPFLAGS) /D "_DLL" /Fo"$(INTDIR)\FileFont_dll$(OBJEXT)" $? - - !ENDIF - ---- misc/silgraphite-2.3.1/engine/src/font/FileFont.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/font/FileFont.cpp Sat Aug 22 19:36:32 2009 -@@ -207,11 +207,11 @@ - cch16 += cch16Used; - } - // } --#else -+#elif 1 - m_stuFaceName.assign(rgchwFace); -- // VS 2005 needs this: -- //for (int cch16 = 0; cch16 < cchw; cch16++) -- // m_stuFaceName.push_back(rgchwFace[cch16]); -+#else // VS 2005 needs this: -+ for (int cch16 = 0; cch16 < cchw; cch16++) -+ m_stuFaceName.push_back(rgchwFace[cch16]); - #endif - pTable = readTable(ktiHead, lSize); - if (!m_fIsValid || !pTable) -@@ -233,7 +233,7 @@ - FileFont::readTable(int /*TableId*/ tid, size_t & size) - { - const TableId tableId = TableId(tid); -- bool isValid = true; -+ bool isTableValid = true; - size_t lOffset = 0, lSize = 0; - if (!m_pTableCache) - { -@@ -245,9 +245,9 @@ - size = m_pTableCache->getTableSize(tableId); - // check whether it is already in the cache - if (pTable) return pTable; -- isValid &= TtfUtil::GetTableInfo(tableId, m_pHeader, m_pTableDir, -+ isTableValid &= TtfUtil::GetTableInfo(tableId, m_pHeader, m_pTableDir, - lOffset, lSize); -- if (!isValid) -+ if (!isTableValid) - return NULL; - fseek(m_pfile, lOffset, SEEK_SET); - // only allocate if needed -@@ -255,16 +255,16 @@ - - if (!pTable) - { -- isValid = false; -+ isTableValid = false; - return NULL; - } - size_t bytesRead = fread(pTable, 1, lSize, m_pfile); -- isValid = bytesRead == lSize; -- if (isValid) -+ isTableValid = bytesRead == lSize; -+ if (isTableValid) - { -- isValid &= TtfUtil::CheckTable(tableId, pTable, lSize); -+ isTableValid &= TtfUtil::CheckTable(tableId, pTable, lSize); - } -- if (!isValid) -+ if (!isTableValid) - { - return 0; - } ---- misc/silgraphite-2.3.1/engine/src/font/Font.cpp Tue May 20 08:04:16 2008 -+++ misc/build/silgraphite-2.3.1/engine/src/font/Font.cpp Sat Aug 22 19:36:33 2009 -@@ -626,7 +626,7 @@ - Assert(false); - m_ifeat = m_cfeat; - } -- else if (m_ifeat + n < 0) -+ else if (static_cast(m_ifeat) + n < 0) - { - // Can't decrement. - Assert(false); -@@ -727,7 +727,7 @@ - Assert(false); - m_ifset = m_cfset; - } -- if (m_ifset + n < 0) -+ if (static_cast(m_ifset) + n < 0) - { - // Can't decrement. - Assert(false); -@@ -820,7 +820,7 @@ - Assert(false); - m_ilang = m_clang; - } -- else if (m_ilang + n < 0) -+ else if (static_cast(m_ilang) + n < 0) - { - // Can't decrement. - Assert(false); -@@ -906,7 +906,7 @@ - Assert(false); - m_ilang = m_clang; - } -- else if (m_ilang + n < 0) -+ else if (static_cast(m_ilang) + n < 0) - { - // Can't decrement. - Assert(false); ---- misc/silgraphite-2.3.1/engine/src/font/TtfUtil.cpp Thu Jan 29 10:33:19 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/font/TtfUtil.cpp Sat Aug 22 19:36:33 2009 -@@ -492,7 +492,7 @@ - const Sfnt::FontHeader * pTable = - reinterpret_cast(pHead); - -- return read(((pTable->mac_style) & 0x00000002) != 0); -+ return ((read(pTable->mac_style) & 0x00000002) != 0); - } - - /*---------------------------------------------------------------------------------------------- -@@ -1108,8 +1108,8 @@ - { // loca entries are two bytes and have been divided by two - if (nGlyphId <= (lLocaSize >> 1) - 1) // allow sentinel value to be accessed - { -- const uint16 * pTable = reinterpret_cast(pLoca); -- return (read(pTable[nGlyphId]) << 1); -+ const uint16 * pTableLoca = reinterpret_cast(pLoca); -+ return (read(pTableLoca[nGlyphId]) << 1); - } - } - -@@ -1117,8 +1117,8 @@ - { // loca entries are four bytes - if (nGlyphId <= (lLocaSize >> 2) - 1) - { -- const uint32 * pTable = reinterpret_cast(pLoca); -- return read(pTable[nGlyphId]); -+ const uint32 * pTableLoca = reinterpret_cast(pLoca); -+ return read(pTableLoca[nGlyphId]); - } - } - -@@ -1586,7 +1586,7 @@ - - for (size_t i = 0; i < cCompId; i++) - { -- void * pSimpleGlyf = GlyfLookup(static_cast(rgnCompId[i]), -+ pSimpleGlyf = GlyfLookup(static_cast(rgnCompId[i]), - pGlyf, pLoca, lLocaSize, pHead); - if (pSimpleGlyf == NULL) {return false;} - -@@ -1748,7 +1748,7 @@ - ----------------------------------------------------------------------------------------------*/ - bool GlyfPoints(gr::gid16 nGlyphId, const void * pGlyf, - const void * pLoca, size_t lLocaSize, const void * pHead, -- const int * prgnContourEndPoint, size_t cnEndPoints, -+ const int * /*prgnContourEndPoint*/, size_t /*cnEndPoints*/, - int * prgnX, int * prgnY, bool * prgfOnCurve, size_t cnPoints) - { - std::fill_n(prgnX, cnPoints, INT_MAX); ---- misc/silgraphite-2.3.1/engine/src/painter/SegmentPainter.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/painter/SegmentPainter.cpp Sat Aug 22 19:36:33 2009 -@@ -353,7 +353,7 @@ - @param bOn - true if we are turning on (ignored in this implementation) - ----------------------------------------------------------------------------------------------*/ - bool SegmentPainter::drawSelectionRange(int ichwAnchor, int ichwEnd, -- float ydLineTop, float ydLineBottom, bool bOn) -+ float ydLineTop, float ydLineBottom, bool /*bOn*/) - { - if (g_fDrawing) - return true; -@@ -993,7 +993,7 @@ - an I-beam (std selection) - ----------------------------------------------------------------------------------------------*/ - void SegmentPainter::CalcOrDrawInsertionPoint( -- int ichwIP, bool fAssocPrev, bool bOn, bool fForceSplit, -+ int ichwIP, bool fAssocPrev, bool /*bOn*/, bool fForceSplit, - Rect * prdPrimary, Rect * prdSecondary) - { - GrResult res = kresOk; -@@ -1277,7 +1277,7 @@ - if NULL, do the drawing - ----------------------------------------------------------------------------------------------*/ - void SegmentPainter::InvertIBeam(float xs, float ysTop, float ysBottom, -- bool fAssocPrev, Rect * prdRet) -+ bool /*fAssocPrev*/, Rect * prdRet) - { - float xd = ScaleXToDest(xs); - float ydTop = ScaleYToDest(ysTop); -@@ -1675,7 +1675,7 @@ - } - - bool SegmentPainter::AtEdgeOfCluster(GrSlotOutput * psloutBase, int isloutBase, -- GrSlotOutput * pslout, int islout, bool fBefore) -+ GrSlotOutput * /*pslout*/, int islout, bool fBefore) - { - // Compare pslout to all the members of the cluster. If it is the minimum or maximum, it - // is at an edge. -@@ -1778,12 +1778,12 @@ - } - for (icomp = 0; icomp < pslout->NumberOfComponents(); icomp++) - { -- for (int ichw = pslout->FirstUnderlyingComponent(icomp) ; -- ichw <= pslout->LastUnderlyingComponent(icomp) ; -- ichw++) -+ for (int ichwTemp = pslout->FirstUnderlyingComponent(icomp) ; -+ ichwTemp <= pslout->LastUnderlyingComponent(icomp) ; -+ ichwTemp++) - { -- if (m_pseg->m_prgiComponent[ichw - m_pseg->m_ichwAssocsMin] == icomp) -- prgfAllSelected[ichw] = fAll; -+ if (m_pseg->m_prgiComponent[ichwTemp - m_pseg->m_ichwAssocsMin] == icomp) -+ prgfAllSelected[ichwTemp] = fAll; - } - } - } -@@ -2304,7 +2304,11 @@ - Assert that there are no overlaps among all the rectangles in the array, which should - be the case if AdjustRectsToNotOverlap is working properly. - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void SegmentPainter::AssertNoOverlaps(std::vector & vrect) -+#else -+void SegmentPainter::AssertNoOverlaps(std::vector & /*vrect*/) -+#endif - { - #ifdef _DEBUG - for (int irect1 = 0; irect1 < signed(vrect.size() - 1); irect1++) -@@ -2452,7 +2456,11 @@ - Assert that there are no overlaps among all the rectangles in the array, which should - be the case if AdjustRectsToNotOverlap is working properly. - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void SegmentPainter::AssertNoOverlaps(std::vector & vls) -+#else -+void SegmentPainter::AssertNoOverlaps(std::vector & /*vls*/) -+#endif - { - #ifdef _DEBUG - for (int ils1 = 0; ils1 < (int)vls.size() - 1; ils1++) -@@ -2884,7 +2892,7 @@ - { - if (icompNext != icompCurr) - { -- float xsHorizNext = (fIPOnRight) ? vxsRights[icompNext] : vxsLefts[icompNext]; -+ xsHorizNext = (fIPOnRight) ? vxsRights[icompNext] : vxsLefts[icompNext]; - if (fMovingRight && xsHorizNext > xsHorizCurr) - break; - else if (!fMovingRight && xsHorizNext < xsHorizCurr) -@@ -2996,7 +3004,7 @@ - /*---------------------------------------------------------------------------------------------- - Make sure the font is set to use the character properties required by this segment. - ----------------------------------------------------------------------------------------------*/ --void SegmentPainter::SetFontProps(unsigned long clrFore, unsigned long clrBack) -+void SegmentPainter::SetFontProps(unsigned long /*clrFore*/, unsigned long /*clrBack*/) - { - return; - } ---- misc/silgraphite-2.3.1/engine/src/segment/FileInput.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/FileInput.cpp Sat Aug 22 19:36:33 2009 -@@ -80,7 +80,7 @@ - #ifdef GR_FW - bool GrBufferIStream::Open(std::wstring stuFileName, int kMode) - #else --bool GrBufferIStream::Open(const char * pcFileName, std::ios::openmode kMode) -+bool GrBufferIStream::Open(const char * /*pcFileName*/, std::ios::openmode /*kMode*/) - #endif - { - Assert(false); // use OpenBuffer ---- misc/silgraphite-2.3.1/engine/src/segment/GrCharStream.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrCharStream.cpp Sat Aug 22 19:36:33 2009 -@@ -417,8 +417,11 @@ - return true; - */ - } -- -+#ifdef NDEBUG -+bool GrCharStream::AtUnicodeCharBoundary(utf8 * prgchs, int cchs, int ichs, UtfType /*utf*/) -+#else - bool GrCharStream::AtUnicodeCharBoundary(utf8 * prgchs, int cchs, int ichs, UtfType utf) -+#endif - { - Assert(ichs >= 0); - Assert(ichs <= cchs); ---- misc/silgraphite-2.3.1/engine/src/segment/GrClassTable.h Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrClassTable.h Sat Aug 22 19:36:33 2009 -@@ -54,7 +54,11 @@ - /*------------------------------------------------------------------------------------------ - Copy the raw memory into the instance. - ------------------------------------------------------------------------------------------*/ -+#ifdef NDEBUG -+ void CopyFrom(data16 * pchwStart, int /*cchw*/) -+#else - void CopyFrom(data16 * pchwStart, int cchw) -+#endif - { - m_cgixBIG = pchwStart[0]; - m_digixBIGInit = pchwStart[1]; ---- misc/silgraphite-2.3.1/engine/src/segment/GrEngine.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrEngine.cpp Sat Aug 22 19:36:33 2009 -@@ -159,12 +159,12 @@ - GrEngine::~GrEngine() - { - DestroyEverything(); -- #ifdef _MSC_VER -- if (!_CrtCheckMemory()) -- { -- OutputDebugString(L"bad memory"); -- } -- #endif -+// #ifdef _MSC_VER -+// if (!_CrtCheckMemory()) -+// { -+// OutputDebugString(L"bad memory"); -+// } -+// #endif - } - - /*---------------------------------------------------------------------------------------------- -@@ -173,12 +173,12 @@ - void GrEngine::DestroyEverything() - { - DestroyContents(); -- #ifdef _MSC_VER -- if (!_CrtCheckMemory()) -- { -- OutputDebugString(L"bad memory"); -- } -- #endif -+// #ifdef _MSC_VER -+// if (!_CrtCheckMemory()) -+// { -+// OutputDebugString(L"bad memory"); -+// } -+// #endif - - m_strCtrlFileReg.erase(); - m_strCtrlFileBold.erase(); -@@ -417,7 +417,11 @@ - @return The supported script direction(s). If more than one, the application is - responsible for choosing the most appropriate. - ----------------------------------------------------------------------------------------------*/ -+#ifdef NDEBUG -+GrResult GrEngine::get_ScriptDirection(unsigned int * pgrfsdc, OLECHAR * /*prgchwErrMsg*/, int /*cchMaxErrMsg*/) -+#else - GrResult GrEngine::get_ScriptDirection(unsigned int * pgrfsdc, OLECHAR * prgchwErrMsg, int cchMaxErrMsg) -+#endif - { - ChkGrOutPtr(pgrfsdc); - ChkGrArrayArg(prgchwErrMsg, cchMaxErrMsg); -@@ -789,7 +793,7 @@ - Record a system error indicating a bad error in rendering using a supposedly valid font. - OBSOLETE - ----------------------------------------------------------------------------------------------*/ --void GrEngine::RecordFontRunError(OLECHAR * prgchwErrMsg, int cchMax, GrResult res) -+void GrEngine::RecordFontRunError(OLECHAR * prgchwErrMsg, int cchMax, GrResult /*res*/) - { - if (prgchwErrMsg == NULL || cchMax == 0) - return; -@@ -970,7 +974,7 @@ - /*---------------------------------------------------------------------------------------------- - Return whether the text is asking for bold and/or italic text. - ----------------------------------------------------------------------------------------------*/ --void GrEngine::GetStyles(Font * pfont, int ichwMin, bool * pfBold, bool * pfItalic) -+void GrEngine::GetStyles(Font * pfont, int /*ichwMin*/, bool * pfBold, bool * pfItalic) - { - *pfBold = pfont->bold(); - *pfItalic = pfont->italic(); -@@ -981,7 +985,11 @@ - Should only be called when we know we are using a base font, or when we are reading - the base font to see if it is valid. - ----------------------------------------------------------------------------------------------*/ -+#ifdef NDEBUG -+void GrEngine::SwitchGraphicsFont(bool /*fBase*/) -+#else - void GrEngine::SwitchGraphicsFont(bool fBase) -+#endif - { - Assert(!fBase || m_stuBaseFaceName.size() > 0); - -@@ -1135,7 +1143,7 @@ - m_chwJShrink0 = 0xffff; - m_chwJStep0 = 0xffff; - m_chwJWeight0 = 0xffff; -- for (int i = 0; i < m_cJLevels; i++) -+ for (i = 0; i < m_cJLevels; i++) - { - // justification glyph attribute IDs - bTmp = grstrm.ReadByteFromFont(); -@@ -1210,10 +1218,12 @@ - - // rendering behaviors--ignore for now - byte cBehaviors = grstrm.ReadByteFromFont(); -- unsigned int nBehaviors[kMaxRenderingBehavior]; -+ int nTmp; -+ //unsigned int nBehaviors[kMaxRenderingBehavior]; -- this big buffer causes a stack overflow in Multiscribe; rework eventually - for (i = 0; i < cBehaviors; i++) - { -- nBehaviors[i] = unsigned(grstrm.ReadIntFromFont()); -+ //nBehaviors[i] = unsigned(grstrm.ReadIntFromFont()); -+ nTmp = unsigned(grstrm.ReadIntFromFont()); - } - - // linebreak glyph ID ---- misc/silgraphite-2.3.1/engine/src/segment/GrFSM.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrFSM.cpp Sat Aug 22 19:36:33 2009 -@@ -46,7 +46,7 @@ - Fill in the FSM by reading from the font stream. - Assumes the stream is in the correct position. - ----------------------------------------------------------------------------------------------*/ --bool GrFSM::ReadFromFont(GrIStream & grstrm, int fxdVersion) -+bool GrFSM::ReadFromFont(GrIStream & grstrm, int /*fxdVersion*/) - { - short snTmp; - -@@ -138,7 +138,7 @@ - Fill in the FSM's state table by reading from the font stream. - Assumes the stream is in the correct position. - ----------------------------------------------------------------------------------------------*/ --bool GrFSM::ReadStateTableFromFont(GrIStream & grstrm, int fxdVersion) -+bool GrFSM::ReadStateTableFromFont(GrIStream & grstrm, int /*fxdVersion*/) - { - int cCells = ((m_crow - m_crowFinal) * m_ccol); - m_prgrowTransitions = new short[cCells]; ---- misc/silgraphite-2.3.1/engine/src/segment/GrFeature.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrFeature.cpp Sat Aug 22 19:36:33 2009 -@@ -186,7 +186,7 @@ - /*---------------------------------------------------------------------------------------------- - Read the languages from the font. - ----------------------------------------------------------------------------------------------*/ --bool GrLangTable::ReadFromFont(GrIStream * pgrstrm, int fxdVersion) -+bool GrLangTable::ReadFromFont(GrIStream * pgrstrm, int /*fxdVersion*/) - { - GrIStream & grstrm = *pgrstrm; - -@@ -206,13 +206,22 @@ - - m_cbOffset0 = (lsbf)(m_prglang[0].cbOffsetBIG); - -- Assert((lsbf)(m_prglang[m_clang].cFeaturesBIG) == 0); // bogus entry has no settings -+ if ((lsbf)(m_prglang[m_clang].cFeaturesBIG) == 0) // bogus entry has no settings -+ { - cb = (lsbf)(m_prglang[m_clang].cbOffsetBIG) - m_cbOffset0; -- Assert(cb % sizeof(FeatSet) == 0); // # of bytes fits nicely into FeatSet class -+ if (cb % sizeof(FeatSet) == 0) // # of bytes fits nicely into FeatSet class -+ { - int cfset = cb / sizeof(FeatSet); - m_prgfset = new FeatSet[cfset]; - m_cfset = cfset; - grstrm.ReadBlockFromFont(m_prgfset, cb); -+ } -+ else return false; -+ } -+ else -+ { -+ return false; -+ } - - return true; - } ---- misc/silgraphite-2.3.1/engine/src/segment/GrPass.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrPass.cpp Sat Aug 22 19:36:34 2009 -@@ -279,9 +279,10 @@ - @param twsh - how we are handling trailing white-space - @param pnRet - return value - @param pcslotGot - return the number of slots gotten -- @param pislotFinalBreak - return the index of the final slot, when we are removing -- the trailing white-space and so the end of the segment -- will be before the any actual line-break slot -+ @param pislotFinalBreak - index of the final slot (LB or actual glyph), or -1; -+ adjusted when we are removing the trailing white-space and -+ so the end of the segment will be before the any actual -+ line-break slot - - @return kNextPass if we were able to generated the number requested, or processing is - complete; otherwise return the number of slots needed from the previous pass. -@@ -465,7 +466,7 @@ - void GrBidiPass::ExtendOutput(GrTableManager * ptman, - GrSlotStream* psstrmIn, GrSlotStream* psstrmOut, - int cslotNeededByNext, TrWsHandling twsh, -- int * pnRet, int * pcslotGot, int * pislotFinalBreak) -+ int * pnRet, int * pcslotGot, int * /*pislotFinalBreak*/) - { - Assert(psstrmIn->SlotsToReprocess() == 0); - -@@ -776,7 +777,7 @@ - int GrPass::ExtendFinalOutput(GrTableManager * ptman, - GrSlotStream * psstrmInput, GrSlotStream * psstrmOutput, - float xsSpaceAllotted, bool fWidthIsCharCount, bool fInfiniteWidth, -- bool fHaveLineBreak, bool fMustBacktrack, LineBrk lbMax, TrWsHandling twsh, -+ bool fHaveLineBreak, bool fMustBacktrack, LineBrk /*lbMax*/, TrWsHandling twsh, - int * pislotLB, float * pxsWidth) - { - EngineState * pengst = ptman->State(); -@@ -897,7 +898,11 @@ - Remove undesirable trailing white-space. - ----------------------------------------------------------------------------------------------*/ - int GrPass::RemoveTrailingWhiteSpace(GrTableManager * ptman, GrSlotStream * psstrmOut, -+#ifdef NDEBUG -+ TrWsHandling /*twsh*/, int * pislotFinalBreak) -+#else - TrWsHandling twsh, int * pislotFinalBreak) -+#endif - { - EngineState * pengst = ptman->State(); - -@@ -944,7 +949,7 @@ - should never be necessary if they've set up their tables right. - ----------------------------------------------------------------------------------------------*/ - void GrPass::CheckInputProgress(GrSlotStream * psstrmInput, GrSlotStream * psstrmOutput, -- int islotOrigInput) -+ int /*islotOrigInput*/) - { - int islotInput = psstrmInput->ReadPosForNextGet(); - // Assert(islotInput >= islotOrigInput); -- no longer true now that we can back up -@@ -1752,7 +1757,7 @@ - ----------------------------------------------------------------------------------------------*/ - int GrPass::Unwind(GrTableManager * ptman, - int islotChanged, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut, -- bool fFirst) -+ bool /*fFirst*/) - { - // Back up the number of slots required for the longest rule context, - // but if we land in the middle of a chunk, go forward to its boundary. -@@ -1824,7 +1829,7 @@ - ----------------------------------------------------------------------------------------------*/ - int GrBidiPass::Unwind(GrTableManager * ptman, - int islotChanged, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut, -- bool fFirst) -+ bool /*fFirst*/) - { - int islotIn; - int islotOut; -@@ -1901,8 +1906,8 @@ - OBSOLETE - ----------------------------------------------------------------------------------------------*/ - //:Ignore --void GrPosPass::Unattach(GrSlotStream * psstrmIn, int islotIn, -- GrSlotStream * psstrmOut, int islotOut, int islotLB) -+void GrPosPass::Unattach(GrSlotStream * /*psstrmIn*/, int /*islotIn*/, -+ GrSlotStream * /*psstrmOut*/, int /*islotOut*/, int /*islotLB*/) - { - // Because this is a positioning pass, there is a one-to-one correspondence between - // the slots in the input and the slots in the output. Thus we can make simplifying ---- misc/silgraphite-2.3.1/engine/src/segment/GrPass.h Thu Aug 21 16:24:32 2008 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrPass.h Sat Aug 22 19:36:34 2009 -@@ -197,7 +197,7 @@ - bool ReadFromFont(GrIStream & grstrm, int fxdSilfVersion, int fxdRuleVersion, int nOffset); - void InitializeWithNoRules(); - -- virtual void SetTopDirLevel(int n) -+ virtual void SetTopDirLevel(int /*n*/) - { // only GrBidiPass does anything interesting - } - -@@ -253,13 +253,13 @@ - m_pzpst->SetResyncSkip(n); - } - -- virtual void DoCleanUpSegMin(GrTableManager * ptman, -- GrSlotStream * psstrmIn, int islotInitReadPos, GrSlotStream * psstrmOut) -+ virtual void DoCleanUpSegMin(GrTableManager * /*ptman*/, -+ GrSlotStream * /*psstrmIn*/, int /*islotInitReadPos*/, GrSlotStream * /*psstrmOut*/) - { - } - -- virtual void DoCleanUpSegLim(GrTableManager * ptman, GrSlotStream * psstrmOut, -- TrWsHandling twsh) -+ virtual void DoCleanUpSegLim(GrTableManager * /*ptman*/, GrSlotStream * /*psstrmOut*/, -+ TrWsHandling /*twsh*/) - { - } - -@@ -383,8 +383,8 @@ - void MapChunks(GrSlotStream * psstrmIn, GrSlotStream * psstrmOut, - int islotChunkI, int islotChunkO, int cslotReprocessed); - -- virtual void Unattach(GrSlotStream * psstrmIn, int islotIn, // GrPosPass overrides -- GrSlotStream * psstrmOut, int islotOut, int islotLB) -+ virtual void Unattach(GrSlotStream * /*psstrmIn*/, int /*islotIn*/, // GrPosPass overrides -+ GrSlotStream * /*psstrmOut*/, int /*islotOut*/, int /*islotLB*/) - { - } - -@@ -500,8 +500,8 @@ - - protected: - // Irrelevant when generating glyphs. -- virtual void RunRule(GrTableManager *, int ruln, -- GrSlotStream * psstrmInput, GrSlotStream * psstrmOutput) -+ virtual void RunRule(GrTableManager *, int /*ruln*/, -+ GrSlotStream * /*psstrmInput*/, GrSlotStream * /*psstrmOutput*/) - { - Assert(false); - } ---- misc/silgraphite-2.3.1/engine/src/segment/GrPassActionCode.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrPassActionCode.cpp Sat Aug 22 19:36:34 2009 -@@ -632,8 +632,13 @@ - /*---------------------------------------------------------------------------------------------- - We are finished processing a slot; go on to the next slot, or possibly go backwards. - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoNext(GrTableManager * ptman, -- int cslot, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) -+#ifdef NDEBUG -+void GrPass::DoNext(GrTableManager * /*ptman*/, -+ int /*cslot*/, GrSlotStream * /*psstrmIn*/, GrSlotStream * /*psstrmOut*/) -+#else -+void GrPass::DoNext(GrTableManager * /*ptman*/, -+ int cslot, GrSlotStream * /*psstrmIn*/, GrSlotStream * /*psstrmOut*/) -+#endif - { - gAssert(cslot == 1); // for now anyway - } -@@ -690,6 +695,7 @@ - psstrmOut->SetSegMinToWritePos(false); - if (fSetSegLim) - psstrmOut->SetSegLimToWritePos(false); -+ //gid16 chw; chw = pslotNew->GlyphID(); - psstrmOut->NextPut(pslotNew); - } - -@@ -729,6 +735,7 @@ - psstrmOut->SetSegMinToWritePos(false); - if (fSetSegLim) - psstrmOut->SetSegLimToWritePos(false); -+ //gid16 chw; chw = pslotNew->GlyphID(); - psstrmOut->NextPut(pslotNew); - } - -@@ -825,7 +832,7 @@ - @param psstrmIn / Out - input/output streams - ----------------------------------------------------------------------------------------------*/ - void GrPass::DoPutSubs3(GrTableManager * ptman, bool fInserting, -- int cslotSel1, int nSelClass1, int cslotSel2, int nSelClass2, int cslotSel3, int nSelClass3, -+ int cslotSel1, int nSelClass1, int cslotSel2, int nSelClass2, int /*cslotSel3*/, int nSelClass3, - int nReplacementClass, - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { -@@ -888,7 +895,7 @@ - Common part of all the DoPutSubs... methods. - ----------------------------------------------------------------------------------------------*/ - void GrPass::DoPutSubsAux(GrTableManager * ptman, bool fInserting, gid16 nGlyphReplacement, -- GrSlotStream * psstrmIn, GrSlotStream * psstrmOut, GrSlotState * pslotNextInput, -+ GrSlotStream * /*psstrmIn*/, GrSlotStream * psstrmOut, GrSlotState * pslotNextInput, - bool fAtSegMin, bool fAtSegLim) - { - EngineState * pengst = ptman->State(); -@@ -915,6 +922,7 @@ - psstrmOut->SetSegMinToWritePos(false); - if (fSetSegLim) - psstrmOut->SetSegLimToWritePos(false); -+ //gid16 chw; chw = pslotNew->GlyphID(); - psstrmOut->NextPut(pslotNew); - } - -@@ -924,7 +932,7 @@ - and its after-assoc to the slot before it. This makes it basically unselectable. - OBSOLETE - handled by slot initialization code - ----------------------------------------------------------------------------------------------*/ --void GrPass::SetNeutralAssocs(GrSlotState * pslotNew, GrSlotStream * psstrmIn) -+void GrPass::SetNeutralAssocs(GrSlotState * pslotNew, GrSlotStream * /*psstrmIn*/) - { - pslotNew->ClearAssocs(); - } -@@ -943,6 +951,7 @@ - psstrmOut->SetSegLimToWritePos(); - - GrSlotState * pslot = psstrmIn->NextGet(); -+ //gid16 chw; chw = pslotNew->GlyphID(); - pslot->MarkDeleted(); - - if (ptman->LoggingTransduction()) -@@ -957,7 +966,7 @@ - @param fInserting - whether current slot was inserted - @param psstrmIn / Out - input/output streams - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoAssoc(int cnAssocs, std::vector & vnAssocs, bool fInserting, -+void GrPass::DoAssoc(int cnAssocs, std::vector & vnAssocs, bool /*fInserting*/, - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { - gAssert((unsigned)cnAssocs == vnAssocs.size()); -@@ -997,7 +1006,11 @@ - @param vnStack - stack to read value from - @param psstrmIn / Out - input/output streams - ----------------------------------------------------------------------------------------------*/ -+#ifdef NDEBUG -+void GrPass::DoSetAttr(GrTableManager * ptman, ActionCommand op, bool /*fInserting*/, -+#else - void GrPass::DoSetAttr(GrTableManager * ptman, ActionCommand op, bool fInserting, -+#endif - SlotAttrName slat, int slati, std::vector & vnStack, - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { -@@ -1192,7 +1205,7 @@ - @param psstrmIn - input stream - ----------------------------------------------------------------------------------------------*/ - void GrPass::DoPushSlotAttr(GrTableManager * ptman, -- int nSlotRef, bool fInserting, -+ int nSlotRef, bool /*fInserting*/, - SlotAttrName slat, int slati, std::vector & vnStack, - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { -@@ -1236,16 +1249,16 @@ - - case kslatAttTo: nVal = pslot->AttachTo(); break; - case kslatAttLevel: nVal = pslot->AttachLevel(); break; -- case kslatAttAtX: nVal = pslot->AttachAtX(ptman, psstrmIn); break; - case kslatAttAtY: nVal = pslot->AttachAtY(); break; - case kslatAttAtGpt: nVal = pslot->AttachAtGpoint(); break; - case kslatAttAtXoff: nVal = pslot->AttachAtXOffset(); break; - case kslatAttAtYoff: nVal = pslot->AttachAtYOffset(); break; -- case kslatAttWithX: nVal = pslot->AttachWithX(ptman, psstrmIn); break; - case kslatAttWithY: nVal = pslot->AttachWithY(); break; - case kslatAttWithGpt: nVal = pslot->AttachWithGpoint(); break; - case kslatAttWithXoff: nVal = pslot->AttachWithXOffset(); break; - case kslatAttWithYoff: nVal = pslot->AttachWithYOffset(); break; -+ case kslatAttAtX: nVal = pslot->AttachAtX(ptman, psstrmIn); break; -+ case kslatAttWithX: nVal = pslot->AttachWithX(ptman, psstrmIn); break; - - case kslatMeasureSol: nVal = pslot->MeasureSol(); break; - case kslatMeasureEol: nVal = pslot->MeasureEol(); break; -@@ -1282,7 +1295,7 @@ - @param vnStack - stack to push onto - @param psstrmIn - input stream - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoPushGlyphAttr(GrTableManager * ptman, int nSlotRef, bool fInserting, -+void GrPass::DoPushGlyphAttr(GrTableManager * ptman, int nSlotRef, bool /*fInserting*/, - int nGlyphAttr, - std::vector & vnStack, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { -@@ -1307,7 +1320,7 @@ - @param vnStack - stack to push onto - @param psstrmIn - input stream - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoPushAttToGlyphAttr(GrTableManager * ptman, int nSlotRef, bool fInserting, -+void GrPass::DoPushAttToGlyphAttr(GrTableManager * ptman, int nSlotRef, bool /*fInserting*/, - int nGlyphAttr, std::vector & vnStack, - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { -@@ -1337,7 +1350,7 @@ - @param vnStack - stack to push onto - @param psstrmIn - input stream - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoPushGlyphMetric(GrTableManager * ptman, int nSlotRef, bool fInserting, -+void GrPass::DoPushGlyphMetric(GrTableManager * ptman, int nSlotRef, bool /*fInserting*/, - int nGlyphAttr, int nAttLevel, - std::vector & vnStack, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { -@@ -1364,7 +1377,7 @@ - @param psstrmIn - input stream - @param psstrmOut - output stream - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoPushAttToGlyphMetric(GrTableManager * ptman, int nSlotRef, bool fInserting, -+void GrPass::DoPushAttToGlyphMetric(GrTableManager * ptman, int nSlotRef, bool /*fInserting*/, - int nGlyphAttr, int nAttLevel, - std::vector & vnStack, - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) -@@ -1399,7 +1412,7 @@ - } - else - { -- pslot->CalcCompositeMetrics(ptman, psstrmIn, nAttLevel, true); -+ pslot->CalcCompositeMetrics(ptman, psstrmIn, NULL, nAttLevel, true); - - float xy; - switch (gmet) -@@ -1435,7 +1448,11 @@ - @param psstrmIn - input stream - @param psstrmOut - output stream - ----------------------------------------------------------------------------------------------*/ --void GrPass::DoPushFeatValue(GrTableManager * ptman, int nSlotRef, bool fInserting, -+#ifdef NDEBUG -+void GrPass::DoPushFeatValue(GrTableManager * /*ptman*/, int nSlotRef, bool /*fInserting*/, -+#else -+void GrPass::DoPushFeatValue(GrTableManager * /*ptman*/, int nSlotRef, bool fInserting, -+#endif - int nFeat, std::vector & vnStack, GrSlotStream * psstrmIn, GrSlotStream * psstrmOut) - { - gAssert(!fInserting); ---- misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.cpp Sat Aug 22 19:36:34 2009 -@@ -261,7 +261,7 @@ - root or attached leaf slots. - OBSOLETE - ----------------------------------------------------------------------------------------------*/ --void GrSlotState::FixAttachmentTree(GrSlotState * pslotOld) -+void GrSlotState::FixAttachmentTree(GrSlotState * /*pslotOld*/) - { - #if 0 - pslotOld->m_vpslotAttLeaves.CopyTo(m_vpslotAttLeaves); -@@ -524,13 +524,13 @@ - GrSlotState * pslot; - if (HasComponents()) - { -- for (int iComponent = 0; iComponent < m_cnCompPerLig; iComponent++) -+ for (int iLigComponent = 0; iLigComponent < m_cnCompPerLig; iLigComponent++) - { -- pslot = CompRefSlot(iComponent); -+ pslot = CompRefSlot(iLigComponent); - if (pslot) - { - Assert(PassModified() >= pslot->PassModified()); -- pslot->AllComponentRefs(vichw, vicomp, iComponent); -+ pslot->AllComponentRefs(vichw, vicomp, iLigComponent); - } - } - } -@@ -1024,7 +1024,7 @@ - NOTE: the caller is responsible to zap the cached positions of following glyphs - in the stream. - ----------------------------------------------------------------------------------------------*/ --void GrSlotState::AttachToRoot(GrTableManager * ptman, GrSlotStream * psstrm, -+void GrSlotState::AttachToRoot(GrTableManager * /*ptman*/, GrSlotStream * psstrm, - GrSlotState * pslotNewRoot) - { - GrSlotState * pslotOldRoot = (m_dislotRootFixed == 0) ? -@@ -1063,7 +1063,7 @@ - - float xsWidth, xsVisWidth; - if (m_xsPositionX == kNegInfFloat || m_ysPositionY == kNegInfFloat) -- ptman->CalcPositionsUpTo(psstrmOut->m_ipass, this, &xsWidth, &xsVisWidth); -+ ptman->CalcPositionsUpTo(psstrmOut->m_ipass, this, true, &xsWidth, &xsVisWidth); - - *pmXPos = ptman->LogToEmUnits(m_xsPositionX); - *pmYPos = ptman->LogToEmUnits(m_ysPositionY); -@@ -1077,7 +1077,7 @@ - { - Assert(m_dislotRootFixed == m_srAttachTo); - GrSlotState * pslotRoot = AttachRoot(psstrm); -- CalcRootMetrics(ptman, psstrm, kPosInfinity); -+ CalcRootMetrics(ptman, psstrm, NULL, kPosInfinity); - if (pslotRoot) - pslotRoot->AdjustRootMetrics(ptman, psstrm); - } -@@ -1086,13 +1086,15 @@ - Calculate the composite metrics for this slot. - - @param psstrm - stream for which we are calculating it -+ @param psstrmNext - because when processing in the middle of a pass, we may need to -+ get the slot from the following (output) stream - @param nLevel - attachment level we are asking for; kPosInifinity means all levels - @param fThorough - true: do a thorough recalculation; false: don't recalculate - metrics for leaves (are they assumed to be accurate???) - --currently not used - ----------------------------------------------------------------------------------------------*/ - void GrSlotState::CalcCompositeMetrics(GrTableManager * ptman, GrSlotStream * psstrm, -- int nLevel, bool fThorough) -+ GrSlotStream * psstrmNext, int nLevel, bool fThorough) - { - if (m_nCompositeLevel == nLevel) - return; -@@ -1101,19 +1103,38 @@ - { - Assert(m_dislotRootFixed == m_srAttachTo); - GrSlotState * pslotRoot = AttachRoot(psstrm); -+ // Kludge to handle the fact that we might have gotten the root from the wrong stream. -+ // Calling MidPassSlotAt finds the right one. -+ if (psstrmNext && pslotRoot) -+ { -+ int islotRoot = pslotRoot->PosPassIndex(); -+ pslotRoot = psstrm->MidPassSlotAt(islotRoot, psstrmNext); -+ } - - InitMetrics(ptman, pslotRoot); - - for (size_t islot = 0; islot < m_vdislotAttLeaves.size(); islot++) - { -- GrSlotState * pslotLeaf = SlotAtOffset(psstrm, m_vdislotAttLeaves[islot]); -+ GrSlotState * pslotLeaf; -+ if (psstrmNext) -+ { -+ // Calculating a position in the middle of processing a pass. -+ pslotLeaf = psstrm->MidPassSlotAt(PosPassIndex() + m_vdislotAttLeaves[islot], -+ psstrmNext); -+ } -+ else -+ { -+ // Calculating the final position. -+ pslotLeaf = SlotAtOffset(psstrm, m_vdislotAttLeaves[islot]); -+ } -+ - if (pslotLeaf->AttachLevel() <= nLevel) -- pslotLeaf->CalcCompositeMetrics(ptman, psstrm, nLevel, fThorough); -+ pslotLeaf->CalcCompositeMetrics(ptman, psstrm, psstrmNext, nLevel, fThorough); - else - // this slot will be ignored in the composite metrics - pslotLeaf->ZapRootMetrics(); - } -- CalcRootMetrics(ptman, psstrm, nLevel); -+ CalcRootMetrics(ptman, psstrm, psstrmNext, nLevel); - - m_nCompositeLevel = nLevel; - } -@@ -1129,25 +1150,33 @@ - /*---------------------------------------------------------------------------------------------- - Calculate the metrics for this node and all its leaf nodes. - ----------------------------------------------------------------------------------------------*/ --void GrSlotState::CalcRootMetrics(GrTableManager * ptman, GrSlotStream * psstrm, int nLevel) -+void GrSlotState::CalcRootMetrics(GrTableManager * /*ptman*/, GrSlotStream * psstrm, -+ GrSlotStream * psstrmNext, int nLevel) - { - for (size_t idislot = 0; idislot < m_vdislotAttLeaves.size(); idislot++) - { -- GrSlotState * pslot = SlotAtOffset(psstrm, m_vdislotAttLeaves[idislot]); -- if (pslot->AttachLevel() > nLevel) -+ GrSlotState * pslotLeaf = SlotAtOffset(psstrm, m_vdislotAttLeaves[idislot]); -+ // Kludge to handle the fact that we might have gotten the leaf from the wrong stream. -+ // Calling MidPassSlotAt finds the right one. -+ if (psstrmNext) -+ { -+ int islot = pslotLeaf->PosPassIndex(); -+ pslotLeaf = psstrm->MidPassSlotAt(islot, psstrmNext); -+ } -+ if (pslotLeaf->AttachLevel() > nLevel) - continue; - -- m_xsClusterXOffset = min(m_xsClusterXOffset, pslot->m_xsClusterXOffset); -- if (!pslot->m_fIgnoreAdvance) -+ m_xsClusterXOffset = min(m_xsClusterXOffset, pslotLeaf->m_xsClusterXOffset); -+ if (!pslotLeaf->m_fIgnoreAdvance) - { - m_xsClusterAdv = max( - m_xsClusterAdv, -- pslot->m_xsClusterAdv + m_xsRootShiftX); -+ pslotLeaf->m_xsClusterAdv + m_xsRootShiftX); - } -- m_xsClusterBbLeft = min(m_xsClusterBbLeft, pslot->m_xsClusterBbLeft); -- m_xsClusterBbRight = max(m_xsClusterBbRight, pslot->m_xsClusterBbRight); -- m_ysClusterBbTop = max(m_ysClusterBbTop, pslot->m_ysClusterBbTop); -- m_ysClusterBbBottom = min(m_ysClusterBbBottom, pslot->m_ysClusterBbBottom); -+ m_xsClusterBbLeft = min(m_xsClusterBbLeft, pslotLeaf->m_xsClusterBbLeft); -+ m_xsClusterBbRight = max(m_xsClusterBbRight, pslotLeaf->m_xsClusterBbRight); -+ m_ysClusterBbTop = max(m_ysClusterBbTop, pslotLeaf->m_ysClusterBbTop); -+ m_ysClusterBbBottom = min(m_ysClusterBbBottom, pslotLeaf->m_ysClusterBbBottom); - } - } - -@@ -1263,7 +1292,7 @@ - /*---------------------------------------------------------------------------------------------- - Y-offsets of a single glyph relative to the previous advance position. - ----------------------------------------------------------------------------------------------*/ --float GrSlotState::GlyphYOffset(GrSlotStream * psstrm) -+float GrSlotState::GlyphYOffset(GrSlotStream * /*psstrm*/) - { - return m_ysOffsetY; - } ---- misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h Sat Aug 22 19:36:34 2009 -@@ -308,7 +308,11 @@ - { - return m_islotPosPass; - } -+#ifdef NDEBUG -+ void SetPosPassIndex(int islot, bool /*fInputToPosPass1*/) -+#else - void SetPosPassIndex(int islot, bool fInputToPosPass1) -+#endif - { - // If we're resetting it, it should be to the same value as before: - Assert(fInputToPosPass1 || m_islotPosPass == kNotYetSet || m_islotPosPass == islot); -@@ -386,12 +390,12 @@ - return (IsInitialLineBreak(chwLB) || IsFinalLineBreak(chwLB)); - //return (m_chwGlyphID == chwLB); // TODO: remove - } -- bool IsInitialLineBreak(gid16 chwLB) -+ bool IsInitialLineBreak(gid16 /*chwLB*/) - { - return (m_spsl == kspslLbInitial); - //return (IsLineBreak(chwLB) && m_fInitialLB == true); // TODO: remove - } -- bool IsFinalLineBreak(gid16 chwLB) -+ bool IsFinalLineBreak(gid16 /*chwLB*/) - { - return (m_spsl == kspslLbFinal); - //return (IsLineBreak(chwLB) && m_fInitialLB == false); // TODO: remove -@@ -475,7 +479,7 @@ - return m_mAttachAtX; - } - -- int AttachWithX(GrTableManager * ptman, GrSlotStream * psstrm) -+ int AttachWithX(GrTableManager * /*ptman*/, GrSlotStream * /*psstrm*/) - { - if (m_mAttachAtX == kNotYetSet) - { -@@ -615,7 +619,7 @@ - GrSlotStream * psstrmIn, GrSlotStream * psstrmOut, int islotThis); - - void CalcCompositeMetrics(GrTableManager * ptman, GrSlotStream * psstrm, -- int nLevel, bool fThorough = false); -+ GrSlotStream * psstrmNext, int nLevel, bool fThorough = false); - - void Position(GrTableManager * ptman, - GrSlotStream * psstrmOut, int * pmXPos, int * pmYPos); -@@ -646,7 +650,7 @@ - { - return ClusterBbLeft(psstrm) + xs; - } -- float ClusterRsb(GrSlotStream * psstrm, float xs) -+ float ClusterRsb(GrSlotStream * /*psstrm*/, float xs) - { - return ClusterAdvWidthFrom(xs) - ClusterBbRightFrom(xs); - } -@@ -668,19 +672,19 @@ - { - return ClusterBbRightFrom(Base(psstrm)->ClusterRootOffset()); - } -- float ClusterBbTop(GrSlotStream * psstrm) -+ float ClusterBbTop(GrSlotStream * /*psstrm*/) - { - return m_ysClusterBbTop; - } -- float ClusterBbBottom(GrSlotStream * psstrm) -+ float ClusterBbBottom(GrSlotStream * /*psstrm*/) - { - return m_ysClusterBbBottom; - } -- float ClusterBbWidth(GrSlotStream * psstrm) -+ float ClusterBbWidth(GrSlotStream * /*psstrm*/) - { - return m_xsClusterBbRight - m_xsClusterBbLeft + 1; - } -- float ClusterBbHeight(GrSlotStream * psstrm) -+ float ClusterBbHeight(GrSlotStream * /*psstrm*/) - { - return m_ysClusterBbTop - m_ysClusterBbBottom + 1; - } -@@ -990,7 +994,8 @@ - void InitMetrics(GrTableManager * ptman, GrSlotState * pslotRoot); - void InitLeafMetrics(GrTableManager * ptman, GrSlotState * pslotRoot); - void InitRootMetrics(GrTableManager * ptman); -- void CalcRootMetrics(GrTableManager * ptman, GrSlotStream *, int nLevel); -+ void CalcRootMetrics(GrTableManager * ptman, GrSlotStream * psstrm, -+ GrSlotStream * psstrmNext, int nLevel); - void AttachToRoot(GrTableManager * ptman, GrSlotStream *, GrSlotState * pslotNewRoot); - void AttachLogUnits(GrTableManager * ptman, - GrSlotState * pslotRoot, ---- misc/silgraphite-2.3.1/engine/src/segment/GrSlotStream.cpp Wed Feb 04 07:53:26 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotStream.cpp Sat Aug 22 19:36:34 2009 -@@ -189,12 +189,16 @@ - stream position when the rule is being run. - - @param dislot - how far back to peek before the write position -- when the rule started; a negative number -+ WHEN THE RULE STARTED; a negative number - (NOTE: the current write position is irrelevant) - @param fNullOkay - true if it's okay to return NULL in the situation where we're asking - for something before the beginning of the stream - ----------------------------------------------------------------------------------------------*/ -+#ifdef NDEBUG -+GrSlotState * GrSlotStream::PeekBack(int dislot, bool /*fNullOkay*/) -+#else - GrSlotState * GrSlotStream::PeekBack(int dislot, bool fNullOkay) -+#endif - { - Assert(dislot < 0); - if (dislot < m_islotRuleStartWrite * -1) -@@ -1104,6 +1108,7 @@ - case kdircRLO: - case kdircRLE: - case kdircPdfR: -+ case kdircRlb: - return true; - - case kdircNeutral: -@@ -1212,7 +1217,7 @@ - return true; - - float xsWidth, xsVisWidth; -- ptman->CalcPositionsUpTo(m_ipass, NULL, &xsWidth, &xsVisWidth); -+ ptman->CalcPositionsUpTo(m_ipass, NULL, false, &xsWidth, &xsVisWidth); - - *pxsWidth = (fIgnoreTrailingWS || twsh == ktwshOnlyWs) ? xsVisWidth : xsWidth; - return (*pxsWidth < xsSpaceAllotted); -@@ -1322,7 +1327,7 @@ - @param islotMin - first slot that is officially part of the segment (after initial LB) - ----------------------------------------------------------------------------------------------*/ - int GrSlotStream::MakeSegmentBreak(GrTableManager * ptman, -- int islotPrevBreak, bool fInsertedLB, int islotStartTry, -+ int /*islotPrevBreak*/, bool /*fInsertedLB*/, int islotStartTry, - LineBrk lb, TrWsHandling twsh, int islotMin, - LineBrk * plbNextToTry) - { -@@ -1576,7 +1581,11 @@ - Return the break weight of the given slot, which should be a line-break. - OBSOLETE?? - ----------------------------------------------------------------------------------------------*/ -+#ifdef NDEBUG -+LineBrk GrSlotStream::BreakWeightAt(gid16 /*chwLB*/, int islot) -+#else - LineBrk GrSlotStream::BreakWeightAt(gid16 chwLB, int islot) -+#endif - { - GrSlotState * pslot = GetSlotAt(islot); - Assert(pslot->IsLineBreak(chwLB)); -@@ -1769,7 +1778,7 @@ - @param fBackingUp - this chunk results in the stream position moving backwards, - so clear anything we're backing over - ----------------------------------------------------------------------------------------------*/ --void GrSlotStream::MapInputChunk(int islotInputMin, int islotOutputMin, int islotInputLim, -+void GrSlotStream::MapInputChunk(int islotInputMin, int islotOutputMin, int /*islotInputLim*/, - bool fSkipChunkStart, bool fBackingUp) - { - Assert(AssertValid()); -@@ -1828,7 +1837,7 @@ - @param fBackingUp - this chunk results in the stream position moving backwards, - so clear anything we're backing over - ----------------------------------------------------------------------------------------------*/ --void GrSlotStream::MapOutputChunk(int islotOutputMin, int islotInputMin, int islotOutputLim, -+void GrSlotStream::MapOutputChunk(int islotOutputMin, int islotInputMin, int /*islotOutputLim*/, - bool fSkipChunkStart, int cslotReprocess, bool fBackingUp) - { - Assert(AssertValid()); -@@ -1863,7 +1872,11 @@ - Ensure that the chunk maps for a pair of streams match properly. The recipient is - the input stream. - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void GrSlotStream::AssertChunkMapsValid(GrSlotStream * psstrmOut) -+#else -+void GrSlotStream::AssertChunkMapsValid(GrSlotStream * ) -+#endif - { - #ifdef _DEBUG - GrSlotStream * psstrmIn = this; -@@ -1915,7 +1924,11 @@ - Ensure that corresponding items in the streams of a positioning pass have matching - stream indices. The recipient is the output stream. - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * psstrmIn) -+#else -+void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * ) -+#endif - { - #ifdef _DEBUG - if (!GotIndexOffset()) -@@ -1939,7 +1948,11 @@ - in the output stream. (Currently the compiler ensures this by making it an error - to write rules that don't do this.) - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void GrSlotStream::AssertAttachmentsInOutput(int islotMin, int islotLim) -+#else -+void GrSlotStream::AssertAttachmentsInOutput(int , int ) -+#endif - { - #ifdef _DEBUG - for (int islot = islotMin; islot < islotLim; islot++) -@@ -2007,7 +2016,11 @@ - Record the number of slots in the stream that are previous to the official start of the - segment. - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void GrSlotStream::CalcIndexOffset(GrTableManager * ptman) -+#else -+void GrSlotStream::CalcIndexOffset(GrTableManager * ) -+#endif - { - if (GotIndexOffset()) - return; // already figured it -@@ -2203,6 +2212,21 @@ - } - - /*---------------------------------------------------------------------------------------------- -+ In the middle of running a pass, return the given slot to use in processing. -+ Read it from the reprocess buffer if appropriate, or for slots previous to the current -+ position, read from the output stream (psstrmNext). -+ -+ psstrmNext may be NULL when processing is complete, therefore we only have one stream to -+ deal with. -+----------------------------------------------------------------------------------------------*/ -+GrSlotState * GrSlotStream::MidPassSlotAt(int islot, GrSlotStream * psstrmNext) -+{ -+ int islotInput = islot - ReadPosForNextGet() + 1; // +1 because RuleInputSlot takes 0 to mean the previously read slot -+ GrSlotState * pslot = RuleInputSlot(islotInput, psstrmNext); -+ return pslot; -+} -+ -+/*---------------------------------------------------------------------------------------------- - Return the "current" input item from the rule's perspective, ie, the last slot read. - So dislotOffset = 0 means not the slot at the read position but one slot earlier. - -@@ -2214,7 +2238,6 @@ - @param fNullOkay - true if it's okay to return NULL in the situation where we're asking - for something before the beginning of the stream - ----------------------------------------------------------------------------------------------*/ -- - GrSlotState * GrSlotStream::RuleInputSlot(int dislotOffset, GrSlotStream * psstrmOutput, - bool fNullOkay) - { -@@ -2244,8 +2267,10 @@ - - if (cslotOffsetBack >= cslotPostReproc + cslotValidReproc) - { -- // Read from the output stream. -- int dislotTmp = dislotOffset - 1 + cslotPostReproc + cslotValidReproc; -+ // Read from the output stream. (Remember that PeekBack works relative to -+ // the rule-start write position, not the current write position.) -+ int dislotTmp = dislotOffset - 1 + cslotPostReproc -+ + cslotValidReproc - SlotsToReprocess(); - Assert(dislotTmp < 0); - return psstrmOutput->PeekBack(dislotTmp); - } -@@ -2253,7 +2278,7 @@ - { - if (m_islotReprocPos > -1) - { -- // Current read pos is inside reprocess buffer. -+ // Current read pos could be inside reprocess buffer. - Assert(cslotPostReproc == 0); - int islotStartReadReprocBuf = m_vpslotReproc.size() - cslotValidReproc; - Assert(islotStartReadReprocBuf >= 0); -@@ -2342,9 +2367,10 @@ - else if (pslotAfter) - pslot->Associate(pslotAfter); - else -+ { - // Weird, but can happen with an empty segment. - Warn("No assocations"); -- -+ } - // Assert(pslot->m_vpslotAssoc.Size() > 0); - pslot->m_fNeutralAssocs = true; - } ---- misc/silgraphite-2.3.1/engine/src/segment/GrSlotStream.h Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotStream.h Sat Aug 22 19:36:34 2009 -@@ -107,7 +107,7 @@ - ReleaseSlots(0, m_vpslot.size()); - } - -- void ReleaseSlots(int islotMin, int islotLim) -+ void ReleaseSlots(int /*islotMin*/, int /*islotLim*/) - { - // A slot stream is responsible for deleting the slot states that it created, - // that is, the ones whose modified tag equals this stream's pass index. -@@ -182,6 +182,7 @@ - return Peek(islot - ReadPosForNextGet()); - } - -+ // Return the functional read position, taking into account the reprocess buffer. - int ReadPosForNextGet() - { - return ReadPos() - SlotsToReprocess(); -@@ -260,12 +261,16 @@ - - void MarkFullyWritten(); - -+#ifdef NDEBUG -+ void SetSegMin(int islot, bool /*fAdjusting*/ = false) -+#else - void SetSegMin(int islot, bool fAdjusting = false) -+#endif - { - Assert(fAdjusting || m_islotSegMin == -1 || m_islotSegMin == islot); - m_islotSegMin = islot; - } -- void SetSegMinToWritePos(bool fMod = true) -+ void SetSegMinToWritePos(bool /*fMod*/ = true) - { - if (m_islotSegMin == -1) - m_islotSegMin = m_islotWritePos; -@@ -456,6 +461,7 @@ - } - } - -+ GrSlotState * MidPassSlotAt(int islot, GrSlotStream * psstrmNext = NULL); - GrSlotState * RuleInputSlot(int dislot = 0, GrSlotStream * psstrmOut = NULL, - bool fNullOkay = false); - GrSlotState * RuleOutputSlot(int dislot = 0); ---- misc/silgraphite-2.3.1/engine/src/segment/GrTableManager.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrTableManager.cpp Sat Aug 22 19:36:34 2009 -@@ -25,8 +25,8 @@ - DEFINE_THIS_FILE - #ifndef _WIN32 - #include --#include - #endif -+#include - - //:>******************************************************************************************** - //:> Forward declarations -@@ -572,7 +572,7 @@ - else - { - Assert(!m_engst.m_fInsertedLB); -- Assert(islotUnderBreak == -1 || m_engst.m_fFinalLB); -+ //Assert(islotUnderBreak == -1 || m_engst.m_fFinalLB); -- no, ExtendGlyphIDOutput clearly sets islotUnderBreak regardless - } - int islotTmp = OutputStream(m_cpass - 1)->WritePos(); - GrSlotState * pslotTmp; -@@ -931,7 +931,7 @@ - @param plbFound - kind of line-break created - ----------------------------------------------------------------------------------------------*/ - bool GrTableManager::Backtrack(int * pislotPrevBreak, -- LineBrk * plbMin, LineBrk lbMax, TrWsHandling twsh, bool fMoreText, -+ LineBrk * plbMin, LineBrk lbMax, TrWsHandling twsh, bool /*fMoreText*/, - int ichwCallerBtLim, bool fEndLine, - LineBrk * plbFound) - { -@@ -1343,7 +1343,7 @@ - Calculate the associations, and record the output slots in the segment. - ----------------------------------------------------------------------------------------------*/ - void GrTableManager::RecordAssocsAndOutput(Font * pfont, -- Segment * pseg, bool fWidthIsCharCount, -+ Segment * pseg, bool /*fWidthIsCharCount*/, - TrWsHandling twsh, bool fParaRtl, int nDirDepth) - { - int cchwUnderlying = pseg->stopCharacter() - pseg->startCharacter(); -@@ -1362,7 +1362,7 @@ - #endif // OLD_TEST_STUFF - - // Make sure the final positions are set for every glyph. -- CalcPositionsUpTo(m_cpass-1, reinterpret_cast(NULL), -+ CalcPositionsUpTo(m_cpass-1, reinterpret_cast(NULL), false, - &xsTotalWidth, &xsVisWidth); - pseg->SetWidths(xsVisWidth, xsTotalWidth); - -@@ -1377,7 +1377,7 @@ - Calculate the underlying-to-surface associations and ligature mappings. - Assumes the arrays have been properly initialized. - ----------------------------------------------------------------------------------------------*/ --void GrTableManager::CalculateAssociations(Segment * pseg, int csloutSurface) -+void GrTableManager::CalculateAssociations(Segment * pseg, int /*csloutSurface*/) - { - GrSlotStream * psstrmFinal = OutputStream(m_cpass-1); - -@@ -2350,18 +2350,20 @@ - final pass, but it could be another if positions are - requested by the rules themselves - @param pslotLast - last slot that needs to be positioned, or NULL -+ @param fMidPass - calculating the position of some slot in the middle of the pass - @param pxsWidth - return the total width used so far - @param psxVisibleWidth - return the visible width so far - - MOVE to EngineState - ----------------------------------------------------------------------------------------------*/ --void GrTableManager::CalcPositionsUpTo(int ipass, GrSlotState * pslotLast, -+void GrTableManager::CalcPositionsUpTo(int ipass, GrSlotState * pslotLast, bool fMidPass, - float * pxsWidth, float * pxsVisibleWidth) - { - Assert(ipass >= m_ipassPos1 - 1); - - int isstrm = ipass; - GrSlotStream * psstrm = OutputStream(isstrm); -+ GrSlotStream * psstrmNext = (isstrm >= m_cpass - 1) ? NULL : OutputStream(isstrm + 1); - Assert(psstrm->GotIndexOffset()); - if (psstrm->WritePos() <= psstrm->IndexOffset()) - { -@@ -2399,7 +2401,9 @@ - // to be later in the stream than the last actual slot passed in. - if (!psstrm->HasSlotAtPosPassIndex(pslotLast->AttachRootPosPassIndex())) - return; -- GrSlotState * pslotLastBase = pslotLast->Base(psstrm); -+ GrSlotState * pslotLastBase = (fMidPass && pslotLast->PosPassIndex() < psstrm->WritePos()) -+ ? pslotLast->Base(psstrmNext) -+ : pslotLast->Base(psstrm); - - if (ipass == m_cpass - 1 && m_engst.m_islotPosNext > -1) - { -@@ -2428,6 +2432,7 @@ - } - - std::vector vpslotAttached; -+ std::vector vpsstrmAttached; - - bool fRtl = RightToLeft(); - -@@ -2435,13 +2440,24 @@ - { - Assert(islot < psstrm->SlotsPresent()); - -- pslot = (isstrm == ipass) ? psstrm->SlotAt(islot) : psstrm->OutputSlotAt(islot); -+ GrSlotStream * psstrmThis = psstrm; -+ if (fMidPass && islot < psstrm->WritePos()) -+ { -+ pslot = psstrm->MidPassSlotAt(islot, psstrmNext); -+ psstrmThis = psstrmNext; -+ } -+ else -+ { -+ //pslot = (isstrm == ipass) ? psstrm->SlotAt(islot) : psstrm->OutputSlotAt(islot); -+ pslot = psstrm->SlotAt(islot); -+ } - - if (!pslot->IsBase()) - { - // This slot is attached to another; it will be positioned strictly - // relative to that one. This happens in the loop below. - vpslotAttached.push_back(pslot); -+ vpsstrmAttached.push_back(psstrmThis); - } - else - { -@@ -2455,7 +2471,7 @@ - } - - // Make sure the metrics are the complete ones. -- pslot->CalcCompositeMetrics(this, psstrm, kPosInfinity, true); -+ pslot->CalcCompositeMetrics(this, psstrm, psstrmNext, kPosInfinity, true); - - float xsInc = pslot->GlyphXOffset(psstrm, fakeItalicRatio); - float ysInc = pslot->GlyphYOffset(psstrm); -@@ -2514,8 +2530,9 @@ - - for (size_t ipslot = 0; ipslot < vpslotAttached.size(); ipslot++) - { -- GrSlotState * pslot = vpslotAttached[ipslot]; -- GrSlotState * pslotBase = pslot->Base(psstrm); -+ GrSlotState * pslotAtt = vpslotAttached[ipslot]; -+ GrSlotStream * psstrmAtt = vpsstrmAttached[ipslot]; -+ GrSlotState * pslotBase = pslotAtt->Base(psstrmAtt); - if (pslotBase->XPosition() == kNegInfinity || pslotBase->YPosition() == kNegInfinity) - { - Assert(false); -@@ -2523,10 +2540,10 @@ - } - float xsCluster = pslotBase->XPosition() - pslotBase->GlyphXOffset(psstrm, fakeItalicRatio); - float ysCluster = pslotBase->YPosition() - pslotBase->GlyphYOffset(psstrm); -- float xsInc = pslot->GlyphXOffset(psstrm, fakeItalicRatio); -- float ysInc = pslot->GlyphYOffset(psstrm); -- pslot->SetXPos(xsCluster + xsInc); -- pslot->SetYPos(ysCluster + ysInc); -+ float xsInc = pslotAtt->GlyphXOffset(psstrm, fakeItalicRatio); -+ float ysInc = pslotAtt->GlyphYOffset(psstrm); -+ pslotAtt->SetXPos(xsCluster + xsInc); -+ pslotAtt->SetYPos(ysCluster + ysInc); - - // My theory is that we don't need to adjust *pxsWidth here, because the width of - // any non-base slots should be factored into the advance width of their cluster ---- misc/silgraphite-2.3.1/engine/src/segment/GrTableManager.h Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrTableManager.h Sat Aug 22 19:36:35 2009 -@@ -442,7 +442,7 @@ - int LogToEmUnits(float xys); - bool GPointToXY(gid16 chwGlyphID, int nGPoint, float * xs, float * ys); - -- void CalcPositionsUpTo(int ipass, GrSlotState * pslotLast, -+ void CalcPositionsUpTo(int ipass, GrSlotState * pslotLast, bool fMidPass, - float * pxsWidth, float * pxsVisibleWidth); - - void InitPosCache() ---- misc/silgraphite-2.3.1/engine/src/segment/Platform.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/Platform.cpp Sat Aug 22 19:36:35 2009 -@@ -103,7 +103,7 @@ - { - // assumes NULL terminated strings - const utf16 *start = s; -- for (; *s; ++s); -+ for (; *s; ++s) {}; - - return s - start; - } ---- misc/silgraphite-2.3.1/engine/src/segment/Segment.cpp Thu Aug 21 16:24:32 2008 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp Sat Aug 22 19:36:35 2009 -@@ -1178,7 +1178,7 @@ - part of the segment. - ----------------------------------------------------------------------------------------------*/ - float Segment::getRangeWidth(int ichMin, int ichLim, -- bool fStartLine, bool fEndLine, bool fSkipSpace) -+ bool /*fStartLine*/, bool /*fEndLine*/, bool fSkipSpace) - { - if (m_dxsWidth < 0) - { -@@ -1549,7 +1549,11 @@ - void Segment::SetUpOutputArrays(Font * pfont, GrTableManager * ptman, - GrSlotStream * psstrmFinal, - int cchwInThisSeg, int csloutSurface, gid16 chwLB, -+#ifdef NDEBUG -+ TrWsHandling twsh, bool fParaRtl, int nDirDepth, bool /*fEmpty*/) -+#else - TrWsHandling twsh, bool fParaRtl, int nDirDepth, bool fEmpty) -+#endif - { - m_mFontEmUnits = EngineImpl()->GetFontEmUnits(); - -@@ -1725,7 +1729,7 @@ - Set up the data structures that represent the actual rendered glyphs for the new segment. - ----------------------------------------------------------------------------------------------*/ - void Segment::SetUpGlyphInfo(GrTableManager * ptman, GrSlotStream * psstrmFinal, -- gid16 chwLB, int nDirDepth, int islotMin, int cslot) -+ gid16 chwLB, int /*nDirDepth*/, int islotMin, int cslot) - { - //int paraDirLevel = (ptman->State()->ParaRightToLeft()) ? 1 : 0; - -@@ -1751,7 +1755,7 @@ - - m_isloutGinf0 = -1; - int iginf = 0; -- for (int islot = islotMin; islot < cslot; islot++) -+ for (islot = islotMin; islot < cslot; islot++) - { - GrSlotState * pslot = psstrmFinal->SlotAt(islot); - -@@ -2160,7 +2164,7 @@ - @param ichwUnder - character index relative to the official beginning of the segment - @param islot - processed glyph it maps to - ----------------------------------------------------------------------------------------------*/ --void Segment::MarkSlotInPrevSeg(int ichwUnder, int islot) -+void Segment::MarkSlotInPrevSeg(int ichwUnder, int /*islot*/) - { - if (ichwUnder >= m_ichwAssocsMin) - m_prgisloutBefore[ichwUnder - m_ichwAssocsMin] = kNegInfinity; -@@ -2174,7 +2178,7 @@ - @param ichwUnder - character index relative to the official beginning of the segment - @param islot - processed glyph it maps to - ----------------------------------------------------------------------------------------------*/ --void Segment::MarkSlotInNextSeg(int ichwUnder, int islot) -+void Segment::MarkSlotInNextSeg(int ichwUnder, int /*islot*/) - { - if (ichwUnder < m_ichwAssocsLim) - m_prgisloutAfter[ichwUnder - m_ichwAssocsMin] = kPosInfinity; -@@ -2351,7 +2355,7 @@ - @param pfAfter - return true if they clicked on trailing side; possibly NULL - ----------------------------------------------------------------------------------------------*/ - int Segment::LogicalSurfaceToUnderlying(int islout, float xsOffset, float ysClick, -- float dxsGlyphWidth, float dysGlyphHeight, bool * pfAfter) -+ float dxsGlyphWidth, float /*dysGlyphHeight*/, bool * pfAfter) - { - Assert(islout >= 0); - Assert(islout < m_cslout); -@@ -2529,31 +2533,31 @@ - else if (fBefore) - { - int isloutRet; -- int ichw = ichwSegOffset; -+ int ichwTemp = ichwSegOffset; - // If no association has been made, loop forward to the next slot - // we are before. As a last resort, answer kPosInfinity, meaning we - // aren't before anything. - do - { -- isloutRet = m_prgisloutBefore[ichw - m_ichwAssocsMin]; -- do { ++ichw; } -- while (!GrCharStream::AtUnicodeCharBoundary(m_pgts, ichw)); -- } while (isloutRet == kPosInfinity && ichw < m_ichwAssocsLim); -+ isloutRet = m_prgisloutBefore[ichwTemp - m_ichwAssocsMin]; -+ do { ++ichwTemp; } -+ while (!GrCharStream::AtUnicodeCharBoundary(m_pgts, ichwTemp)); -+ } while (isloutRet == kPosInfinity && ichwTemp < m_ichwAssocsLim); - return isloutRet; - } - else - { - int isloutRet; -- int ichw = ichwSegOffset; -+ int ichwTemp = ichwSegOffset; - // If no association has been made, loop backward to the previous slot - // we are after. As a last resort, answer kNegInfinity, meaning we - // aren't after anything. - do - { -- isloutRet = m_prgisloutAfter[ichw - m_ichwAssocsMin]; -- do { --ichw; } -- while (!GrCharStream::AtUnicodeCharBoundary(m_pgts, ichw)); -- } while (isloutRet == kNegInfinity && ichw >= 0); -+ isloutRet = m_prgisloutAfter[ichwTemp - m_ichwAssocsMin]; -+ do { --ichwTemp; } -+ while (!GrCharStream::AtUnicodeCharBoundary(m_pgts, ichwTemp)); -+ } while (isloutRet == kNegInfinity && ichwTemp >= 0); - return isloutRet; - } - Assert(false); // should never reach here -@@ -2748,7 +2752,11 @@ - that root glyph as one of its roots. - OBSOLETE - ----------------------------------------------------------------------------------------------*/ -+#ifdef _DEBUG - void Segment::AssertValidClusters(GrSlotStream * psstrm) -+#else -+void Segment::AssertValidClusters(GrSlotStream * /*psstrm*/) -+#endif - { - #ifdef _DEBUG - for (int islot = 0; islot < psstrm->WritePos(); islot++) ---- misc/silgraphite-2.3.1/engine/src/segment/TransductionLog.cpp Wed Jan 28 04:01:29 2009 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/TransductionLog.cpp Sat Aug 22 19:36:35 2009 -@@ -175,7 +175,7 @@ - Output a file showing a log of the transduction process and the resulting segment. - ----------------------------------------------------------------------------------------------*/ - void GrTableManager::WriteXductnLog(std::ostream & strmOut, -- GrCharStream * pchstrm, Segment * psegRet, -+ GrCharStream * pchstrm, Segment * /*psegRet*/, - int cbPrevSegDat, byte * pbPrevSegDat) - { - if (cbPrevSegDat == 0) -@@ -416,8 +416,8 @@ - the raw (UTF-16 or UTF-8) chars for display. To do this we get the raw characters - directly from the text source. - ----------------------------------------------------------------------------------------------*/ --void GrCharStream::GetLogDataRaw(GrTableManager * ptman, int cchl, int cchrBackup, -- int cchrMaxRaw, int * prgchl, -+void GrCharStream::GetLogDataRaw(GrTableManager * /*ptman*/, int cchl, int cchrBackup, -+ int /*cchrMaxRaw*/, int * prgchl, - utf16 * prgchw2, utf16 * prgchw3, utf16 * prgchw4, utf16 * prgchw5, utf16 * prgchw6, - int * prgcchr) - { -@@ -441,7 +441,7 @@ - case kutf8: - prgchsRunText8 = new utf8[cchrRange]; - m_pgts->fetch(ichrMin, cchrRange, prgchsRunText8); -- for (int ichr = 0; ichr < cchrRange; ichr++) -+ for (ichr = 0; ichr < cchrRange; ichr++) - prgchwRunText[ichr] = (utf16)prgchsRunText8[ichr]; // zero-extend into UTF-16 buffer - break; - case kutf16: -@@ -634,7 +634,7 @@ - m_pzpst->LogRulesFiredAndFailed(strmOut, psstrmIn); - } - --void PassState::LogRulesFiredAndFailed(std::ostream & strmOut, GrSlotStream * psstrmIn) -+void PassState::LogRulesFiredAndFailed(std::ostream & strmOut, GrSlotStream * /*psstrmIn*/) - { - - strmOut << "PASS " << m_ipass << "\n\n" << "Rules matched: "; -@@ -1193,7 +1193,7 @@ - if (fAnyPseudos) - { - strmOut << "Actual glyphs: "; -- for (int islout = 0; islout < m_cslout; islout++) -+ for (islout = 0; islout < m_cslout; islout++) - { - GrSlotOutput * psloutTmp = m_prgslout + islout; - if (psloutTmp->GlyphID() != psloutTmp->ActualGlyphForOutput(ptman)) -@@ -1319,7 +1319,7 @@ - Write out the header lines for the slot contents. - ----------------------------------------------------------------------------------------------*/ - void GrTableManager::LogSlotHeader(std::ostream & strmOut, int islotLim, -- int cspPerSlot, int cspLeading, int islotMin) -+ int /*cspPerSlot*/, int cspLeading, int islotMin) - { - islotLim = min(islotLim, MAX_SLOTS); - -@@ -1721,7 +1721,7 @@ - - case kslatAttAtX: // always do these in pairs - case kslatAttAtY: -- if (m_mAttachAtX != (pslotPrev ? pslotPrev->m_mAttachAtX : kNotYetSet) || -+ if (m_mAttachAtX != (pslotPrev ? pslotPrev->m_mAttachAtX : static_cast(kNotYetSet)) || - m_mAttachAtY != (pslotPrev ? pslotPrev->m_mAttachAtY : 0)) - { - ptman->LogInTable(strmOut, -@@ -1730,7 +1730,7 @@ - } - break; - case kslatAttAtGpt: -- if (m_nAttachAtGpoint != (pslotPrev ? pslotPrev->m_nAttachAtGpoint : kNotYetSet)) -+ if (m_nAttachAtGpoint != (pslotPrev ? pslotPrev->m_nAttachAtGpoint : static_cast(kNotYetSet))) - { - ptman->LogInTable(strmOut, - ((m_nAttachAtGpoint == kGpointZero) ? 0 : m_nAttachAtGpoint)); -@@ -1750,7 +1750,7 @@ - - case kslatAttWithX: // always do these in pairs - case kslatAttWithY: -- if (m_mAttachWithX != (pslotPrev ? pslotPrev->m_mAttachWithX : kNotYetSet) || -+ if (m_mAttachWithX != (pslotPrev ? pslotPrev->m_mAttachWithX : static_cast(kNotYetSet)) || - m_mAttachWithY != (pslotPrev ? pslotPrev->m_mAttachWithY : 0)) - { - ptman->LogInTable(strmOut, -@@ -1759,7 +1759,7 @@ - } - break; - case kslatAttWithGpt: -- if (m_nAttachWithGpoint != (pslotPrev ? pslotPrev->m_nAttachWithGpoint : kNotYetSet)) -+ if (m_nAttachWithGpoint != (pslotPrev ? pslotPrev->m_nAttachWithGpoint : static_cast(kNotYetSet))) - { - ptman->LogInTable(strmOut, - ((m_nAttachWithGpoint == kGpointZero) ? 0 : m_nAttachWithGpoint)); -@@ -1786,14 +1786,14 @@ - break; - - case kslatBreak: -- if (m_lb != (pslotPrev ? pslotPrev->m_lb : kNotYetSet8)) -+ if (m_lb != (pslotPrev ? pslotPrev->m_lb : static_cast(kNotYetSet8))) - { - ptman->LogBreakWeightInTable(strmOut, m_lb); - return; - } - break; - case kslatDir: -- if (m_dirc != (pslotPrev ? pslotPrev->m_dirc : kNotYetSet8)) -+ if (m_dirc != (pslotPrev ? pslotPrev->m_dirc : static_cast(kNotYetSet8))) - { - ptman->LogDirCodeInTable(strmOut, m_dirc); - return; ---- misc/silgraphite-2.3.1/engine/test/ProfileHarness/GrUtfTextSrc.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/ProfileHarness/GrUtfTextSrc.cpp Sat Aug 22 19:36:35 2009 -@@ -210,12 +210,12 @@ - } - - --bool GrUtfTextSrc::getRightToLeft(gr::toffset ich) -+bool GrUtfTextSrc::getRightToLeft(gr::toffset /*ich*/) - { - return mRtl; // assumes src only contains one direction - } - --unsigned int GrUtfTextSrc::getDirectionDepth(gr::toffset ich) -+unsigned int GrUtfTextSrc::getDirectionDepth(gr::toffset /*ich*/) - { - return (mRtl) ? 1 : 0; // TBD - } -@@ -254,7 +254,7 @@ - return range; - } - --size_t GrUtfTextSrc::getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset) -+size_t GrUtfTextSrc::getFontFeatures(gr::toffset /*ich*/, gr::FeatureSetting * /*prgfset*/) - { - return 0; - } -@@ -277,14 +277,14 @@ - - // these should be called I hope - float --GrUtfTextSrc::getFontSize(gr::toffset ich) -+GrUtfTextSrc::getFontSize(gr::toffset /*ich*/) - { - assert(mFont); - return mPointSize; - } - - bool --GrUtfTextSrc::getBold(gr::toffset ich) -+GrUtfTextSrc::getBold(gr::toffset /*ich*/) - { - assert(mFont); - // NS_ASSERTION(false, "unexpected call to getBold"); -@@ -293,7 +293,7 @@ - } - - bool --GrUtfTextSrc::getItalic(gr::toffset ich) -+GrUtfTextSrc::getItalic(gr::toffset /*ich*/) - { - assert(mFont); - //NS_ASSERTION(false, "unexpected call to getItalic"); -@@ -301,7 +301,7 @@ - return mFont->italic(); - } - --gr::isocode GrUtfTextSrc::getLanguage(gr::toffset ich) -+gr::isocode GrUtfTextSrc::getLanguage(gr::toffset /*ich*/) - { - gr::isocode unknown; - std::fill_n(unknown.rgch, 4, '\0'); ---- misc/silgraphite-2.3.1/engine/test/ProfileHarness/GrUtfTextSrc.h Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/ProfileHarness/GrUtfTextSrc.h Sat Aug 22 19:36:35 2009 -@@ -79,7 +79,7 @@ - virtual size_t fetch(gr::toffset ichMin, size_t cch, gr::utf32 * prgchBuffer); - virtual size_t fetch(gr::toffset ichMin, size_t cch, gr::utf16 * prgchwBuffer); - virtual size_t fetch(gr::toffset ichMin, size_t cch, gr::utf8 * prgchsBuffer); -- virtual gr::GrResult getFaceName(int ich, unsigned int cchMax, -+ virtual gr::GrResult getFaceName(int /*ich*/, unsigned int /*cchMax*/, - gr::utf16 * prgchFaceName, unsigned int * pcchLen) - { - prgchFaceName[0] = 0; -@@ -92,12 +92,12 @@ - virtual bool getItalic(gr::toffset ich); - virtual bool getRightToLeft(gr::toffset ich); - virtual unsigned int getDirectionDepth(gr::toffset ich); -- virtual float getVerticalOffset(gr::toffset ich) { return 0;}; -+ virtual float getVerticalOffset(gr::toffset /*ich*/) { return 0;}; - virtual gr::isocode getLanguage(gr::toffset ich); - - virtual std::pair propertyRange(gr::toffset ich); - virtual size_t getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset); -- virtual bool sameSegment(gr::toffset ich1, gr::toffset ich2) { return true; }; -+ virtual bool sameSegment(gr::toffset /*ich1*/, gr::toffset /*ich2*/) { return true; }; - - protected: - bool checkBuffer8(); -@@ -129,11 +129,11 @@ - virtual void getColors(gr::toffset ich, int * pclrFore, int * pclrBack); - - // Shouldn't be here! -- virtual gr::GrResult Fetch(int ichMin, int ichLim, gr::utf16 * prgchBuf) { return gr::kresNotImpl; }; -- virtual gr::GrResult get_Length(int * pcch) { return gr::kresNotImpl; }; -- virtual gr::GrResult GetFontVariations(int ich, -- wchar_t * prgchFontVar, int ichMax, int * pich, -- int * pichMin, int * pichLim) { return gr::kresNotImpl; }; -+ virtual gr::GrResult Fetch(int /*ichMin*/, int /*ichLim*/, gr::utf16 * /*prgchBuf*/) { return gr::kresNotImpl; }; -+ virtual gr::GrResult get_Length(int * /*pcch*/) { return gr::kresNotImpl; }; -+ virtual gr::GrResult GetFontVariations(int /*ich*/, -+ wchar_t * /*prgchFontVar*/, int /*ichMax*/, int * /*pich*/, -+ int * /*pichMin*/, int * /*pichLim*/) { return gr::kresNotImpl; }; - - }; - ---- misc/silgraphite-2.3.1/engine/test/ProfileHarness/ProfileHarness.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/ProfileHarness/ProfileHarness.cpp Sat Aug 22 19:36:35 2009 -@@ -39,14 +39,14 @@ - typedef std::pair< gr::GlyphIterator, gr::GlyphIterator > GlyphRange; - - #ifndef HAVE_STRTOF --float strtof(char * text, char ** ignore) -+float strtof(char * text, char ** /*ignore*/) - { - return static_cast(atof(text)); - } - #endif - - #ifndef HAVE_STRTOL --long strtol(char * text, char ** ignore) -+long strtol(char * text, char ** /*ignore*/) - { - return atol(text); - } ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp Sat Aug 22 19:36:35 2009 -@@ -327,7 +327,7 @@ - &dxStretchAchieved); - for (int iiiGlyph = 0; iiiGlyph < cStretchable; iiiGlyph++) - { -- int iiGlyph = viiGlyphsRem[iiiGlyph]; -+ iiGlyph = viiGlyphsRem[iiiGlyph]; - vdxStretchLeft[iiGlyph] = vdxStretchRem[iiiGlyph]; - vdxWidth[iiGlyph] = vdxWidthRem[iiiGlyph]; - } ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp Sat Aug 22 19:36:35 2009 -@@ -675,7 +675,7 @@ - OutputErrorAux(ptcase, strErr, i, true, valueFound, valueExpected); - } - --void OutputErrorAux(TestCase * ptcase, std::string strErr, int i, -+void OutputErrorAux(TestCase * /*ptcase*/, std::string strErr, int i, - bool showValues, int valueFound, int valueExpected) - { - // if (g_debugMode) ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp Sat Aug 22 19:36:36 2009 -@@ -70,7 +70,7 @@ - /*---------------------------------------------------------------------------------------------- - Return true if the text uses a right-to-left writing system. - ----------------------------------------------------------------------------------------------*/ --bool SimpleTextSrc::getRightToLeft(toffset ich) -+bool SimpleTextSrc::getRightToLeft(toffset /*ich*/) - { - return false; - } -@@ -78,7 +78,7 @@ - /*---------------------------------------------------------------------------------------------- - Return the depth of embedding of the writing system. - ----------------------------------------------------------------------------------------------*/ --unsigned int SimpleTextSrc::getDirectionDepth(toffset ich) -+unsigned int SimpleTextSrc::getDirectionDepth(toffset /*ich*/) - { - return 0; - } -@@ -87,7 +87,7 @@ - Return the vertical offset of the text. This simple implementation provides no - vertical offset. - ----------------------------------------------------------------------------------------------*/ --float SimpleTextSrc::getVerticalOffset(toffset ich) -+float SimpleTextSrc::getVerticalOffset(toffset /*ich*/) - { - return 0; - } ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h Thu Jan 22 00:36:42 2009 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h Sat Aug 22 19:36:36 2009 -@@ -59,12 +59,12 @@ - { - return m_cchLength; - } -- virtual size_t fetch(toffset ichMin, size_t cch, utf32 * prgchBuffer) -+ virtual size_t fetch(toffset /*ichMin*/, size_t /*cch*/, utf32 * /*prgchBuffer*/) - { - throw; - } - virtual size_t fetch(toffset ichMin, size_t cch, gr::utf16 * prgchwBuffer); -- virtual size_t fetch(toffset ichMin, size_t cch, utf8 * prgchsBuffer) -+ virtual size_t fetch(toffset /*ichMin*/, size_t /*cch*/, utf8 * /*prgchsBuffer*/) - { - throw; - }; -@@ -73,14 +73,14 @@ - virtual unsigned int getDirectionDepth(toffset ich); - virtual float getVerticalOffset(toffset ich); - -- virtual isocode getLanguage(toffset ich) -+ virtual isocode getLanguage(toffset /*ich*/) - { - isocode ret; - ret.rgch[0] = 'e'; ret.rgch[1] = 'n'; ret.rgch[2] = 0; ret.rgch[3] = 0; - return ret; - } - -- virtual std::pair propertyRange(toffset ich) -+ virtual std::pair propertyRange(toffset /*ich*/) - { - std::pair pairRet; - pairRet.first = 0; -@@ -88,16 +88,16 @@ - return pairRet; - } - -- virtual size_t getFontFeatures(toffset ich, FeatureSetting * prgfset) -+ virtual size_t getFontFeatures(toffset /*ich*/, FeatureSetting * /*prgfset*/) - { - return 0; // no features in this simple implementation - } -- virtual bool sameSegment(toffset ich1, toffset ich2) -+ virtual bool sameSegment(toffset /*ich1*/, toffset /*ich2*/) - { - return true; - } - -- virtual void getColors(toffset ich, int * pclrFore, int * pclrBack) -+ virtual void getColors(toffset /*ich*/, int * pclrFore, int * pclrBack) - { - *pclrFore = kclrBlack; - *pclrBack = kclrTransparent; ---- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp Thu Jan 29 10:33:19 2009 -+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp Sat Aug 22 19:36:36 2009 -@@ -70,6 +72,7 @@ - // But don't store m_hfont, because we don't really "own" it; the client is - // responsible for releasing it. - m_hfont = 0; -+ m_pGlyphMetricMap = NULL; - memset(&m_fpropSet, 0, sizeof(m_fpropSet)); - - m_pbCmapTbl = NULL; -@@ -196,6 +198,7 @@ - m_hdc = 0; - m_hfont = 0; - m_hfontClient = 0; -+ m_pGlyphMetricMap = NULL; - memset(&m_fpropSet, 0, sizeof(FontProps)); - - m_pbCmapTbl = NULL; -@@ -408,7 +410,7 @@ - if (pPolyCurve->wType == TT_PRIM_QSPLINE && - // test if this is the last curve - pPolyHdr->cb - (int)((byte *)(&pPolyCurve->apfx[j]) - (byte *)(pPolyHdr)) -- == sizeof POINTFX && -+ == sizeof (POINTFX) && - // and the two points are identical - CompareFixed(pPolyCurve->apfx[j].x, pPolyHdr->pfxStart.x) && - CompareFixed(pPolyCurve->apfx[j].y, pPolyHdr->pfxStart.y)) -@@ -457,6 +459,16 @@ - ----------------------------------------------------------------------------------------------*/ - void WinFont::getGlyphMetrics(gid16 chw, gr::Rect & boundingBox, gr::Point & advances) - { -+ if (m_pGlyphMetricMap) -+ { -+ GlyphMetricMap::iterator i = m_pGlyphMetricMap->find(chw); -+ if (i != m_pGlyphMetricMap->end()) -+ { -+ boundingBox = i->second.first; -+ advances = i->second.second; -+ return; -+ } -+ } - GLYPHMETRICS gm; - const MAT2 mat2 = {{0,1}, {0,0}, {0,0}, {0,1}}; - if (GDI_ERROR == ::GetGlyphOutline(m_hdc, chw, GGO_GLYPH_INDEX | GGO_METRICS, -@@ -474,6 +476,10 @@ - boundingBox.bottom = (float)gm.gmptGlyphOrigin.y - gm.gmBlackBoxY; - advances.x = gm.gmCellIncX; - advances.y = gm.gmCellIncY; -+ if (m_pGlyphMetricMap) -+ { -+ (*m_pGlyphMetricMap)[chw] = std::pair(boundingBox, advances); -+ } - } - - /*---------------------------------------------------------------------------------------------- -@@ -618,7 +620,10 @@ - - static int cCreateFontCalls = 0; - static int cCreateFontZero = 0; -- HFONT hfont = g_fhc.GetFont(lf); -+ FontHandleCache::FontCacheValue cache = g_fhc.GetCache(lf); -+ HFONT hfont = cache.hfont; -+ m_pGlyphMetricMap = cache.pGlyphMetricMap; -+ //HFONT hfont = g_fhc.GetFont(lf); - //char ch1[200]; - //if (hfont == 0) - //{ -@@ -731,7 +733,7 @@ - @param lf LOGFONT value that describes the desired font - @return Font handle - ----------------------------------------------------------------------------------------------*/ --HFONT WinFont::FontHandleCache::GetFont(LOGFONT & lf) -+WinFont::FontHandleCache::FontCacheValue WinFont::FontHandleCache::GetCache(LOGFONT & lf) - { - FontCacheValue fcv; - FontHandleHashMap::iterator itFound = m_hmlffcv.find(lf); -@@ -752,11 +754,12 @@ - THROW(kresFail); - - fcv.nRefs = 1; -+ fcv.pGlyphMetricMap = new GlyphMetricMap(); - - m_hmlffcv.insert(std::pair(lf, fcv)); - } - -- return fcv.hfont; -+ return fcv; - } - - /*---------------------------------------------------------------------------------------------- -@@ -767,7 +767,7 @@ - ----------------------------------------------------------------------------------------------*/ - void WinFont::FontHandleCache::DeleteFont(HFONT hfont) - { -- if (!hfont || !m_bValid) -+ if (!hfont || !m_bValid || m_hmlffcv.size() == 0) - return; - - // find the font in the hash map -@@ -782,6 +784,8 @@ - { - // delete font - ::DeleteObject(hfont); -+ if (fcv.pGlyphMetricMap) -+ delete fcv.pGlyphMetricMap; - m_hmlffcv.erase(it); - } - else -@@ -832,7 +832,8 @@ - bool WinFont::LogFontHashFuncs::operator() (const WinFont::LogFontWrapper & key1, - const WinFont::LogFontWrapper & key2) const - { -- return (key1 == key2); -+ // return true if key1 should be ordered before key2 -+ return (operator()(key1) < operator()(key2)); - } - - /*-------------------------------------------------------------------------------------- ---- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h Thu Jan 29 10:33:19 2009 -+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h Sat Aug 22 19:36:36 2009 -@@ -27,7 +27,13 @@ - #include "GrClient.h" - #include "Font.h" -+#include - -+#ifdef _STLPORT_VERSION -+namespace stdext = _STLP_STD; -+#endif -+ - namespace gr - { -+typedef std::map > GlyphMetricMap; - - class FontFace; -@@ -100,6 +110,7 @@ - HFONT m_hfontClient; // need to replace this HFONT into the DC when we are finished - // with it - -+ GlyphMetricMap * m_pGlyphMetricMap; - // Debugging: - //OLECHAR m_rgchTemp[32]; - -@@ -185,11 +196,13 @@ - class FontHandleCache // hungarian: fhc - { - public: -- struct FontCacheValue -+ struct FontCacheValue - { - int nRefs; // reference count - HFONT hfont; // font handle - -+ GlyphMetricMap * pGlyphMetricMap; // glyph metrics -+ - bool operator==(const FontCacheValue & val) const - { - return (hfont == val.hfont); -@@ -199,7 +212,8 @@ - FontHandleCache() : m_bValid(true) {}; - ~FontHandleCache(); - -- HFONT GetFont(LOGFONT & lf); -+ //HFONT GetFont(LOGFONT & lf); -+ FontCacheValue GetCache(LOGFONT & lf); - void DeleteFont(HFONT hfont); - - typedef stdext::hash_map FontHandleHashMap; ---- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RtTextSrc.h~ 2009-01-22 05:06:42.000000000 +0630 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RtTextSrc.h 2010-04-30 23:14:49.000000000 +0630 -@@ -44,18 +44,18 @@ - } - } - -- virtual size_t getFontFeatures(toffset ich, FeatureSetting * prgfset) -+ virtual size_t getFontFeatures(toffset /*ich*/, FeatureSetting * prgfset) - { - // Note: size of prgfset buffer = gr::kMaxFeatures = 64 - std::copy(m_fset, m_fset + MAXFEAT, prgfset); - return m_cFeats; - } - -- virtual bool getRightToLeft(toffset ich) -+ virtual bool getRightToLeft(toffset /*ich*/) - { - return m_fRtl; - } -- virtual unsigned int getDirectionDepth(toffset ich) -+ virtual unsigned int getDirectionDepth(toffset /*ich*/) - { - return ((m_fRtl == 1) ? 1 : 0); - } - ---- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2010-06-21 12:55:34.000000000 +0630 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2010-06-21 13:16:59.000000000 +0630 -@@ -16,8 +16,9 @@ - //:> Include files - //:>******************************************************************************************** - //#include "main.h" // This is used by clients, so main.h is not available -- -+#ifdef _MSC_VER - #pragma hdrstop -+#endif - // any other headers (not precompiled) - #include "GrClient.h" - #include "ITextSource.h" -@@ -31,9 +32,6 @@ - #include - #endif - --#undef THIS_FILE --DEFINE_THIS_FILE -- - //:>******************************************************************************************** - //:> Global constants - //:>******************************************************************************************** -@@ -327,9 +325,9 @@ - &dxStretchAchieved); - for (int iiiGlyph = 0; iiiGlyph < cStretchable; iiiGlyph++) - { -- iiGlyph = viiGlyphsRem[iiiGlyph]; -- vdxStretchLeft[iiGlyph] = vdxStretchRem[iiiGlyph]; -- vdxWidth[iiGlyph] = vdxWidthRem[iiiGlyph]; -+ int ivGlyph = viiGlyphsRem[iiiGlyph]; -+ vdxStretchLeft[ivGlyph] = vdxStretchRem[iiiGlyph]; -+ vdxWidth[ivGlyph] = vdxWidthRem[iiiGlyph]; - } - } - else -@@ -366,12 +364,12 @@ - { - #ifdef WIN32 - wchar_t rgchw[20]; -- std::fill_n(rgchw, 20, 0); -+ std::fill_n(rgchw, 20, L'\0'); - _itow(dxStretchNeeded - dxStretchAchieved, rgchw, 10); - std::wstring strTmp(L"justification failed by "); - strTmp += rgchw; - strTmp += L" units (width needed = "; -- std::fill_n(rgchw, 10, 0); -+ std::fill_n(rgchw, 10, L'\0'); - _itow(dxDesiredWidth, rgchw, 10); - strTmp += rgchw; - strTmp += L")\n"; ---- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.h 2009-01-22 05:06:42.000000000 +0630 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.h 2010-06-21 13:16:49.000000000 +0630 -@@ -11,7 +11,9 @@ - Description: - A default justification agent for Graphite. - -------------------------------------------------------------------------------*//*:End Ignore*/ -+#ifdef _MSC_VER - #pragma once -+#endif - #ifndef GRJUSTIFIER_INCLUDED - #define GRJUSTIFIER_INCLUDED - ---- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h 2010-06-21 12:55:34.000000000 +0630 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h 2010-06-21 13:18:12.000000000 +0630 -@@ -11,7 +11,9 @@ - Description: - A simple text source that shows how to use this interface within Graphite. - -------------------------------------------------------------------------------*//*:End Ignore*/ -+#ifdef _MSC_VER - #pragma once -+#endif - #ifndef GRTXTSRC_INCLUDED - #define GRTXTSRC_INCLUDED - - ---- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp 2010-06-21 12:55:34.000000000 +0630 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp 2010-06-21 13:18:24.000000000 +0630 -@@ -15,7 +15,9 @@ - //:>******************************************************************************************** - //:> Include files - //:>******************************************************************************************** -+#ifdef _MSC_VER - #pragma hdrstop -+#endif - // any other headers (not precompiled) - - #include "GrClient.h" -@@ -23,9 +25,6 @@ - #include "ITextSource.h" - #include "SimpleTextSrc.h" - --#undef THIS_FILE --DEFINE_THIS_FILE -- - //:>******************************************************************************************** - //:> Initialization and destruction - //:>******************************************************************************************** ---- misc/build/silgraphite-2.3.1/engine/src/segment/MemoryUsage.cpp 2009-01-22 05:06:42.000000000 +0630 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/MemoryUsage.cpp 2010-06-21 13:36:36.000000000 +0630 -@@ -11,10 +11,10 @@ - Description: - Calculates memory usage for the engine and segments. - ----------------------------------------------------------------------------------------------*/ -- -+#ifdef _MSC_VER - #pragma warning(disable: 4244) // conversion from wchar_t to char - #pragma warning(disable: 4702) // unreachable code -- -+#endif - //:>******************************************************************************************** - //:> Include files - //:>******************************************************************************************** -@@ -54,8 +54,6 @@ - #ifdef _MSC_VER - #pragma hdrstop - #endif --#undef THIS_FILE --DEFINE_THIS_FILE - - //:End Ignore - ---- misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 2010-06-23 19:52:56.429060400 +0700 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 2010-05-25 11:51:15.195066300 +0700 -@@ -48,7 +48,7 @@ - { - } - -- ~GrSlotAbstract() -+ virtual ~GrSlotAbstract() - { - // the table manager is responsible for destroying the contents of m_prgnVarLenBuf - } -@@ -231,7 +231,7 @@ - ZapCompositeMetrics(); - } - -- ~GrSlotState() -+ virtual ~GrSlotState() - { - } - ---- misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp.bak 2010-06-23 19:59:54.611660400 +0700 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp 2010-06-23 21:30:16.335460400 +0700 -@@ -246,6 +246,8 @@ - - m_dxsVisibleWidth = -1; - m_dxsTotalWidth = -1; -+ m_ichwAssocsMin = 0; -+ m_ichwAssocsLim = 0; - - // m_psstrm = NULL; - m_prgslout = NULL; -@@ -2988,9 +2988,10 @@ - return kresOk; - } - -- -+#ifdef __GNUC__ - // suppress GCC 4.3 warning for optimized min()/max() when called with (ich, ich+1) or similar - #pragma GCC diagnostic ignored "-Wstrict-overflow" -+#endif - - /*---------------------------------------------------------------------------------------------- - Merge the given characters into the same Uniscribe cluster. This means merging any ---- misc/build/silgraphite-2.3.1/wrappers/win32/win32_dll.cpp.bak 2008-05-09 18:10:30.000000000 +0700 -+++ misc/build/silgraphite-2.3.1/wrappers/win32/win32_dll.cpp 2010-05-10 15:46:54.291818000 +0700 -@@ -14,7 +14,7 @@ - DllMain. This is the main DLL entry point for a non-MFC DLL. For an MFC DLL, DllMain is - in DllModul.cpp. Both DllMains call ModuleEntry::DllMain. - ----------------------------------------------------------------------------------------------*/ --extern "C" BOOL WINAPI DllMain(HMODULE hmod, DWORD dwReason, PVOID pvReserved) -+extern "C" BOOL WINAPI DllMain(HMODULE hmod, DWORD dwReason, PVOID /*pvReserved*/) - { - bool fRet = true; - diff --git a/graphite/graphite-2.3.1.patch.mingw b/graphite/graphite-2.3.1.patch.mingw deleted file mode 100644 index c5fc3ecdf252..000000000000 --- a/graphite/graphite-2.3.1.patch.mingw +++ /dev/null @@ -1,159 +0,0 @@ ---- misc/silgraphite-2.3.1/engine/config/ltmain.sh 2009-01-28 11:21:59.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/engine/config/ltmain.sh 2009-08-23 20:59:13.180125000 +0900 -@@ -3963,7 +3963,7 @@ - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) -- absdir=`cd "$dir" && pwd` -+ absdir=`cygpath -m -a "$dir"` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" ---- misc/silgraphite-2.3.1/engine/src/Makefile.in 2009-01-28 11:25:00.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/engine/src/Makefile.in 2009-08-23 20:59:13.742625000 +0900 -@@ -62,7 +62,8 @@ - GrFSM.lo GrGlyphTable.lo GrPassActionCode.lo GrPass.lo \ - GrSlotState.lo GrSlotStream.lo GrTableManager.lo \ - MemoryUsage.lo Platform.lo SegmentAux.lo Segment.lo TestFSM.lo \ -- TestPasses.lo TransductionLog.lo SegmentPainter.lo -+ TestPasses.lo TransductionLog.lo SegmentPainter.lo WinFont.lo \ -+ WinSegmentPainter.lo - libgraphite_la_OBJECTS = $(am_libgraphite_la_OBJECTS) - libgraphite_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -@@ -257,11 +258,14 @@ - $(segmentdir)/Platform.cpp $(segmentdir)/SegmentAux.cpp \ - $(segmentdir)/Segment.cpp $(segmentdir)/TestFSM.cpp \ - $(segmentdir)/TestPasses.cpp $(segmentdir)/TransductionLog.cpp \ -- $(painterdir)/SegmentPainter.cpp -+ $(painterdir)/SegmentPainter.cpp \ -+ $(winwrapperdir)/WinFont.cpp \ -+ $(winwrapperdir)/WinSegmentPainter.cpp - genericdir = $(top_srcdir)/src/generic - fontdir = $(top_srcdir)/src/font - segmentdir = $(top_srcdir)/src/segment - painterdir = $(top_srcdir)/src/painter -+winwrapperdir = $(top_srcdir)/../wrappers/win32 - all: all-am - - .SUFFIXES: -@@ -358,6 +362,8 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TransductionLog.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TtfUtil.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinFont.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinSegmentPainter.Plo@am__quote@ - - .cpp.o: - @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -569,6 +575,20 @@ - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SegmentPainter.lo `test -f '$(painterdir)/SegmentPainter.cpp' || echo '$(srcdir)/'`$(painterdir)/SegmentPainter.cpp - -+WinFont.lo: $(winwrapperdir)/WinFont.cpp -+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinFont.lo -MD -MP -MF $(DEPDIR)/WinFont.Tpo -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/WinFont.Tpo $(DEPDIR)/WinFont.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinFont.cpp' object='WinFont.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp -+ -+WinSegmentPainter.lo: $(winwrapperdir)/WinSegmentPainter.cpp -+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinSegmentPainter.lo -MD -MP -MF $(DEPDIR)/WinSegmentPainter.Tpo -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/WinSegmentPainter.Tpo $(DEPDIR)/WinSegmentPainter.Plo -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinSegmentPainter.cpp' object='WinSegmentPainter.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp -+ - mostlyclean-libtool: - -rm -f *.lo - ---- misc/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-01-22 07:36:42.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-08-23 20:59:14.148875000 +0900 -@@ -208,7 +208,11 @@ - } - // } - #elif 1 -+#ifdef __MINGW32__ -+ m_stuFaceName.assign(reinterpret_cast(rgchwFace)); -+#else - m_stuFaceName.assign(rgchwFace); -+#endif - #else // VS 2005 needs this: - for (int cch16 = 0; cch16 < cchw; cch16++) - m_stuFaceName.push_back(rgchwFace[cch16]); ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-01-22 07:36:42.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-08-23 20:59:15.445750000 +0900 -@@ -375,7 +375,7 @@ - _itow(dxDesiredWidth, rgchw, 10); - strTmp += rgchw; - strTmp += L")\n"; -- OutputDebugString(strTmp.c_str()); -+ OutputDebugStringW(strTmp.c_str()); - #else - Assert(fprintf(stderr, - "justification failed by %d units (width needed = %d)\n", ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp 2009-01-22 07:36:42.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp 2009-08-23 20:59:15.711375000 +0900 -@@ -56,7 +56,7 @@ - - int main(int argc, char* argv[]) - { --#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW32__) - _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); - #endif // WIN32 - ---- misc/silgraphite-2.3.1/engine/test/RegressionTest/main.h 2009-01-29 17:33:19.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/main.h 2009-08-23 20:59:15.945750000 +0900 -@@ -36,7 +36,7 @@ - ////#include - #include - #include --#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW32__) - #include - #endif // _WIN32 - #include ---- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-01-29 17:33:19.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-08-23 20:59:16.211375000 +0900 -@@ -846,7 +846,7 @@ - - } // namespace gr - --template stdext::hash_map< -+template class stdext::hash_map< - gr::WinFont::LogFontWrapper, - gr::WinFont::FontHandleCache::FontCacheValue, - gr::WinFont::LogFontHashFuncs>; ---- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-01-29 17:33:19.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-08-23 20:59:16.367625000 +0900 -@@ -17,6 +17,9 @@ - #endif - #ifndef WINFONT_INCLUDED - #define WINFONT_INCLUDED -+#if __GNUC__ >=3 -+#pragma GCC system_header -+#endif - - //:End Ignore - -@@ -27,6 +30,8 @@ - #include "GrClient.h" - #include "Font.h" - -+namespace stdext = std; -+ - #ifdef _STLPORT_VERSION - namespace stdext = _STLP_STD; - #endif ---- misc/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2008-05-09 20:10:30.000000000 +0900 -+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2009-08-23 21:14:38.961375000 +0900 -@@ -82,7 +82,7 @@ - // return ::SetBkColor(hdc, PALETTERGB(GetRValue(clr), GetGValue(clr), GetBValue(clr))); - //} - -- void WinSegmentPainter::paintAux(); -+ void paintAux(); - - protected: - // member variables: diff --git a/graphite/graphite-removeobsolete.patch b/graphite/graphite-removeobsolete.patch deleted file mode 100644 index 3dcfb36a10c3..000000000000 --- a/graphite/graphite-removeobsolete.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- misc/silgraphite-2.3.1.orig/engine/include/graphite/Segment.h -+++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h -@@ -142,7 +142,6 @@ - LineBrk lbStart, LineBrk lbEnd, SegEnd est, - bool fStartLine, bool fEndLine, bool fWsRtl); - void DestroyContents(); -- void SwapWith(Segment * pgrseg); - void ClearAltEndLineSeg(); - - ITextSource * GetString(); // client is responsible to Release() ---- misc/silgraphite-2.3.1.orig/engine/src/segment/Segment.cpp -+++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp -@@ -569,21 +569,6 @@ - } - - /*---------------------------------------------------------------------------------------------- -- Swap the guts of the two segments. -- OBSOLETE ------------------------------------------------------------------------------------------------*/ --void Segment::SwapWith(Segment * pgrseg) --{ -- int crefThis = m_cref; -- int crefOther = pgrseg->m_cref; -- -- std::swap(*this, *pgrseg); -- -- m_cref = crefThis; -- pgrseg->m_cref = crefOther; --} -- --/*---------------------------------------------------------------------------------------------- - Delete the pointer to the alternate-end-of-line segment. - ----------------------------------------------------------------------------------------------*/ - void Segment::ClearAltEndLineSeg() diff --git a/graphite/graphite-updatewerror.patch b/graphite/graphite-updatewerror.patch deleted file mode 100644 index 6d812b6f254a..000000000000 --- a/graphite/graphite-updatewerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/silgraphite-2.3.1.orig/engine/configure -+++ misc/build/silgraphite-2.3.1/engine/configure -@@ -16877,7 +16877,7 @@ - # (note: the flags here are gcc-specific and may fail with other compilers) - build_flags="" - if test "$enable_debug" = yes; then -- build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses -Werror" -+ build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses" - elif test "$enable_strict" = yes; then - build_flags="$build_flags -DNDEBUG -Wall -Wno-unknown-pragmas -Wparentheses -Werror" - else diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch new file mode 100644 index 000000000000..ef7e4b2f0a0f --- /dev/null +++ b/graphite/graphite2-0.9.2.patch @@ -0,0 +1,370 @@ +diff -r 5369cdd12120 CMakeLists.txt +--- misc/build/graphite2-0.9.2/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700 +@@ -61,7 +61,7 @@ + add_subdirectory(gr2fonttest) + add_subdirectory(tests) + add_subdirectory(doc) +-set(version 0.0.0) ++set(version 2.0.0) + set(libdir ${CMAKE_INSTALL_PREFIX}/lib) + set(includedir ${CMAKE_INSTALL_PREFIX}/include) + +diff -r 5369cdd12120 gr2fonttest/gr2FontTest.cpp +--- misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -758,13 +758,11 @@ + float advanceWidth = gr_seg_advance_X(pSeg); + fprintf(log, "Advance width = %6.1f\n", advanceWidth); + unsigned int numchar = gr_seg_n_cinfo(pSeg); +- gr_uint32 *firsts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32)); +- gr_uint32 *lasts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32)); +- gr_seg_char_slots(pSeg, firsts, lasts, 0, 0); + fprintf(log, "\nChar\tUnicode\tBefore\tAfter\n"); + for (unsigned int j = 0; j < numchar; j++) + { +- fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(gr_seg_cinfo(pSeg, j)), firsts[j], lasts[j]); ++ const gr_char_info *c = gr_seg_cinfo(pSeg, j); ++ fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(c), gr_cinfo_before(c), gr_cinfo_after(c)); + } + free(map); + gr_seg_destroy(pSeg); +diff -r 5369cdd12120 include/graphite2/Segment.h +--- misc/build/graphite2-0.9.2/include/graphite2/Segment.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/include/graphite2/Segment.h Fri Feb 18 16:05:40 2011 +0700 +@@ -135,6 +135,20 @@ + */ + GR2_API int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/); + ++/** Returns the slot index that after this character is after in the slot stream ++ * ++ * @return after slot index between 0 and gr_seg_n_slots() ++ * @param p Pointer to charinfo to return information on. ++ */ ++GR2_API int gr_cinfo_after(const gr_char_info* p/*not NULL*/); ++ ++/** Returns the slot index that before this character is before in the slot stream ++ * ++ * @return before slot index between 0 and gr_seg_n_slots() ++ * @param p Pointer to charinfo to return information on. ++ */ ++GR2_API int gr_cinfo_before(const gr_char_info* p/*not NULL*/); ++ + /** Returns the number of unicode characters in a string. + * + * @return number of characters in the string +@@ -205,22 +219,6 @@ + */ + GR2_API const gr_slot* gr_seg_last_slot(gr_segment* pSeg/*not NULL*/); //may give a base slot or a slot which is attached to another + +-/** Calculates the underlying character to glyph associations. +- * +- * @param pSeg Pointer to the segment we want information on. +- * @param begins An array of gr_seg_n_cinfo integers giving slot index for each +- * charinfo. The value corresponds to which slot a cursor would be before +- * if an underlying cursor were before the charinfo at this index. +- * @param ends An array of gr_seg_n_cinfo integers giving the slot index for each +- * charinfo. The value at an index corresponds to which slot a cursor would +- * be after if an underlying cursor were after the charinfo at the index. +- * @param sbegins An array of gr_seg_n_cinfo gr_slot * corresponding to the gr_slot at +- * index given by begins. The pointer to the array may be NULL. +- * @param sends An array of gr_seg_n_cinfo gr_slot * corresponding to the gr_slot at the +- * index given by ends. The pointer to the array may be NULL. +- */ +-GR2_API void gr_seg_char_slots(const gr_segment *pSeg, gr_uint32 *begins, gr_uint32 *ends, gr_slot **sbegins, gr_slot **sends); +- + /** Returns the next slot along in the segment. + * + * Slots are held in a linked list. This returns the next in the linked list. The slot +@@ -306,6 +304,13 @@ + */ + GR2_API int gr_slot_after(const gr_slot* p/*not NULL*/); + ++/** Returns the index of this slot in the segment ++ * ++ * Returns the index given to this slot during final positioning. This corresponds to the value returned br gr_cinfo_before() ++ * and gr_cinfo_after() ++ */ ++GR2_API unsigned int gr_slot_index(const gr_slot* p/*not NULL*/); ++ + /** Return a slot attribute value + * + * Given a slot and an attribute along with a possible subattribute, return the +diff -r 5369cdd12120 src/CMakeLists.txt +--- misc/build/graphite2-0.9.2/src/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700 +@@ -25,7 +25,7 @@ + INCLUDE(CheckTypeSize) + INCLUDE(CheckCXXSourceCompiles) + +-set(GRAPHITE_API_MAJOR 1) ++set(GRAPHITE_API_MAJOR 2) + set(GRAPHITE_API_MINOR 0) + set(GRAPHITE_API_AGE 0) + set(GRAPHITE_SO_VERSION ${GRAPHITE_API_MAJOR}.${GRAPHITE_API_MINOR}.${GRAPHITE_API_AGE}) +diff -r 5369cdd12120 src/CharInfo.h +--- misc/build/graphite2-0.9.2/src/CharInfo.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/CharInfo.h Fri Feb 18 16:05:40 2011 +0700 +@@ -29,16 +29,23 @@ + { + + public: ++ CharInfo() : m_before(-1), m_after(0) {} + void init(int cid) { m_char = cid; } + unsigned int unicodeChar() const { return m_char; } + void feats(int offset) { m_featureid = offset; } + int fid() const { return m_featureid; } + int breakWeight() const { return m_break; } + void breakWeight(int val) { m_break = val; } ++ int after() const { return m_after; } ++ void after(int val) { m_after = val; } ++ int before() const { return m_before; } ++ void before(int val) { m_before = val; } + + CLASS_NEW_DELETE + private: + int m_char; // Unicode character from character stream ++ int m_before; // slot index before us, comes before ++ int m_after; // slot index after us, comes after + uint8 m_featureid; // index into features list in the segment + int8 m_break; // breakweight coming from lb table + }; +diff -r 5369cdd12120 src/Segment.cpp +--- misc/build/graphite2-0.9.2/src/Segment.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Segment.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -283,6 +283,7 @@ + { + Position currpos; + Slot *s, *ls = NULL; ++ int iSlot = 0; + float cMin = 0.; + float clusterMin = 0.; + Rect bbox; +@@ -292,8 +293,16 @@ + + if (m_dir & 1) + { +- for (s = iEnd; s && s != iStart->prev(); s = s->prev()) ++ for (s = iEnd, iSlot = m_numGlyphs - 1; s && s != iStart->prev(); s = s->prev(), --iSlot) + { ++ for (int j = s->before(); j <= s->after(); j++) ++ { ++ CharInfo *c = charinfo(j); ++ if (c->before() == -1 || iSlot < c->before()) c->before(iSlot); ++ if (c->after() < iSlot) c->after(iSlot); ++ } ++ s->index(iSlot); ++ + if (s->isBase()) + { + clusterMin = currpos.x; +@@ -306,8 +315,16 @@ + } + else + { +- for (s = iStart; s && s != iEnd->next(); s = s->next()) ++ for (s = iStart, iSlot = 0; s && s != iEnd->next(); s = s->next(), ++iSlot) + { ++ for (int j = s->before(); j <= s->after(); j++) ++ { ++ CharInfo *c = charinfo(j); ++ if (c->before() == -1 || iSlot < c->before()) c->before(iSlot); ++ if (c->after() < iSlot) c->after(iSlot); ++ } ++ s->index(iSlot); ++ + if (s->isBase()) + { + clusterMin = currpos.x; +@@ -321,35 +338,6 @@ + if (iStart == m_first && iEnd == m_last) m_advance = currpos; + } + +- +-void Segment::getCharSlots(uint32 *begins, uint32 *ends, Slot **sbegins, Slot **sends) const +-{ +- Slot *s; +- uint32 i; +- if (!begins || !ends) return; +- memset(begins, 0xFF, m_numCharinfo * sizeof(uint32)); +- memset(ends, 0, m_numCharinfo * sizeof(uint32)); +- +- for (s = m_first, i = 0; s; s = s->next(), i++) +- { +- for (int j = s->before(); j <= s->after(); j++) +- { +- assert(j >= 0); +- assert(j < static_cast(m_numCharinfo)); +- if (i < begins[j]) +- { +- begins[j] = i; +- if (sbegins) sbegins[j] = s; +- } +- if (i > ends[j]) +- { +- ends[j] = i; +- if (sends) sends[j] = s; +- } +- } +- } +-} +- + #ifndef DISABLE_TRACING + void Segment::logSegment(gr_encform enc, const void* pStart, size_t nChars) const + { +diff -r 5369cdd12120 src/Segment.h +--- misc/build/graphite2-0.9.2/src/Segment.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Segment.h Fri Feb 18 16:05:40 2011 +0700 +@@ -118,7 +118,6 @@ + int defaultOriginal() const { return m_defaultOriginal; } + const Face * getFace() const { return m_face; } + const Features & getFeatures(unsigned int /*charIndex*/) { assert(m_feats.size() == 1); return m_feats[0]; } +- void getCharSlots(uint32 *begins, uint32 *ends, Slot **sbegins, Slot **sends) const; + + CLASS_NEW_DELETE + +diff -r 5369cdd12120 src/Slot.cpp +--- misc/build/graphite2-0.9.2/src/Slot.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Slot.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -188,15 +188,15 @@ + } + } + +-int Slot::getAttr(const Segment *seg, attrCode index, uint8 subindex) const ++int Slot::getAttr(const Segment *seg, attrCode ind, uint8 subindex) const + { + if (!this) return 0; +- if (index == gr_slatUserDefnV1) ++ if (ind == gr_slatUserDefnV1) + { +- index = gr_slatUserDefn; ++ ind = gr_slatUserDefn; + subindex = 0; + } +- switch (index) ++ switch (ind) + { + case gr_slatAdvX : + return static_cast(m_advance.x); +@@ -259,15 +259,15 @@ + } + } + +-void Slot::setAttr(Segment *seg, attrCode index, uint8 subindex, int16 value, const SlotMap & map) ++void Slot::setAttr(Segment *seg, attrCode ind, uint8 subindex, int16 value, const SlotMap & map) + { + if (!this) return; +- if (index == gr_slatUserDefnV1) ++ if (ind == gr_slatUserDefnV1) + { +- index = gr_slatUserDefn; ++ ind = gr_slatUserDefn; + subindex = 0; + } +- switch (index) ++ switch (ind) + { + case gr_slatAdvX : + m_advance = Position(value, m_advance.y); +diff -r 5369cdd12120 src/Slot.h +--- misc/build/graphite2-0.9.2/src/Slot.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Slot.h Fri Feb 18 16:05:40 2011 +0700 +@@ -47,6 +47,8 @@ + Position advancePos() const { return m_advance; } + int before() const { return m_before; } + int after() const { return m_after; } ++ uint32 index() const { return m_index; } ++ void index(uint32 val) { m_index = val; } + + Slot(); + void set(const Slot & slot, int charOffset, uint8 numUserAttr); +@@ -58,10 +60,10 @@ + void setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph = NULL); + void setRealGid(uint16 realGid) { m_realglyphid = realGid; } + void origin(const Position &pos) { m_position = pos + m_shift; } +- void originate(int index) { m_original = index; } ++ void originate(int ind) { m_original = ind; } + int original() const { return m_original; } +- void before(int index) { m_before = index; } +- void after(int index) { m_after = index; } ++ void before(int ind) { m_before = ind; } ++ void after(int ind) { m_after = ind; } + bool isBase() const { return (!m_parent); } + void update(int numSlots, int numCharInfo, Position &relpos); + Position finalise(const Segment* seg, const Font* font, Position* base, Rect* bbox, float* cMin, uint8 attrLevel, float *clusterMin); +@@ -75,8 +77,8 @@ + uint16 *userAttrs() { return m_userAttr; } + void userAttrs(uint16 *p) { m_userAttr = p; } + void markInsertBefore(bool state) { if (!state) m_flags |= SLOT_INSERT; else m_flags &= ~SLOT_INSERT; } +- void setAttr(Segment* seg, attrCode index, uint8 subindex, int16 val, const SlotMap & map); +- int getAttr(const Segment *seg, attrCode index, uint8 subindex) const; ++ void setAttr(Segment* seg, attrCode ind, uint8 subindex, int16 val, const SlotMap & map); ++ int getAttr(const Segment *seg, attrCode ind, uint8 subindex) const; + void attachTo(Slot *ap) { m_parent = ap; } + Slot *attachedTo() const { return m_parent; } + Slot* firstChild() const { return m_child; } +@@ -96,8 +98,9 @@ + unsigned short m_glyphid; // glyph id + uint16 m_realglyphid; + uint32 m_original; // charinfo that originated this slot (e.g. for feature values) +- uint32 m_before; // charinfo index of before association +- uint32 m_after; // charinfo index of after association ++ uint32 m_before; // charinfo index of before association ++ uint32 m_after; // charinfo index of after association ++ uint32 m_index; // slot index given to this slot during finalising + Slot *m_parent; // index to parent we are attached to + Slot *m_child; // index to first child slot that attaches to us + Slot *m_sibling; // index to next child that attaches to our parent +diff -r 5369cdd12120 src/gr_char_info.cpp +--- misc/build/graphite2-0.9.2/src/gr_char_info.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/gr_char_info.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -39,4 +39,16 @@ + return p->breakWeight(); + } + +-} // extern "C" +\ No newline at end of file ++int gr_cinfo_after(const gr_char_info *p/*not NULL*/) ++{ ++ assert(p); ++ return p->after(); ++} ++ ++int gr_cinfo_before(const gr_char_info *p/*not NULL*/) ++{ ++ assert(p); ++ return p->before(); ++} ++ ++} // extern "C" +diff -r 5369cdd12120 src/gr_segment.cpp +--- misc/build/graphite2-0.9.2/src/gr_segment.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/gr_segment.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -162,11 +162,5 @@ + return static_cast(pSeg->last()); + } + +-void gr_seg_char_slots(const gr_segment *pSeg, gr_uint32 *begins, gr_uint32 *ends, gr_slot **sbegins, gr_slot **sends) +-{ +- assert(pSeg && begins && ends); +- pSeg->getCharSlots(begins, ends, reinterpret_cast(sbegins), reinterpret_cast(sends)); +-} +- + + } // extern "C" +diff -r 5369cdd12120 src/gr_slot.cpp +--- misc/build/graphite2-0.9.2/src/gr_slot.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/gr_slot.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -121,6 +121,12 @@ + return p->after(); + } + ++unsigned int gr_slot_index(const gr_slot *p/*not NULL*/) ++{ ++ assert(p); ++ return p->index(); ++} ++ + int gr_slot_attr(const gr_slot* p/*not NULL*/, const gr_segment* pSeg/*not NULL*/, gr_attrCode index, gr_uint8 subindex) + { + assert(p); diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 1da1d14d69c7..299b09e2519d 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -39,103 +39,68 @@ TARGET=so_graphite .IF "$(SYSTEM_GRAPHITE)" == "YES" all: - @echo "An already available installation of silgraphite should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of graphite2 should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- .IF "$(ENABLE_GRAPHITE)"=="TRUE" -TARFILE_NAME=silgraphite-2.3.1 -TARFILE_MD5=d35724900f6a4105550293686688bbb3 -#graphite-updatewerror.patch -Werror passed to CFLAGS configure for -#--enable-debug, but not in configure.ac, so update configure to -#match -PATCH_FILES=\ - graphite-2.3.1.patch \ - graphite-removeobsolete.patch \ - graphite-updatewerror.patch +TARFILE_NAME=graphite2-0.9.2 +TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108 +PATCH_FILES= graphite2-0.9.2.patch # convert line-endings to avoid problems when patching -CONVERTFILES=\ - engine/makefile.vc8 \ - engine/test/RegressionTest/RtTextSrc.h +CONVERTFILES= -CONFIGURE_DIR=engine +CONFIGURE_DIR=build .IF "$(COM)"=="MSC" -.IF "$(COMEX)"=="10" -VCNUM=7 -.ELSE -VCNUM=8 +CMAKE_GENERATOR="NMake Makefiles" +# make use of stlport headerfiles +EXT_USE_STLPORT=TRUE +GR_CMAKE_LINK_FLAGS=-D "CMAKE_SHARED_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_MODULE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_EXE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_SYSTEM_PROCESSOR=x86" +BUILD_ACTION=nmake .ENDIF -BUILD_ACTION=nmake VERBOSE=1 -.IF "$(debug)"!="" -BUILD_FLAGS= "CFG=DEBUG" -CFLAGSWITHPATH= $(CFLAGS:s!-Fd./!-Fd../../../../../!) -.ELSE -# Speed Optimization is really needed for Graphite -CFLAGSWITHPATH= $(CFLAGS) /O2 + +.IF "$(COM)"=="GCC" +CMAKE_GENERATOR="Unix Makefiles" +GR_CMAKE_LINK_FLAGS= +.IF "$(OS)"=="WNT" +#PATCH_FILES+=graphite2.patch.mingw .ENDIF -### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly -### TODO: use "guw.exe" instead? -ALLCFLAGS= $(CFLAGSWITHPATH) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS) -JUSTASLASH= / -CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/) -CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/) -BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll .ENDIF .IF "$(COM)"=="GCC" +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) +.ENDIF -# Does linux want --disable-shared? -.IF "$(debug)"!="" -GR_CONFIGURE_FLAGS= --enable-debug=yes --disable-final --enable-static --disable-shared +.IF "$(debug)"=="true" +CMAKE_BUILD_TYPE=Debug .ELSE -GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared +CMAKE_BUILD_TYPE=Release .ENDIF -EXTRA_GR_CXX_FLAGS=-fPIC -.IF "$(OS)"=="WNT" -PATCH_FILES+=graphite-2.3.1.patch.mingw -EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc -.IF "$(MINGW_SHARED_GCCLIB)"=="YES" -EXTRA_GR_CXX_FLAGS+=-shared-libgcc -.ENDIF -EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -.ENDIF +# Don't include STLPORT headers because it interferes with CMake's compiler +# detection. Graphite2 no longer uses the STL anyway. +CONFIGURE_ACTION=bash -c 'INCLUDE="$(COMPATH)/Include;$(PSDK_HOME)/Include" CXXFLAGS="$(CFLAGSCXX) $(CDEFS)" LIB="$(ILIB)" cmake -G $(CMAKE_GENERATOR) -D CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -D ENABLE_COMPARE_RENDERER=0 $(GR_CMAKE_LINK_FLAGS) .. ' -# don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail -# -CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' -.ENDIF BUILD_DIR=$(CONFIGURE_DIR) .IF "$(OS)"=="WNT" && "$(COM)"!="GCC" -.IF "$(debug)"!="" -OUT2LIB=engine$/debug$/*.lib +OUT2LIB=build$/src$/*.lib +OUT2BIN=build$/src$/*.dll .ELSE -OUT2LIB=engine$/release$/*.lib -.ENDIF +.IF "$(OS)"=="MACOSX" +OUT2LIB+=build$/src$/libgraphite2.*.dylib .ELSE -OUT2LIB=engine$/src$/.libs$/libgraphite*.a +OUT2LIB=build$/src$/libgraphite2.so.*.*.* .ENDIF - -.IF "$(COM)"=="GCC" -BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) .ENDIF -.IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/libgraphite.*.dylib -.ENDIF - - OUTDIR2INC= \ - engine$/include$/graphite + include/graphite2 -.IF "$(OS)"=="WNT" -OUT2INC=wrappers$/win32$/WinFont.h -.ENDIF .ELSE dddd: @echo Nothing to do diff --git a/graphite/prj/d.lst b/graphite/prj/d.lst index 574849dfc1f1..8eedd6c3d741 100644 --- a/graphite/prj/d.lst +++ b/graphite/prj/d.lst @@ -1,6 +1,5 @@ -mkdir: %_DEST%\inc%_EXT%\graphite -..\%__SRC%\inc\graphite\*.h %_DEST%\inc%_EXT%\graphite\*.h -..\%__SRC%\inc\WinFont.h %_DEST%\inc%_EXT%\graphite\WinFont.h +mkdir: %_DEST%\inc%_EXT%\graphite2 +..\%__SRC%\inc\graphite2\*.h %_DEST%\inc%_EXT%\graphite2\*.h ..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib @@ -8,8 +7,6 @@ mkdir: %_DEST%\inc%_EXT%\graphite ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.pdb %_DEST%\bin%_EXT%\*.pdb -..\%__SRC%\lib\graphite.lib %_DEST%\lib%_EXT%\graphite.lib -linklib: libgraphite.so.*.*.* -linklib: libgraphite.dylib.*.*.* -#linklib: graphite.* +linklib: libgraphite2.so.*.*.* +linklib: libgraphite2.dylib.*.*.* -- cgit From d9acb375a875936e1c4f75b08cde9a8cc763e7e5 Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Fri, 4 Mar 2011 19:53:41 +0700 Subject: Remove cmake dependency. Statically create graphite library --- graphite/graphite_make.patch | 57 ++++++++++++++++++++++++++++++++++++++++ graphite/makefile.mk | 62 +++++++------------------------------------- 2 files changed, 66 insertions(+), 53 deletions(-) create mode 100644 graphite/graphite_make.patch diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch new file mode 100644 index 000000000000..b2be0ddfac21 --- /dev/null +++ b/graphite/graphite_make.patch @@ -0,0 +1,57 @@ +--- misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +@@ -0,0 +1,53 @@ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=libgraphite2_off ++TARGET=graphite2_off ++ENABLE_EXCEPTIONS=FALSE ++LIBTARGET=NO ++ ++.INCLUDE : settings.mk ++ ++CFLAGS+=-DDISABLE_TRACING -I../include ++.IF "$(debug)" == "" ++CFLAGS+=-O3 -DNDEBUG ++.ENDIF ++ ++VMACHINE=call ++.IF "$(COM)"=="GCC" ++VMACHINE=direct ++.ENDIF ++ ++SLOFILES= \ ++ $(SLO)/$(VMACHINE)_machine.obj \ ++ $(SLO)/gr_char_info.obj \ ++ $(SLO)/gr_features.obj \ ++ $(SLO)/gr_face.obj \ ++ $(SLO)/gr_font.obj \ ++ $(SLO)/gr_segment.obj \ ++ $(SLO)/gr_slot.obj \ ++ $(SLO)/CachedFace.obj \ ++ $(SLO)/CmapCache.obj \ ++ $(SLO)/Code.obj \ ++ $(SLO)/Face.obj \ ++ $(SLO)/FeatureMap.obj \ ++ $(SLO)/Font.obj \ ++ $(SLO)/GlyphFace.obj \ ++ $(SLO)/GlyphFaceCache.obj \ ++ $(SLO)/NameTable.obj \ ++ $(SLO)/Pass.obj \ ++ $(SLO)/SegCache.obj \ ++ $(SLO)/SegCacheEntry.obj \ ++ $(SLO)/SegCacheStore.obj \ ++ $(SLO)/Segment.obj \ ++ $(SLO)/Silf.obj \ ++ $(SLO)/Slot.obj \ ++ $(SLO)/TtfUtil.obj ++ ++LIB1ARCHIV=$(LB)$/lib$(TARGET).a ++LIB1TARGET=$(SLB)$/$(TARGET).lib ++LIB1OBJFILES=$(SLOFILES) ++OUT2INC=../include/graphite2 ++ ++.INCLUDE : target.mk + diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 299b09e2519d..f2444a75ff19 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -31,7 +31,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE PRJ=. PRJNAME=graphite -TARGET=so_graphite +TARGET=libgraphite # --- Settings ----------------------------------------------------- @@ -47,63 +47,19 @@ all: .IF "$(ENABLE_GRAPHITE)"=="TRUE" TARFILE_NAME=graphite2-0.9.2 TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108 -PATCH_FILES= graphite2-0.9.2.patch +PATCH_FILES= graphite2-0.9.2.patch \ + graphite_make.patch # convert line-endings to avoid problems when patching CONVERTFILES= -CONFIGURE_DIR=build +BUILD_DIR=src +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) -.IF "$(COM)"=="MSC" -CMAKE_GENERATOR="NMake Makefiles" -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE -GR_CMAKE_LINK_FLAGS=-D "CMAKE_SHARED_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_MODULE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_EXE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_SYSTEM_PROCESSOR=x86" -BUILD_ACTION=nmake -.ENDIF - -.IF "$(COM)"=="GCC" -CMAKE_GENERATOR="Unix Makefiles" -GR_CMAKE_LINK_FLAGS= -.IF "$(OS)"=="WNT" -#PATCH_FILES+=graphite2.patch.mingw -.ENDIF -.ENDIF - -.IF "$(COM)"=="GCC" -BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) -.ENDIF - -.IF "$(debug)"=="true" -CMAKE_BUILD_TYPE=Debug -.ELSE -CMAKE_BUILD_TYPE=Release -.ENDIF - -# Don't include STLPORT headers because it interferes with CMake's compiler -# detection. Graphite2 no longer uses the STL anyway. -CONFIGURE_ACTION=bash -c 'INCLUDE="$(COMPATH)/Include;$(PSDK_HOME)/Include" CXXFLAGS="$(CFLAGSCXX) $(CDEFS)" LIB="$(ILIB)" cmake -G $(CMAKE_GENERATOR) -D CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -D ENABLE_COMPARE_RENDERER=0 $(GR_CMAKE_LINK_FLAGS) .. ' - - -BUILD_DIR=$(CONFIGURE_DIR) - -.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" -OUT2LIB=build$/src$/*.lib -OUT2BIN=build$/src$/*.dll -.ELSE -.IF "$(OS)"=="MACOSX" -OUT2LIB+=build$/src$/libgraphite2.*.dylib -.ELSE -OUT2LIB=build$/src$/libgraphite2.so.*.*.* -.ENDIF -.ENDIF - -OUTDIR2INC= \ - include/graphite2 - -.ELSE -dddd: - @echo Nothing to do +OUT2INC_SUBDIR=graphite2 +OUT2INC=include/graphite2/Font.h \ + include/graphite2/Segment.h \ + include/graphite2/Types.h .ENDIF # --- Targets ------------------------------------------------------ -- cgit From 945c9208f1b9434e92f95a8412f4fa643aacfdcd Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Fri, 4 Mar 2011 19:55:17 +0700 Subject: Upgrade to ICU 4.6 --- icu/icu4c-aix.patch | 65 ++++++++++++------------------------ icu/icu4c.8320.freeserif.crash.patch | 9 ++--- icu/icuversion.mk | 4 +-- icu/makefile.mk | 11 ++---- 4 files changed, 31 insertions(+), 58 deletions(-) diff --git a/icu/icu4c-aix.patch b/icu/icu4c-aix.patch index fa43e8563588..39eaccb6dbbe 100644 --- a/icu/icu4c-aix.patch +++ b/icu/icu4c-aix.patch @@ -1,8 +1,8 @@ --- misc/icu/source/config/mh-aix-gcc 2009-01-15 01:46:10.000000000 -0600 +++ misc/build/icu/source/config/mh-aix-gcc 2010-06-24 20:58:16.000000000 -0500 -@@ -1,85 +1,49 @@ +@@ -1,10 +1,7 @@ ## -*-makefile-*- --## Copyright (c) 2003-2007 IBM, Ken Foskey, and others. All rights reserved. +-## Copyright (c) 2003-2009 IBM, Ken Foskey, and others. All rights reserved. -## -## Aix-specific setup (for gcc) -## @@ -12,6 +12,10 @@ +## Copyright (c) 1999-2006, International Business Machines Corporation and +## others. All Rights Reserved. + # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and cdatatst.c) + CFLAGS += -D_ALL_SOURCE +@@ 11,17 +8,13 @@ + ## Commands to generate dependency files -GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) -GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) @@ -24,9 +28,12 @@ -LINK.c= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) - +-## Shared library options +-LD_SOOPTIONS= -Wl,-bsymbolic +- -## Commands to make a shared library --SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall --SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall +-SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS) +-SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS) +## Flags for position independent code +SHAREDLIBCFLAGS = -fPIC +SHAREDLIBCXXFLAGS = -fPIC @@ -35,6 +42,7 @@ +## Additional flags when building libraries and with threads +THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE +LIBCPPFLAGS = +@@ -28,40 +21,24 @@ ## Compiler switch to embed a runtime search path -LD_RPATH= -I @@ -69,6 +77,7 @@ -FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) -MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) -SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ))) +-SHARED_OBJECT_NO_VERSION = $(basename $(SO_TARGET)).$(SOBJ) - -# The following is for Makefile.inc's use. -ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) @@ -88,6 +97,7 @@ + #LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) +#SH# # We can't depend on MIDDLE_SO_TARGET being set. +#SH# LD_SONAME= +@@ -68,29 +44,8 @@ ## Shared object suffix -SOBJ= so @@ -103,9 +113,13 @@ - -## Build archive from shared object -%.a : %.so -- $(AR) $(ARFLAGS) $@ $< +- ln -f $< $(SHARED_OBJECT_NO_VERSION) +- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION) +- rm -f $(SHARED_OBJECT_NO_VERSION) -$(LIBDIR)/%.a : %.so -- $(AR) $(ARFLAGS) $@ $< +- ln -f $< $(SHARED_OBJECT_NO_VERSION) +- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION) +- rm -f $(SHARED_OBJECT_NO_VERSION) - -## Build import list from export list -%.e : %.exp @@ -115,41 +129,4 @@ ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c -@@ -107,16 +71,19 @@ - [ -s $@ ] || rm -f $@' - - ## Versioned libraries rules --%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) -- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ --%.$(SO): %$(SO_TARGET_VERSION).$(SO) -- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ - -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${featureIndexArray[feature]); featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag); diff --git a/icu/icuversion.mk b/icu/icuversion.mk index a170642b276c..7b1ed64ac381 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -27,7 +27,7 @@ # major ICU_MAJOR*=4 # minor -ICU_MINOR*=0 +ICU_MINOR*=6 # micro -ICU_MICRO*=1 +ICU_MICRO*=0 diff --git a/icu/makefile.mk b/icu/makefile.mk index dfe725231dd9..6b1937578434 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -37,22 +37,17 @@ TARGET=so_icu .INCLUDE : icuversion.mk -.IF "$(ICU_MICRO)"!="0" -TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)_$(ICU_MICRO)-src -TARFILE_MD5=2f6ecca935948f7db92d925d88d0d078 -.ELSE -TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src -TARFILE_MD5= -.ENDIF +TARFILE_NAME=icu4c-4_6-src +TARFILE_MD5=43e56b71c407be5154de681eaa646a4a TARFILE_ROOTDIR=icu #icu4c.8320.freeserif.crash.patch, see #http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif PATCH_FILES=\ - ${TARFILE_NAME}.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch +# ${TARFILE_NAME}.patch \ .IF "$(GUI)"=="UNX" -- cgit From a7fe7cb634a50a396a24306f1258b1ed650dedff Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Tue, 8 Mar 2011 11:45:57 +0700 Subject: Fix memory leaks in vectors --- graphite/graphite2-0.9.2.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch index ef7e4b2f0a0f..5f132997d4e8 100644 --- a/graphite/graphite2-0.9.2.patch +++ b/graphite/graphite2-0.9.2.patch @@ -368,3 +368,15 @@ diff -r 5369cdd12120 src/gr_slot.cpp int gr_slot_attr(const gr_slot* p/*not NULL*/, const gr_segment* pSeg/*not NULL*/, gr_attrCode index, gr_uint8 subindex) { assert(p); +diff current src/List.h +--- misc/build/graphite2-0.9.2/src/List.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/List.h Fri Feb 18 16:05:40 2011 +0700 +@@ -51,6 +51,6 @@ + template + Vector(I first, const I last) : m_first(0), m_last(0), m_end(0) { insert(begin(), first, last); } +- ~Vector() { free(m_first); } ++ ~Vector() { clear(); free(m_first); } + + iterator begin() { return m_first; } + const_iterator begin() const { return m_first; } + -- cgit From e4781b57c033771ebadb0725ddd4faebfb3799c3 Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Thu, 10 Mar 2011 07:19:57 +0700 Subject: fix icu patch --- icu/icu4c.8320.freeserif.crash.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch index 0b94864ed56d..5acc62c223ec 100644 --- a/icu/icu4c.8320.freeserif.crash.patch +++ b/icu/icu4c.8320.freeserif.crash.patch @@ -10,7 +10,7 @@ le_uint32 lookupOrderCount; --- misc/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000 +++ misc/build/icu/source/layout/LookupProcessor.cpp 2011-02-02 12:31:54.215503036 +0000 -@@ -62,6 +62,10 @@ +@@ -70,6 +70,10 @@ if (selectMask != 0) { const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup); @@ -21,7 +21,7 @@ le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags); glyphIterator.reset(lookupFlags, selectMask); -@@ -96,6 +100,9 @@ +@@ -111,6 +115,9 @@ for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) { le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]); -- cgit From 1f5b215e2ad6e957981c31a3c94bae3e31427543 Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Thu, 10 Mar 2011 11:07:23 +0700 Subject: reduce patch to remove need to match on trailing space that git strips --- icu/icu4c.8320.freeserif.crash.patch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch index 5acc62c223ec..64b133d21608 100644 --- a/icu/icu4c.8320.freeserif.crash.patch +++ b/icu/icu4c.8320.freeserif.crash.patch @@ -31,10 +31,7 @@ lookupSelectArray[lookupListIndex] |= featureMask; lookupOrderArray[store++] = lookupListIndex; } -@@ -121,8 +128,8 @@ - LookupProcessor::LookupProcessor(const char *baseAddress, - Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset, - LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures, +@@ -124,5 +131,5 @@ LEErrorCode& success) - : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), + : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0), -- cgit From 1745f16c63d6f4b03523f08591262a3db70fec5c Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Fri, 11 Mar 2011 14:33:11 +0700 Subject: Fix spacing in patch --- icu/icu4c-aix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu/icu4c-aix.patch b/icu/icu4c-aix.patch index 39eaccb6dbbe..df90e59358b9 100644 --- a/icu/icu4c-aix.patch +++ b/icu/icu4c-aix.patch @@ -98,7 +98,7 @@ +#SH# # We can't depend on MIDDLE_SO_TARGET being set. +#SH# LD_SONAME= @@ -68,29 +44,8 @@ - + ## Shared object suffix -SOBJ= so -# without the -brtl option, the library names use .a. AIX is funny that way. -- cgit From 4c4f86df0cb7afbdb1257045087c686495b033c1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 11 Mar 2011 09:03:27 +0000 Subject: restore build of build patch that seem to still make sense --- icu/icu4c-4_0_1-src.patch | 260 ----------------------------------- icu/icu4c-build.patch | 117 ++++++++++++++++ icu/icu4c.8320.freeserif.crash.patch | 8 +- icu/makefile.mk | 2 +- 4 files changed, 123 insertions(+), 264 deletions(-) delete mode 100644 icu/icu4c-4_0_1-src.patch create mode 100644 icu/icu4c-build.patch diff --git a/icu/icu4c-4_0_1-src.patch b/icu/icu4c-4_0_1-src.patch deleted file mode 100644 index 6d50ca634d4e..000000000000 --- a/icu/icu4c-4_0_1-src.patch +++ /dev/null @@ -1,260 +0,0 @@ ---- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 -+++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 -@@ -52,7 +52,7 @@ - Poorly upgraded Solaris machines can't have this defined. - Cleanly installed Solaris can use this #define. - */ --#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) -+#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) - #define _XOPEN_SOURCE_EXTENDED 1 - #endif - ---- misc/icu/source/common/unicode/pwin32.h 2008-07-01 10:41:12.000000000 +0900 -+++ misc/build/icu/source/common/unicode/pwin32.h 2008-11-05 22:37:21.479250000 +0900 -@@ -32,6 +32,10 @@ - #define __STDC_CONSTANT_MACROS - #endif - -+#if defined(__MINGW32__) -+#define U_HAVE_INTTYPES_H 1 -+#endif -+ - /* _MSC_VER is used to detect the Microsoft compiler. */ - #if defined(_MSC_VER) - #define U_INT64_IS_LONG_LONG 0 ---- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 -+++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 -@@ -25,7 +25,7 @@ - SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) - - ## Compiler switches to embed a library name and version information --LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) - - ## Compiler switch to embed a runtime search path - LD_RPATH= -@@ -41,10 +41,6 @@ - ## Non-shared intermediate object suffix - STATIC_O = ao - --## Override Versioned target for a shared library. --FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) --MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) -- - ## Compilation rules - %.$(STATIC_O): $(srcdir)/%.c - $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -@@ -76,15 +72,9 @@ - - ## Versioned libraries rules - --%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) - $(RM) $@ && ln -s ${tmpDir, -+#ifdef __MINGW32__ -+ U_FILE_ALT_SEP_STRING, -+#else - U_FILE_SEP_STRING, -+#endif - o->shortName); - T_FileStream_writeLine(makefile, tmp); - ---- misc/icu/source/tools/pkgdata/dllmode.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/dllmode.c 2008-11-07 06:08:36.016750000 +0900 -@@ -139,7 +139,11 @@ - sprintf(tmp, "# List file for gencmn:\n" - "CMNLIST=%s%s$(NAME)_dll.lst\n\n", - o->tmpDir, -+#ifdef __MINGW32__ -+ U_FILE_ALT_SEP_STRING); -+#else - U_FILE_SEP_STRING); -+#endif - T_FileStream_writeLine(makefile, tmp); - - if(o->hadStdin == FALSE) { /* shortcut */ ---- misc/icu/source/tools/pkgdata/make.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/make.c 2008-11-06 23:23:04.096625000 +0900 -@@ -313,8 +313,13 @@ - uprv_strcpy(cfile+uprv_strlen(cfile)-uprv_strlen(objSuffix), ".c" ); /* replace .o with .c */ - - /* Make up parents.. */ -+#ifdef __MINGW32__ -+ parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR_DEPEND)/")); -+ sprintf(parentPath, "$(SRCDIR_DEPEND)/%s", baseName); -+#else - parentPath = uprv_malloc(1+uprv_strlen(baseName) + uprv_strlen("$(SRCDIR)/")); - sprintf(parentPath, "$(SRCDIR)/%s", baseName); -+#endif - parents = pkg_appendToList(parents, NULL, parentPath); - - /* make up commands.. */ -@@ -379,7 +384,11 @@ - T_FileStream_writeLine(f, "\n"); - T_FileStream_writeLine(f, "BASE_OBJECTS=$(NAME)_dat.o\n"); - T_FileStream_writeLine(f, "\n"); -+#ifdef __MINGW32__ -+ T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS_DEPEND)\n"); -+#else - T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME).dat: $(CMNLIST) $(DATAFILEPATHS)\n"); -+#endif - T_FileStream_writeLine(f, "\t$(INVOKE) $(ICUPKG) -t$(ICUDATA_CHAR) -c -s $(SRCDIR) -a $(CMNLIST) new $(TEMP_DIR)/$(CNAME).dat\n"); - T_FileStream_writeLine(f, "\n"); - T_FileStream_writeLine(f, "$(TEMP_DIR)/$(NAME)_dat.o : $(TEMP_DIR)/$(NAME).dat\n"); ---- misc/icu/source/tools/pkgdata/pkgdata.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/pkgdata.c 2008-11-07 05:59:27.110500000 +0900 -@@ -594,7 +594,11 @@ - exit(U_ILLEGAL_ARGUMENT_ERROR); - } - uprv_strcpy(tmp, o->srcDir); -+#ifdef __MINGW32__ -+ uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_ALT_SEP_STRING); -+#else - uprv_strcat(tmp, o->srcDir[uprv_strlen(o->srcDir)-1]==U_FILE_SEP_CHAR?"":U_FILE_SEP_STRING); -+#endif - uprv_strcat(tmp, s); - o->filePaths = pkg_appendToList(o->filePaths, &tail2, uprv_strdup(tmp)); - linePtr = lineNext; ---- misc/icu/source/tools/pkgdata/sttcmode.c 2008-07-01 10:41:20.000000000 +0900 -+++ misc/build/icu/source/tools/pkgdata/sttcmode.c 2008-11-07 00:30:05.690375000 +0900 -@@ -172,7 +172,11 @@ - sprintf(tmp, "# List file for gencmn:\n" - "CMNLIST=%s%s$(NAME)_static.lst\n\n", - o->tmpDir, -+#ifdef __MINGW32__ -+ U_FILE_ALT_SEP_STRING); -+#else - U_FILE_SEP_STRING); -+#endif - T_FileStream_writeLine(makefile, tmp); - - if(o->hadStdin == FALSE) { /* shortcut */ ---- misc/build/icu/source/test/intltest/dtifmtts.cpp.old 2010-09-20 20:49:33.953125000 +0200 -+++ misc/build/icu/source/test/intltest/dtifmtts.cpp 2010-09-20 20:51:37.875000000 +0200 -@@ -13,8 +13,9 @@ - //FIXME: define it in compiler flag - //#define DTIFMTTS_DEBUG 1 - -- -+#if defined (_MSC_VER) && (_MSC_VER < 1600) - #include -+#endif - #ifdef DTIFMTTS_DEBUG - #endif - diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch new file mode 100644 index 000000000000..7fa5e8e58cb7 --- /dev/null +++ b/icu/icu4c-build.patch @@ -0,0 +1,117 @@ +--- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 ++++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 +@@ -52,7 +52,7 @@ + Poorly upgraded Solaris machines can't have this defined. + Cleanly installed Solaris can use this #define. + */ +-#if !defined(_XOPEN_SOURCE_EXTENDED) && ((!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) || defined(__xlc__)) ++#if !defined(_XOPEN_SOURCE_EXTENDED) && ((!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) || defined(__xlc__)) + #define _XOPEN_SOURCE_EXTENDED 1 + #endif + +--- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 ++++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 +@@ -25,7 +25,7 @@ + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) + + ## Compiler switches to embed a library name and version information +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) + + ## Compiler switch to embed a runtime search path + LD_RPATH= +@@ -41,10 +41,6 @@ + ## Non-shared intermediate object suffix + STATIC_O = ao + +-## Override Versioned target for a shared library. +-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO) +-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO) +- + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c + $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< +@@ -76,16 +72,10 @@ + + ## Versioned libraries rules + +-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO) ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) + $(RM) $@ && ln -s ${featureIndexArray[feature]); featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag); diff --git a/icu/makefile.mk b/icu/makefile.mk index 6b1937578434..e8dee27956f5 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -45,9 +45,9 @@ TARFILE_ROOTDIR=icu #http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif PATCH_FILES=\ + icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch -# ${TARFILE_NAME}.patch \ .IF "$(GUI)"=="UNX" -- cgit -- cgit From ab6aeefe786302cb209436f150c0cb463efb99e4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 11 Mar 2011 09:24:19 +0000 Subject: add -fpermissive for yucky narrowing --- graphite/graphite_make.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index b2be0ddfac21..033f335f1e6b 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -1,6 +1,6 @@ --- misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +++ misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -@@ -0,0 +1,53 @@ +@@ -0,0 +1,54 @@ +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + +PRJ=..$/..$/..$/..$/.. @@ -20,6 +20,7 @@ +VMACHINE=call +.IF "$(COM)"=="GCC" +VMACHINE=direct ++CFLAGSCXX+=-fpermissive +.ENDIF + +SLOFILES= \ -- cgit From 64c58dfa9fcf0e1a3ba53ebbd73af9025cf56f0f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 11 Mar 2011 10:01:47 +0000 Subject: fix aix patch --- icu/icu4c-aix.patch | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/icu/icu4c-aix.patch b/icu/icu4c-aix.patch index df90e59358b9..aedaae12adbd 100644 --- a/icu/icu4c-aix.patch +++ b/icu/icu4c-aix.patch @@ -14,13 +14,9 @@ # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and cdatatst.c) CFLAGS += -D_ALL_SOURCE -@@ 11,17 +8,13 @@ - - ## Commands to generate dependency files --GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) --GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) -+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) +@@ -13,84 +10,30 @@ + GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) + GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -## Commands to link -## We need to use the C++ linker, even when linking C programs, since @@ -32,8 +28,8 @@ -LD_SOOPTIONS= -Wl,-bsymbolic - -## Commands to make a shared library --SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS) --SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS) +-SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS) +-SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS) +## Flags for position independent code +SHAREDLIBCFLAGS = -fPIC +SHAREDLIBCXXFLAGS = -fPIC @@ -42,23 +38,15 @@ +## Additional flags when building libraries and with threads +THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE +LIBCPPFLAGS = -@@ -28,40 +21,24 @@ ## Compiler switch to embed a runtime search path -LD_RPATH= -I -LD_RPATH_PRE= -+LD_RPATH= -+LD_RPATH_PRE = - +- -## enable the shared lib loader -LDFLAGS += -Wl,-bbigtoc -+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -+## (incl. the C++ runtime libs potentially found in the URE lib dir): -+#ENABLE_RPATH=YES -+#RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib' -+ -+#SH# ENABLE_RPATH=YES -+#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'" ++LD_RPATH= ++LD_RPATH_PRE= ## These are the library specific LDFLAGS LDFLAGSICUDT=-nodefaultlibs -nostdlib @@ -92,20 +80,14 @@ - -## The type of assembly needed when pkgdata is used for generating shared libraries. -GENCCODE_ASSEMBLY=-a xlc -+## Compiler switch to embed a library name -+# The initial tab in the next line is to prevent icu-config from reading it. -+ #LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) -+#SH# # We can't depend on MIDDLE_SO_TARGET being set. -+#SH# LD_SONAME= -@@ -68,29 +44,8 @@ - +- ## Shared object suffix -SOBJ= so -# without the -brtl option, the library names use .a. AIX is funny that way. -SO= a -A= a -- +SO = so + ## Non-shared intermediate object suffix -STATIC_O = o - @@ -129,4 +111,3 @@ ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c - -- cgit From db993edbdc3743860c42fa5aef11f1fd207d7cb1 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 11 Mar 2011 11:35:10 +0100 Subject: fix graphite build on Linux 64-bit --- graphite/graphite2-0.9.2.patch | 11 +++++++++++ graphite/graphite_make.patch | 3 ++- graphite/makefile.mk | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch index 5f132997d4e8..9b3003967f8d 100644 --- a/graphite/graphite2-0.9.2.patch +++ b/graphite/graphite2-0.9.2.patch @@ -380,3 +380,14 @@ diff current src/List.h iterator begin() { return m_first; } const_iterator begin() const { return m_first; } +--- misc/graphite2-0.9.2/src/Code.cpp 2011-02-12 16:54:16.000000000 +0100 ++++ misc/build/graphite2-0.9.2/src/Code.cpp 2011-03-11 11:28:11.700215286 +0100 +@@ -168,7 +168,7 @@ + face.getGlyphFaceCache()->numAttrs(), + face.numFeatures(), + {1,1,1,1,1,1,1,1, +- 1,1,1,1,1,1,1,-1, ++ 1,1,1,1,1,1,1,(uint8)-1, + 1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,0,0, + 0,0,0,0,0,0,0,0, diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index 033f335f1e6b..20c3fe045eeb 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -1,6 +1,7 @@ --- misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +++ misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -@@ -0,0 +1,54 @@ +@@ -1,1 +1,54 @@ +-dummy +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + +PRJ=..$/..$/..$/..$/.. diff --git a/graphite/makefile.mk b/graphite/makefile.mk index f2444a75ff19..e580b405b63a 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -50,6 +50,9 @@ TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108 PATCH_FILES= graphite2-0.9.2.patch \ graphite_make.patch +ADDITIONAL_FILES= \ + src/makefile.mk + # convert line-endings to avoid problems when patching CONVERTFILES= -- cgit From 65b7f0525708b43613c0a08f71ec362894cf8953 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 11 Mar 2011 13:18:02 +0000 Subject: WaE: silence new icu warnings --- icu/icu4c-warnings.patch | 21 +++++++++++++++++++++ icu/makefile.mk | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 icu/icu4c-warnings.patch diff --git a/icu/icu4c-warnings.patch b/icu/icu4c-warnings.patch new file mode 100644 index 000000000000..e484b59a6c69 --- /dev/null +++ b/icu/icu4c-warnings.patch @@ -0,0 +1,21 @@ +--- misc/icu/source/common/unicode/stringpiece.h ++++ misc/build/icu/source/common/unicode/stringpiece.h +@@ -140,7 +140,7 @@ + * @param len the length of the new data + * @internal + */ +- void set(const char* data, int32_t len) { ptr_ = data; length_ = len; } ++ void set(const char* data_, int32_t len) { ptr_ = data_; length_ = len; } + + /** + * Reset the stringpiece to refer to new data. +--- misc/icu/source/common/unicode/ ++++ misc/build/icu/source/common/unicode/utf16.h +@@ -316,6 +316,7 @@ + (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \ + } else /* c>0x10ffff or not enough space */ { \ + (isError)=TRUE; \ ++ (void)(isError); \ + } \ + } + diff --git a/icu/makefile.mk b/icu/makefile.mk index e8dee27956f5..5d7a92b4545b 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -47,7 +47,8 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ - icu4c-aix.patch + icu4c-aix.patch \ + icu4c-warnings.patch .IF "$(GUI)"=="UNX" -- cgit -- cgit From 16aa53366937621342496b5532f5747c4119a899 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 14 Mar 2011 13:21:50 +0200 Subject: Now when attempting to use MSVC2010, use msbuild to build it --- icu/makefile.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index 5d7a92b4545b..a15e4a211daf 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -213,11 +213,7 @@ ICU_BUILD_LIBPOST= CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg . -.IF "$(CCNUMVER)"<="001400000000" -BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHsc" && cd ..$/.. -.ELSE -BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHa -Zc:wchar_t-" && cd ..$/.. -.ENDIF +BUILD_ACTION=cd allinone && msbuild.exe allinone.sln && cd ..$/.. OUT2LIB= \ $(BUILD_DIR)$/..$/lib$/icudata.lib \ -- cgit From ed9b67df359953dcaff448c6db25cbc73ddafd46 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 14 Mar 2011 13:44:24 +0100 Subject: Dupplicate symbol in Windows build --- icu/icu4c-build.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 7fa5e8e58cb7..cedd2807e8a3 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -115,3 +115,14 @@ if ((t & MASK_TRANSPARENT) != 0) { continue; +--- icu/source/common/stringpiece.cpp 2010-10-29 20:01:01.000000000 +0200 ++++ icu.new/source/common/stringpiece.cpp 2011-03-14 13:38:59.094036495 +0100 +@@ -75,7 +75,7 @@ + * Visual Studios 9.0. + * Cygwin with MSVC 9.0 also complains here about redefinition. + */ +-#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC) ++#if (!defined(_MSC_VER) && !defined(CYGWINMSVC)) + const int32_t StringPiece::npos; + #endif + -- cgit From 222b8352289dee2b8c5ce4445a402993105a1f2c Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 14 Mar 2011 13:46:37 +0100 Subject: Oops --- icu/icu4c-build.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index cedd2807e8a3..ed1449b349e4 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -115,8 +115,8 @@ if ((t & MASK_TRANSPARENT) != 0) { continue; ---- icu/source/common/stringpiece.cpp 2010-10-29 20:01:01.000000000 +0200 -+++ icu.new/source/common/stringpiece.cpp 2011-03-14 13:38:59.094036495 +0100 +--- misc/icu/source/common/stringpiece.cpp 2010-10-29 20:01:01.000000000 +0200 ++++ misc/build/icu/source/common/stringpiece.cpp 2011-03-14 13:38:59.094036495 +0100 @@ -75,7 +75,7 @@ * Visual Studios 9.0. * Cygwin with MSVC 9.0 also complains here about redefinition. -- cgit From beb70d756ae09e4bab3f45eea54b8abe4b081b41 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 14 Mar 2011 14:55:27 +0200 Subject: Build the Relase configuration with msbuild --- icu/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index a15e4a211daf..d8f2e6af23b9 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -213,7 +213,7 @@ ICU_BUILD_LIBPOST= CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg . -BUILD_ACTION=cd allinone && msbuild.exe allinone.sln && cd ..$/.. +BUILD_ACTION=cd allinone && msbuild.exe /p:Configuration=Release allinone.sln && cd ..$/.. OUT2LIB= \ $(BUILD_DIR)$/..$/lib$/icudata.lib \ -- cgit From fb99fbe9bf1cb52b01cf718d0a79217fa90af10f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Mar 2011 14:20:54 +0100 Subject: Don't build with builtin wchar_t on Windows --- icu/icu4c-4_6-wchar_t.patch | 2228 +++++++++++++++++++++++++++++++++++++++++++ icu/makefile.mk | 11 +- 2 files changed, 2236 insertions(+), 3 deletions(-) create mode 100644 icu/icu4c-4_6-wchar_t.patch diff --git a/icu/icu4c-4_6-wchar_t.patch b/icu/icu4c-4_6-wchar_t.patch new file mode 100644 index 000000000000..7b02cb4d860e --- /dev/null +++ b/icu/icu4c-4_6-wchar_t.patch @@ -0,0 +1,2228 @@ +--- misc/icu/source/common/common.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/common/common.vcxproj 2011-03-14 13:14:22.991271967 +0100 +@@ -90,8 +90,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/common.pch + .\x86\Release/ + .\x86\Release/ +@@ -129,8 +129,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/common.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -169,8 +169,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/common.pch + .\x64\Release/ + .\x64\Release/ +@@ -206,8 +206,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/common.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/extra/uconv/uconv.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/extra/uconv/uconv.vcxproj 2011-03-14 13:14:23.003272786 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/uconv.pch + .\x86\Release/ + .\x86\Release/ +@@ -134,8 +134,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/uconv.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -178,8 +178,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/uconv.pch + .\x64\Release/ + .\x64\Release/ +@@ -219,8 +219,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/uconv.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/i18n/i18n.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/i18n/i18n.vcxproj 2011-03-14 13:14:22.988271760 +0100 +@@ -91,8 +91,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/i18n.pch + .\x86\Release/ + .\x86\Release/ +@@ -133,8 +133,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/i18n.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -176,8 +176,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/i18n.pch + .\x64\Release/ + .\x64\Release/ +@@ -216,8 +216,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/i18n.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/io/io.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/io/io.vcxproj 2011-03-14 13:14:22.985271555 +0100 +@@ -91,8 +91,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/icuio.pch + .\x86\Release/ + .\x86\Release/ +@@ -133,8 +133,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/icuio.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -176,8 +176,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/icuio.pch + .\x64\Release/ + .\x64\Release/ +@@ -216,8 +216,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/icuio.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/layout/layout.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/layout/layout.vcxproj 2011-03-14 13:14:23.000272579 +0100 +@@ -92,8 +92,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/layout.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -135,8 +135,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/layout.pch + .\x86\Release/ + .\x86\Release/ +@@ -177,8 +177,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/layout.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -218,8 +218,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/layout.pch + .\x64\Release/ + .\x64\Release/ +--- misc/icu/source/layoutex/layoutex.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/layoutex/layoutex.vcxproj 2011-03-14 13:14:23.000272579 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/layoutex.pch + .\x86\Release/ + .\x86\Release/ +@@ -133,8 +133,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/layoutex.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/layoutex.pch + .\x64\Release/ + .\x64\Release/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/layoutex.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/samples/break/break.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/break/break.vcxproj 2011-03-14 12:32:23.335497900 +0100 +@@ -92,7 +92,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/break.pch +@@ -134,7 +134,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/break.pch +@@ -176,7 +176,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/break.pch +@@ -219,7 +219,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/break.pch +--- misc/icu/source/samples/cal/cal.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/cal/cal.vcxproj 2011-03-14 12:32:23.337498038 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/cal.pch +@@ -127,7 +127,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/cal.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/cal.pch +@@ -206,7 +206,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/cal.pch +--- misc/icu/source/samples/case/case.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/case/case.vcxproj 2011-03-14 12:32:23.343498452 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/case.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/case.pch +@@ -168,7 +168,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/case.pch +@@ -207,7 +207,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/case.pch +--- misc/icu/source/samples/citer/citer.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/citer/citer.vcxproj 2011-03-14 12:32:23.335497900 +0100 +@@ -82,7 +82,7 @@ + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 +@@ -112,7 +112,7 @@ + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 +@@ -136,7 +136,7 @@ + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 +@@ -164,7 +164,7 @@ + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 +--- misc/icu/source/samples/coll/coll.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/coll/coll.vcxproj 2011-03-14 12:32:23.340498245 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/coll.pch +@@ -127,7 +127,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/coll.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/coll.pch +@@ -206,7 +206,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/coll.pch +--- misc/icu/source/samples/csdet/csdet.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/csdet/csdet.vcxproj 2011-03-14 12:32:23.336497969 +0100 +@@ -82,7 +82,7 @@ + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 +@@ -112,7 +112,7 @@ + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 +@@ -136,7 +136,7 @@ + ../../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 +@@ -164,7 +164,7 @@ + ../../../include;%(AdditionalIncludeDirectories) + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 +--- misc/icu/source/samples/date/date.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/date/date.vcxproj 2011-03-14 12:32:23.339498176 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/date.pch +@@ -127,7 +127,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/date.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/date.pch +@@ -205,7 +205,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/date.pch +--- misc/icu/source/samples/datefmt/datefmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/datefmt/datefmt.vcxproj 2011-03-14 12:32:23.335497900 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/datefmt.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/datefmt.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/datefmt.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/datefmt.pch +--- misc/icu/source/samples/layout/layout.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/layout/layout.vcxproj 2011-03-14 12:32:23.338498107 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/layout.pch +@@ -126,7 +126,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/layout.pch +@@ -163,7 +163,7 @@ + _DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/layout.pch +@@ -202,7 +202,7 @@ + _DEBUG;WIN64;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/layout.pch +--- misc/icu/source/samples/legacy/legacy.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/legacy/legacy.vcxproj 2011-03-14 12:32:23.342498383 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/legacy.pch +@@ -127,7 +127,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/legacy.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/legacy.pch +@@ -205,7 +205,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/legacy.pch +--- misc/icu/source/samples/msgfmt/msgfmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/msgfmt/msgfmt.vcxproj 2011-03-14 12:32:23.339498176 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/msgfmt.pch +@@ -127,7 +127,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/msgfmt.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/msgfmt.pch +@@ -205,7 +205,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/msgfmt.pch +--- misc/icu/source/samples/numfmt/numfmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/numfmt/numfmt.vcxproj 2011-03-14 12:32:23.340498245 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/numfmt.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/numfmt.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/numfmt.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/numfmt.pch +--- misc/icu/source/samples/props/props.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/props/props.vcxproj 2011-03-14 12:32:23.336497969 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDebugDLL + true +- true ++ false + + + .\x86\Release/props.pch +@@ -127,7 +127,7 @@ + true + MultiThreadedDebugDLL + true +- true ++ false + + + .\x64\Release/props.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/props.pch +@@ -205,7 +205,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/props.pch +--- misc/icu/source/samples/strsrch/strsrch.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/strsrch/strsrch.vcxproj 2011-03-14 12:32:23.344498521 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/strsrch.pch +@@ -128,7 +128,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/strsrch.pch +@@ -170,7 +170,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/strsrch.pch +@@ -209,7 +209,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/strsrch.pch +--- misc/icu/source/samples/translit/translit.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/translit/translit.vcxproj 2011-03-14 12:32:23.344498521 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/translit.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/translit.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/translit.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/translit.pch +--- misc/icu/source/samples/uciter8/uciter8.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/uciter8/uciter8.vcxproj 2011-03-14 12:32:23.341498314 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/uciter8.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/uciter8.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/uciter8.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/uciter8.pch +--- misc/icu/source/samples/ucnv/ucnv.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/ucnv/ucnv.vcxproj 2011-03-14 12:32:23.337498038 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/ucnv.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/ucnv.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/ucnv.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/ucnv.pch +--- misc/icu/source/samples/udata/reader.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/udata/reader.vcxproj 2011-03-14 12:32:23.338498107 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\reader_Win32_Debug/reader.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\reader_Win32_Debug/reader.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\reader_Win32_Release/reader.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\reader_Win32_Release/reader.pch +--- misc/icu/source/samples/udata/writer.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/udata/writer.vcxproj 2011-03-14 12:32:23.338498107 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/writer.pch +@@ -127,7 +127,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/writer.pch +@@ -168,7 +168,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/writer.pch +@@ -207,7 +207,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/writer.pch +--- misc/icu/source/samples/ufortune/ufortune.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/ufortune/ufortune.vcxproj 2011-03-14 12:32:23.342498383 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + .\x86\Debug/ufortune.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -125,7 +125,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + .\x64\Debug/ufortune.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -164,7 +164,7 @@ + true + MultiThreadedDLL + true +- true ++ false + .\x86\Release/ufortune.pch + .\x86\Release/ + .\x86\Release/ +@@ -201,7 +201,7 @@ + true + MultiThreadedDLL + true +- true ++ false + .\x64\Release/ufortune.pch + .\x64\Release/ + .\x64\Release/ +--- misc/icu/source/samples/ugrep/ugrep.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/ugrep/ugrep.vcxproj 2011-03-14 12:32:23.341498314 +0100 +@@ -89,7 +89,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/ugrep.pch +@@ -133,7 +133,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/ugrep.pch +@@ -174,7 +174,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/ugrep.pch +@@ -217,7 +217,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/ugrep.pch +--- misc/icu/source/samples/uresb/uresb.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/uresb/uresb.vcxproj 2011-03-14 12:32:23.342498383 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/uresb.pch +@@ -127,7 +127,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/uresb.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/uresb.pch +@@ -205,7 +205,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/uresb.pch +--- misc/icu/source/samples/ustring/ustring.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/samples/ustring/ustring.vcxproj 2011-03-14 12:32:23.343498452 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/ustring.pch +@@ -127,7 +127,7 @@ + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/ustring.pch +@@ -165,7 +165,7 @@ + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/ustring.pch +@@ -205,7 +205,7 @@ + WIN64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/ustring.pch +--- misc/icu/source/stubdata/stubdata.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/stubdata/stubdata.vcxproj 2011-03-14 13:14:23.003272786 +0100 +@@ -95,8 +95,8 @@ + + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release\stubdata.pch + .\x86\Release/ + .\x86\Release/ +@@ -142,8 +142,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/stubdata.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -189,8 +189,8 @@ + + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release\stubdata.pch + .\x64\Release/ + .\x64\Release/ +@@ -234,8 +234,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/stubdata.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/test/cintltst/cintltst.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/test/cintltst/cintltst.vcxproj 2011-03-14 13:14:23.002272717 +0100 +@@ -88,8 +88,8 @@ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x86\Debug/cintltst.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -127,8 +127,8 @@ + MultiThreaded + true + true +- true +- true ++ false ++ false + .\x86\Release/cintltst.pch + .\x86\Release/ + .\x86\Release/ +@@ -164,8 +164,8 @@ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x64\Debug/cintltst.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -202,8 +202,8 @@ + MultiThreaded + true + true +- true +- true ++ false ++ false + .\x64\Release/cintltst.pch + .\x64\Release/ + .\x64\Release/ +--- misc/icu/source/test/intltest/intltest.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/test/intltest/intltest.vcxproj 2011-03-14 13:14:23.001272648 +0100 +@@ -89,8 +89,8 @@ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x86\Debug/intltest.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -129,8 +129,8 @@ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x64\Debug/intltest.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -164,8 +164,8 @@ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded +- true +- true ++ false ++ false + .\x86\Release/intltest.pch + .\x86\Release/ + .\x86\Release/ +@@ -199,8 +199,8 @@ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded +- true +- true ++ false ++ false + .\x64\Release/intltest.pch + .\x64\Release/ + .\x64\Release/ +--- misc/icu/source/test/iotest/iotest.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/test/iotest/iotest.vcxproj 2011-03-14 13:14:23.001272648 +0100 +@@ -90,8 +90,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/iotest.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -127,8 +127,8 @@ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x86\Release/iotest.pch + .\x86\Release/ + .\x86\Release/ +@@ -166,8 +166,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/iotest.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -201,8 +201,8 @@ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x64\Release/iotest.pch + .\x64\Release/ + .\x64\Release/ +--- misc/icu/source/test/letest/gendata.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/test/letest/gendata.vcxproj 2011-03-14 12:32:23.346498659 +0100 +@@ -87,7 +87,7 @@ + WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/gendata.pch +@@ -126,7 +126,7 @@ + WIN64;WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/gendata.pch +@@ -166,7 +166,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/gendata.pch +@@ -204,7 +204,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/gendata.pch +--- misc/icu/source/test/letest/letest.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/test/letest/letest.vcxproj 2011-03-14 12:32:23.346498659 +0100 +@@ -88,7 +88,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/letest.pch +@@ -123,7 +123,7 @@ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/letest.pch +@@ -163,7 +163,7 @@ + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/letest.pch +@@ -197,7 +197,7 @@ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/letest.pch +--- misc/icu/source/tools/ctestfw/ctestfw.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/ctestfw/ctestfw.vcxproj 2011-03-14 13:14:22.995272239 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/icutest.pch + .\x86\Release/ + .\x86\Release/ +@@ -133,8 +133,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/icutest.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/icutest.pch + .\x64\Release/ + .\x64\Release/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/icutest.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/genbrk/genbrk.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/genbrk/genbrk.vcxproj 2011-03-14 13:14:22.996272307 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/genbrk.pch + .\x86\Release/ + .\x86\Release/ +@@ -132,8 +132,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/genbrk.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/genbrk.pch + .\x64\Release/ + .\x64\Release/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/genbrk.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/genccode/genccode.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/genccode/genccode.vcxproj 2011-03-14 12:32:23.332497693 +0100 +@@ -92,7 +92,7 @@ + true + MultiThreadedDLL + true +- true ++ false + .\x86\Release/genccode.pch + .\x86\Release/ + .\x86\Release/ +@@ -131,7 +131,7 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true ++ false + .\x86\Debug/genccode.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -173,7 +173,7 @@ + true + MultiThreadedDLL + true +- true ++ false + .\x64\Release/genccode.pch + .\x64\Release/ + .\x64\Release/ +@@ -211,7 +211,7 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true ++ false + .\x64\Debug/genccode.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/gencfu/gencfu.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/gencfu/gencfu.vcxproj 2011-03-14 13:14:22.993272104 +0100 +@@ -90,7 +90,7 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true ++ false + + + .\x86\Debug/ +@@ -120,8 +120,8 @@ + false + MultiThreadedDLL + true +- true +- true ++ false ++ false + + + .\x86\Release/ +@@ -155,8 +155,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gencfu.pch + .\x64\Release/ + .\x64\Release/ +@@ -193,8 +193,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gencfu.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/gencmn/gencmn.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/gencmn/gencmn.vcxproj 2011-03-14 13:14:22.997272375 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gencmn.pch + .\x86\Release/ + .\x86\Release/ +@@ -132,8 +132,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gencmn.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gencmn.pch + .\x64\Release/ + .\x64\Release/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gencmn.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/gencnval/gencnval.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/gencnval/gencnval.vcxproj 2011-03-14 13:14:22.999272511 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gencnval.pch + .\x86\Release/ + .\x86\Release/ +@@ -132,8 +132,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gencnval.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gencnval.pch + .\x64\Release/ + .\x64\Release/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gencnval.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/genctd/genctd.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/genctd/genctd.vcxproj 2011-03-14 13:14:22.998272443 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/genctd.pch + .\x86\Release/ + .\x86\Release/ +@@ -132,8 +132,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/genctd.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/genctd.pch + .\x64\Release/ + .\x64\Release/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/genctd.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/gennorm2/gennorm2.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/gennorm2/gennorm2.vcxproj 2011-03-14 13:14:22.995272239 +0100 +@@ -87,8 +87,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release\gennorm2.pch + .\x86\Release\ + .\x86\Release\ +@@ -131,8 +131,8 @@ + true + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug\gennorm2.pch + .\x86\Debug\ + .\x86\Debug\ +@@ -172,8 +172,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release\gennorm2.pch + .\x64\Release\ + .\x64\Release\ +@@ -216,8 +216,8 @@ + true + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug\gennorm2.pch + .\x64\Debug\ + .\x64\Debug\ +--- misc/icu/source/tools/genrb/derb.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/genrb/derb.vcxproj 2011-03-14 13:14:22.991271967 +0100 +@@ -96,8 +96,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release_derb/derb.pch + .\x86\Release_derb/ + .\x86\Release_derb/ +@@ -140,8 +140,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug_derb/derb.pch + .\x86\Debug_derb/ + .\x86\Debug_derb/ +@@ -185,8 +185,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release_derb/derb.pch + .\x64\Release_derb/ + .\x64\Release_derb/ +@@ -227,8 +227,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug_derb/derb.pch + .\x64\Debug_derb/ + .\x64\Debug_derb/ +--- misc/icu/source/tools/genrb/genrb.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/genrb/genrb.vcxproj 2011-03-14 13:14:22.992272036 +0100 +@@ -91,8 +91,8 @@ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x86\Release/genrb.pch + .\x86\Release/ + .\x86\Release/ +@@ -131,8 +131,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/genrb.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -173,8 +173,8 @@ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x64\Release/genrb.pch + .\x64\Release/ + .\x64\Release/ +@@ -212,8 +212,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/genrb.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/gensprep/gensprep.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/gensprep/gensprep.vcxproj 2011-03-14 13:14:22.994272171 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gensprep.pch + .\x86\Release/ + .\x86\Release/ +@@ -132,8 +132,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gensprep.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -174,8 +174,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gensprep.pch + .\x64\Release/ + .\x64\Release/ +@@ -213,8 +213,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gensprep.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/gentest/gentest.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/gentest/gentest.vcxproj 2011-03-14 13:14:22.994272171 +0100 +@@ -88,8 +88,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gentest.pch + .\x86\Release/ + .\x86\Release/ +@@ -123,8 +123,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gentest.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -161,8 +161,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gentest.pch + .\x64\Release/ + .\x64\Release/ +@@ -195,8 +195,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gentest.pch + .\x64\Debug/ + .\x64\Debug/ +--- misc/icu/source/tools/icuinfo/icuinfo.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/icuinfo/icuinfo.vcxproj 2011-03-14 13:14:22.992272036 +0100 +@@ -91,8 +91,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x86\Release/icuinfo.pch + x86\Release/ + x86\Release/ +@@ -127,8 +127,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icuinfo.pch + Debug/ + Debug/ +@@ -168,8 +168,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x64\Release/icuinfo.pch + x64\Release/ + x64\Release/ +@@ -205,8 +205,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icuinfo.pch + Debug/ + Debug/ +--- misc/icu/source/tools/icuinfo/testplug.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/icuinfo/testplug.vcxproj 2011-03-14 13:14:22.993272104 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release-testplug/testplug.pch + .\x86\Release-testplug/ + .\x86\Release-testplug/ +@@ -133,8 +133,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug-testplug/testplug.pch + .\x86\Debug-testplug/ + .\x86\Debug-testplug/ +@@ -175,8 +175,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release-testplug/testplug.pch + .\x64\Release-testplug/ + .\x64\Release-testplug/ +@@ -214,8 +214,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug-testplug/testplug.pch + .\x64\Debug-testplug/ + .\x64\Debug-testplug/ +--- misc/icu/source/tools/icupkg/icupkg.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/icupkg/icupkg.vcxproj 2011-03-14 13:14:22.996272307 +0100 +@@ -90,8 +90,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x86\Release/icupkg.pch + x86\Release/ + x86\Release/ +@@ -126,8 +126,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icupkg.pch + Debug/ + Debug/ +@@ -167,8 +167,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x64\Release/icupkg.pch + x64\Release/ + x64\Release/ +@@ -204,8 +204,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icupkg.pch + Debug/ + Debug/ +--- misc/icu/source/tools/makeconv/makeconv.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/makeconv/makeconv.vcxproj 2011-03-14 13:14:22.998272443 +0100 +@@ -93,8 +93,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/makeconv.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -134,8 +134,8 @@ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x86\Release/makeconv.pch + .\x86\Release/ + .\x86\Release/ +@@ -175,8 +175,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/makeconv.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -215,8 +215,8 @@ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x64\Release/makeconv.pch + .\x64\Release/ + .\x64\Release/ +--- misc/icu/source/tools/pkgdata/pkgdata.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/pkgdata/pkgdata.vcxproj 2011-03-14 13:14:22.991271967 +0100 +@@ -93,8 +93,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/pkgdata.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -135,8 +135,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/pkgdata.pch + .\x86\Release/ + .\x86\Release/ +@@ -176,8 +176,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/pkgdata.pch + .\x64\Debug/ + .\x64\Debug/ +@@ -217,8 +217,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/pkgdata.pch + .\x64\Release/ + .\x64\Release/ +--- icu/source/tools/toolutil/toolutil.vcxproj 2010-10-09 03:23:28.000000000 +0200 ++++ misc/build/icu/source/tools/toolutil/toolutil.vcxproj 2011-03-14 13:14:22.997272375 +0100 +@@ -92,8 +92,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/toolutil.pch + .\x86\Release/ + .\x86\Release/ +@@ -135,8 +135,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/toolutil.pch + .\x86\Debug/ + .\x86\Debug/ +@@ -178,8 +178,8 @@ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/toolutil.pch + .\x64\Release/ + .\x64\Release/ +@@ -219,8 +219,8 @@ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/toolutil.pch + .\x64\Debug/ + .\x64\Debug/ diff --git a/icu/makefile.mk b/icu/makefile.mk index d8f2e6af23b9..5c8d742f4025 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -48,6 +48,7 @@ PATCH_FILES=\ icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ + icu4c-4_6-wchar_t.patch \ icu4c-warnings.patch .IF "$(GUI)"=="UNX" @@ -211,12 +212,16 @@ ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF -CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg . +.IF "$(CPU)" == "I" +ICU_BUILD_ARCH=Win32 +.ELSE +ICU_BUILD_ARCH=x64 +.ENDIF -BUILD_ACTION=cd allinone && msbuild.exe /p:Configuration=Release allinone.sln && cd ..$/.. +BUILD_ACTION=cd allinone && msbuild.exe allinone.sln /p:Configuration=$(ICU_BUILD_VERSION) /p:Platform=$(ICU_BUILD_ARCH) OUT2LIB= \ - $(BUILD_DIR)$/..$/lib$/icudata.lib \ + $(BUILD_DIR)$/..$/lib$/icudt.lib \ $(BUILD_DIR)$/..$/lib$/icuin$(ICU_BUILD_LIBPOST).lib \ $(BUILD_DIR)$/..$/lib$/icuuc$(ICU_BUILD_LIBPOST).lib \ $(BUILD_DIR)$/..$/lib$/icule$(ICU_BUILD_LIBPOST).lib \ -- cgit From 0abd2462ba67bc60f67b5bb7ba5c14c17412590b Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 14 Mar 2011 14:38:00 +0100 Subject: Don't hardcode icu version in d.lst --- icu/prj/d.lst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/icu/prj/d.lst b/icu/prj/d.lst index c5d777277ead..5290123b549d 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -9,11 +9,7 @@ mkdir: %_DEST%\inc%_EXT%\external\unicode ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\bin\icudt40.dll %_DEST%\bin%_EXT%\icudt40.dll -..\%__SRC%\bin\icuin40.dll %_DEST%\bin%_EXT%\icuin40.dll -..\%__SRC%\bin\icule40.dll %_DEST%\bin%_EXT%\icule40.dll -..\%__SRC%\bin\icutu40.dll %_DEST%\bin%_EXT%\icutu40.dll -..\%__SRC%\bin\icuuc40.dll %_DEST%\bin%_EXT%\icuuc40.dll +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\genccode %_DEST%\bin%_EXT%\genccode ..\%__SRC%\bin\genccode.exe %_DEST%\bin%_EXT%\genccode.exe -- cgit From 9471e90f2b7ddda73779606e82ec25f48f437f01 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 14 Mar 2011 16:26:14 +0100 Subject: make apply on Linux where line endings matter --- icu/icu4c-4_6-wchar_t.patch | 3820 +++++++++++++++++++++---------------------- 1 file changed, 1910 insertions(+), 1910 deletions(-) diff --git a/icu/icu4c-4_6-wchar_t.patch b/icu/icu4c-4_6-wchar_t.patch index 7b02cb4d860e..16ec4b9efb76 100644 --- a/icu/icu4c-4_6-wchar_t.patch +++ b/icu/icu4c-4_6-wchar_t.patch @@ -1,2228 +1,2228 @@ --- misc/icu/source/common/common.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/common/common.vcxproj 2011-03-14 13:14:22.991271967 +0100 @@ -90,8 +90,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/common.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/common.pch + .\x86\Release/ + .\x86\Release/ @@ -129,8 +129,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/common.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/common.pch + .\x86\Debug/ + .\x86\Debug/ @@ -169,8 +169,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/common.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/common.pch + .\x64\Release/ + .\x64\Release/ @@ -206,8 +206,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/common.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/common.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/extra/uconv/uconv.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/extra/uconv/uconv.vcxproj 2011-03-14 13:14:23.003272786 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/uconv.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/uconv.pch + .\x86\Release/ + .\x86\Release/ @@ -134,8 +134,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/uconv.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/uconv.pch + .\x86\Debug/ + .\x86\Debug/ @@ -178,8 +178,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/uconv.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/uconv.pch + .\x64\Release/ + .\x64\Release/ @@ -219,8 +219,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/uconv.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/uconv.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/i18n/i18n.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/i18n/i18n.vcxproj 2011-03-14 13:14:22.988271760 +0100 @@ -91,8 +91,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/i18n.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/i18n.pch + .\x86\Release/ + .\x86\Release/ @@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/i18n.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/i18n.pch + .\x86\Debug/ + .\x86\Debug/ @@ -176,8 +176,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/i18n.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/i18n.pch + .\x64\Release/ + .\x64\Release/ @@ -216,8 +216,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/i18n.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/i18n.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/io/io.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/io/io.vcxproj 2011-03-14 13:14:22.985271555 +0100 @@ -91,8 +91,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/icuio.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/icuio.pch + .\x86\Release/ + .\x86\Release/ @@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/icuio.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/icuio.pch + .\x86\Debug/ + .\x86\Debug/ @@ -176,8 +176,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/icuio.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/icuio.pch + .\x64\Release/ + .\x64\Release/ @@ -216,8 +216,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/icuio.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/icuio.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/layout/layout.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/layout/layout.vcxproj 2011-03-14 13:14:23.000272579 +0100 @@ -92,8 +92,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/layout.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/layout.pch + .\x86\Debug/ + .\x86\Debug/ @@ -135,8 +135,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/layout.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/layout.pch + .\x86\Release/ + .\x86\Release/ @@ -177,8 +177,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/layout.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/layout.pch + .\x64\Debug/ + .\x64\Debug/ @@ -218,8 +218,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/layout.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/layout.pch + .\x64\Release/ + .\x64\Release/ --- misc/icu/source/layoutex/layoutex.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/layoutex/layoutex.vcxproj 2011-03-14 13:14:23.000272579 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/layoutex.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/layoutex.pch + .\x86\Release/ + .\x86\Release/ @@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/layoutex.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/layoutex.pch + .\x86\Debug/ + .\x86\Debug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/layoutex.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/layoutex.pch + .\x64\Release/ + .\x64\Release/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/layoutex.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/layoutex.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/samples/break/break.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/break/break.vcxproj 2011-03-14 12:32:23.335497900 +0100 @@ -92,7 +92,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/break.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/break.pch @@ -134,7 +134,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/break.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/break.pch @@ -176,7 +176,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/break.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/break.pch @@ -219,7 +219,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/break.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/break.pch --- misc/icu/source/samples/cal/cal.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/cal/cal.vcxproj 2011-03-14 12:32:23.337498038 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/cal.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/cal.pch @@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/cal.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/cal.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/cal.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/cal.pch @@ -206,7 +206,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/cal.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/cal.pch --- misc/icu/source/samples/case/case.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/case/case.vcxproj 2011-03-14 12:32:23.343498452 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/case.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/case.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/case.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/case.pch @@ -168,7 +168,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/case.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/case.pch @@ -207,7 +207,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/case.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/case.pch --- misc/icu/source/samples/citer/citer.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/citer/citer.vcxproj 2011-03-14 12:32:23.335497900 +0100 @@ -82,7 +82,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 @@ -112,7 +112,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 @@ -136,7 +136,7 @@ - ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 @@ -164,7 +164,7 @@ - ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 --- misc/icu/source/samples/coll/coll.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/coll/coll.vcxproj 2011-03-14 12:32:23.340498245 +0100 @@ -88,7 +88,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/coll.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/coll.pch @@ -127,7 +127,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/coll.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/coll.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/coll.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/coll.pch @@ -206,7 +206,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/coll.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/coll.pch --- misc/icu/source/samples/csdet/csdet.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/csdet/csdet.vcxproj 2011-03-14 12:32:23.336497969 +0100 @@ -82,7 +82,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 @@ -112,7 +112,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 + true + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + Level3 @@ -136,7 +136,7 @@ - ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 + ../../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 @@ -164,7 +164,7 @@ - ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 + ../../../include;%(AdditionalIncludeDirectories) + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded +- true ++ false + + + Level3 --- misc/icu/source/samples/date/date.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/date/date.vcxproj 2011-03-14 12:32:23.339498176 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/date.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/date.pch @@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/date.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/date.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/date.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/date.pch @@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/date.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/date.pch --- misc/icu/source/samples/datefmt/datefmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/datefmt/datefmt.vcxproj 2011-03-14 12:32:23.335497900 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/datefmt.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/datefmt.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/datefmt.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/datefmt.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/datefmt.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/datefmt.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/datefmt.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/datefmt.pch --- misc/icu/source/samples/layout/layout.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/layout/layout.vcxproj 2011-03-14 12:32:23.338498107 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/layout.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/layout.pch @@ -126,7 +126,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/layout.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/layout.pch @@ -163,7 +163,7 @@ - _DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/layout.pch + _DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/layout.pch @@ -202,7 +202,7 @@ - _DEBUG;WIN64;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/layout.pch + _DEBUG;WIN64;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/layout.pch --- misc/icu/source/samples/legacy/legacy.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/legacy/legacy.vcxproj 2011-03-14 12:32:23.342498383 +0100 @@ -88,7 +88,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/legacy.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/legacy.pch @@ -127,7 +127,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/legacy.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/legacy.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/legacy.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/legacy.pch @@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/legacy.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/legacy.pch --- misc/icu/source/samples/msgfmt/msgfmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/msgfmt/msgfmt.vcxproj 2011-03-14 12:32:23.339498176 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/msgfmt.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/msgfmt.pch @@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/msgfmt.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/msgfmt.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/msgfmt.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/msgfmt.pch @@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/msgfmt.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/msgfmt.pch --- misc/icu/source/samples/numfmt/numfmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/numfmt/numfmt.vcxproj 2011-03-14 12:32:23.340498245 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/numfmt.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/numfmt.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/numfmt.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/numfmt.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/numfmt.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/numfmt.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/numfmt.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/numfmt.pch --- misc/icu/source/samples/props/props.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/props/props.vcxproj 2011-03-14 12:32:23.336497969 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDebugDLL - true -- true -+ false - - - .\x86\Release/props.pch + true + MultiThreadedDebugDLL + true +- true ++ false + + + .\x86\Release/props.pch @@ -127,7 +127,7 @@ - true - MultiThreadedDebugDLL - true -- true -+ false - - - .\x64\Release/props.pch + true + MultiThreadedDebugDLL + true +- true ++ false + + + .\x64\Release/props.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/props.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/props.pch @@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/props.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/props.pch --- misc/icu/source/samples/strsrch/strsrch.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/strsrch/strsrch.vcxproj 2011-03-14 12:32:23.344498521 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/strsrch.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/strsrch.pch @@ -128,7 +128,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/strsrch.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/strsrch.pch @@ -170,7 +170,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/strsrch.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/strsrch.pch @@ -209,7 +209,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/strsrch.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/strsrch.pch --- misc/icu/source/samples/translit/translit.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/translit/translit.vcxproj 2011-03-14 12:32:23.344498521 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/translit.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/translit.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/translit.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/translit.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/translit.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/translit.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/translit.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/translit.pch --- misc/icu/source/samples/uciter8/uciter8.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/uciter8/uciter8.vcxproj 2011-03-14 12:32:23.341498314 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/uciter8.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/uciter8.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/uciter8.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/uciter8.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/uciter8.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/uciter8.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/uciter8.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/uciter8.pch --- misc/icu/source/samples/ucnv/ucnv.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/ucnv/ucnv.vcxproj 2011-03-14 12:32:23.337498038 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/ucnv.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/ucnv.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/ucnv.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/ucnv.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/ucnv.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/ucnv.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/ucnv.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/ucnv.pch --- misc/icu/source/samples/udata/reader.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/udata/reader.vcxproj 2011-03-14 12:32:23.338498107 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\reader_Win32_Debug/reader.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\reader_Win32_Debug/reader.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\reader_Win32_Debug/reader.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\reader_Win32_Debug/reader.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\reader_Win32_Release/reader.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\reader_Win32_Release/reader.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\reader_Win32_Release/reader.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\reader_Win32_Release/reader.pch --- misc/icu/source/samples/udata/writer.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/udata/writer.vcxproj 2011-03-14 12:32:23.338498107 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/writer.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/writer.pch @@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/writer.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/writer.pch @@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/writer.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/writer.pch @@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/writer.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/writer.pch --- misc/icu/source/samples/ufortune/ufortune.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/ufortune/ufortune.vcxproj 2011-03-14 12:32:23.342498383 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - .\x86\Debug/ufortune.pch - .\x86\Debug/ - .\x86\Debug/ + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + .\x86\Debug/ufortune.pch + .\x86\Debug/ + .\x86\Debug/ @@ -125,7 +125,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - .\x64\Debug/ufortune.pch - .\x64\Debug/ - .\x64\Debug/ + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + .\x64\Debug/ufortune.pch + .\x64\Debug/ + .\x64\Debug/ @@ -164,7 +164,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x86\Release/ufortune.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true ++ false + .\x86\Release/ufortune.pch + .\x86\Release/ + .\x86\Release/ @@ -201,7 +201,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x64\Release/ufortune.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true ++ false + .\x64\Release/ufortune.pch + .\x64\Release/ + .\x64\Release/ --- misc/icu/source/samples/ugrep/ugrep.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/ugrep/ugrep.vcxproj 2011-03-14 12:32:23.341498314 +0100 @@ -89,7 +89,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/ugrep.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/ugrep.pch @@ -133,7 +133,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/ugrep.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/ugrep.pch @@ -174,7 +174,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/ugrep.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/ugrep.pch @@ -217,7 +217,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/ugrep.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/ugrep.pch --- misc/icu/source/samples/uresb/uresb.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/uresb/uresb.vcxproj 2011-03-14 12:32:23.342498383 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/uresb.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/uresb.pch @@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/uresb.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/uresb.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/uresb.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/uresb.pch @@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/uresb.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/uresb.pch --- misc/icu/source/samples/ustring/ustring.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/samples/ustring/ustring.vcxproj 2011-03-14 12:32:23.343498452 +0100 @@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/ustring.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x86\Release/ustring.pch @@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/ustring.pch + true + MultiThreadedDLL + true +- true ++ false + + + .\x64\Release/ustring.pch @@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/ustring.pch + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x86\Debug/ustring.pch @@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/ustring.pch + WIN64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL +- true ++ false + + + .\x64\Debug/ustring.pch --- misc/icu/source/stubdata/stubdata.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/stubdata/stubdata.vcxproj 2011-03-14 13:14:23.003272786 +0100 @@ -95,8 +95,8 @@ - - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release\stubdata.pch - .\x86\Release/ - .\x86\Release/ + + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release\stubdata.pch + .\x86\Release/ + .\x86\Release/ @@ -142,8 +142,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/stubdata.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/stubdata.pch + .\x86\Debug/ + .\x86\Debug/ @@ -189,8 +189,8 @@ - - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release\stubdata.pch - .\x64\Release/ - .\x64\Release/ + + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release\stubdata.pch + .\x64\Release/ + .\x64\Release/ @@ -234,8 +234,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/stubdata.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/stubdata.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/test/cintltst/cintltst.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/test/cintltst/cintltst.vcxproj 2011-03-14 13:14:23.002272717 +0100 @@ -88,8 +88,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x86\Debug/cintltst.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x86\Debug/cintltst.pch + .\x86\Debug/ + .\x86\Debug/ @@ -127,8 +127,8 @@ - MultiThreaded - true - true -- true -- true -+ false -+ false - .\x86\Release/cintltst.pch - .\x86\Release/ - .\x86\Release/ + MultiThreaded + true + true +- true +- true ++ false ++ false + .\x86\Release/cintltst.pch + .\x86\Release/ + .\x86\Release/ @@ -164,8 +164,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x64\Debug/cintltst.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x64\Debug/cintltst.pch + .\x64\Debug/ + .\x64\Debug/ @@ -202,8 +202,8 @@ - MultiThreaded - true - true -- true -- true -+ false -+ false - .\x64\Release/cintltst.pch - .\x64\Release/ - .\x64\Release/ + MultiThreaded + true + true +- true +- true ++ false ++ false + .\x64\Release/cintltst.pch + .\x64\Release/ + .\x64\Release/ --- misc/icu/source/test/intltest/intltest.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/test/intltest/intltest.vcxproj 2011-03-14 13:14:23.001272648 +0100 @@ -89,8 +89,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x86\Debug/intltest.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x86\Debug/intltest.pch + .\x86\Debug/ + .\x86\Debug/ @@ -129,8 +129,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x64\Debug/intltest.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebug + true +- true +- true ++ false ++ false + .\x64\Debug/intltest.pch + .\x64\Debug/ + .\x64\Debug/ @@ -164,8 +164,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded -- true -- true -+ false -+ false - .\x86\Release/intltest.pch - .\x86\Release/ - .\x86\Release/ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded +- true +- true ++ false ++ false + .\x86\Release/intltest.pch + .\x86\Release/ + .\x86\Release/ @@ -199,8 +199,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded -- true -- true -+ false -+ false - .\x64\Release/intltest.pch - .\x64\Release/ - .\x64\Release/ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreaded +- true +- true ++ false ++ false + .\x64\Release/intltest.pch + .\x64\Release/ + .\x64\Release/ --- misc/icu/source/test/iotest/iotest.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/test/iotest/iotest.vcxproj 2011-03-14 13:14:23.001272648 +0100 @@ -90,8 +90,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/iotest.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/iotest.pch + .\x86\Debug/ + .\x86\Debug/ @@ -127,8 +127,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x86\Release/iotest.pch - .\x86\Release/ - .\x86\Release/ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x86\Release/iotest.pch + .\x86\Release/ + .\x86\Release/ @@ -166,8 +166,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/iotest.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/iotest.pch + .\x64\Debug/ + .\x64\Debug/ @@ -201,8 +201,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x64\Release/iotest.pch - .\x64\Release/ - .\x64\Release/ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x64\Release/iotest.pch + .\x64\Release/ + .\x64\Release/ --- misc/icu/source/test/letest/gendata.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/test/letest/gendata.vcxproj 2011-03-14 12:32:23.346498659 +0100 @@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/gendata.pch + WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/gendata.pch @@ -126,7 +126,7 @@ - WIN64;WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/gendata.pch + WIN64;WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/gendata.pch @@ -166,7 +166,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/gendata.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/gendata.pch @@ -204,7 +204,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/gendata.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/gendata.pch --- misc/icu/source/test/letest/letest.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/test/letest/letest.vcxproj 2011-03-14 12:32:23.346498659 +0100 @@ -88,7 +88,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/letest.pch + true + MultiThreaded + true +- true ++ false + + + .\x86\Release/letest.pch @@ -123,7 +123,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/letest.pch + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x86\Debug/letest.pch @@ -163,7 +163,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/letest.pch + true + MultiThreaded + true +- true ++ false + + + .\x64\Release/letest.pch @@ -197,7 +197,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/letest.pch + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +- true ++ false + + + .\x64\Debug/letest.pch --- misc/icu/source/tools/ctestfw/ctestfw.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/ctestfw/ctestfw.vcxproj 2011-03-14 13:14:22.995272239 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/icutest.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/icutest.pch + .\x86\Release/ + .\x86\Release/ @@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/icutest.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/icutest.pch + .\x86\Debug/ + .\x86\Debug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/icutest.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/icutest.pch + .\x64\Release/ + .\x64\Release/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/icutest.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/icutest.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/genbrk/genbrk.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/genbrk/genbrk.vcxproj 2011-03-14 13:14:22.996272307 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/genbrk.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/genbrk.pch + .\x86\Release/ + .\x86\Release/ @@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/genbrk.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/genbrk.pch + .\x86\Debug/ + .\x86\Debug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/genbrk.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/genbrk.pch + .\x64\Release/ + .\x64\Release/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/genbrk.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/genbrk.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/genccode/genccode.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/genccode/genccode.vcxproj 2011-03-14 12:32:23.332497693 +0100 @@ -92,7 +92,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x86\Release/genccode.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true ++ false + .\x86\Release/genccode.pch + .\x86\Release/ + .\x86\Release/ @@ -131,7 +131,7 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -+ false - .\x86\Debug/genccode.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true ++ false + .\x86\Debug/genccode.pch + .\x86\Debug/ + .\x86\Debug/ @@ -173,7 +173,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x64\Release/genccode.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true ++ false + .\x64\Release/genccode.pch + .\x64\Release/ + .\x64\Release/ @@ -211,7 +211,7 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -+ false - .\x64\Debug/genccode.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true ++ false + .\x64\Debug/genccode.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/gencfu/gencfu.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/gencfu/gencfu.vcxproj 2011-03-14 13:14:22.993272104 +0100 @@ -90,7 +90,7 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -+ false - - - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true ++ false + + + .\x86\Debug/ @@ -120,8 +120,8 @@ - false - MultiThreadedDLL - true -- true -- true -+ false -+ false - - - .\x86\Release/ + false + MultiThreadedDLL + true +- true +- true ++ false ++ false + + + .\x86\Release/ @@ -155,8 +155,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gencfu.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gencfu.pch + .\x64\Release/ + .\x64\Release/ @@ -193,8 +193,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gencfu.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gencfu.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/gencmn/gencmn.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/gencmn/gencmn.vcxproj 2011-03-14 13:14:22.997272375 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gencmn.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gencmn.pch + .\x86\Release/ + .\x86\Release/ @@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gencmn.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gencmn.pch + .\x86\Debug/ + .\x86\Debug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gencmn.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gencmn.pch + .\x64\Release/ + .\x64\Release/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gencmn.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gencmn.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/gencnval/gencnval.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/gencnval/gencnval.vcxproj 2011-03-14 13:14:22.999272511 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gencnval.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gencnval.pch + .\x86\Release/ + .\x86\Release/ @@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gencnval.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gencnval.pch + .\x86\Debug/ + .\x86\Debug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gencnval.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gencnval.pch + .\x64\Release/ + .\x64\Release/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gencnval.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gencnval.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/genctd/genctd.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/genctd/genctd.vcxproj 2011-03-14 13:14:22.998272443 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/genctd.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/genctd.pch + .\x86\Release/ + .\x86\Release/ @@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/genctd.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/genctd.pch + .\x86\Debug/ + .\x86\Debug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/genctd.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/genctd.pch + .\x64\Release/ + .\x64\Release/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/genctd.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/genctd.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/gennorm2/gennorm2.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/gennorm2/gennorm2.vcxproj 2011-03-14 13:14:22.995272239 +0100 @@ -87,8 +87,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release\gennorm2.pch - .\x86\Release\ - .\x86\Release\ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release\gennorm2.pch + .\x86\Release\ + .\x86\Release\ @@ -131,8 +131,8 @@ - true - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug\gennorm2.pch - .\x86\Debug\ - .\x86\Debug\ + true + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug\gennorm2.pch + .\x86\Debug\ + .\x86\Debug\ @@ -172,8 +172,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release\gennorm2.pch - .\x64\Release\ - .\x64\Release\ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release\gennorm2.pch + .\x64\Release\ + .\x64\Release\ @@ -216,8 +216,8 @@ - true - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug\gennorm2.pch - .\x64\Debug\ - .\x64\Debug\ + true + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug\gennorm2.pch + .\x64\Debug\ + .\x64\Debug\ --- misc/icu/source/tools/genrb/derb.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/genrb/derb.vcxproj 2011-03-14 13:14:22.991271967 +0100 @@ -96,8 +96,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release_derb/derb.pch - .\x86\Release_derb/ - .\x86\Release_derb/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release_derb/derb.pch + .\x86\Release_derb/ + .\x86\Release_derb/ @@ -140,8 +140,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug_derb/derb.pch - .\x86\Debug_derb/ - .\x86\Debug_derb/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug_derb/derb.pch + .\x86\Debug_derb/ + .\x86\Debug_derb/ @@ -185,8 +185,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release_derb/derb.pch - .\x64\Release_derb/ - .\x64\Release_derb/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release_derb/derb.pch + .\x64\Release_derb/ + .\x64\Release_derb/ @@ -227,8 +227,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug_derb/derb.pch - .\x64\Debug_derb/ - .\x64\Debug_derb/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug_derb/derb.pch + .\x64\Debug_derb/ + .\x64\Debug_derb/ --- misc/icu/source/tools/genrb/genrb.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/genrb/genrb.vcxproj 2011-03-14 13:14:22.992272036 +0100 @@ -91,8 +91,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x86\Release/genrb.pch - .\x86\Release/ - .\x86\Release/ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x86\Release/genrb.pch + .\x86\Release/ + .\x86\Release/ @@ -131,8 +131,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/genrb.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/genrb.pch + .\x86\Debug/ + .\x86\Debug/ @@ -173,8 +173,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x64\Release/genrb.pch - .\x64\Release/ - .\x64\Release/ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x64\Release/genrb.pch + .\x64\Release/ + .\x64\Release/ @@ -212,8 +212,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/genrb.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/genrb.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/gensprep/gensprep.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/gensprep/gensprep.vcxproj 2011-03-14 13:14:22.994272171 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gensprep.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gensprep.pch + .\x86\Release/ + .\x86\Release/ @@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gensprep.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gensprep.pch + .\x86\Debug/ + .\x86\Debug/ @@ -174,8 +174,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gensprep.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gensprep.pch + .\x64\Release/ + .\x64\Release/ @@ -213,8 +213,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gensprep.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gensprep.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/gentest/gentest.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/gentest/gentest.vcxproj 2011-03-14 13:14:22.994272171 +0100 @@ -88,8 +88,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gentest.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/gentest.pch + .\x86\Release/ + .\x86\Release/ @@ -123,8 +123,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gentest.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/gentest.pch + .\x86\Debug/ + .\x86\Debug/ @@ -161,8 +161,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gentest.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/gentest.pch + .\x64\Release/ + .\x64\Release/ @@ -195,8 +195,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gentest.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/gentest.pch + .\x64\Debug/ + .\x64\Debug/ --- misc/icu/source/tools/icuinfo/icuinfo.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/icuinfo/icuinfo.vcxproj 2011-03-14 13:14:22.992272036 +0100 @@ -91,8 +91,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x86\Release/icuinfo.pch - x86\Release/ - x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x86\Release/icuinfo.pch + x86\Release/ + x86\Release/ @@ -127,8 +127,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icuinfo.pch - Debug/ - Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icuinfo.pch + Debug/ + Debug/ @@ -168,8 +168,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x64\Release/icuinfo.pch - x64\Release/ - x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x64\Release/icuinfo.pch + x64\Release/ + x64\Release/ @@ -205,8 +205,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icuinfo.pch - Debug/ - Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icuinfo.pch + Debug/ + Debug/ --- misc/icu/source/tools/icuinfo/testplug.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/icuinfo/testplug.vcxproj 2011-03-14 13:14:22.993272104 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release-testplug/testplug.pch - .\x86\Release-testplug/ - .\x86\Release-testplug/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release-testplug/testplug.pch + .\x86\Release-testplug/ + .\x86\Release-testplug/ @@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug-testplug/testplug.pch - .\x86\Debug-testplug/ - .\x86\Debug-testplug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug-testplug/testplug.pch + .\x86\Debug-testplug/ + .\x86\Debug-testplug/ @@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release-testplug/testplug.pch - .\x64\Release-testplug/ - .\x64\Release-testplug/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release-testplug/testplug.pch + .\x64\Release-testplug/ + .\x64\Release-testplug/ @@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug-testplug/testplug.pch - .\x64\Debug-testplug/ - .\x64\Debug-testplug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug-testplug/testplug.pch + .\x64\Debug-testplug/ + .\x64\Debug-testplug/ --- misc/icu/source/tools/icupkg/icupkg.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/icupkg/icupkg.vcxproj 2011-03-14 13:14:22.996272307 +0100 @@ -90,8 +90,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x86\Release/icupkg.pch - x86\Release/ - x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x86\Release/icupkg.pch + x86\Release/ + x86\Release/ @@ -126,8 +126,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icupkg.pch - Debug/ - Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icupkg.pch + Debug/ + Debug/ @@ -167,8 +167,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x64\Release/icupkg.pch - x64\Release/ - x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + x64\Release/icupkg.pch + x64\Release/ + x64\Release/ @@ -204,8 +204,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icupkg.pch - Debug/ - Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + Debug/icupkg.pch + Debug/ + Debug/ --- misc/icu/source/tools/makeconv/makeconv.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/makeconv/makeconv.vcxproj 2011-03-14 13:14:22.998272443 +0100 @@ -93,8 +93,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/makeconv.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/makeconv.pch + .\x86\Debug/ + .\x86\Debug/ @@ -134,8 +134,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x86\Release/makeconv.pch - .\x86\Release/ - .\x86\Release/ + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x86\Release/makeconv.pch + .\x86\Release/ + .\x86\Release/ @@ -175,8 +175,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/makeconv.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/makeconv.pch + .\x64\Debug/ + .\x64\Debug/ @@ -215,8 +215,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x64\Release/makeconv.pch - .\x64\Release/ - .\x64\Release/ + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) + true + MultiThreadedDLL +- true +- true ++ false ++ false + .\x64\Release/makeconv.pch + .\x64\Release/ + .\x64\Release/ --- misc/icu/source/tools/pkgdata/pkgdata.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/pkgdata/pkgdata.vcxproj 2011-03-14 13:14:22.991271967 +0100 @@ -93,8 +93,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/pkgdata.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/pkgdata.pch + .\x86\Debug/ + .\x86\Debug/ @@ -135,8 +135,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/pkgdata.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/pkgdata.pch + .\x86\Release/ + .\x86\Release/ @@ -176,8 +176,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/pkgdata.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/pkgdata.pch + .\x64\Debug/ + .\x64\Debug/ @@ -217,8 +217,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/pkgdata.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/pkgdata.pch + .\x64\Release/ + .\x64\Release/ --- icu/source/tools/toolutil/toolutil.vcxproj 2010-10-09 03:23:28.000000000 +0200 +++ misc/build/icu/source/tools/toolutil/toolutil.vcxproj 2011-03-14 13:14:22.997272375 +0100 @@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/toolutil.pch - .\x86\Release/ - .\x86\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x86\Release/toolutil.pch + .\x86\Release/ + .\x86\Release/ @@ -135,8 +135,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/toolutil.pch - .\x86\Debug/ - .\x86\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x86\Debug/toolutil.pch + .\x86\Debug/ + .\x86\Debug/ @@ -178,8 +178,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/toolutil.pch - .\x64\Release/ - .\x64\Release/ + true + MultiThreadedDLL + true +- true +- true ++ false ++ false + .\x64\Release/toolutil.pch + .\x64\Release/ + .\x64\Release/ @@ -219,8 +219,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/toolutil.pch - .\x64\Debug/ - .\x64\Debug/ + EnableFastChecks + MultiThreadedDebugDLL + true +- true +- true ++ false ++ false + .\x64\Debug/toolutil.pch + .\x64\Debug/ + .\x64\Debug/ -- cgit From dc1386ffc3e2a5e63ff7c9dbcaa3d8a40d9dee33 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 15 Mar 2011 10:35:24 +0100 Subject: Downgrade icu to 4.4.2 --- icu/icuversion.mk | 4 ++-- icu/makefile.mk | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/icu/icuversion.mk b/icu/icuversion.mk index 7b1ed64ac381..b0e576988c7b 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -27,7 +27,7 @@ # major ICU_MAJOR*=4 # minor -ICU_MINOR*=6 +ICU_MINOR*=4 # micro -ICU_MICRO*=0 +ICU_MICRO*=2 diff --git a/icu/makefile.mk b/icu/makefile.mk index 5c8d742f4025..99d975bac704 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -37,8 +37,8 @@ TARGET=so_icu .INCLUDE : icuversion.mk -TARFILE_NAME=icu4c-4_6-src -TARFILE_MD5=43e56b71c407be5154de681eaa646a4a +TARFILE_NAME=icu4c-4_4_2-src +TARFILE_MD5=314e582264c36b3735466c522899aa07 TARFILE_ROOTDIR=icu #icu4c.8320.freeserif.crash.patch, see @@ -218,7 +218,11 @@ ICU_BUILD_ARCH=Win32 ICU_BUILD_ARCH=x64 .ENDIF -BUILD_ACTION=cd allinone && msbuild.exe allinone.sln /p:Configuration=$(ICU_BUILD_VERSION) /p:Platform=$(ICU_BUILD_ARCH) +.IF "$(CCNUMVER)" >= "001600000000" +BUILD_ACTION=cd allinone && MSBuild.exe allinone.sln /p:Configuration=$(ICU_BUILD_VERSION) /p:Platform=$(ICU_BUILD_ARCH) +.ELSE +BUILD_ACTION=cd allinone && $(COMPATH)$/vcpackages$/vcbuild.exe allinone.sln "$(ICU_BUILD_VERSION)|$(ICU_BUILD_ARCH)" +.ENDIF OUT2LIB= \ $(BUILD_DIR)$/..$/lib$/icudt.lib \ -- cgit From 1c3f71ec25eb0e1a3c529ff4a902c8962d6e8976 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 15 Mar 2011 11:21:43 +0100 Subject: Make icu 4.4.2 build on Linux --- icu/icu4c-4_4_2-wchar_t.patch | 2553 +++++++++++++++++++++++++++++++++++++++++ icu/icu4c-4_6-wchar_t.patch | 2228 ----------------------------------- icu/icu4c-build.patch | 53 +- icu/makefile.mk | 2 +- 4 files changed, 2580 insertions(+), 2256 deletions(-) create mode 100644 icu/icu4c-4_4_2-wchar_t.patch delete mode 100644 icu/icu4c-4_6-wchar_t.patch diff --git a/icu/icu4c-4_4_2-wchar_t.patch b/icu/icu4c-4_4_2-wchar_t.patch new file mode 100644 index 000000000000..de34c4ee1bb6 --- /dev/null +++ b/icu/icu4c-4_4_2-wchar_t.patch @@ -0,0 +1,2553 @@ +--- misc/icu/source/common/common.vcproj 2010-09-29 20:37:20.000000000 +0200 ++++ misc/build/icu/source/common/common.vcproj 2011-03-15 10:44:59.823402944 +0100 +@@ -53,8 +53,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/common.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -144,8 +144,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/common.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -237,8 +237,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/common.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -327,8 +327,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/common.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/extra/uconv/uconv.vcproj 2010-09-29 20:37:14.000000000 +0200 ++++ misc/build/icu/source/extra/uconv/uconv.vcproj 2011-03-15 10:44:59.842405231 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/uconv.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -143,8 +143,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/uconv.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -237,8 +237,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/uconv.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -331,8 +331,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/uconv.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/i18n/i18n.vcproj 2010-09-29 20:37:10.000000000 +0200 ++++ misc/build/icu/source/i18n/i18n.vcproj 2011-03-15 10:44:59.818402341 +0100 +@@ -54,8 +54,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/i18n.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -148,8 +148,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/i18n.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -244,8 +244,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/i18n.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -337,8 +337,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/i18n.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/io/io.vcproj 2010-09-29 20:37:36.000000000 +0200 ++++ misc/build/icu/source/io/io.vcproj 2011-03-15 10:44:59.813401741 +0100 +@@ -54,8 +54,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/icuio.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -148,8 +148,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/icuio.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -244,8 +244,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/icuio.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -340,8 +340,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/icuio.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/layout/layout.vcproj 2010-09-29 20:38:38.000000000 +0200 ++++ misc/build/icu/source/layout/layout.vcproj 2011-03-15 10:44:59.838404750 +0100 +@@ -55,8 +55,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/layout.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -151,8 +151,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/layout.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -245,8 +245,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/layout.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -343,8 +343,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/layout.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/layoutex/layoutex.vcproj 2010-09-29 20:38:36.000000000 +0200 ++++ misc/build/icu/source/layoutex/layoutex.vcproj 2011-03-15 10:44:59.839404871 +0100 +@@ -55,8 +55,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/layoutex.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -148,8 +148,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/layoutex.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -243,8 +243,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/layoutex.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -338,8 +338,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/layoutex.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/samples/break/break.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/break/break.vcproj 2011-03-15 10:43:34.493128191 +0100 +@@ -55,7 +55,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/break.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -148,7 +148,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/break.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -241,7 +241,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/break.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -335,7 +335,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/break.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/cal/cal.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/cal/cal.vcproj 2011-03-15 10:43:34.497128671 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/cal.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/cal.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/cal.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -322,7 +322,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/cal.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/case/case.vcproj 2010-09-29 20:37:34.000000000 +0200 ++++ misc/build/icu/source/samples/case/case.vcproj 2011-03-15 10:43:34.504129515 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/case.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/case.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/case.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/case.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/citer/citer.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/citer/citer.vcproj 2011-03-15 10:43:34.494128311 +0100 +@@ -49,7 +49,7 @@ + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +@@ -131,7 +131,7 @@ + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +@@ -209,7 +209,7 @@ + AdditionalIncludeDirectories="..\..\..\include" + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="0" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +@@ -289,7 +289,7 @@ + AdditionalIncludeDirectories="..\..\..\include" + PreprocessorDefinitions="WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="0" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +--- misc/icu/source/samples/coll/coll.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/coll/coll.vcproj 2011-03-15 10:43:34.500129033 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/coll.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/coll.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/coll.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -322,7 +322,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/coll.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/csdet/csdet.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/csdet/csdet.vcproj 2011-03-15 10:43:34.495128431 +0100 +@@ -49,7 +49,7 @@ + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +@@ -131,7 +131,7 @@ + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +@@ -209,7 +209,7 @@ + AdditionalIncludeDirectories="../../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="0" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +@@ -289,7 +289,7 @@ + AdditionalIncludeDirectories="../../../include" + PreprocessorDefinitions="WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="0" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" +--- misc/icu/source/samples/date/date.vcproj 2010-09-29 20:37:34.000000000 +0200 ++++ misc/build/icu/source/samples/date/date.vcproj 2011-03-15 10:43:34.499128912 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/date.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/date.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/date.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -321,7 +321,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/date.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/datefmt/datefmt.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/datefmt/datefmt.vcproj 2011-03-15 10:43:34.494128311 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/datefmt.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/datefmt.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/datefmt.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/datefmt.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/layout/layout.vcproj 2010-09-29 20:37:34.000000000 +0200 ++++ misc/build/icu/source/samples/layout/layout.vcproj 2011-03-15 10:43:34.498128791 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/layout.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -140,7 +140,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/layout.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -228,7 +228,7 @@ + PreprocessorDefinitions="_DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/layout.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -318,7 +318,7 @@ + PreprocessorDefinitions="_DEBUG;WIN64;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/layout.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/legacy/legacy.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/legacy/legacy.vcproj 2011-03-15 10:43:34.503129395 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/legacy.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/legacy.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/legacy.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -321,7 +321,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/legacy.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/msgfmt/msgfmt.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/msgfmt/msgfmt.vcproj 2011-03-15 10:43:34.499128912 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/msgfmt.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/msgfmt.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/msgfmt.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -321,7 +321,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/msgfmt.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/numfmt/numfmt.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/numfmt/numfmt.vcproj 2011-03-15 10:43:34.500129033 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/numfmt.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/numfmt.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/numfmt.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/numfmt.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/props/props.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/props/props.vcproj 2011-03-15 10:43:34.495128431 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/props.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/props.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/props.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -321,7 +321,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/props.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/strsrch/strsrch.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/strsrch/strsrch.vcproj 2011-03-15 10:43:34.505129635 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/strsrch.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -142,7 +142,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/strsrch.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -235,7 +235,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/strsrch.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -325,7 +325,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/strsrch.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/translit/translit.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/translit/translit.vcproj 2011-03-15 10:43:34.505129635 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/translit.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/translit.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/translit.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/translit.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/uciter8/uciter8.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/uciter8/uciter8.vcproj 2011-03-15 10:43:34.502129275 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/uciter8.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/uciter8.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/uciter8.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/uciter8.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/ucnv/ucnv.vcproj 2010-09-29 20:37:34.000000000 +0200 ++++ misc/build/icu/source/samples/ucnv/ucnv.vcproj 2011-03-15 10:43:34.496128551 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/ucnv.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/ucnv.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/ucnv.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/ucnv.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/udata/reader.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/udata/reader.vcproj 2011-03-15 10:43:34.497128671 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\reader_Win32_Debug/reader.pch" + AssemblerListingLocation=".\reader_Win32_Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\reader_Win32_Debug/reader.pch" + AssemblerListingLocation=".\reader_Win32_Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\reader_Win32_Release/reader.pch" + AssemblerListingLocation=".\reader_Win32_Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\reader_Win32_Release/reader.pch" + AssemblerListingLocation=".\reader_Win32_Release/" +--- misc/icu/source/samples/udata/writer.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/udata/writer.vcproj 2011-03-15 10:43:34.498128791 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/writer.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -141,7 +141,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/writer.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/writer.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -323,7 +323,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/writer.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/samples/ufortune/ufortune.vcproj 2010-09-29 20:37:32.000000000 +0200 ++++ misc/build/icu/source/samples/ufortune/ufortune.vcproj 2011-03-15 10:43:34.503129395 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/ufortune.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -140,7 +140,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/ufortune.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -231,7 +231,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/ufortune.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -320,7 +320,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/ufortune.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/samples/ugrep/ugrep.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/ugrep/ugrep.vcproj 2011-03-15 10:43:34.501129154 +0100 +@@ -53,7 +53,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/ugrep.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -147,7 +147,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/ugrep.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -238,7 +238,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/ugrep.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -330,7 +330,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/ugrep.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/uresb/uresb.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/uresb/uresb.vcproj 2011-03-15 10:43:34.502129275 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/uresb.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/uresb.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/uresb.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -321,7 +321,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/uresb.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/samples/ustring/ustring.vcproj 2010-09-29 20:37:30.000000000 +0200 ++++ misc/build/icu/source/samples/ustring/ustring.vcproj 2011-03-15 10:43:34.504129515 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/ustring.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -141,7 +141,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/ustring.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -230,7 +230,7 @@ + PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/ustring.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -321,7 +321,7 @@ + PreprocessorDefinitions="WIN64;WIN32,_DEBUG,_CONSOLE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/ustring.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/stubdata/stubdata.vcproj 2010-09-29 20:37:36.000000000 +0200 ++++ misc/build/icu/source/stubdata/stubdata.vcproj 2011-03-15 10:44:59.843405351 +0100 +@@ -55,8 +55,8 @@ + ExceptionHandling="0" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release\stubdata.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -153,8 +153,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/stubdata.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -250,8 +250,8 @@ + ExceptionHandling="0" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release\stubdata.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -350,8 +350,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/stubdata.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/test/cintltst/cintltst.vcproj 2010-09-29 20:36:50.000000000 +0200 ++++ misc/build/icu/source/test/cintltst/cintltst.vcproj 2011-03-15 10:44:59.842405231 +0100 +@@ -51,8 +51,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/cintltst.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -143,8 +143,8 @@ + RuntimeLibrary="0" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/cintltst.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -232,8 +232,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/cintltst.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -327,8 +327,8 @@ + RuntimeLibrary="0" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/cintltst.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/test/intltest/intltest.vcproj 2010-09-29 20:36:54.000000000 +0200 ++++ misc/build/icu/source/test/intltest/intltest.vcproj 2011-03-15 10:44:59.841405111 +0100 +@@ -52,8 +52,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/intltest.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -145,8 +145,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/intltest.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -234,8 +234,8 @@ + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="0" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/intltest.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -321,8 +321,8 @@ + PreprocessorDefinitions="WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="0" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/intltest.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/test/iotest/iotest.vcproj 2010-09-29 20:36:58.000000000 +0200 ++++ misc/build/icu/source/test/iotest/iotest.vcproj 2011-03-15 10:44:59.839404871 +0100 +@@ -52,8 +52,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/iotest.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -142,8 +142,8 @@ + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/iotest.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -232,8 +232,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/iotest.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -324,8 +324,8 @@ + PreprocessorDefinitions="WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/iotest.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/test/letest/gendata.vcproj 2010-09-29 20:36:48.000000000 +0200 ++++ misc/build/icu/source/test/letest/gendata.vcproj 2011-03-15 10:43:34.507129876 +0100 +@@ -50,7 +50,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/gendata.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -140,7 +140,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/gendata.pch" + AssemblerListingLocation=".\x64\Debug/" +@@ -231,7 +231,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/gendata.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -320,7 +320,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/gendata.pch" + AssemblerListingLocation=".\x64\Release/" +--- misc/icu/source/test/letest/letest.vcproj 2010-09-29 20:36:48.000000000 +0200 ++++ misc/build/icu/source/test/letest/letest.vcproj 2011-03-15 10:43:34.508129997 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Release/letest.pch" + AssemblerListingLocation=".\x86\Release/" +@@ -137,7 +137,7 @@ + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/letest.pch" + AssemblerListingLocation=".\x86\Debug/" +@@ -229,7 +229,7 @@ + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Release/letest.pch" + AssemblerListingLocation=".\x64\Release/" +@@ -318,7 +318,7 @@ + PreprocessorDefinitions="WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x64\Debug/letest.pch" + AssemblerListingLocation=".\x64\Debug/" +--- misc/icu/source/tools/ctestfw/ctestfw.vcproj 2010-09-29 20:37:22.000000000 +0200 ++++ misc/build/icu/source/tools/ctestfw/ctestfw.vcproj 2011-03-15 10:44:59.828403544 +0100 +@@ -55,8 +55,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/icutest.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -148,8 +148,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/icutest.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -243,8 +243,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/icutest.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -338,8 +338,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/icutest.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genbidi/genbidi.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/genbidi/genbidi.vcproj 2011-03-15 10:44:59.827403424 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genbidi.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genbidi.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genbidi.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genbidi.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genbrk/genbrk.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/genbrk/genbrk.vcproj 2011-03-15 10:44:59.831403907 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genbrk.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genbrk.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genbrk.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genbrk.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gencase/gencase.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/gencase/gencase.vcproj 2011-03-15 10:44:59.830403786 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/gencase.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/gencase.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gencase.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gencase.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genccode/genccode.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/genccode/genccode.vcproj 2011-03-15 10:43:34.489127708 +0100 +@@ -52,7 +52,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genccode.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -140,7 +140,7 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genccode.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -232,7 +232,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genccode.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -323,7 +323,7 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- TreatWChar_tAsBuiltInType="true" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genccode.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gencfu/gencfu.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/gencfu/gencfu.vcproj 2011-03-15 10:44:59.826403304 +0100 +@@ -52,7 +52,7 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" ++ DisableLanguageExtensions="false" + UsePrecompiledHeader="0" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -137,8 +137,8 @@ + MinimalRebuild="false" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + UsePrecompiledHeader="0" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -224,8 +224,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gencfu.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -316,8 +316,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gencfu.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gencmn/gencmn.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/gencmn/gencmn.vcproj 2011-03-15 10:44:59.832404028 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/gencmn.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/gencmn.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gencmn.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gencmn.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gencnval/gencnval.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/gencnval/gencnval.vcproj 2011-03-15 10:44:59.836404508 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/gencnval.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/gencnval.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gencnval.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gencnval.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genctd/genctd.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/genctd/genctd.vcproj 2011-03-15 10:44:59.834404268 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genctd.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genctd.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genctd.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genctd.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gennames/gennames.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/gennames/gennames.vcproj 2011-03-15 10:44:59.836404508 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/gennames.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/gennames.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gennames.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gennames.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gennorm2/gennorm2.vcproj 2010-09-29 20:37:24.000000000 +0200 ++++ misc/build/icu/source/tools/gennorm2/gennorm2.vcproj 2011-03-15 10:44:59.829403665 +0100 +@@ -53,8 +53,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release\gennorm2.pch" + AssemblerListingLocation=".\x86\Release\" + ObjectFile=".\x86\Release\" +@@ -146,8 +146,8 @@ + StringPooling="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug\gennorm2.pch" + AssemblerListingLocation=".\x86\Debug\" + ObjectFile=".\x86\Debug\" +@@ -237,8 +237,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release\gennorm2.pch" + AssemblerListingLocation=".\x64\Release\" + ObjectFile=".\x64\Release\" +@@ -330,8 +330,8 @@ + StringPooling="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug\gennorm2.pch" + AssemblerListingLocation=".\x64\Debug\" + ObjectFile=".\x64\Debug\" +--- misc/icu/source/tools/genpname/genpname.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/genpname/genpname.vcproj 2011-03-15 10:44:59.835404388 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genpname.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genpname.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genpname.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genpname.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genprops/genprops.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/genprops/genprops.vcproj 2011-03-15 10:44:59.832404028 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genprops.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genprops.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -234,8 +234,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genprops.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -326,8 +326,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genprops.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genrb/derb.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/genrb/derb.vcproj 2011-03-15 10:44:59.824403064 +0100 +@@ -56,8 +56,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release_derb/derb.pch" + AssemblerListingLocation=".\x86\Release_derb/" + ObjectFile=".\x86\Release_derb/" +@@ -149,8 +149,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug_derb/derb.pch" + AssemblerListingLocation=".\x86\Debug_derb/" + ObjectFile=".\x86\Debug_derb/" +@@ -244,8 +244,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release_derb/derb.pch" + AssemblerListingLocation=".\x64\Release_derb/" + ObjectFile=".\x64\Release_derb/" +@@ -339,8 +339,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug_derb/derb.pch" + AssemblerListingLocation=".\x64\Debug_derb/" + ObjectFile=".\x64\Debug_derb/" +--- misc/icu/source/tools/genrb/genrb.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/genrb/genrb.vcproj 2011-03-15 10:44:59.824403064 +0100 +@@ -51,8 +51,8 @@ + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genrb.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -140,8 +140,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genrb.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -232,8 +232,8 @@ + PreprocessorDefinitions="WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genrb.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -324,8 +324,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genrb.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gensprep/gensprep.vcproj 2010-09-29 20:37:22.000000000 +0200 ++++ misc/build/icu/source/tools/gensprep/gensprep.vcproj 2011-03-15 10:44:59.827403424 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/gensprep.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -141,8 +141,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/gensprep.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -233,8 +233,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gensprep.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -325,8 +325,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gensprep.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/gentest/gentest.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/gentest/gentest.vcproj 2011-03-15 10:44:59.828403544 +0100 +@@ -51,8 +51,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/gentest.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -138,8 +138,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/gentest.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -229,8 +229,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/gentest.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -319,8 +319,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/gentest.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/genuca/genuca.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/genuca/genuca.vcproj 2011-03-15 10:44:59.833404148 +0100 +@@ -53,8 +53,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/genuca.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -145,8 +145,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/genuca.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -235,8 +235,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/genuca.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -330,8 +330,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/genuca.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/tools/icuinfo/icuinfo.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/icuinfo/icuinfo.vcproj 2011-03-15 10:44:59.826403304 +0100 +@@ -53,8 +53,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="x86\Release/icuinfo.pch" + AssemblerListingLocation="x86\Release/" + ObjectFile="x86\Release/" +@@ -140,8 +140,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="Debug/icuinfo.pch" + AssemblerListingLocation="Debug/" + ObjectFile="Debug/" +@@ -231,8 +231,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="x64\Release/icuinfo.pch" + AssemblerListingLocation="x64\Release/" + ObjectFile="x64\Release/" +@@ -318,8 +318,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="Debug/icuinfo.pch" + AssemblerListingLocation="Debug/" + ObjectFile="Debug/" +--- misc/icu/source/tools/icuinfo/testplug.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/icuinfo/testplug.vcproj 2011-03-15 10:44:59.825403184 +0100 +@@ -55,8 +55,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/testplug.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -148,8 +148,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/testplug.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -243,8 +243,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/testplug.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -335,8 +335,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/testplug.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/icupkg/icupkg.vcproj 2010-09-29 20:37:22.000000000 +0200 ++++ misc/build/icu/source/tools/icupkg/icupkg.vcproj 2011-03-15 10:44:59.829403665 +0100 +@@ -52,8 +52,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="x86\Release/icupkg.pch" + AssemblerListingLocation="x86\Release/" + ObjectFile="x86\Release/" +@@ -139,8 +139,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="Debug/icupkg.pch" + AssemblerListingLocation="Debug/" + ObjectFile="Debug/" +@@ -230,8 +230,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="x64\Release/icupkg.pch" + AssemblerListingLocation="x64\Release/" + ObjectFile="x64\Release/" +@@ -320,8 +320,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile="Debug/icupkg.pch" + AssemblerListingLocation="Debug/" + ObjectFile="Debug/" +--- misc/icu/source/tools/icuswap/icuswap.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/icuswap/icuswap.vcproj 2011-03-15 10:44:59.831403907 +0100 +@@ -51,7 +51,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" ++ DisableLanguageExtensions="false" + PrecompiledHeaderFile=".\x86\Release/icuswap.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -140,7 +140,7 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" ++ DisableLanguageExtensions="false" + PrecompiledHeaderFile=".\x86\Debug/icuswap.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -233,7 +233,7 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" ++ DisableLanguageExtensions="false" + PrecompiledHeaderFile=".\x64\Release/icuswap.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -324,7 +324,7 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" ++ DisableLanguageExtensions="false" + PrecompiledHeaderFile=".\x64\Debug/icuswap.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/makeconv/makeconv.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/makeconv/makeconv.vcproj 2011-03-15 10:44:59.835404388 +0100 +@@ -53,8 +53,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/makeconv.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -144,8 +144,8 @@ + PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1" + StringPooling="true" + RuntimeLibrary="2" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/makeconv.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -234,8 +234,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/makeconv.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -328,8 +328,8 @@ + PreprocessorDefinitions="WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1" + StringPooling="true" + RuntimeLibrary="2" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/makeconv.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/tools/pkgdata/pkgdata.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/pkgdata/pkgdata.vcproj 2011-03-15 10:44:59.823402944 +0100 +@@ -53,8 +53,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/pkgdata.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -145,8 +145,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/pkgdata.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -235,8 +235,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/pkgdata.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +@@ -330,8 +330,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/pkgdata.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +--- misc/icu/source/tools/toolutil/toolutil.vcproj 2010-09-29 20:37:28.000000000 +0200 ++++ misc/build/icu/source/tools/toolutil/toolutil.vcproj 2011-03-15 10:44:59.834404268 +0100 +@@ -55,8 +55,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Release/toolutil.pch" + AssemblerListingLocation=".\x86\Release/" + ObjectFile=".\x86\Release/" +@@ -150,8 +150,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x86\Debug/toolutil.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" +@@ -246,8 +246,8 @@ + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Release/toolutil.pch" + AssemblerListingLocation=".\x64\Release/" + ObjectFile=".\x64\Release/" +@@ -343,8 +343,8 @@ + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" +- DisableLanguageExtensions="true" +- TreatWChar_tAsBuiltInType="true" ++ DisableLanguageExtensions="false" ++ TreatWChar_tAsBuiltInType="false" + PrecompiledHeaderFile=".\x64\Debug/toolutil.pch" + AssemblerListingLocation=".\x64\Debug/" + ObjectFile=".\x64\Debug/" +--- misc/icu/source/tools/tzcode/icuzdump.vcproj 2010-09-29 20:37:26.000000000 +0200 ++++ misc/build/icu/source/tools/tzcode/icuzdump.vcproj 2011-03-15 10:44:59.825403184 +0100 +@@ -48,7 +48,7 @@ + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +- DisableLanguageExtensions="true" ++ DisableLanguageExtensions="false" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\x86\Debug/icuzdump.pch" + AssemblerListingLocation=".\x86\Debug/" diff --git a/icu/icu4c-4_6-wchar_t.patch b/icu/icu4c-4_6-wchar_t.patch deleted file mode 100644 index 16ec4b9efb76..000000000000 --- a/icu/icu4c-4_6-wchar_t.patch +++ /dev/null @@ -1,2228 +0,0 @@ ---- misc/icu/source/common/common.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/common/common.vcxproj 2011-03-14 13:14:22.991271967 +0100 -@@ -90,8 +90,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/common.pch - .\x86\Release/ - .\x86\Release/ -@@ -129,8 +129,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/common.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -169,8 +169,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/common.pch - .\x64\Release/ - .\x64\Release/ -@@ -206,8 +206,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/common.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/extra/uconv/uconv.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/extra/uconv/uconv.vcxproj 2011-03-14 13:14:23.003272786 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/uconv.pch - .\x86\Release/ - .\x86\Release/ -@@ -134,8 +134,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/uconv.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -178,8 +178,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/uconv.pch - .\x64\Release/ - .\x64\Release/ -@@ -219,8 +219,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/uconv.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/i18n/i18n.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/i18n/i18n.vcxproj 2011-03-14 13:14:22.988271760 +0100 -@@ -91,8 +91,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/i18n.pch - .\x86\Release/ - .\x86\Release/ -@@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/i18n.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -176,8 +176,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/i18n.pch - .\x64\Release/ - .\x64\Release/ -@@ -216,8 +216,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/i18n.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/io/io.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/io/io.vcxproj 2011-03-14 13:14:22.985271555 +0100 -@@ -91,8 +91,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/icuio.pch - .\x86\Release/ - .\x86\Release/ -@@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/icuio.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -176,8 +176,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/icuio.pch - .\x64\Release/ - .\x64\Release/ -@@ -216,8 +216,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/icuio.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/layout/layout.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/layout/layout.vcxproj 2011-03-14 13:14:23.000272579 +0100 -@@ -92,8 +92,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/layout.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -135,8 +135,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/layout.pch - .\x86\Release/ - .\x86\Release/ -@@ -177,8 +177,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/layout.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -218,8 +218,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/layout.pch - .\x64\Release/ - .\x64\Release/ ---- misc/icu/source/layoutex/layoutex.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/layoutex/layoutex.vcxproj 2011-03-14 13:14:23.000272579 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/layoutex.pch - .\x86\Release/ - .\x86\Release/ -@@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/layoutex.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/layoutex.pch - .\x64\Release/ - .\x64\Release/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/layoutex.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/samples/break/break.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/break/break.vcxproj 2011-03-14 12:32:23.335497900 +0100 -@@ -92,7 +92,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/break.pch -@@ -134,7 +134,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/break.pch -@@ -176,7 +176,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/break.pch -@@ -219,7 +219,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/break.pch ---- misc/icu/source/samples/cal/cal.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/cal/cal.vcxproj 2011-03-14 12:32:23.337498038 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/cal.pch -@@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/cal.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/cal.pch -@@ -206,7 +206,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/cal.pch ---- misc/icu/source/samples/case/case.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/case/case.vcxproj 2011-03-14 12:32:23.343498452 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/case.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/case.pch -@@ -168,7 +168,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/case.pch -@@ -207,7 +207,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/case.pch ---- misc/icu/source/samples/citer/citer.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/citer/citer.vcxproj 2011-03-14 12:32:23.335497900 +0100 -@@ -82,7 +82,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 -@@ -112,7 +112,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 -@@ -136,7 +136,7 @@ - ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 -@@ -164,7 +164,7 @@ - ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 ---- misc/icu/source/samples/coll/coll.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/coll/coll.vcxproj 2011-03-14 12:32:23.340498245 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/coll.pch -@@ -127,7 +127,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/coll.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/coll.pch -@@ -206,7 +206,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/coll.pch ---- misc/icu/source/samples/csdet/csdet.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/csdet/csdet.vcxproj 2011-03-14 12:32:23.336497969 +0100 -@@ -82,7 +82,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 -@@ -112,7 +112,7 @@ - true - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - Level3 -@@ -136,7 +136,7 @@ - ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 -@@ -164,7 +164,7 @@ - ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded -- true -+ false - - - Level3 ---- misc/icu/source/samples/date/date.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/date/date.vcxproj 2011-03-14 12:32:23.339498176 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/date.pch -@@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/date.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/date.pch -@@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/date.pch ---- misc/icu/source/samples/datefmt/datefmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/datefmt/datefmt.vcxproj 2011-03-14 12:32:23.335497900 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/datefmt.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/datefmt.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/datefmt.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/datefmt.pch ---- misc/icu/source/samples/layout/layout.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/layout/layout.vcxproj 2011-03-14 12:32:23.338498107 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/layout.pch -@@ -126,7 +126,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/layout.pch -@@ -163,7 +163,7 @@ - _DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/layout.pch -@@ -202,7 +202,7 @@ - _DEBUG;WIN64;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/layout.pch ---- misc/icu/source/samples/legacy/legacy.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/legacy/legacy.vcxproj 2011-03-14 12:32:23.342498383 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/legacy.pch -@@ -127,7 +127,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/legacy.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/legacy.pch -@@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/legacy.pch ---- misc/icu/source/samples/msgfmt/msgfmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/msgfmt/msgfmt.vcxproj 2011-03-14 12:32:23.339498176 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/msgfmt.pch -@@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/msgfmt.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/msgfmt.pch -@@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/msgfmt.pch ---- misc/icu/source/samples/numfmt/numfmt.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/numfmt/numfmt.vcxproj 2011-03-14 12:32:23.340498245 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/numfmt.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/numfmt.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/numfmt.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/numfmt.pch ---- misc/icu/source/samples/props/props.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/props/props.vcxproj 2011-03-14 12:32:23.336497969 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDebugDLL - true -- true -+ false - - - .\x86\Release/props.pch -@@ -127,7 +127,7 @@ - true - MultiThreadedDebugDLL - true -- true -+ false - - - .\x64\Release/props.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/props.pch -@@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/props.pch ---- misc/icu/source/samples/strsrch/strsrch.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/strsrch/strsrch.vcxproj 2011-03-14 12:32:23.344498521 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/strsrch.pch -@@ -128,7 +128,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/strsrch.pch -@@ -170,7 +170,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/strsrch.pch -@@ -209,7 +209,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/strsrch.pch ---- misc/icu/source/samples/translit/translit.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/translit/translit.vcxproj 2011-03-14 12:32:23.344498521 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/translit.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/translit.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/translit.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/translit.pch ---- misc/icu/source/samples/uciter8/uciter8.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/uciter8/uciter8.vcxproj 2011-03-14 12:32:23.341498314 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/uciter8.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/uciter8.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/uciter8.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/uciter8.pch ---- misc/icu/source/samples/ucnv/ucnv.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/ucnv/ucnv.vcxproj 2011-03-14 12:32:23.337498038 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/ucnv.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/ucnv.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/ucnv.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/ucnv.pch ---- misc/icu/source/samples/udata/reader.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/udata/reader.vcxproj 2011-03-14 12:32:23.338498107 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\reader_Win32_Debug/reader.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\reader_Win32_Debug/reader.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\reader_Win32_Release/reader.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\reader_Win32_Release/reader.pch ---- misc/icu/source/samples/udata/writer.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/udata/writer.vcxproj 2011-03-14 12:32:23.338498107 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/writer.pch -@@ -127,7 +127,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/writer.pch -@@ -168,7 +168,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/writer.pch -@@ -207,7 +207,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/writer.pch ---- misc/icu/source/samples/ufortune/ufortune.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/ufortune/ufortune.vcxproj 2011-03-14 12:32:23.342498383 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - .\x86\Debug/ufortune.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -125,7 +125,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - .\x64\Debug/ufortune.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -164,7 +164,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x86\Release/ufortune.pch - .\x86\Release/ - .\x86\Release/ -@@ -201,7 +201,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x64\Release/ufortune.pch - .\x64\Release/ - .\x64\Release/ ---- misc/icu/source/samples/ugrep/ugrep.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/ugrep/ugrep.vcxproj 2011-03-14 12:32:23.341498314 +0100 -@@ -89,7 +89,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/ugrep.pch -@@ -133,7 +133,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/ugrep.pch -@@ -174,7 +174,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/ugrep.pch -@@ -217,7 +217,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/ugrep.pch ---- misc/icu/source/samples/uresb/uresb.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/uresb/uresb.vcxproj 2011-03-14 12:32:23.342498383 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/uresb.pch -@@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/uresb.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/uresb.pch -@@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/uresb.pch ---- misc/icu/source/samples/ustring/ustring.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/samples/ustring/ustring.vcxproj 2011-03-14 12:32:23.343498452 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x86\Release/ustring.pch -@@ -127,7 +127,7 @@ - true - MultiThreadedDLL - true -- true -+ false - - - .\x64\Release/ustring.pch -@@ -165,7 +165,7 @@ - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x86\Debug/ustring.pch -@@ -205,7 +205,7 @@ - WIN64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL -- true -+ false - - - .\x64\Debug/ustring.pch ---- misc/icu/source/stubdata/stubdata.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/stubdata/stubdata.vcxproj 2011-03-14 13:14:23.003272786 +0100 -@@ -95,8 +95,8 @@ - - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release\stubdata.pch - .\x86\Release/ - .\x86\Release/ -@@ -142,8 +142,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/stubdata.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -189,8 +189,8 @@ - - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release\stubdata.pch - .\x64\Release/ - .\x64\Release/ -@@ -234,8 +234,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/stubdata.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/test/cintltst/cintltst.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/test/cintltst/cintltst.vcxproj 2011-03-14 13:14:23.002272717 +0100 -@@ -88,8 +88,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x86\Debug/cintltst.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -127,8 +127,8 @@ - MultiThreaded - true - true -- true -- true -+ false -+ false - .\x86\Release/cintltst.pch - .\x86\Release/ - .\x86\Release/ -@@ -164,8 +164,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x64\Debug/cintltst.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -202,8 +202,8 @@ - MultiThreaded - true - true -- true -- true -+ false -+ false - .\x64\Release/cintltst.pch - .\x64\Release/ - .\x64\Release/ ---- misc/icu/source/test/intltest/intltest.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/test/intltest/intltest.vcxproj 2011-03-14 13:14:23.001272648 +0100 -@@ -89,8 +89,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x86\Debug/intltest.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -129,8 +129,8 @@ - EnableFastChecks - MultiThreadedDebug - true -- true -- true -+ false -+ false - .\x64\Debug/intltest.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -164,8 +164,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded -- true -- true -+ false -+ false - .\x86\Release/intltest.pch - .\x86\Release/ - .\x86\Release/ -@@ -199,8 +199,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded -- true -- true -+ false -+ false - .\x64\Release/intltest.pch - .\x64\Release/ - .\x64\Release/ ---- misc/icu/source/test/iotest/iotest.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/test/iotest/iotest.vcxproj 2011-03-14 13:14:23.001272648 +0100 -@@ -90,8 +90,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/iotest.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -127,8 +127,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x86\Release/iotest.pch - .\x86\Release/ - .\x86\Release/ -@@ -166,8 +166,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/iotest.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -201,8 +201,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x64\Release/iotest.pch - .\x64\Release/ - .\x64\Release/ ---- misc/icu/source/test/letest/gendata.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/test/letest/gendata.vcxproj 2011-03-14 12:32:23.346498659 +0100 -@@ -87,7 +87,7 @@ - WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/gendata.pch -@@ -126,7 +126,7 @@ - WIN64;WIN32;_DEBUG;_CONSOLE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/gendata.pch -@@ -166,7 +166,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/gendata.pch -@@ -204,7 +204,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/gendata.pch ---- misc/icu/source/test/letest/letest.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/test/letest/letest.vcxproj 2011-03-14 12:32:23.346498659 +0100 -@@ -88,7 +88,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x86\Release/letest.pch -@@ -123,7 +123,7 @@ - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x86\Debug/letest.pch -@@ -163,7 +163,7 @@ - true - MultiThreaded - true -- true -+ false - - - .\x64\Release/letest.pch -@@ -197,7 +197,7 @@ - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug -- true -+ false - - - .\x64\Debug/letest.pch ---- misc/icu/source/tools/ctestfw/ctestfw.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/ctestfw/ctestfw.vcxproj 2011-03-14 13:14:22.995272239 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/icutest.pch - .\x86\Release/ - .\x86\Release/ -@@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/icutest.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/icutest.pch - .\x64\Release/ - .\x64\Release/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/icutest.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/genbrk/genbrk.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/genbrk/genbrk.vcxproj 2011-03-14 13:14:22.996272307 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/genbrk.pch - .\x86\Release/ - .\x86\Release/ -@@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/genbrk.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/genbrk.pch - .\x64\Release/ - .\x64\Release/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/genbrk.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/genccode/genccode.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/genccode/genccode.vcxproj 2011-03-14 12:32:23.332497693 +0100 -@@ -92,7 +92,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x86\Release/genccode.pch - .\x86\Release/ - .\x86\Release/ -@@ -131,7 +131,7 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -+ false - .\x86\Debug/genccode.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -173,7 +173,7 @@ - true - MultiThreadedDLL - true -- true -+ false - .\x64\Release/genccode.pch - .\x64\Release/ - .\x64\Release/ -@@ -211,7 +211,7 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -+ false - .\x64\Debug/genccode.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/gencfu/gencfu.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/gencfu/gencfu.vcxproj 2011-03-14 13:14:22.993272104 +0100 -@@ -90,7 +90,7 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -+ false - - - .\x86\Debug/ -@@ -120,8 +120,8 @@ - false - MultiThreadedDLL - true -- true -- true -+ false -+ false - - - .\x86\Release/ -@@ -155,8 +155,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gencfu.pch - .\x64\Release/ - .\x64\Release/ -@@ -193,8 +193,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gencfu.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/gencmn/gencmn.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/gencmn/gencmn.vcxproj 2011-03-14 13:14:22.997272375 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gencmn.pch - .\x86\Release/ - .\x86\Release/ -@@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gencmn.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gencmn.pch - .\x64\Release/ - .\x64\Release/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gencmn.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/gencnval/gencnval.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/gencnval/gencnval.vcxproj 2011-03-14 13:14:22.999272511 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gencnval.pch - .\x86\Release/ - .\x86\Release/ -@@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gencnval.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gencnval.pch - .\x64\Release/ - .\x64\Release/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gencnval.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/genctd/genctd.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/genctd/genctd.vcxproj 2011-03-14 13:14:22.998272443 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/genctd.pch - .\x86\Release/ - .\x86\Release/ -@@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/genctd.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/genctd.pch - .\x64\Release/ - .\x64\Release/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/genctd.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/gennorm2/gennorm2.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/gennorm2/gennorm2.vcxproj 2011-03-14 13:14:22.995272239 +0100 -@@ -87,8 +87,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release\gennorm2.pch - .\x86\Release\ - .\x86\Release\ -@@ -131,8 +131,8 @@ - true - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug\gennorm2.pch - .\x86\Debug\ - .\x86\Debug\ -@@ -172,8 +172,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release\gennorm2.pch - .\x64\Release\ - .\x64\Release\ -@@ -216,8 +216,8 @@ - true - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug\gennorm2.pch - .\x64\Debug\ - .\x64\Debug\ ---- misc/icu/source/tools/genrb/derb.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/genrb/derb.vcxproj 2011-03-14 13:14:22.991271967 +0100 -@@ -96,8 +96,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release_derb/derb.pch - .\x86\Release_derb/ - .\x86\Release_derb/ -@@ -140,8 +140,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug_derb/derb.pch - .\x86\Debug_derb/ - .\x86\Debug_derb/ -@@ -185,8 +185,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release_derb/derb.pch - .\x64\Release_derb/ - .\x64\Release_derb/ -@@ -227,8 +227,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug_derb/derb.pch - .\x64\Debug_derb/ - .\x64\Debug_derb/ ---- misc/icu/source/tools/genrb/genrb.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/genrb/genrb.vcxproj 2011-03-14 13:14:22.992272036 +0100 -@@ -91,8 +91,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x86\Release/genrb.pch - .\x86\Release/ - .\x86\Release/ -@@ -131,8 +131,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/genrb.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -173,8 +173,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x64\Release/genrb.pch - .\x64\Release/ - .\x64\Release/ -@@ -212,8 +212,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/genrb.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/gensprep/gensprep.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/gensprep/gensprep.vcxproj 2011-03-14 13:14:22.994272171 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gensprep.pch - .\x86\Release/ - .\x86\Release/ -@@ -132,8 +132,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gensprep.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -174,8 +174,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gensprep.pch - .\x64\Release/ - .\x64\Release/ -@@ -213,8 +213,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gensprep.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/gentest/gentest.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/gentest/gentest.vcxproj 2011-03-14 13:14:22.994272171 +0100 -@@ -88,8 +88,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/gentest.pch - .\x86\Release/ - .\x86\Release/ -@@ -123,8 +123,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/gentest.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -161,8 +161,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/gentest.pch - .\x64\Release/ - .\x64\Release/ -@@ -195,8 +195,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/gentest.pch - .\x64\Debug/ - .\x64\Debug/ ---- misc/icu/source/tools/icuinfo/icuinfo.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/icuinfo/icuinfo.vcxproj 2011-03-14 13:14:22.992272036 +0100 -@@ -91,8 +91,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x86\Release/icuinfo.pch - x86\Release/ - x86\Release/ -@@ -127,8 +127,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icuinfo.pch - Debug/ - Debug/ -@@ -168,8 +168,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x64\Release/icuinfo.pch - x64\Release/ - x64\Release/ -@@ -205,8 +205,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icuinfo.pch - Debug/ - Debug/ ---- misc/icu/source/tools/icuinfo/testplug.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/icuinfo/testplug.vcxproj 2011-03-14 13:14:22.993272104 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release-testplug/testplug.pch - .\x86\Release-testplug/ - .\x86\Release-testplug/ -@@ -133,8 +133,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug-testplug/testplug.pch - .\x86\Debug-testplug/ - .\x86\Debug-testplug/ -@@ -175,8 +175,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release-testplug/testplug.pch - .\x64\Release-testplug/ - .\x64\Release-testplug/ -@@ -214,8 +214,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug-testplug/testplug.pch - .\x64\Debug-testplug/ - .\x64\Debug-testplug/ ---- misc/icu/source/tools/icupkg/icupkg.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/icupkg/icupkg.vcxproj 2011-03-14 13:14:22.996272307 +0100 -@@ -90,8 +90,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x86\Release/icupkg.pch - x86\Release/ - x86\Release/ -@@ -126,8 +126,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icupkg.pch - Debug/ - Debug/ -@@ -167,8 +167,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - x64\Release/icupkg.pch - x64\Release/ - x64\Release/ -@@ -204,8 +204,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - Debug/icupkg.pch - Debug/ - Debug/ ---- misc/icu/source/tools/makeconv/makeconv.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/makeconv/makeconv.vcxproj 2011-03-14 13:14:22.998272443 +0100 -@@ -93,8 +93,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/makeconv.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -134,8 +134,8 @@ - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x86\Release/makeconv.pch - .\x86\Release/ - .\x86\Release/ -@@ -175,8 +175,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/makeconv.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -215,8 +215,8 @@ - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) - true - MultiThreadedDLL -- true -- true -+ false -+ false - .\x64\Release/makeconv.pch - .\x64\Release/ - .\x64\Release/ ---- misc/icu/source/tools/pkgdata/pkgdata.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/pkgdata/pkgdata.vcxproj 2011-03-14 13:14:22.991271967 +0100 -@@ -93,8 +93,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/pkgdata.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -135,8 +135,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/pkgdata.pch - .\x86\Release/ - .\x86\Release/ -@@ -176,8 +176,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/pkgdata.pch - .\x64\Debug/ - .\x64\Debug/ -@@ -217,8 +217,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/pkgdata.pch - .\x64\Release/ - .\x64\Release/ ---- icu/source/tools/toolutil/toolutil.vcxproj 2010-10-09 03:23:28.000000000 +0200 -+++ misc/build/icu/source/tools/toolutil/toolutil.vcxproj 2011-03-14 13:14:22.997272375 +0100 -@@ -92,8 +92,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x86\Release/toolutil.pch - .\x86\Release/ - .\x86\Release/ -@@ -135,8 +135,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x86\Debug/toolutil.pch - .\x86\Debug/ - .\x86\Debug/ -@@ -178,8 +178,8 @@ - true - MultiThreadedDLL - true -- true -- true -+ false -+ false - .\x64\Release/toolutil.pch - .\x64\Release/ - .\x64\Release/ -@@ -219,8 +219,8 @@ - EnableFastChecks - MultiThreadedDebugDLL - true -- true -- true -+ false -+ false - .\x64\Debug/toolutil.pch - .\x64\Debug/ - .\x64\Debug/ diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index ed1449b349e4..9920f7a61eec 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -1,16 +1,27 @@ ---- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200 -+++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200 +--- misc/icu/source/common/putil.c 2010-09-29 20:37:22.000000000 +0200 ++++ misc/build/icu/source/common/putil.c 2011-03-15 10:58:44.054592942 +0100 @@ -52,7 +52,7 @@ Poorly upgraded Solaris machines can't have this defined. Cleanly installed Solaris can use this #define. */ --#if !defined(_XOPEN_SOURCE_EXTENDED) && ((!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) || defined(__xlc__)) -+#if !defined(_XOPEN_SOURCE_EXTENDED) && ((!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) || defined(__xlc__)) +-#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L) ++#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) #define _XOPEN_SOURCE_EXTENDED 1 #endif ---- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 -+++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 +--- misc/icu/source/common/stringpiece.cpp 2010-09-29 20:37:20.000000000 +0200 ++++ misc/build/icu/source/common/stringpiece.cpp 2011-03-15 10:57:24.722045561 +0100 +@@ -71,7 +71,7 @@ + * Visual Studios 9.0. + * Cygwin with MSVC 9.0 also complains here about redefinition. + */ +-#if (!defined(_MSC_VER) || (_MSC_VER >= 1500)) && !defined(CYGWINMSVC) ++#if (!defined(_MSC_VER) && !defined(CYGWINMSVC)) + const int32_t StringPiece::npos; + #endif + +--- misc/icu/source/config/mh-darwin 2010-09-29 20:37:36.000000000 +0200 ++++ misc/build/icu/source/config/mh-darwin 2011-03-15 10:56:26.653056004 +0100 @@ -25,7 +25,7 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) @@ -51,10 +62,10 @@ ## Remove shared library 's' STATIC_PREFIX_WHEN_USED = ---- misc/icu/source/config/mh-linux 2007-12-12 19:57:36.000000000 +0100 -+++ misc/build/icu/source/config/mh-linux 2008-05-21 18:59:13.000000000 +0200 +--- misc/icu/source/config/mh-linux 2010-09-29 20:37:36.000000000 +0200 ++++ misc/build/icu/source/config/mh-linux 2011-03-15 10:56:26.653056004 +0100 @@ -20,6 +20,11 @@ - LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN + LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN LD_RPATH_PRE = -Wl,-rpath, +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH @@ -65,8 +76,8 @@ ## These are the library specific LDFLAGS LDFLAGSICUDT=-nodefaultlibs -nostdlib ---- misc/icu/source/config/mh-solaris 2008-07-01 03:41:26.000000000 +0200 -+++ misc/build/icu/source/config/mh-solaris 2009-02-17 11:54:45.105890123 +0100 +--- misc/icu/source/config/mh-solaris 2010-09-29 20:37:36.000000000 +0200 ++++ misc/build/icu/source/config/mh-solaris 2011-03-15 11:01:04.370475053 +0100 @@ -36,17 +36,21 @@ ## Commands to link @@ -82,7 +93,7 @@ +SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G -norunpath ## Compiler switch to embed a runtime search path - LD_RPATH= -R'$$'ORIGIN + LD_RPATH= -R'$$'ORIGIN LD_RPATH_PRE= -R +## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH @@ -92,8 +103,8 @@ #LIBRARY_PATH_PREFIX=/usr/lib/lwp: ## Compiler switch to embed a library name ---- misc/icu/source/layout/ArabicShaping.cpp 2008-07-01 03:42:04.000000000 +0200 -+++ misc/build/icu/source/layout/ArabicShaping.cpp 2009-02-17 12:04:34.264869737 +0100 +--- misc/icu/source/layout/ArabicShaping.cpp 2010-09-29 20:38:38.000000000 +0200 ++++ misc/build/icu/source/layout/ArabicShaping.cpp 2011-03-15 10:56:26.655056238 +0100 @@ -79,7 +79,6 @@ #define markFeatureMask 0x00040000UL #define mkmkFeatureMask 0x00020000UL @@ -109,20 +120,8 @@ - if (t == ST_NOSHAPE_NONE) { - glyphStorage.setAuxData(out, NO_FEATURES, success); - } else { -- glyphStorage.setAuxData(out, ISOL_FEATURES, success); + glyphStorage.setAuxData(out, ISOL_FEATURES, success); - } -+ glyphStorage.setAuxData(out, ISOL_FEATURES, success); if ((t & MASK_TRANSPARENT) != 0) { continue; ---- misc/icu/source/common/stringpiece.cpp 2010-10-29 20:01:01.000000000 +0200 -+++ misc/build/icu/source/common/stringpiece.cpp 2011-03-14 13:38:59.094036495 +0100 -@@ -75,7 +75,7 @@ - * Visual Studios 9.0. - * Cygwin with MSVC 9.0 also complains here about redefinition. - */ --#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC) -+#if (!defined(_MSC_VER) && !defined(CYGWINMSVC)) - const int32_t StringPiece::npos; - #endif - diff --git a/icu/makefile.mk b/icu/makefile.mk index 99d975bac704..0da21c395694 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -48,7 +48,7 @@ PATCH_FILES=\ icu4c-build.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ - icu4c-4_6-wchar_t.patch \ + icu4c-4_4_2-wchar_t.patch \ icu4c-warnings.patch .IF "$(GUI)"=="UNX" -- cgit From ebfbc9188c2fe345c66798eca4a8f8cd6f4f301d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 15 Mar 2011 14:15:21 +0000 Subject: fix build error, add build depend --- graphite/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphite/prj/build.lst b/graphite/prj/build.lst index cefb762e68a5..2f5f881f3848 100644 --- a/graphite/prj/build.lst +++ b/graphite/prj/build.lst @@ -1,3 +1,3 @@ -gr graphite : solenv NULL +gr graphite : solenv soltools NULL gr graphite usr1 - all gr_mkout NULL gr graphite nmake - all gr_graphite NULL -- cgit From 20a45dba84dfd4ac600eec893182fe3de6d4dafa Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 15 Mar 2011 21:07:33 +0100 Subject: try to deliver graphite_off.lib properly --- graphite/prj/d.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphite/prj/d.lst b/graphite/prj/d.lst index 8eedd6c3d741..065ee1acf29c 100644 --- a/graphite/prj/d.lst +++ b/graphite/prj/d.lst @@ -4,7 +4,7 @@ mkdir: %_DEST%\inc%_EXT%\graphite2 ..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib +..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.pdb %_DEST%\bin%_EXT%\*.pdb -- cgit From e82100b6fe2375ec60e4c2e9cc1adad6807eeb07 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 15 Mar 2011 21:45:01 +0100 Subject: Add possibility to specify that one builds static graphite --- graphite/graphite2-0.9.2.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch index 9b3003967f8d..d9836e328ff5 100644 --- a/graphite/graphite2-0.9.2.patch +++ b/graphite/graphite2-0.9.2.patch @@ -391,3 +391,14 @@ diff current src/List.h 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,0,0, 0,0,0,0,0,0,0,0, +--- misc/graphite2-0.9.2/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100 ++++ misc/build/graphite2-0.9.2/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100 +@@ -36,7 +36,7 @@ + }; + + // Definitions for library publicly exported symbols +-#if defined _WIN32 || defined __CYGWIN__ ++#if defined _WIN32 || defined __CYGWIN__ || !defined GR2_STATIC + #ifdef GR2_EXPORTING + #ifdef __GNUC__ + #define GR2_API __attribute__((dllexport)) -- cgit From 8e4bc214b41aaf9f5bf313fe36d381b80ca1b11c Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 15 Mar 2011 22:19:09 +0100 Subject: avoid __declspec decorations on windows --- graphite/graphite_make.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index 20c3fe045eeb..f28ed6da8ff7 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -13,7 +13,7 @@ + +.INCLUDE : settings.mk + -+CFLAGS+=-DDISABLE_TRACING -I../include ++CFLAGS+=-DDISABLE_TRACING -I../include -DGR2_STATIC +.IF "$(debug)" == "" +CFLAGS+=-O3 -DNDEBUG +.ENDIF -- cgit From 02b496a567deedea05c77c40ac6b534550e3b715 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 15 Mar 2011 21:44:17 +0000 Subject: escape spaces in compiler name --- icu/icu4c-escapespace.patch | 11 +++++++++++ icu/makefile.mk | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 icu/icu4c-escapespace.patch diff --git a/icu/icu4c-escapespace.patch b/icu/icu4c-escapespace.patch new file mode 100644 index 000000000000..89c191ae0af6 --- /dev/null +++ b/icu/icu4c-escapespace.patch @@ -0,0 +1,11 @@ +--- misc/icu/source/tools/icuinfo/Makefile.in 2011-03-15 21:41:25.647780036 +0000 ++++ misc/build/icu/source/tools/icuinfo/Makefile.in 2011-03-15 21:41:25.647780036 +0000 +@@ -36,7 +36,7 @@ + + ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME) + +-CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\" ++CPPFLAGS+= -DU_PLATFORM="\"@platform@\"" -DU_BUILD="\"@build@\"" -DU_HOST="\"@host@\"" -DU_CC="\"@CC@\"" -DU_CXX="\"@CXX@\"" + # -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ " + + diff --git a/icu/makefile.mk b/icu/makefile.mk index 0da21c395694..cad69ca08bc1 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -49,7 +49,8 @@ PATCH_FILES=\ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ icu4c-4_4_2-wchar_t.patch \ - icu4c-warnings.patch + icu4c-warnings.patch \ + icu4c-escapespace.patch .IF "$(GUI)"=="UNX" -- cgit From cb2b51f970cdf9b67f600f942cffa219684d05c7 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 15 Mar 2011 23:09:17 +0100 Subject: Maybe one day I get this right --- graphite/graphite2-0.9.2.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch index d9836e328ff5..35f0bd23650b 100644 --- a/graphite/graphite2-0.9.2.patch +++ b/graphite/graphite2-0.9.2.patch @@ -398,7 +398,7 @@ diff current src/List.h // Definitions for library publicly exported symbols -#if defined _WIN32 || defined __CYGWIN__ -+#if defined _WIN32 || defined __CYGWIN__ || !defined GR2_STATIC ++#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC #ifdef GR2_EXPORTING #ifdef __GNUC__ #define GR2_API __attribute__((dllexport)) -- cgit From a12885cdad54a4336223e06be45912526f3c4933 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 17 Mar 2011 15:30:26 +0100 Subject: Don't build things we don't use and that are broken --- icu/makefile.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index cad69ca08bc1..a7c41a92d32f 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -106,7 +106,9 @@ LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic- CONFIGURE_DIR=source -CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)' +CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ +./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \ +--disable-extras $(DISABLE_64BIT)' CONFIGURE_FLAGS= @@ -159,7 +161,12 @@ icu_LIBS=-lmingwthrd icu_LIBS+=-lstdc++_s .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 -CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' +CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ +./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \ +--disable-extras $(DISABLE_64BIT)' +CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \ +./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --disable-icuio \ +--disable-samples --disable-tests --disable-extras --enable-64bit-libs=no' CONFIGURE_FLAGS= -- cgit From c0470de216263d617f7e0663babf3eae4483f0db Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 18 Mar 2011 12:05:11 +0100 Subject: Work around a strange problem with libicudata on Mac OSX --- icu/icu4c-build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 9920f7a61eec..e5e4bd9b10a0 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -27,7 +27,7 @@ ## Compiler switches to embed a library name and version information -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET)) ## Compiler switch to embed a runtime search path LD_RPATH= -- cgit From be52ac8c786426317a4516efc1de3bac80386e94 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 18 Mar 2011 12:17:56 +0100 Subject: Don't build static icu that nobody uses --- icu/makefile.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index a7c41a92d32f..441eaf850168 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -107,8 +107,7 @@ LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic- CONFIGURE_DIR=source CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \ ---disable-extras $(DISABLE_64BIT)' +./configure --enable-layout --disable-static --enable-shared $(DISABLE_64BIT)' CONFIGURE_FLAGS= @@ -161,12 +160,8 @@ icu_LIBS=-lmingwthrd icu_LIBS+=-lstdc++_s .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 -CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \ ---disable-extras $(DISABLE_64BIT)' CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \ -./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --disable-icuio \ ---disable-samples --disable-tests --disable-extras --enable-64bit-libs=no' +./configure --build=i586-pc-mingw32 --enable-layout --disable-static --enable-shared --enable-64bit-libs=no' CONFIGURE_FLAGS= -- cgit -- cgit From d1163460846f979311a04835eb99a3f6a2743fab Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 29 Mar 2011 17:59:06 +0200 Subject: icu-4.2.1-rpath.diff: pass $ORIGIN correctly to icu RPATH need to escape the dollar '$' --- icu/icu4c-rpath.patch | 21 +++++++++++++++++++++ icu/makefile.mk | 1 + 2 files changed, 22 insertions(+) create mode 100644 icu/icu4c-rpath.patch diff --git a/icu/icu4c-rpath.patch b/icu/icu4c-rpath.patch new file mode 100644 index 000000000000..5094a05ae56c --- /dev/null +++ b/icu/icu4c-rpath.patch @@ -0,0 +1,21 @@ +--- misc/icu/source/data/pkgdataMakefile.in 2010-12-22 23:44:02.000000000 +0100 ++++ misc/build/icu/source/data/pkgdataMakefile.in 2011-01-03 17:52:44.000000000 +0100 +@@ -15,6 +15,9 @@ include $(top_builddir)/icudefs.mk + OUTPUTFILE=icupkg.inc + MIDDLE_SO_TARGET= + ++# escape $ with \ when passing to echo; needed to preserve $ORIGIN ++SHLIB.c.shell := $(subst $$,\$$,$(SHLIB.c)) ++ + all : clean + @echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE) + @echo SO=$(SO) >> $(OUTPUTFILE) +@@ -24,7 +27,7 @@ all : clean + @echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE) + @echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE) + @echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE) +- @echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE) ++ @echo GENLIB="$(SHLIB.c.shell)" >> $(OUTPUTFILE) + @echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE) + @echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE) + @echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE) diff --git a/icu/makefile.mk b/icu/makefile.mk index 8dda4b894bc0..dbbd4c08d0fd 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu PATCH_FILES=\ icu4c-build.patch \ + icu4c-rpath.patch \ icu4c.8320.freeserif.crash.patch \ icu4c-aix.patch \ icu4c-4_4_2-wchar_t.patch \ -- cgit -- cgit From 0b509dbe1b4fb6ad097a9dafd877fdfb5db95d58 Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:47:37 +0100 Subject: drop bogus executable flag from idl/build/src and config files --- neon/prj/build.lst | 0 nss/prj/d.lst | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 neon/prj/build.lst mode change 100755 => 100644 nss/prj/d.lst diff --git a/neon/prj/build.lst b/neon/prj/build.lst old mode 100755 new mode 100644 diff --git a/nss/prj/d.lst b/nss/prj/d.lst old mode 100755 new mode 100644 -- cgit -- cgit -- cgit From 2fdce0355265dd0bc8fbad897526ef6793e12b5c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 5 Apr 2011 15:07:02 +0100 Subject: silence some more of that annoying gcc#47679 --- boost/boost.gcc47679.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch index 1c804aaa998c..9b33a5fffb8a 100644 --- a/boost/boost.gcc47679.patch +++ b/boost/boost.gcc47679.patch @@ -36,3 +36,26 @@ template inline bool allow_more_digits(std::size_t i) { +--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 ++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 +@@ -31,6 +31,8 @@ + + #include "boost/optional/optional_fwd.hpp" + ++#include ++ + #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) + // VC6.0 has the following bug: + // When a templated assignment operator exist, an implicit conversion +@@ -114,6 +116,11 @@ + + public: + ++ aligned_storage() ++ { ++ memset(&dummy_, 0, sizeof(dummy_)); ++ } ++ + void const* address() const { return &dummy_.data[0]; } + void * address() { return &dummy_.data[0]; } + } ; -- cgit From a335ce660e30a39396b21f2d335deca2b2d4a7ad Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 5 Apr 2011 06:21:33 +0100 Subject: hacky patch to deliver icuin.lib as iicui18n.lib fixes forms build error no doubt not the right fix but gets the build over the hump --- icu/prj/d.lst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 5290123b549d..608f19e77251 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -8,6 +8,8 @@ mkdir: %_DEST%\inc%_EXT%\external\unicode ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib +..\%__SRC%\lib\icuin.lib %_DEST%\lib%_EXT%\iicui18n.lib +..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -- cgit -- cgit From 8bec4809317b4b89c74dd26b9083b70cabf053ab Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 6 Apr 2011 15:13:17 +0300 Subject: Add possibility to bundle some Agfa Monotype fonts Based on the old novell-win32-agfa-monotype-fonts.diff patch. --- more_fonts/fonts/ttf_amt/makefile.mk | 59 ++++++++++++++++++++++++++++++++++++ more_fonts/prj/build.lst | 1 + more_fonts/prj/d.lst | 1 + 3 files changed, 61 insertions(+) create mode 100644 more_fonts/fonts/ttf_amt/makefile.mk diff --git a/more_fonts/fonts/ttf_amt/makefile.mk b/more_fonts/fonts/ttf_amt/makefile.mk new file mode 100644 index 000000000000..3754213d14e7 --- /dev/null +++ b/more_fonts/fonts/ttf_amt/makefile.mk @@ -0,0 +1,59 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/.. + +PRJNAME=more_fonts +TARGET=ttf_amt + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=agfa-monotype-fonts +TARFILE_MD5=9bad41ce5c3fd069b87f28aeac70314d +TARFILE_ROOTDIR=agfa-monotype-fonts + +PATCH_FILES= + +CONFIGURE_DIR= +CONFIGURE_ACTION= + +BUILD_DIR= +BUILD_ACTION= +BUILD_FLAGS= + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.IF "$(WITH_AGFA_MONOTYPE_FONTS)"!="NO" +.INCLUDE : tg_ext.mk +.ENDIF diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst index ffa98aee6181..94f4ec8b6a1e 100644 --- a/more_fonts/prj/build.lst +++ b/more_fonts/prj/build.lst @@ -3,3 +3,4 @@ bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL bs more_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL bs more_fonts\fonts\ttf_linlibertineg nmake - all linl_fonts NULL +bs more_fonts\fonts\ttf_amt nmake - all amt_fonts NULL diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index b944b155bedc..229521e2c4fd 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -9,3 +9,4 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium ..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\LinLibertineG\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_LinLibertineG +..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -- cgit From 8c01e7910eb34df98ad7d09798a2c633bf00a984 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Thu, 7 Apr 2011 11:31:08 +0200 Subject: build Agfa fonts only when enabled --- more_fonts/fonts/ttf_amt/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/more_fonts/fonts/ttf_amt/makefile.mk b/more_fonts/fonts/ttf_amt/makefile.mk index 3754213d14e7..6e54dc70bd90 100644 --- a/more_fonts/fonts/ttf_amt/makefile.mk +++ b/more_fonts/fonts/ttf_amt/makefile.mk @@ -54,6 +54,6 @@ BUILD_FLAGS= .INCLUDE : set_ext.mk .INCLUDE : target.mk -.IF "$(WITH_AGFA_MONOTYPE_FONTS)"!="NO" +.IF "$(WITH_AGFA_MONOTYPE_FONTS)" == "YES" .INCLUDE : tg_ext.mk .ENDIF -- cgit From 9e9220fefbcfe75c6a3022aa985b03c4fb2e8cb2 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Thu, 7 Apr 2011 11:31:08 +0200 Subject: build Agfa fonts only when enabled --- more_fonts/fonts/ttf_amt/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/more_fonts/fonts/ttf_amt/makefile.mk b/more_fonts/fonts/ttf_amt/makefile.mk index 3754213d14e7..6e54dc70bd90 100644 --- a/more_fonts/fonts/ttf_amt/makefile.mk +++ b/more_fonts/fonts/ttf_amt/makefile.mk @@ -54,6 +54,6 @@ BUILD_FLAGS= .INCLUDE : set_ext.mk .INCLUDE : target.mk -.IF "$(WITH_AGFA_MONOTYPE_FONTS)"!="NO" +.IF "$(WITH_AGFA_MONOTYPE_FONTS)" == "YES" .INCLUDE : tg_ext.mk .ENDIF -- cgit -- cgit -- cgit -- cgit From 95c304f06bf3fe1d0ce7bf5601856e0c7da17acf Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Sat, 30 Apr 2011 07:23:46 -0700 Subject: Igonre .gitattributes & Mac X work directories --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index ad966da44344..b4e1032da5ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,14 @@ # backup and temporary files *~ .*.sw[op] +.gitattributes # the build directories /*/unxlng?? /*/unxlng??.pro /*/wntmsc??? /*/wntmsc???.pro +/*/unxmacx? +/*/unxmacx?.pro /moz/zipped/*.zip -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit From b5d29a7e7b6fd3a97c3b8988e5aad34e6bce42b5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 14 May 2011 01:35:52 +0300 Subject: Cross-compilation support and iOS in particular --- berkeleydb/makefile.mk | 15 ++++++++++++++- berkeleydb/prj/d.lst | 5 +---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 84d7e0b231eb..fc7b379a070d 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -94,10 +94,19 @@ CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ ..$/dist$/configure -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-compat185 +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+= --disable-shared +.ELSE +CONFIGURE_FLAGS+= --enable-shared +.ENDIF .IF "$(OS)"=="MACOSX" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF + # just pass ARCH_FLAGS to native build CFLAGS+:=$(ARCH_FLAGS) CXXFLAGS+:=$(ARCH_FLAGS) @@ -107,7 +116,11 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) +.IF "$(OS)"=="IOS" +OUT2LIB=$(BUILD_DIR)$/libdb*.a +.ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) +.ENDIF OUT2INC= \ $(BUILD_DIR)$/db.h diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst index 78682f825e0b..6324294fa16d 100644 --- a/berkeleydb/prj/d.lst +++ b/berkeleydb/prj/d.lst @@ -3,13 +3,10 @@ mkdir: %_DEST%\inc%_EXT%\berkeleydb ..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h ..\%__SRC%\lib\libdb47.lib %_DEST%\lib%_EXT%\libdb47.lib - +..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib%_EXT%\libdb-4.7.a ..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib%_EXT%\libdb-4.7.so - ..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib%_EXT%\libdb-4.7.dylib - ..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib%_EXT%\libdb-4.7.a - ..\%__SRC%\bin\libdb47.dll %_DEST%\bin%_EXT%\libdb47.dll -- cgit From 7fab6b19015c2ea208a0369abfccdf3e1a7ef2f5 Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Mon, 16 May 2011 14:37:54 +0700 Subject: Fix graphite2 particulary for LinLibertineG --- graphite/graphite-2.3.1_debug.patch | 13 -- graphite/graphite2-0.9.2.patch | 404 ------------------------------------ graphite/graphite2-0.9.4.patch | 85 ++++++++ 3 files changed, 85 insertions(+), 417 deletions(-) delete mode 100644 graphite/graphite-2.3.1_debug.patch delete mode 100644 graphite/graphite2-0.9.2.patch create mode 100644 graphite/graphite2-0.9.4.patch diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch deleted file mode 100644 index 583fac711e2b..000000000000 --- a/graphite/graphite-2.3.1_debug.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100 -@@ -247,7 +247,9 @@ - GlyphSetIterator::reference GlyphSetIterator::operator*() const - { - assert(m_pseg != 0); -- assert(m_vit != std::vector::const_iterator()); -+ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities -+ // a valid iterator cannot be compared to an empty one in that case -+ // assert(m_vit != std::vector::const_iterator()); - // in the case of a non-contiguous list - return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0]; - } diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch deleted file mode 100644 index 35f0bd23650b..000000000000 --- a/graphite/graphite2-0.9.2.patch +++ /dev/null @@ -1,404 +0,0 @@ -diff -r 5369cdd12120 CMakeLists.txt ---- misc/build/graphite2-0.9.2/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700 -@@ -61,7 +61,7 @@ - add_subdirectory(gr2fonttest) - add_subdirectory(tests) - add_subdirectory(doc) --set(version 0.0.0) -+set(version 2.0.0) - set(libdir ${CMAKE_INSTALL_PREFIX}/lib) - set(includedir ${CMAKE_INSTALL_PREFIX}/include) - -diff -r 5369cdd12120 gr2fonttest/gr2FontTest.cpp ---- misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Fri Feb 18 16:05:40 2011 +0700 -@@ -758,13 +758,11 @@ - float advanceWidth = gr_seg_advance_X(pSeg); - fprintf(log, "Advance width = %6.1f\n", advanceWidth); - unsigned int numchar = gr_seg_n_cinfo(pSeg); -- gr_uint32 *firsts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32)); -- gr_uint32 *lasts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32)); -- gr_seg_char_slots(pSeg, firsts, lasts, 0, 0); - fprintf(log, "\nChar\tUnicode\tBefore\tAfter\n"); - for (unsigned int j = 0; j < numchar; j++) - { -- fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(gr_seg_cinfo(pSeg, j)), firsts[j], lasts[j]); -+ const gr_char_info *c = gr_seg_cinfo(pSeg, j); -+ fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(c), gr_cinfo_before(c), gr_cinfo_after(c)); - } - free(map); - gr_seg_destroy(pSeg); -diff -r 5369cdd12120 include/graphite2/Segment.h ---- misc/build/graphite2-0.9.2/include/graphite2/Segment.h Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/include/graphite2/Segment.h Fri Feb 18 16:05:40 2011 +0700 -@@ -135,6 +135,20 @@ - */ - GR2_API int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/); - -+/** Returns the slot index that after this character is after in the slot stream -+ * -+ * @return after slot index between 0 and gr_seg_n_slots() -+ * @param p Pointer to charinfo to return information on. -+ */ -+GR2_API int gr_cinfo_after(const gr_char_info* p/*not NULL*/); -+ -+/** Returns the slot index that before this character is before in the slot stream -+ * -+ * @return before slot index between 0 and gr_seg_n_slots() -+ * @param p Pointer to charinfo to return information on. -+ */ -+GR2_API int gr_cinfo_before(const gr_char_info* p/*not NULL*/); -+ - /** Returns the number of unicode characters in a string. - * - * @return number of characters in the string -@@ -205,22 +219,6 @@ - */ - GR2_API const gr_slot* gr_seg_last_slot(gr_segment* pSeg/*not NULL*/); //may give a base slot or a slot which is attached to another - --/** Calculates the underlying character to glyph associations. -- * -- * @param pSeg Pointer to the segment we want information on. -- * @param begins An array of gr_seg_n_cinfo integers giving slot index for each -- * charinfo. The value corresponds to which slot a cursor would be before -- * if an underlying cursor were before the charinfo at this index. -- * @param ends An array of gr_seg_n_cinfo integers giving the slot index for each -- * charinfo. The value at an index corresponds to which slot a cursor would -- * be after if an underlying cursor were after the charinfo at the index. -- * @param sbegins An array of gr_seg_n_cinfo gr_slot * corresponding to the gr_slot at -- * index given by begins. The pointer to the array may be NULL. -- * @param sends An array of gr_seg_n_cinfo gr_slot * corresponding to the gr_slot at the -- * index given by ends. The pointer to the array may be NULL. -- */ --GR2_API void gr_seg_char_slots(const gr_segment *pSeg, gr_uint32 *begins, gr_uint32 *ends, gr_slot **sbegins, gr_slot **sends); -- - /** Returns the next slot along in the segment. - * - * Slots are held in a linked list. This returns the next in the linked list. The slot -@@ -306,6 +304,13 @@ - */ - GR2_API int gr_slot_after(const gr_slot* p/*not NULL*/); - -+/** Returns the index of this slot in the segment -+ * -+ * Returns the index given to this slot during final positioning. This corresponds to the value returned br gr_cinfo_before() -+ * and gr_cinfo_after() -+ */ -+GR2_API unsigned int gr_slot_index(const gr_slot* p/*not NULL*/); -+ - /** Return a slot attribute value - * - * Given a slot and an attribute along with a possible subattribute, return the -diff -r 5369cdd12120 src/CMakeLists.txt ---- misc/build/graphite2-0.9.2/src/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700 -@@ -25,7 +25,7 @@ - INCLUDE(CheckTypeSize) - INCLUDE(CheckCXXSourceCompiles) - --set(GRAPHITE_API_MAJOR 1) -+set(GRAPHITE_API_MAJOR 2) - set(GRAPHITE_API_MINOR 0) - set(GRAPHITE_API_AGE 0) - set(GRAPHITE_SO_VERSION ${GRAPHITE_API_MAJOR}.${GRAPHITE_API_MINOR}.${GRAPHITE_API_AGE}) -diff -r 5369cdd12120 src/CharInfo.h ---- misc/build/graphite2-0.9.2/src/CharInfo.h Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/CharInfo.h Fri Feb 18 16:05:40 2011 +0700 -@@ -29,16 +29,23 @@ - { - - public: -+ CharInfo() : m_before(-1), m_after(0) {} - void init(int cid) { m_char = cid; } - unsigned int unicodeChar() const { return m_char; } - void feats(int offset) { m_featureid = offset; } - int fid() const { return m_featureid; } - int breakWeight() const { return m_break; } - void breakWeight(int val) { m_break = val; } -+ int after() const { return m_after; } -+ void after(int val) { m_after = val; } -+ int before() const { return m_before; } -+ void before(int val) { m_before = val; } - - CLASS_NEW_DELETE - private: - int m_char; // Unicode character from character stream -+ int m_before; // slot index before us, comes before -+ int m_after; // slot index after us, comes after - uint8 m_featureid; // index into features list in the segment - int8 m_break; // breakweight coming from lb table - }; -diff -r 5369cdd12120 src/Segment.cpp ---- misc/build/graphite2-0.9.2/src/Segment.cpp Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/Segment.cpp Fri Feb 18 16:05:40 2011 +0700 -@@ -283,6 +283,7 @@ - { - Position currpos; - Slot *s, *ls = NULL; -+ int iSlot = 0; - float cMin = 0.; - float clusterMin = 0.; - Rect bbox; -@@ -292,8 +293,16 @@ - - if (m_dir & 1) - { -- for (s = iEnd; s && s != iStart->prev(); s = s->prev()) -+ for (s = iEnd, iSlot = m_numGlyphs - 1; s && s != iStart->prev(); s = s->prev(), --iSlot) - { -+ for (int j = s->before(); j <= s->after(); j++) -+ { -+ CharInfo *c = charinfo(j); -+ if (c->before() == -1 || iSlot < c->before()) c->before(iSlot); -+ if (c->after() < iSlot) c->after(iSlot); -+ } -+ s->index(iSlot); -+ - if (s->isBase()) - { - clusterMin = currpos.x; -@@ -306,8 +315,16 @@ - } - else - { -- for (s = iStart; s && s != iEnd->next(); s = s->next()) -+ for (s = iStart, iSlot = 0; s && s != iEnd->next(); s = s->next(), ++iSlot) - { -+ for (int j = s->before(); j <= s->after(); j++) -+ { -+ CharInfo *c = charinfo(j); -+ if (c->before() == -1 || iSlot < c->before()) c->before(iSlot); -+ if (c->after() < iSlot) c->after(iSlot); -+ } -+ s->index(iSlot); -+ - if (s->isBase()) - { - clusterMin = currpos.x; -@@ -321,35 +338,6 @@ - if (iStart == m_first && iEnd == m_last) m_advance = currpos; - } - -- --void Segment::getCharSlots(uint32 *begins, uint32 *ends, Slot **sbegins, Slot **sends) const --{ -- Slot *s; -- uint32 i; -- if (!begins || !ends) return; -- memset(begins, 0xFF, m_numCharinfo * sizeof(uint32)); -- memset(ends, 0, m_numCharinfo * sizeof(uint32)); -- -- for (s = m_first, i = 0; s; s = s->next(), i++) -- { -- for (int j = s->before(); j <= s->after(); j++) -- { -- assert(j >= 0); -- assert(j < static_cast(m_numCharinfo)); -- if (i < begins[j]) -- { -- begins[j] = i; -- if (sbegins) sbegins[j] = s; -- } -- if (i > ends[j]) -- { -- ends[j] = i; -- if (sends) sends[j] = s; -- } -- } -- } --} -- - #ifndef DISABLE_TRACING - void Segment::logSegment(gr_encform enc, const void* pStart, size_t nChars) const - { -diff -r 5369cdd12120 src/Segment.h ---- misc/build/graphite2-0.9.2/src/Segment.h Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/Segment.h Fri Feb 18 16:05:40 2011 +0700 -@@ -118,7 +118,6 @@ - int defaultOriginal() const { return m_defaultOriginal; } - const Face * getFace() const { return m_face; } - const Features & getFeatures(unsigned int /*charIndex*/) { assert(m_feats.size() == 1); return m_feats[0]; } -- void getCharSlots(uint32 *begins, uint32 *ends, Slot **sbegins, Slot **sends) const; - - CLASS_NEW_DELETE - -diff -r 5369cdd12120 src/Slot.cpp ---- misc/build/graphite2-0.9.2/src/Slot.cpp Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/Slot.cpp Fri Feb 18 16:05:40 2011 +0700 -@@ -188,15 +188,15 @@ - } - } - --int Slot::getAttr(const Segment *seg, attrCode index, uint8 subindex) const -+int Slot::getAttr(const Segment *seg, attrCode ind, uint8 subindex) const - { - if (!this) return 0; -- if (index == gr_slatUserDefnV1) -+ if (ind == gr_slatUserDefnV1) - { -- index = gr_slatUserDefn; -+ ind = gr_slatUserDefn; - subindex = 0; - } -- switch (index) -+ switch (ind) - { - case gr_slatAdvX : - return static_cast(m_advance.x); -@@ -259,15 +259,15 @@ - } - } - --void Slot::setAttr(Segment *seg, attrCode index, uint8 subindex, int16 value, const SlotMap & map) -+void Slot::setAttr(Segment *seg, attrCode ind, uint8 subindex, int16 value, const SlotMap & map) - { - if (!this) return; -- if (index == gr_slatUserDefnV1) -+ if (ind == gr_slatUserDefnV1) - { -- index = gr_slatUserDefn; -+ ind = gr_slatUserDefn; - subindex = 0; - } -- switch (index) -+ switch (ind) - { - case gr_slatAdvX : - m_advance = Position(value, m_advance.y); -diff -r 5369cdd12120 src/Slot.h ---- misc/build/graphite2-0.9.2/src/Slot.h Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/Slot.h Fri Feb 18 16:05:40 2011 +0700 -@@ -47,6 +47,8 @@ - Position advancePos() const { return m_advance; } - int before() const { return m_before; } - int after() const { return m_after; } -+ uint32 index() const { return m_index; } -+ void index(uint32 val) { m_index = val; } - - Slot(); - void set(const Slot & slot, int charOffset, uint8 numUserAttr); -@@ -58,10 +60,10 @@ - void setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph = NULL); - void setRealGid(uint16 realGid) { m_realglyphid = realGid; } - void origin(const Position &pos) { m_position = pos + m_shift; } -- void originate(int index) { m_original = index; } -+ void originate(int ind) { m_original = ind; } - int original() const { return m_original; } -- void before(int index) { m_before = index; } -- void after(int index) { m_after = index; } -+ void before(int ind) { m_before = ind; } -+ void after(int ind) { m_after = ind; } - bool isBase() const { return (!m_parent); } - void update(int numSlots, int numCharInfo, Position &relpos); - Position finalise(const Segment* seg, const Font* font, Position* base, Rect* bbox, float* cMin, uint8 attrLevel, float *clusterMin); -@@ -75,8 +77,8 @@ - uint16 *userAttrs() { return m_userAttr; } - void userAttrs(uint16 *p) { m_userAttr = p; } - void markInsertBefore(bool state) { if (!state) m_flags |= SLOT_INSERT; else m_flags &= ~SLOT_INSERT; } -- void setAttr(Segment* seg, attrCode index, uint8 subindex, int16 val, const SlotMap & map); -- int getAttr(const Segment *seg, attrCode index, uint8 subindex) const; -+ void setAttr(Segment* seg, attrCode ind, uint8 subindex, int16 val, const SlotMap & map); -+ int getAttr(const Segment *seg, attrCode ind, uint8 subindex) const; - void attachTo(Slot *ap) { m_parent = ap; } - Slot *attachedTo() const { return m_parent; } - Slot* firstChild() const { return m_child; } -@@ -96,8 +98,9 @@ - unsigned short m_glyphid; // glyph id - uint16 m_realglyphid; - uint32 m_original; // charinfo that originated this slot (e.g. for feature values) -- uint32 m_before; // charinfo index of before association -- uint32 m_after; // charinfo index of after association -+ uint32 m_before; // charinfo index of before association -+ uint32 m_after; // charinfo index of after association -+ uint32 m_index; // slot index given to this slot during finalising - Slot *m_parent; // index to parent we are attached to - Slot *m_child; // index to first child slot that attaches to us - Slot *m_sibling; // index to next child that attaches to our parent -diff -r 5369cdd12120 src/gr_char_info.cpp ---- misc/build/graphite2-0.9.2/src/gr_char_info.cpp Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/gr_char_info.cpp Fri Feb 18 16:05:40 2011 +0700 -@@ -39,4 +39,16 @@ - return p->breakWeight(); - } - --} // extern "C" -\ No newline at end of file -+int gr_cinfo_after(const gr_char_info *p/*not NULL*/) -+{ -+ assert(p); -+ return p->after(); -+} -+ -+int gr_cinfo_before(const gr_char_info *p/*not NULL*/) -+{ -+ assert(p); -+ return p->before(); -+} -+ -+} // extern "C" -diff -r 5369cdd12120 src/gr_segment.cpp ---- misc/build/graphite2-0.9.2/src/gr_segment.cpp Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/gr_segment.cpp Fri Feb 18 16:05:40 2011 +0700 -@@ -162,11 +162,5 @@ - return static_cast(pSeg->last()); - } - --void gr_seg_char_slots(const gr_segment *pSeg, gr_uint32 *begins, gr_uint32 *ends, gr_slot **sbegins, gr_slot **sends) --{ -- assert(pSeg && begins && ends); -- pSeg->getCharSlots(begins, ends, reinterpret_cast(sbegins), reinterpret_cast(sends)); --} -- - - } // extern "C" -diff -r 5369cdd12120 src/gr_slot.cpp ---- misc/build/graphite2-0.9.2/src/gr_slot.cpp Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/gr_slot.cpp Fri Feb 18 16:05:40 2011 +0700 -@@ -121,6 +121,12 @@ - return p->after(); - } - -+unsigned int gr_slot_index(const gr_slot *p/*not NULL*/) -+{ -+ assert(p); -+ return p->index(); -+} -+ - int gr_slot_attr(const gr_slot* p/*not NULL*/, const gr_segment* pSeg/*not NULL*/, gr_attrCode index, gr_uint8 subindex) - { - assert(p); -diff current src/List.h ---- misc/build/graphite2-0.9.2/src/List.h Sat Feb 12 22:54:16 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/List.h Fri Feb 18 16:05:40 2011 +0700 -@@ -51,6 +51,6 @@ - template - Vector(I first, const I last) : m_first(0), m_last(0), m_end(0) { insert(begin(), first, last); } -- ~Vector() { free(m_first); } -+ ~Vector() { clear(); free(m_first); } - - iterator begin() { return m_first; } - const_iterator begin() const { return m_first; } - ---- misc/graphite2-0.9.2/src/Code.cpp 2011-02-12 16:54:16.000000000 +0100 -+++ misc/build/graphite2-0.9.2/src/Code.cpp 2011-03-11 11:28:11.700215286 +0100 -@@ -168,7 +168,7 @@ - face.getGlyphFaceCache()->numAttrs(), - face.numFeatures(), - {1,1,1,1,1,1,1,1, -- 1,1,1,1,1,1,1,-1, -+ 1,1,1,1,1,1,1,(uint8)-1, - 1,1,1,1,1,1,1,1, - 1,1,1,1,1,1,0,0, - 0,0,0,0,0,0,0,0, ---- misc/graphite2-0.9.2/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100 -+++ misc/build/graphite2-0.9.2/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100 -@@ -36,7 +36,7 @@ - }; - - // Definitions for library publicly exported symbols --#if defined _WIN32 || defined __CYGWIN__ -+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC - #ifdef GR2_EXPORTING - #ifdef __GNUC__ - #define GR2_API __attribute__((dllexport)) diff --git a/graphite/graphite2-0.9.4.patch b/graphite/graphite2-0.9.4.patch new file mode 100644 index 000000000000..e8e44a588ffe --- /dev/null +++ b/graphite/graphite2-0.9.4.patch @@ -0,0 +1,85 @@ +diff -r b3a86877ec68 src/Pass.cpp +--- misc/build/graphite2-0.9.4/src/Pass.cpp Wed May 11 09:34:52 2011 +0700 ++++ misc/build/graphite2-0.9.4/src/Pass.cpp Mon May 16 14:23:58 2011 +0700 +@@ -513,6 +513,7 @@ + bool Pass::testConstraint(const Rule &r, Machine & m) const + { + if (r.sort - r.preContext > (int)m.slotMap().size() - m.slotMap().context()) return false; ++ if (m.slotMap().context() - r.preContext < 0) return false; + if (!*r.constraint) return true; + assert(r.constraint->constraint()); + +@@ -527,6 +528,7 @@ + Machine::status_t status = Machine::finished; + for (int n = r.sort; n && map; --n, ++map) + { ++ if (!*map) continue; + const int32 ret = r.constraint->run(m, map, status); + if (!ret || status != Machine::finished) + { +diff -r b3a86877ec68 src/Rule.h +--- misc/build/graphite2-0.9.4/src/Rule.h Wed May 11 09:34:52 2011 +0700 ++++ misc/build/graphite2-0.9.4/src/Rule.h Mon May 16 14:23:58 2011 +0700 +@@ -187,8 +187,9 @@ + // Merge the new sorted rules list into the current sorted result set. + const RuleEntry * lre = begin(), * rre = state.rules; + RuleEntry * out = m_rules + (m_begin == m_rules)*MAX_RULES; ++ const RuleEntry * lrend = out + MAX_RULES; + m_begin = out; +- while (lre != end()) ++ while (lre != end() && out != lrend) + { + if (*lre < *rre) *out++ = *lre++; + else if (*rre < *lre) { *out++ = *rre++; } +@@ -196,12 +197,12 @@ + + if (rre == state.rules_end) + { +- while (lre != end()) { *out++ = *lre++; } ++ while (lre != end() && out != lrend) { *out++ = *lre++; } + m_end = out; + return; + } + } +- while (rre != state.rules_end) { *out++ = *rre++; } ++ while (rre != state.rules_end && out != lrend) { *out++ = *rre++; } + m_end = out; + } + +diff -r b3a86877ec68 src/opcodes.h +--- misc/build/graphite2-0.9.4/src/opcodes.h Wed May 11 09:34:52 2011 +0700 ++++ misc/build/graphite2-0.9.4/src/opcodes.h Mon May 16 14:23:58 2011 +0700 +@@ -274,6 +274,7 @@ + { + seg.last()->next(newSlot); + newSlot->prev(seg.last()); ++ newSlot->before(seg.last()->before()); + seg.last(newSlot); + } + else +@@ -286,10 +287,12 @@ + { + iss->prev()->next(newSlot); + newSlot->prev(iss->prev()); ++ newSlot->before(iss->prev()->after()); + } + else + { + newSlot->prev(NULL); ++ newSlot->before(iss->before()); + seg.first(newSlot); + } + newSlot->next(iss); +@@ -297,10 +300,12 @@ + { + iss->prev(newSlot); + newSlot->originate(iss->original()); ++ newSlot->after(iss->before()); + } + else if (newSlot->prev()) + { + newSlot->originate(newSlot->prev()->original()); ++ newSlot->after(newSlot->prev()->after()); + } + else + { -- cgit From c1b808f4ee94f2b352d2cc58b39aea0ae59f6812 Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Mon, 16 May 2011 14:39:01 +0700 Subject: And the makefiles --- graphite/graphite_make.patch | 4 ++-- graphite/makefile.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index f28ed6da8ff7..6db7758820c5 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -1,5 +1,5 @@ ---- misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -+++ misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +--- misc/build/graphite2-0.9.4/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 ++++ misc/build/graphite2-0.9.4/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 @@ -1,1 +1,54 @@ -dummy +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE diff --git a/graphite/makefile.mk b/graphite/makefile.mk index e580b405b63a..8369080b5fef 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -45,9 +45,9 @@ all: # --- Files -------------------------------------------------------- .IF "$(ENABLE_GRAPHITE)"=="TRUE" -TARFILE_NAME=graphite2-0.9.2 -TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108 -PATCH_FILES= graphite2-0.9.2.patch \ +TARFILE_NAME=graphite2-0.9.4 +TARFILE_MD5=1a5ae56d15e704a709010c5478fdf384 +PATCH_FILES= graphite2-0.9.4.patch \ graphite_make.patch ADDITIONAL_FILES= \ -- cgit From 970f1dc0c98f7c0f9fd9a6c2a0ce6228e80272d7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 16 May 2011 15:58:42 +0300 Subject: Always link with WS2_32LIB, not WSOCK32LIB --- neon/neon.patch | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/neon/neon.patch b/neon/neon.patch index 473b88695ccc..0f5669152a28 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -492,7 +492,7 @@ +#endif --- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100 +++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100 -@@ -1 +1,102 @@ +@@ -1,1 +1,99 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -572,10 +572,7 @@ + $(ZLIB3RDLIB) + +.IF "$(GUI)"=="WNT" -+ SHL1STDLIBS+= $(WSOCK32LIB) -+ .IF "$(WINDOWS_VISTA_PSDK)" != "" -+ SHL1STDLIBS+= $(WS2_32LIB) -+ .ENDIF ++ SHL1STDLIBS+= $(WS2_32LIB) + SHL1STDLIBS+= $(OPENSSLLIB) +.ELSE # WNT + .IF "$(OS)"=="SOLARIS" -- cgit From 91a8d7bf04688fe2c3fcc7c385d109a6778ce4d2 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 16 May 2011 20:04:12 +0200 Subject: Revert "And the makefiles" caused many build problems on Windows; too late to do this change This reverts commit 7911b8ed64ba69322dc5b82177c7149c39c3604e. --- graphite/graphite_make.patch | 4 ++-- graphite/makefile.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index 6db7758820c5..f28ed6da8ff7 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -1,5 +1,5 @@ ---- misc/build/graphite2-0.9.4/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -+++ misc/build/graphite2-0.9.4/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +--- misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 @@ -1,1 +1,54 @@ -dummy +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 8369080b5fef..e580b405b63a 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -45,9 +45,9 @@ all: # --- Files -------------------------------------------------------- .IF "$(ENABLE_GRAPHITE)"=="TRUE" -TARFILE_NAME=graphite2-0.9.4 -TARFILE_MD5=1a5ae56d15e704a709010c5478fdf384 -PATCH_FILES= graphite2-0.9.4.patch \ +TARFILE_NAME=graphite2-0.9.2 +TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108 +PATCH_FILES= graphite2-0.9.2.patch \ graphite_make.patch ADDITIONAL_FILES= \ -- cgit From 31e0d0c56fffa4873c029979f15c6cee1bdf81ed Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 16 May 2011 20:05:14 +0200 Subject: Revert "Fix graphite2 particulary for LinLibertineG" caused many build problems on Windows; too late to do this change This reverts commit 1dbaab9692545a9c8c032a886932a7626e48dbe9. --- graphite/graphite-2.3.1_debug.patch | 13 ++ graphite/graphite2-0.9.2.patch | 404 ++++++++++++++++++++++++++++++++++++ graphite/graphite2-0.9.4.patch | 85 -------- 3 files changed, 417 insertions(+), 85 deletions(-) create mode 100644 graphite/graphite-2.3.1_debug.patch create mode 100644 graphite/graphite2-0.9.2.patch delete mode 100644 graphite/graphite2-0.9.4.patch diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch new file mode 100644 index 000000000000..583fac711e2b --- /dev/null +++ b/graphite/graphite-2.3.1_debug.patch @@ -0,0 +1,13 @@ +--- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200 ++++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100 +@@ -247,7 +247,9 @@ + GlyphSetIterator::reference GlyphSetIterator::operator*() const + { + assert(m_pseg != 0); +- assert(m_vit != std::vector::const_iterator()); ++ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities ++ // a valid iterator cannot be compared to an empty one in that case ++ // assert(m_vit != std::vector::const_iterator()); + // in the case of a non-contiguous list + return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0]; + } diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch new file mode 100644 index 000000000000..35f0bd23650b --- /dev/null +++ b/graphite/graphite2-0.9.2.patch @@ -0,0 +1,404 @@ +diff -r 5369cdd12120 CMakeLists.txt +--- misc/build/graphite2-0.9.2/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700 +@@ -61,7 +61,7 @@ + add_subdirectory(gr2fonttest) + add_subdirectory(tests) + add_subdirectory(doc) +-set(version 0.0.0) ++set(version 2.0.0) + set(libdir ${CMAKE_INSTALL_PREFIX}/lib) + set(includedir ${CMAKE_INSTALL_PREFIX}/include) + +diff -r 5369cdd12120 gr2fonttest/gr2FontTest.cpp +--- misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/gr2fonttest/gr2FontTest.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -758,13 +758,11 @@ + float advanceWidth = gr_seg_advance_X(pSeg); + fprintf(log, "Advance width = %6.1f\n", advanceWidth); + unsigned int numchar = gr_seg_n_cinfo(pSeg); +- gr_uint32 *firsts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32)); +- gr_uint32 *lasts = (gr_uint32 *)malloc(numchar * sizeof(gr_uint32)); +- gr_seg_char_slots(pSeg, firsts, lasts, 0, 0); + fprintf(log, "\nChar\tUnicode\tBefore\tAfter\n"); + for (unsigned int j = 0; j < numchar; j++) + { +- fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(gr_seg_cinfo(pSeg, j)), firsts[j], lasts[j]); ++ const gr_char_info *c = gr_seg_cinfo(pSeg, j); ++ fprintf(log, "%d\t%04X\t%d\t%d\n", j, gr_cinfo_unicode_char(c), gr_cinfo_before(c), gr_cinfo_after(c)); + } + free(map); + gr_seg_destroy(pSeg); +diff -r 5369cdd12120 include/graphite2/Segment.h +--- misc/build/graphite2-0.9.2/include/graphite2/Segment.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/include/graphite2/Segment.h Fri Feb 18 16:05:40 2011 +0700 +@@ -135,6 +135,20 @@ + */ + GR2_API int gr_cinfo_break_weight(const gr_char_info* p/*not NULL*/); + ++/** Returns the slot index that after this character is after in the slot stream ++ * ++ * @return after slot index between 0 and gr_seg_n_slots() ++ * @param p Pointer to charinfo to return information on. ++ */ ++GR2_API int gr_cinfo_after(const gr_char_info* p/*not NULL*/); ++ ++/** Returns the slot index that before this character is before in the slot stream ++ * ++ * @return before slot index between 0 and gr_seg_n_slots() ++ * @param p Pointer to charinfo to return information on. ++ */ ++GR2_API int gr_cinfo_before(const gr_char_info* p/*not NULL*/); ++ + /** Returns the number of unicode characters in a string. + * + * @return number of characters in the string +@@ -205,22 +219,6 @@ + */ + GR2_API const gr_slot* gr_seg_last_slot(gr_segment* pSeg/*not NULL*/); //may give a base slot or a slot which is attached to another + +-/** Calculates the underlying character to glyph associations. +- * +- * @param pSeg Pointer to the segment we want information on. +- * @param begins An array of gr_seg_n_cinfo integers giving slot index for each +- * charinfo. The value corresponds to which slot a cursor would be before +- * if an underlying cursor were before the charinfo at this index. +- * @param ends An array of gr_seg_n_cinfo integers giving the slot index for each +- * charinfo. The value at an index corresponds to which slot a cursor would +- * be after if an underlying cursor were after the charinfo at the index. +- * @param sbegins An array of gr_seg_n_cinfo gr_slot * corresponding to the gr_slot at +- * index given by begins. The pointer to the array may be NULL. +- * @param sends An array of gr_seg_n_cinfo gr_slot * corresponding to the gr_slot at the +- * index given by ends. The pointer to the array may be NULL. +- */ +-GR2_API void gr_seg_char_slots(const gr_segment *pSeg, gr_uint32 *begins, gr_uint32 *ends, gr_slot **sbegins, gr_slot **sends); +- + /** Returns the next slot along in the segment. + * + * Slots are held in a linked list. This returns the next in the linked list. The slot +@@ -306,6 +304,13 @@ + */ + GR2_API int gr_slot_after(const gr_slot* p/*not NULL*/); + ++/** Returns the index of this slot in the segment ++ * ++ * Returns the index given to this slot during final positioning. This corresponds to the value returned br gr_cinfo_before() ++ * and gr_cinfo_after() ++ */ ++GR2_API unsigned int gr_slot_index(const gr_slot* p/*not NULL*/); ++ + /** Return a slot attribute value + * + * Given a slot and an attribute along with a possible subattribute, return the +diff -r 5369cdd12120 src/CMakeLists.txt +--- misc/build/graphite2-0.9.2/src/CMakeLists.txt Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/CMakeLists.txt Fri Feb 18 16:05:40 2011 +0700 +@@ -25,7 +25,7 @@ + INCLUDE(CheckTypeSize) + INCLUDE(CheckCXXSourceCompiles) + +-set(GRAPHITE_API_MAJOR 1) ++set(GRAPHITE_API_MAJOR 2) + set(GRAPHITE_API_MINOR 0) + set(GRAPHITE_API_AGE 0) + set(GRAPHITE_SO_VERSION ${GRAPHITE_API_MAJOR}.${GRAPHITE_API_MINOR}.${GRAPHITE_API_AGE}) +diff -r 5369cdd12120 src/CharInfo.h +--- misc/build/graphite2-0.9.2/src/CharInfo.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/CharInfo.h Fri Feb 18 16:05:40 2011 +0700 +@@ -29,16 +29,23 @@ + { + + public: ++ CharInfo() : m_before(-1), m_after(0) {} + void init(int cid) { m_char = cid; } + unsigned int unicodeChar() const { return m_char; } + void feats(int offset) { m_featureid = offset; } + int fid() const { return m_featureid; } + int breakWeight() const { return m_break; } + void breakWeight(int val) { m_break = val; } ++ int after() const { return m_after; } ++ void after(int val) { m_after = val; } ++ int before() const { return m_before; } ++ void before(int val) { m_before = val; } + + CLASS_NEW_DELETE + private: + int m_char; // Unicode character from character stream ++ int m_before; // slot index before us, comes before ++ int m_after; // slot index after us, comes after + uint8 m_featureid; // index into features list in the segment + int8 m_break; // breakweight coming from lb table + }; +diff -r 5369cdd12120 src/Segment.cpp +--- misc/build/graphite2-0.9.2/src/Segment.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Segment.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -283,6 +283,7 @@ + { + Position currpos; + Slot *s, *ls = NULL; ++ int iSlot = 0; + float cMin = 0.; + float clusterMin = 0.; + Rect bbox; +@@ -292,8 +293,16 @@ + + if (m_dir & 1) + { +- for (s = iEnd; s && s != iStart->prev(); s = s->prev()) ++ for (s = iEnd, iSlot = m_numGlyphs - 1; s && s != iStart->prev(); s = s->prev(), --iSlot) + { ++ for (int j = s->before(); j <= s->after(); j++) ++ { ++ CharInfo *c = charinfo(j); ++ if (c->before() == -1 || iSlot < c->before()) c->before(iSlot); ++ if (c->after() < iSlot) c->after(iSlot); ++ } ++ s->index(iSlot); ++ + if (s->isBase()) + { + clusterMin = currpos.x; +@@ -306,8 +315,16 @@ + } + else + { +- for (s = iStart; s && s != iEnd->next(); s = s->next()) ++ for (s = iStart, iSlot = 0; s && s != iEnd->next(); s = s->next(), ++iSlot) + { ++ for (int j = s->before(); j <= s->after(); j++) ++ { ++ CharInfo *c = charinfo(j); ++ if (c->before() == -1 || iSlot < c->before()) c->before(iSlot); ++ if (c->after() < iSlot) c->after(iSlot); ++ } ++ s->index(iSlot); ++ + if (s->isBase()) + { + clusterMin = currpos.x; +@@ -321,35 +338,6 @@ + if (iStart == m_first && iEnd == m_last) m_advance = currpos; + } + +- +-void Segment::getCharSlots(uint32 *begins, uint32 *ends, Slot **sbegins, Slot **sends) const +-{ +- Slot *s; +- uint32 i; +- if (!begins || !ends) return; +- memset(begins, 0xFF, m_numCharinfo * sizeof(uint32)); +- memset(ends, 0, m_numCharinfo * sizeof(uint32)); +- +- for (s = m_first, i = 0; s; s = s->next(), i++) +- { +- for (int j = s->before(); j <= s->after(); j++) +- { +- assert(j >= 0); +- assert(j < static_cast(m_numCharinfo)); +- if (i < begins[j]) +- { +- begins[j] = i; +- if (sbegins) sbegins[j] = s; +- } +- if (i > ends[j]) +- { +- ends[j] = i; +- if (sends) sends[j] = s; +- } +- } +- } +-} +- + #ifndef DISABLE_TRACING + void Segment::logSegment(gr_encform enc, const void* pStart, size_t nChars) const + { +diff -r 5369cdd12120 src/Segment.h +--- misc/build/graphite2-0.9.2/src/Segment.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Segment.h Fri Feb 18 16:05:40 2011 +0700 +@@ -118,7 +118,6 @@ + int defaultOriginal() const { return m_defaultOriginal; } + const Face * getFace() const { return m_face; } + const Features & getFeatures(unsigned int /*charIndex*/) { assert(m_feats.size() == 1); return m_feats[0]; } +- void getCharSlots(uint32 *begins, uint32 *ends, Slot **sbegins, Slot **sends) const; + + CLASS_NEW_DELETE + +diff -r 5369cdd12120 src/Slot.cpp +--- misc/build/graphite2-0.9.2/src/Slot.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Slot.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -188,15 +188,15 @@ + } + } + +-int Slot::getAttr(const Segment *seg, attrCode index, uint8 subindex) const ++int Slot::getAttr(const Segment *seg, attrCode ind, uint8 subindex) const + { + if (!this) return 0; +- if (index == gr_slatUserDefnV1) ++ if (ind == gr_slatUserDefnV1) + { +- index = gr_slatUserDefn; ++ ind = gr_slatUserDefn; + subindex = 0; + } +- switch (index) ++ switch (ind) + { + case gr_slatAdvX : + return static_cast(m_advance.x); +@@ -259,15 +259,15 @@ + } + } + +-void Slot::setAttr(Segment *seg, attrCode index, uint8 subindex, int16 value, const SlotMap & map) ++void Slot::setAttr(Segment *seg, attrCode ind, uint8 subindex, int16 value, const SlotMap & map) + { + if (!this) return; +- if (index == gr_slatUserDefnV1) ++ if (ind == gr_slatUserDefnV1) + { +- index = gr_slatUserDefn; ++ ind = gr_slatUserDefn; + subindex = 0; + } +- switch (index) ++ switch (ind) + { + case gr_slatAdvX : + m_advance = Position(value, m_advance.y); +diff -r 5369cdd12120 src/Slot.h +--- misc/build/graphite2-0.9.2/src/Slot.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Slot.h Fri Feb 18 16:05:40 2011 +0700 +@@ -47,6 +47,8 @@ + Position advancePos() const { return m_advance; } + int before() const { return m_before; } + int after() const { return m_after; } ++ uint32 index() const { return m_index; } ++ void index(uint32 val) { m_index = val; } + + Slot(); + void set(const Slot & slot, int charOffset, uint8 numUserAttr); +@@ -58,10 +60,10 @@ + void setGlyph(Segment *seg, uint16 glyphid, const GlyphFace * theGlyph = NULL); + void setRealGid(uint16 realGid) { m_realglyphid = realGid; } + void origin(const Position &pos) { m_position = pos + m_shift; } +- void originate(int index) { m_original = index; } ++ void originate(int ind) { m_original = ind; } + int original() const { return m_original; } +- void before(int index) { m_before = index; } +- void after(int index) { m_after = index; } ++ void before(int ind) { m_before = ind; } ++ void after(int ind) { m_after = ind; } + bool isBase() const { return (!m_parent); } + void update(int numSlots, int numCharInfo, Position &relpos); + Position finalise(const Segment* seg, const Font* font, Position* base, Rect* bbox, float* cMin, uint8 attrLevel, float *clusterMin); +@@ -75,8 +77,8 @@ + uint16 *userAttrs() { return m_userAttr; } + void userAttrs(uint16 *p) { m_userAttr = p; } + void markInsertBefore(bool state) { if (!state) m_flags |= SLOT_INSERT; else m_flags &= ~SLOT_INSERT; } +- void setAttr(Segment* seg, attrCode index, uint8 subindex, int16 val, const SlotMap & map); +- int getAttr(const Segment *seg, attrCode index, uint8 subindex) const; ++ void setAttr(Segment* seg, attrCode ind, uint8 subindex, int16 val, const SlotMap & map); ++ int getAttr(const Segment *seg, attrCode ind, uint8 subindex) const; + void attachTo(Slot *ap) { m_parent = ap; } + Slot *attachedTo() const { return m_parent; } + Slot* firstChild() const { return m_child; } +@@ -96,8 +98,9 @@ + unsigned short m_glyphid; // glyph id + uint16 m_realglyphid; + uint32 m_original; // charinfo that originated this slot (e.g. for feature values) +- uint32 m_before; // charinfo index of before association +- uint32 m_after; // charinfo index of after association ++ uint32 m_before; // charinfo index of before association ++ uint32 m_after; // charinfo index of after association ++ uint32 m_index; // slot index given to this slot during finalising + Slot *m_parent; // index to parent we are attached to + Slot *m_child; // index to first child slot that attaches to us + Slot *m_sibling; // index to next child that attaches to our parent +diff -r 5369cdd12120 src/gr_char_info.cpp +--- misc/build/graphite2-0.9.2/src/gr_char_info.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/gr_char_info.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -39,4 +39,16 @@ + return p->breakWeight(); + } + +-} // extern "C" +\ No newline at end of file ++int gr_cinfo_after(const gr_char_info *p/*not NULL*/) ++{ ++ assert(p); ++ return p->after(); ++} ++ ++int gr_cinfo_before(const gr_char_info *p/*not NULL*/) ++{ ++ assert(p); ++ return p->before(); ++} ++ ++} // extern "C" +diff -r 5369cdd12120 src/gr_segment.cpp +--- misc/build/graphite2-0.9.2/src/gr_segment.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/gr_segment.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -162,11 +162,5 @@ + return static_cast(pSeg->last()); + } + +-void gr_seg_char_slots(const gr_segment *pSeg, gr_uint32 *begins, gr_uint32 *ends, gr_slot **sbegins, gr_slot **sends) +-{ +- assert(pSeg && begins && ends); +- pSeg->getCharSlots(begins, ends, reinterpret_cast(sbegins), reinterpret_cast(sends)); +-} +- + + } // extern "C" +diff -r 5369cdd12120 src/gr_slot.cpp +--- misc/build/graphite2-0.9.2/src/gr_slot.cpp Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/gr_slot.cpp Fri Feb 18 16:05:40 2011 +0700 +@@ -121,6 +121,12 @@ + return p->after(); + } + ++unsigned int gr_slot_index(const gr_slot *p/*not NULL*/) ++{ ++ assert(p); ++ return p->index(); ++} ++ + int gr_slot_attr(const gr_slot* p/*not NULL*/, const gr_segment* pSeg/*not NULL*/, gr_attrCode index, gr_uint8 subindex) + { + assert(p); +diff current src/List.h +--- misc/build/graphite2-0.9.2/src/List.h Sat Feb 12 22:54:16 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/List.h Fri Feb 18 16:05:40 2011 +0700 +@@ -51,6 +51,6 @@ + template + Vector(I first, const I last) : m_first(0), m_last(0), m_end(0) { insert(begin(), first, last); } +- ~Vector() { free(m_first); } ++ ~Vector() { clear(); free(m_first); } + + iterator begin() { return m_first; } + const_iterator begin() const { return m_first; } + +--- misc/graphite2-0.9.2/src/Code.cpp 2011-02-12 16:54:16.000000000 +0100 ++++ misc/build/graphite2-0.9.2/src/Code.cpp 2011-03-11 11:28:11.700215286 +0100 +@@ -168,7 +168,7 @@ + face.getGlyphFaceCache()->numAttrs(), + face.numFeatures(), + {1,1,1,1,1,1,1,1, +- 1,1,1,1,1,1,1,-1, ++ 1,1,1,1,1,1,1,(uint8)-1, + 1,1,1,1,1,1,1,1, + 1,1,1,1,1,1,0,0, + 0,0,0,0,0,0,0,0, +--- misc/graphite2-0.9.2/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100 ++++ misc/build/graphite2-0.9.2/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100 +@@ -36,7 +36,7 @@ + }; + + // Definitions for library publicly exported symbols +-#if defined _WIN32 || defined __CYGWIN__ ++#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC + #ifdef GR2_EXPORTING + #ifdef __GNUC__ + #define GR2_API __attribute__((dllexport)) diff --git a/graphite/graphite2-0.9.4.patch b/graphite/graphite2-0.9.4.patch deleted file mode 100644 index e8e44a588ffe..000000000000 --- a/graphite/graphite2-0.9.4.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -r b3a86877ec68 src/Pass.cpp ---- misc/build/graphite2-0.9.4/src/Pass.cpp Wed May 11 09:34:52 2011 +0700 -+++ misc/build/graphite2-0.9.4/src/Pass.cpp Mon May 16 14:23:58 2011 +0700 -@@ -513,6 +513,7 @@ - bool Pass::testConstraint(const Rule &r, Machine & m) const - { - if (r.sort - r.preContext > (int)m.slotMap().size() - m.slotMap().context()) return false; -+ if (m.slotMap().context() - r.preContext < 0) return false; - if (!*r.constraint) return true; - assert(r.constraint->constraint()); - -@@ -527,6 +528,7 @@ - Machine::status_t status = Machine::finished; - for (int n = r.sort; n && map; --n, ++map) - { -+ if (!*map) continue; - const int32 ret = r.constraint->run(m, map, status); - if (!ret || status != Machine::finished) - { -diff -r b3a86877ec68 src/Rule.h ---- misc/build/graphite2-0.9.4/src/Rule.h Wed May 11 09:34:52 2011 +0700 -+++ misc/build/graphite2-0.9.4/src/Rule.h Mon May 16 14:23:58 2011 +0700 -@@ -187,8 +187,9 @@ - // Merge the new sorted rules list into the current sorted result set. - const RuleEntry * lre = begin(), * rre = state.rules; - RuleEntry * out = m_rules + (m_begin == m_rules)*MAX_RULES; -+ const RuleEntry * lrend = out + MAX_RULES; - m_begin = out; -- while (lre != end()) -+ while (lre != end() && out != lrend) - { - if (*lre < *rre) *out++ = *lre++; - else if (*rre < *lre) { *out++ = *rre++; } -@@ -196,12 +197,12 @@ - - if (rre == state.rules_end) - { -- while (lre != end()) { *out++ = *lre++; } -+ while (lre != end() && out != lrend) { *out++ = *lre++; } - m_end = out; - return; - } - } -- while (rre != state.rules_end) { *out++ = *rre++; } -+ while (rre != state.rules_end && out != lrend) { *out++ = *rre++; } - m_end = out; - } - -diff -r b3a86877ec68 src/opcodes.h ---- misc/build/graphite2-0.9.4/src/opcodes.h Wed May 11 09:34:52 2011 +0700 -+++ misc/build/graphite2-0.9.4/src/opcodes.h Mon May 16 14:23:58 2011 +0700 -@@ -274,6 +274,7 @@ - { - seg.last()->next(newSlot); - newSlot->prev(seg.last()); -+ newSlot->before(seg.last()->before()); - seg.last(newSlot); - } - else -@@ -286,10 +287,12 @@ - { - iss->prev()->next(newSlot); - newSlot->prev(iss->prev()); -+ newSlot->before(iss->prev()->after()); - } - else - { - newSlot->prev(NULL); -+ newSlot->before(iss->before()); - seg.first(newSlot); - } - newSlot->next(iss); -@@ -297,10 +300,12 @@ - { - iss->prev(newSlot); - newSlot->originate(iss->original()); -+ newSlot->after(iss->before()); - } - else if (newSlot->prev()) - { - newSlot->originate(newSlot->prev()->original()); -+ newSlot->after(newSlot->prev()->after()); - } - else - { -- cgit From 0bd8a0b4122d38d42e0dea2c3f239cde98b2584b Mon Sep 17 00:00:00 2001 From: Martin Hosken Date: Mon, 16 May 2011 20:07:36 +0200 Subject: Fix graphite2-0.9.2 particulary for LinLibertineG (fdo#36510, fdo#36752) Signed-off-by: Petr Mladek --- graphite/graphite2-0.9.2.patch | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch index 35f0bd23650b..a775c1fe6c8e 100644 --- a/graphite/graphite2-0.9.2.patch +++ b/graphite/graphite2-0.9.2.patch @@ -402,3 +402,52 @@ diff current src/List.h #ifdef GR2_EXPORTING #ifdef __GNUC__ #define GR2_API __attribute__((dllexport)) +diff -r b3a86877ec68 src/Pass.cpp +--- misc/build/graphite2-0.9.2/src/Pass.cpp Wed May 11 09:34:52 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Pass.cpp Mon May 16 13:54:00 2011 +0700 +@@ -513,6 +513,7 @@ + bool Pass::testConstraint(const Rule &r, Machine & m) const + { + if (r.sort - r.preContext > (int)m.slotMap().size() - m.slotMap().context()) return false; ++ if (m.slotMap().context() - r.preContext < 0) return false; + if (!*r.constraint) return true; + assert(r.constraint->constraint()); + +@@ -527,6 +528,7 @@ + Machine::status_t status = Machine::finished; + for (int n = r.sort; n && map; --n, ++map) + { ++ if (!*map) continue; + const int32 ret = r.constraint->run(m, map, status); + if (!ret || status != Machine::finished) + { +diff -r b3a86877ec68 src/Rule.h +--- misc/build/graphite2-0.9.2/src/Rule.h Wed May 11 09:34:52 2011 +0700 ++++ misc/build/graphite2-0.9.2/src/Rule.h Mon May 16 13:54:00 2011 +0700 +@@ -187,8 +187,9 @@ + // Merge the new sorted rules list into the current sorted result set. + const RuleEntry * lre = begin(), * rre = state.rules; + RuleEntry * out = m_rules + (m_begin == m_rules)*MAX_RULES; ++ const RuleEntry * lrend = out + MAX_RULES; + m_begin = out; +- while (lre != end()) ++ while (lre != end() && out != lrend) + { + if (*lre < *rre) *out++ = *lre++; + else if (*rre < *lre) { *out++ = *rre++; } +@@ -196,12 +197,12 @@ + + if (rre == state.rules_end) + { +- while (lre != end()) { *out++ = *lre++; } ++ while (lre != end() && out != lrend) { *out++ = *lre++; } + m_end = out; + return; + } + } +- while (rre != state.rules_end) { *out++ = *rre++; } ++ while (rre != state.rules_end && out != lrend) { *out++ = *rre++; } + m_end = out; + } + + -- cgit -- cgit -- cgit From 52685c078f5c5e847491f58d545b273089035149 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 19 May 2011 00:34:10 +0300 Subject: Add the unxios and unxand directories --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index b4e1032da5ee..5659c3eb1ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,9 @@ /*/wntmsc???.pro /*/unxmacx? /*/unxmacx?.pro +/*/unxios? +/*/unxios?.pro +/*/unxand? +/*/unxand?.pro /moz/zipped/*.zip -- cgit From 9bc07d4476a87ff11d2c59be6a43cecb4d45f190 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 19 May 2011 00:39:03 +0300 Subject: Add the wntgcc directories --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5659c3eb1ffd..d2f8ff4a2ade 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ /*/unxlng??.pro /*/wntmsc??? /*/wntmsc???.pro +/*/wntgcc? +/*/wntgcc?.pro /*/unxmacx? /*/unxmacx?.pro /*/unxios? -- cgit From bfed48d5b5b9f8c7f4b89835243948e6ed55fb11 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 21 May 2011 16:38:28 +0300 Subject: Drop OS2 --- curl/makefile.mk | 13 ------------- hunspell/makefile.mk | 4 ---- libxml2/makefile.mk | 5 ----- neon/neon.patch | 5 +---- python/pyversion.mk | 3 --- 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/curl/makefile.mk b/curl/makefile.mk index dfcb77fa1ce4..7588a4859b2a 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -135,19 +135,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib .ENDIF .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_DIR=.$/lib -.IF "$(debug)"=="" -BUILD_ACTION=make -f Makefile.os2 -.ELSE -BUILD_ACTION=make -f Makefile.os2 -.ENDIF - -OUT2BIN=$(BUILD_DIR)$/libcurl.dll -OUT2LIB=$(BUILD_DIR)$/libcurl.lib - -.ENDIF # "$(GUI)"=="OS2" - OUT2INC= \ include$/curl$/easy.h \ include$/curl$/multi.h \ diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 9c213a4d9a9a..6ab9b36cc877 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -87,10 +87,6 @@ BUILD_ACTION=cd src/hunspell && dmake .ENDIF .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_ACTION=cd src/hunspell && dmake -.ENDIF # "$(GUI)"=="OS2" - OUT2INC= \ $(BUILD_DIR)$/src$/hunspell$/*.hxx \ $(BUILD_DIR)$/src$/hunspell$/*.h diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 9e69e67f67e2..f037648132db 100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -97,13 +97,8 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= -.IF "$(OS)"=="OS2" -CONFIGURE_ACTION=sh .$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" -.ELSE CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" -.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/neon/neon.patch b/neon/neon.patch index 0f5669152a28..b7a3f8514335 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -492,7 +492,7 @@ +#endif --- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100 +++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100 -@@ -1,1 +1,99 @@ +@@ -1,1 +1,96 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -578,9 +578,6 @@ + .IF "$(OS)"=="SOLARIS" + SHL1STDLIBS+= -lnsl -lsocket -ldl + .ENDIF # SOLARIS -+ .IF "$(OS)"=="OS2" -+ SHL1STDLIBS+= pthread.lib libz.lib -+ .ENDIF # OS2 + .IF "$(SYSTEM_OPENSSL)"=="YES" + SHL1STDLIBS+= $(OPENSSLLIB) + .ELSE diff --git a/python/pyversion.mk b/python/pyversion.mk index 55a616b12064..71b5acffd278 100644 --- a/python/pyversion.mk +++ b/python/pyversion.mk @@ -12,9 +12,6 @@ PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0 .ENDIF PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR) -.ELIF "$(GUI)" == "OS2" -PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll -PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib .ELSE .IF "$(COM)" == "GCC" PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll -- cgit -- cgit -- cgit From 0b9066d9c3e7517707bb45850d672da0c59aaf44 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 May 2011 02:29:34 +0300 Subject: Cross-compilation support and iOS in particular --- libxml2/makefile.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index f037648132db..60a2e54414af 100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -98,13 +98,21 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF +CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) .IF "$(debug)"!="" CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug .ENDIF +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF .ENDIF @@ -115,6 +123,9 @@ EXTRPATH=URELIB OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config +.ELIF "$(OS)"=="IOS" +OUT2LIB+=.libs$/libxml2.a +OUT2BIN+=xml2-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=.libs$/libxml2*.a -- cgit From 31e8c4834f4b790b3a44696d8c5f14dc32e7d37b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 May 2011 02:38:21 +0300 Subject: Cross-compilation support and iOS in particular --- libxslt/makefile.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 7d6bd1efb354..7c24f9bd22bc 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -117,7 +117,15 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF +CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -130,6 +138,10 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib OUT2BIN+=xsltproc$/.libs$/xsltproc OUT2BIN+=xslt-config +.ELIF "$(OS)"=="IOS" +OUT2LIB+=libxslt$/.libs$/libxslt.a +OUT2LIB+=libexslt$/.libs$/libexslt.a +OUT2BIN+=xslt-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=libxslt$/.libs$/*.a -- cgit From 4a5e101859a25590597af961b0ec0c0edbd58c96 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 May 2011 02:53:29 +0300 Subject: Typo --- libxslt/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 7c24f9bd22bc..b3567d2e8793 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -118,7 +118,7 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure .IF "$(OS)"=="IOS" -CONFIGURE_FLAGS+=--disable-shared +CONFIGURE_FLAGS=--disable-shared .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF -- cgit From 5814cca89b59eec0254c7487bb38ba6c3a3e305c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 May 2011 02:54:27 +0300 Subject: Typo --- libxml2/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 60a2e54414af..37c0efa99add 100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -99,7 +99,7 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure .IF "$(OS)"=="IOS" -CONFIGURE_FLAGS+=--disable-shared +CONFIGURE_FLAGS=--disable-shared .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF -- cgit From 8e872440fdf116e903baf92c80b88154566688c8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 May 2011 03:06:30 +0300 Subject: Cross-compilation support and iOS in particular --- curl/makefile.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/curl/makefile.mk b/curl/makefile.mk index 7588a4859b2a..6be9def7754f 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -79,13 +79,26 @@ curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF +CONFIGURE_FLAGS+= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" + +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) +.IF "$(OS)"=="IOS" +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a +.ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 +.ENDIF .ENDIF # "$(GUI)"=="UNX" -- cgit -- cgit From 315641944d405f9c304ff8e2dc4de22ae99f45fd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 26 May 2011 01:13:27 +0300 Subject: Pass --build and --host when cross-compiling --- expat/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/expat/makefile.mk b/expat/makefile.mk index 867e2b371558..6084cf54bddd 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -55,6 +55,10 @@ CONFIGURE_ACTION= CONFIGURE_ACTION=.$/configure .ENDIF +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF + BUILD_DIR=lib BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) -- cgit From 229b1d0673f17edde20ea01b52bad40164db9828 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 26 May 2011 02:58:34 +0300 Subject: Cross-compilation support and iOS in particular --- icu/makefile.mk | 26 +++++++++++++++++++++++++- icu/prj/d.lst | 7 +++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index dbbd4c08d0fd..b23aa6667c1d 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -96,14 +96,29 @@ LDFLAGSADD+=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) LDFLAGSADD += -Wl,--hash-style=both .ENDIF +.IF "$(OS)"=="IOS" +# Let's try this... +icu_CFLAGS+=-DUCONFIG_NO_FILE_IO +.ENDIF + .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF CONFIGURE_DIR=source +.IF "$(OS)"=="IOS" +STATIC_OR_SHARED=--enable-static --disable-shared +.ELSE +STATIC_OR_SHARED==--disable-static --enable-shared +.ENDIF + +.IF "$(CROSS_COMPILING)"!="" +BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(ICU_NATIVE_BUILD_ROOT) +.ENDIF + CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout --disable-static --enable-shared $(DISABLE_64BIT)' +./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT)' CONFIGURE_FLAGS= @@ -116,6 +131,14 @@ CONFIGURE_FLAGS= BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS) +.IF "$(OS)"=="IOS" +OUT2LIB= \ + $(BUILD_DIR)$/lib$/libicudata.a \ + $(BUILD_DIR)$/lib$/libicuuc.a \ + $(BUILD_DIR)$/lib$/libicui18n.a \ + $(BUILD_DIR)$/lib$/libicule.a \ + $(BUILD_DIR)$/lib$/libicutu.a +.ELSE OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \ @@ -137,6 +160,7 @@ OUT2BIN= \ $(BUILD_DIR)$/bin$/genccode \ $(BUILD_DIR)$/bin$/genbrk \ $(BUILD_DIR)$/bin$/gencmn +.ENDIF .ENDIF diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 608f19e77251..19992a2bb1fe 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -25,6 +25,13 @@ mkdir: %_DEST%\inc%_EXT%\external\unicode ..\%__SRC%\lib\libicule.*.*.* %_DEST%\lib%_EXT%\ ..\%__SRC%\lib\libicuuc.*.*.* %_DEST%\lib%_EXT%\ ..\%__SRC%\lib\libicutu.*.*.* %_DEST%\lib%_EXT%\ + +..\%__SRC%\lib\libicudata.a %_DEST%\lib%_EXT%\ +..\%__SRC%\lib\libicui18n.a %_DEST%\lib%_EXT%\ +..\%__SRC%\lib\libicule.a %_DEST%\lib%_EXT%\ +..\%__SRC%\lib\libicuuc.a %_DEST%\lib%_EXT%\ +..\%__SRC%\lib\libicutu.a %_DEST%\lib%_EXT%\ + ..\icuversion.mk %_DEST%\inc%_EXT%\icuversion.mk linklib: libicudata.*.*.* -- cgit From 16a8d1be88df94336b3c27c5284b9fcc3f32c052 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 28 May 2011 00:12:11 -0500 Subject: libcroco: manage libxml2 depemdency properly on MacOS --- libcroco/makefile.mk | 11 ++++++++--- libcroco/prj/build.lst | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index d5c84d517190..926cbf8b415b 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,18 +51,23 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" +.IF "$(SYSTEM_LIBXML)"=="YES" +LIBXML2_INCLUDE=-I/usr/include/libxml2 +.ELSE +LIBXML2_INCLUDE= +.ENDIF CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 $(LIBXML2_INCLUDE)" \ LDFLAGS="-L$(SOLARLIBDIR)" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ LIBXML2_CFLAGS=" " \ LIBXML2_LIBS="-lxml2" - + CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/libcroco/prj/build.lst b/libcroco/prj/build.lst index ef0578bfe141..b03d58bba3d4 100644 --- a/libcroco/prj/build.lst +++ b/libcroco/prj/build.lst @@ -1,3 +1,3 @@ -cr libcroco : libxml2 glib soltools NULL +cr libcroco : LIBXML2:libxml2 glib soltools NULL cr libcroco usr1 - all cr_mkout NULL cr libcroco nmake - all cr_libcroco NULL -- cgit From b833043246cf309dce728ea410f8e9a115afe41e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 11:38:38 +0300 Subject: Just use cp, no need for $(GNUCOPY) which would need cygpathing anyway --- glib/glib-2.28.1-win32.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch index 6e7c06d68465..b7374c5c9c54 100644 --- a/glib/glib-2.28.1-win32.patch +++ b/glib/glib-2.28.1-win32.patch @@ -310,7 +310,7 @@ $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --header >> xgen-gwmh \ - && copy /y xgen-gwmh gio-marshal.h \ - && del xgen-gwmh xgen-gwmh~ -+ && $(GNUCOPY) /y xgen-gwmh gio-marshal.h \ ++ && cp xgen-gwmh gio-marshal.h \ + && rm xgen-gwmh xgen-gwmh~ gio-marshal.c: gio-marshal.h @@ -318,7 +318,7 @@ && $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --body >> xgen-gwmc \ - && copy xgen-gwmc gio-marshal.c \ - && del xgen-gwmc xgen-gwmc~ -+ && $(GNUCOPY) xgen-gwmc gio-marshal.c \ ++ && cp xgen-gwmc gio-marshal.c \ + && rm xgen-gwmc xgen-gwmc~ local_sources = \ @@ -328,7 +328,7 @@ $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h -+ $(GNUCOPY) $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h ++ cp $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h gioenumtypes.h: $(gio_headers) gioenumtypes.h.template $(PERL) ..\gobject\glib-mkenums --template gioenumtypes.h.template $(gio_headers) > gioenumtypes.h @@ -479,11 +479,11 @@ -..\glibconfig.h: ..\glibconfig.h.win32 - copy ..\glibconfig.h.win32 ..\glibconfig.h +glibconfig.h: glibconfig.h.win32 -+ $(GNUCOPY) glibconfig.h.win32 glibconfig.h ++ cp glibconfig.h.win32 glibconfig.h ..\config.h: ..\config.h.win32 - copy ..\config.h.win32 ..\config.h -+ $(GNUCOPY) ..\config.h.win32 ..\config.h ++ cp ..\config.h.win32 ..\config.h localcharset.obj : libcharset\localcharset.c $(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c @@ -588,7 +588,7 @@ gmoduleconf.h: gmoduleconf.h.win32 - copy gmoduleconf.h.win32 gmoduleconf.h -+ $(GNUCOPY) gmoduleconf.h.win32 gmoduleconf.h ++ cp gmoduleconf.h.win32 gmoduleconf.h gmodule.res : gmodule.rc - rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc @@ -649,7 +649,7 @@ - -gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe - glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c -+ $(GNUCOPY) xgen-gmh gmarshal.h ++ cp xgen-gmh gmarshal.h libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \ @@ -703,12 +703,12 @@ config.h: config.h.win32 - copy config.h.win32 config.h -+ $(GNUCOPY) config.h.win32 config.h ++ cp config.h.win32 config.h -glibconfig.h: glibconfig.h.win32 - copy glibconfig.h.win32 glibconfig.h +glibconfig.h: glib/glibconfig.h.win32 -+ $(GNUCOPY) glib/glibconfig.h.win32 glib/glibconfig.h ++ cp glib/glibconfig.h.win32 glib/glibconfig.h --- misc/glib-2.28.1/tests/makefile.msc 2011-02-18 16:35:43.000000000 +0100 +++ misc/build/glib-2.28.1/tests/makefile.msc 2011-03-04 08:33:02.079762100 +0100 @@ -7,7 +7,7 @@ -- cgit From a031b8d16b6887c82d2186c05a6607565e871569 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 12:17:08 +0300 Subject: Avoid potential mixup of incomopatible but identically named GLib DLLs Don't use the same name for the GLib DLLs that we build with MSVS9 as in the "official" MinGW-built packages (either the ones from www.gtk.org, or the ones from OBS). The "official" GLib DLLs use msvcrt.dll, while the ones we build use msvcr90.dll. We want to avoid potential confusion. Call the DLLs we build glib-2.0.dll etc, not libglib-2.0-0.dll etc. --- glib/glib-2.28.1-win32.patch | 72 ++++++++++++++++++++++++++------------------ glib/makefile.mk | 10 +++--- 2 files changed, 47 insertions(+), 35 deletions(-) mode change 100755 => 100644 glib/makefile.mk diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch index b7374c5c9c54..a6fc48f8a652 100644 --- a/glib/glib-2.28.1-win32.patch +++ b/glib/glib-2.28.1-win32.patch @@ -323,7 +323,12 @@ local_sources = \ glocaldirectorymonitor.c \ -@@ -228,7 +293,7 @@ +@@ -228,11 +293,11 @@ + gio-marshal.c \ + gioenumtypes.h \ + gioenumtypes.c \ +- libgio-$(PKG_VER)-0.dll ++ gio-$(PKG_VER).dll $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 @@ -340,15 +345,16 @@ + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo $(PACKAGE).res $(PACKAGE).rc -libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib $(PACKAGE).def $(RESOURCE) -+libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) - $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \ +- $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \ ++gio-$(PKG_VER).dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) ++ $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(RESOURCE) \ ..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \ - win32\giowin32.lib \ - $(INTL_LIBS) \ - kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \ + win32\giowin32.lib gvdb\giogvdb.lib \ + $(INTL_LIBS) $(ZLIB_LIBS) \ -+ kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib Shlwapi.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \ ++ kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib shlwapi.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \ /implib:gio-2.0.lib /def:$(PACKAGE).def .c.obj : @@ -392,7 +398,8 @@ + glibconfig.h \ gnulib\gnulib.lib \ pcre\pcre.lib \ - libglib-2.0-0.dll \ +- libglib-2.0-0.dll \ ++ glib-2.0.dll \ - glib-2.28s.lib \ - gspawn-win32-helper.exe \ - gspawn-win32-helper-console.exe \ @@ -501,7 +508,7 @@ lib /out:glib-2.28s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib -libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res -+libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res ++glib-2.0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \ gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \ $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def @@ -560,7 +567,7 @@ all : pcre.lib --- misc/glib-2.28.1/gmodule/makefile.msc 2011-02-18 16:34:58.000000000 +0100 +++ misc/build/glib-2.28.1/gmodule/makefile.msc 2011-03-04 08:43:06.896355600 +0100 -@@ -7,7 +7,7 @@ +@@ -7,12 +7,12 @@ ################################################################ @@ -569,6 +576,12 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" all : \ + gmoduleconf.h \ +- libgmodule-2.0-0.dll ++ gmodule-2.0.dll + + gmodule_OBJECTS = \ + gmodule.obj @@ -16,22 +16,22 @@ gmodule_OBJECTS = \ @@ -594,7 +607,8 @@ - rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gmodule.res gmodule.rc - libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res +-libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res ++gmodule-2.0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \ ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def @@ -605,7 +619,7 @@ +++ misc/build/glib-2.28.1/gobject/makefile.msc 2011-03-04 12:33:52.399273100 +0100 --- misc/glib-2.28.1/gobject/makefile.msc 2011-02-18 16:35:05.000000000 +0100 +++ misc/build/glib-2.28.1/gobject/makefile.msc 2011-03-09 09:29:52.712284300 +0100 -@@ -7,7 +7,7 @@ +@@ -7,23 +7,22 @@ ################################################################ @@ -614,16 +628,18 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" \ -DG_ENABLE_DEBUG # -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -@@ -16,7 +16,6 @@ + # -DG_DISABLE_CAST_CHECKS + all : \ glib-genmarshal.exe \ gmarshal.h \ - gmarshal.c \ gmarshal.strings \ - gobject-query.exe \ - libgobject-2.0-0.dll \ -@@ -24,8 +23,10 @@ - testgobject.exe +- gobject-query.exe \ +- libgobject-2.0-0.dll \ ++ gobject-2.0.dll \ + gobject-2.28s.lib \ +- testgobject.exe gobject_OBJECTS = \ + gatomicarray.obj \ @@ -631,8 +647,6 @@ gboxed.obj \ gclosure.obj \ genums.obj \ - gobject.obj \ - gparam.obj \ @@ -47,21 +49,18 @@ -DG_GNUC_PRINTF=;G_GNUC_PRINTF gobject.symbols >> gobject.def @@ -651,25 +665,17 @@ - glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c + cp xgen-gmh gmarshal.h - libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res +-libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res ++gobject-2.0.dll : $(gobject_OBJECTS) gobject.def gobject.res $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \ - ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@ + ..\glib\glib-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || rm $@ gobject-2.28s.lib : $(gobject_OBJECTS) lib /out:$@ $(gobject_OBJECTS) -@@ -69,7 +68,7 @@ - # link glib's static version to avoid installing - glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings - $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \ -- ..\glib\glib-2.28s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) -+ ..\glib\glib-2.28s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) - - gobject-query.exe : gobject-query.c libgobject-2.0-0.dll - $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \ --- misc/glib-2.28.1/gthread/makefile.msc 2011-02-18 16:35:00.000000000 +0100 +++ misc/build/glib-2.28.1/gthread/makefile.msc 2011-03-04 08:43:06.900355800 +0100 -@@ -7,7 +7,7 @@ +@@ -7,10 +7,10 @@ ################################################################ @@ -677,16 +683,22 @@ +INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC) DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" all : \ - libgthread-2.0-0.dll -@@ -19,7 +19,7 @@ +- libgthread-2.0-0.dll ++ gthread-2.0.dll + + gthread_OBJECTS = \ + gthread-impl.obj +@@ -19,8 +19,8 @@ $(CC) -c $(CFLAGS) gthread-impl.c gthread.res : gthread.rc - rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gthread.res gthread.rc - libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res +-libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res ++gthread-2.0.dll : $(gthread_OBJECTS) gthread.def gthread.res $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \ + ..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def --- misc/glib-2.28.1/makefile.msc 2009-04-01 01:04:20.000000000 +0200 +++ misc/build/glib-2.28.1/makefile.msc 2011-03-04 09:11:06.663432800 +0100 @@ -1,7 +1,7 @@ diff --git a/glib/makefile.mk b/glib/makefile.mk old mode 100755 new mode 100644 index e724baee219f..8827dc3d8cfb --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -300,11 +300,11 @@ ADDITIONAL_FILES= config.h \ BUILD_ACTION=nmake -f makefile.msc -OUT2BIN+=gio$/libgio-2.0-0.dll -OUT2BIN+=glib$/libglib-2.0-0.dll -OUT2BIN+=gmodule$/libgmodule-2.0-0.dll -OUT2BIN+=gobject$/libgobject-2.0-0.dll -OUT2BIN+=gthread$/libgthread-2.0-0.dll +OUT2BIN+=gio$/gio-2.0.dll +OUT2BIN+=glib$/glib-2.0.dll +OUT2BIN+=gmodule$/gmodule-2.0.dll +OUT2BIN+=gobject$/gobject-2.0.dll +OUT2BIN+=gthread$/gthread-2.0.dll OUT2BIN+=gobject$/glib-mkenums OUT2BIN+=gobject$/glib-genmarshal.exe -- cgit From afd1aece660fcc8b604b11fd09d7978ede5fd570 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 12:59:23 +0300 Subject: Can't use SRC_ROOT on Windows thanks to the symbolic links --- cairo/cairo-1.8.0.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch index 424c6041562d..e693eb4cc019 100644 --- a/cairo/cairo-1.8.0.patch +++ b/cairo/cairo-1.8.0.patch @@ -7,8 +7,8 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib -+PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc -+PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib ++PIXMAN_CFLAGS := -I../../../../inc ++PIXMAN_LIBS := ../../../../lib/pixman-1.lib CAIRO_LIBS = gdi32.lib msimg32.lib user32.lib ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1) -- cgit From b0414f3fa123b532c44a9180b9e2d9122ee35981 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 13:18:08 +0300 Subject: Make the patch actually apply --- python/Python-2.6.1-nohardlink.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/Python-2.6.1-nohardlink.patch b/python/Python-2.6.1-nohardlink.patch index c552b1a0e126..2592253e5835 100644 --- a/python/Python-2.6.1-nohardlink.patch +++ b/python/Python-2.6.1-nohardlink.patch @@ -1,9 +1,9 @@ --- misc/Python-2.6.1/Makefile.pre.in 2011-03-08 18:23:37.230410480 +0100 +++ misc/build/Python-2.6.1/Makefile.pre.in 2011-03-08 18:22:57.935746999 +0100 @@ -414,7 +414,7 @@ - libpython$(VERSION).so: $(LIBRARY_OBJS) - if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + SONAME="-Wl,-h$(INSTSONAME)"; \ + fi; \ + $(LDSHARED) $(LDFLAGS) $(SONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ - $(LN) -f $(INSTSONAME) $@; \ + $(LN) -fs $(INSTSONAME) $@; \ else\ -- cgit From 0bb3ffd6456e7a7291bbadff2f547301579f05d3 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 28 May 2011 06:04:08 -0500 Subject: cairo depend on libpng --- cairo/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst index c531e6c0ffb9..5827e76d25f5 100644 --- a/cairo/prj/build.lst +++ b/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : ZLIB:zlib soltools NULL +lcairo cairo : ZLIB:zlib libpng soltools NULL lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL -- cgit From 5c44a7e02f8d09c276ad0b22b80fed4826a1dfc6 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sun, 29 May 2011 18:22:44 +0200 Subject: Mac: actually use the define that is used in the patch, link against SDK --- glib/makefile.mk | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/glib/makefile.mk b/glib/makefile.mk index 8827dc3d8cfb..70736ff88386 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_glib .IF "$(SYSTEM_GLIB)" == "YES" all: - @echo "An already available installation of glib should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of glib should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -50,20 +50,15 @@ TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e .IF "$(OS)"=="MACOSX" PATCH_FILES=glib-2.28.1.patch -CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)" -CONFIGURE_DIR= -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - .$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" \ - LDFLAGS="$(CONFIGURE_LDFLAGS)" -CONFIGURE_FLAGS=--disable-fam -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" -.ENDIF -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -BUILD_DIR=$(CONFIGURE_DIR) +CONFIGURE_FLAGS=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) +CONFIGURE_FLAGS+=--disable-fam +CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX" +CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" +CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" +CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) EXTRPATH=LOADER OUT2LIB+=gio/.libs/libgio-2.0.0.dylib @@ -72,8 +67,8 @@ OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib OUT2LIB+=gobject/.libs/libgobject-2.0.0.dylib OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib -OUT2BIN+=gobject$/glib-mkenums -OUT2BIN+=gobject$/.libs$/glib-genmarshal +OUT2BIN+=gobject/glib-mkenums +OUT2BIN+=gobject/.libs/glib-genmarshal OUT2INC+=glib/glib.h OUT2INC+=glib/glib-object.h -- cgit From 93b1b381ed8567029cc077a818e5aff0b4ed1482 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 27 May 2011 20:58:57 +0300 Subject: Don't build Python if DISABLE_PYTHON is TRUE I don't know if this is the right thing to do. The --disable-python switch is documented to "Disable build of Python 2.x UNO API". Does that mean that it should disable use of Python at run-time completely? What about use of Python tools at build-time, do we have such? Will --disable-python then disable their use, too? --- python/makefile.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python/makefile.mk b/python/makefile.mk index fb729bda8db5..f51e7e88398f 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -33,6 +33,9 @@ TARGET=so_python # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk + +.IF "$(DISABLE_PYTHON)"!="TRUE" + .INCLUDE : pyversion.mk .IF "$(SYSTEM_PYTHON)" == "YES" @@ -146,7 +149,9 @@ PYVERSIONFILE=$(MISC)$/pyversion.mk .INCLUDE : set_ext.mk +.ENDIF # DISABLE_PYTHON != TRUE .INCLUDE : target.mk +.IF "$(DISABLE_PYTHON)"!="TRUE" .INCLUDE : tg_ext.mk .IF "$(L10N_framework)"=="" @@ -182,3 +187,4 @@ $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) -rm -f $@ cat $? > $@ +.ENDIF # DISABLE_PYTHON != TRUE -- cgit From b2c1dd30f3db212c6bbd48394fca04668e0cde93 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 27 May 2011 21:04:26 +0300 Subject: Pass --build and --host options when cross-compiling --- hunspell/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 6ab9b36cc877..a28d63e0dd1f 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -66,6 +66,10 @@ CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF + BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a -- cgit From 9fc04f1763980a0238ec934c09c90d419c6d064a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 01:15:48 +0300 Subject: Cross-compiling and iOS support --- cairo/cairo/makefile.mk | 12 +++++++++++- cairo/pixman/makefile.mk | 11 ++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index d6d17390db66..a077ec98af05 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -145,7 +145,15 @@ cairo_CFLAGS+=-march=i486 CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static --enable-xlib +.ENDIF +CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -201,6 +209,8 @@ OUT2BIN+=src$/.libs$/*.dll OUT2LIB+=src$/release$/*.lib OUT2BIN+=src$/release$/*.dll .ENDIF +.ELIF "$(OS)"=="IOS" +OUT2LIB+=src$/.libs$/libcairo-1.a .ELSE OUT2LIB+=src$/.libs$/libcairo.so* .ENDIF diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 6d2504b6fbb8..1f61bfa897a6 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -120,8 +120,15 @@ pixman_CFLAGS+=-fPIC CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS=--disable-shared +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -142,6 +149,8 @@ OUT2LIB+=pixman$/.libs$/*.a .ELSE OUT2LIB+=pixman$/release$/*.lib .ENDIF +.ELIF "$(OS)"=="IOS" +OUT2LIB+=pixman$/.libs$/libpixman-1.a .ELSE OUT2LIB+=pixman$/.libs$/libpixman-1.so* .ENDIF -- cgit From b39178a1fd9ca87143c3befad9f9a8521a46c627 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 02:48:41 +0300 Subject: Build for iOS simply using dmake directly, like for Windows Just use a config.h geneated for Mac OS X for now, tweak later if necesssary. --- gettext/gettext-0.18.1.1.patch | 1699 +++++++++++++++++++++++++++++++++++----- gettext/makefile.mk | 18 + 2 files changed, 1506 insertions(+), 211 deletions(-) diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch index b42cafe93974..72970b663bec 100644 --- a/gettext/gettext-0.18.1.1.patch +++ b/gettext/gettext-0.18.1.1.patch @@ -1,6 +1,6 @@ --- misc/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk Wed Aug 20 14:26:42 2008 -@@ -1 +1,108 @@ +@@ -1,1 +1,109 @@ -dummy +#************************************************************************* +# @@ -42,12 +42,13 @@ + +.INCLUDE : settings.mk + -+#.IF "$(GUI)$(CPU)"=="WNTP" -+CFLAGS+=-c -DLOCALEDIR=\"./share/locale\" -DLOCALE_ALIAS_PATH=\"./share/locale\" -DLIBDIR=\"./lib\" -+CFLAGS+=-DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"./lib\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -+CFLAGS+=-DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I. -I.. -DDLL_EXPORT -DPIC -+ -+ #.ENDIF ++CFLAGS+=-c -DLOCALEDIR=\"./share/locale\" -DLOCALE_ALIAS_PATH=\"./share/locale\" -DLIBDIR=\"./lib\" ++CFLAGS+=-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"./lib\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate ++CFLAGS+=-DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I. -I.. ++ ++.IF "$(GUI)"=="WNT" ++CFLAGS+=-DBUILDING_DLL -DDLL_EXPORT -DPIC ++.ENDIF + +# --- Files ------------------------------------- + @@ -96,36 +97,1326 @@ + +SHL1DEF= $(MISC)$/$(SHL1TARGET).def + -+DEF1NAME= $(SHL1TARGET) -+DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ -+ $(SLB)$/$(TARGET).lib -+DEFLIB1NAME=$(TARGET) ++DEF1NAME= $(SHL1TARGET) ++DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ ++ $(SLB)$/$(TARGET).lib ++DEFLIB1NAME=$(TARGET) ++ ++# --- Targets ---------------------------------- ++ ++.INCLUDE : target.mk ++ ++# --- filter file ------------------------------ ++ ++$(MISC)$/$(SHL1TARGET).flt: makefile.mk ++ @echo CLEAR_THE_FILE > $@ ++ +--- misc/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c 2010-06-06 14:49:57.000000000 +0200 ++++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c 2011-03-09 11:51:02.615094200 +0100 +@@ -75,6 +74,9 @@ + # include "c-ctype.h" + #endif + ++typedef __int64 intmax_t; ++ ++ + #ifdef STATIC + STATIC + #endif +--- misc/gettext-0.18.1.1/gettext-runtime/config.h Wed Aug 20 14:33:55 2008 ++++ misc/build/gettext-0.18.1.1/gettext-runtime/config.h Wed Aug 20 14:26:42 2008 +@@ -1,1 +1,2560 @@ +-dummy ++#ifdef _WIN32 ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define if the compiler is building for multiple architectures of Apple ++ platforms at once. */ ++/* #undef AA_APPLE_UNIVERSAL_BUILD */ ++ ++/* Define to the number of bits in type 'ptrdiff_t'. */ ++#define BITSIZEOF_PTRDIFF_T 32 ++ ++/* Define to the number of bits in type 'sig_atomic_t'. */ ++#define BITSIZEOF_SIG_ATOMIC_T 32 ++ ++/* Define to the number of bits in type 'size_t'. */ ++#define BITSIZEOF_SIZE_T 32 ++ ++/* Define to the number of bits in type 'wchar_t'. */ ++#define BITSIZEOF_WCHAR_T 16 ++ ++/* Define to the number of bits in type 'wint_t'. */ ++#define BITSIZEOF_WINT_T 16 ++ ++/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP ++ systems. This function is required for `alloca.c' support on those systems. ++ */ ++/* #undef CRAY_STACKSEG_END */ ++ ++/* Define if mono is the preferred C# implementation. */ ++/* #undef CSHARP_CHOICE_MONO */ ++ ++/* Define if pnet is the preferred C# implementation. */ ++/* #undef CSHARP_CHOICE_PNET */ ++ ++/* Define to 1 if using `alloca.c'. */ ++/* #undef C_ALLOCA */ ++ ++/* Define to 1 if // is a file system root distinct from /. */ ++#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1 ++ ++/* Define to 1 if translation of program messages to the user's native ++ language is requested. */ ++#define ENABLE_NLS 1 ++ ++/* Define to 1 if the package shall run at any location in the file system. */ ++/* #undef ENABLE_RELOCATABLE */ ++ ++/* Define on systems for which file names may have a so-called `drive letter' ++ prefix, define this to compute the length of that prefix, including the ++ colon. */ ++#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 1 ++ ++/* Define if the backslash character may also serve as a file name component ++ separator. */ ++#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 1 ++ ++/* Define if a drive letter prefix denotes a relative path if it is not ++ followed by a file name component separator. */ ++#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1 ++ ++/* Define to 1 if realpath() can malloc memory, always gives an absolute path, ++ and handles trailing slash correctly. */ ++/* #undef FUNC_REALPATH_WORKS */ ++ ++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending ++ whether the gnulib module canonicalize-lgpl shall be considered present. */ ++#define GNULIB_CANONICALIZE_LGPL 1 ++ ++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending ++ whether the gnulib module fwriteerror shall be considered present. */ ++#define GNULIB_FWRITEERROR 1 ++ ++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending ++ whether the gnulib module sigpipe shall be considered present. */ ++#define GNULIB_SIGPIPE 1 ++ ++/* Define to 1 when the gnulib module canonicalize_file_name should be tested. ++ */ ++#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1 ++ ++/* Define to 1 when the gnulib module environ should be tested. */ ++#define GNULIB_TEST_ENVIRON 1 ++ ++/* Define to 1 when the gnulib module getopt-gnu should be tested. */ ++#define GNULIB_TEST_GETOPT_GNU 1 ++ ++/* Define to 1 when the gnulib module lstat should be tested. */ ++#define GNULIB_TEST_LSTAT 1 ++ ++/* Define to 1 when the gnulib module malloc-posix should be tested. */ ++#define GNULIB_TEST_MALLOC_POSIX 1 ++ ++/* Define to 1 when the gnulib module mbrtowc should be tested. */ ++#define GNULIB_TEST_MBRTOWC 1 ++ ++/* Define to 1 when the gnulib module mbsinit should be tested. */ ++#define GNULIB_TEST_MBSINIT 1 ++ ++/* Define to 1 when the gnulib module mbslen should be tested. */ ++#define GNULIB_TEST_MBSLEN 1 ++ ++/* Define to 1 when the gnulib module mbsstr should be tested. */ ++#define GNULIB_TEST_MBSSTR 1 ++ ++/* Define to 1 when the gnulib module memchr should be tested. */ ++#define GNULIB_TEST_MEMCHR 1 ++ ++/* Define to 1 when the gnulib module readlink should be tested. */ ++#define GNULIB_TEST_READLINK 1 ++ ++/* Define to 1 when the gnulib module realpath should be tested. */ ++#define GNULIB_TEST_REALPATH 1 ++ ++/* Define to 1 when the gnulib module sigprocmask should be tested. */ ++#define GNULIB_TEST_SIGPROCMASK 1 ++ ++/* Define to 1 when the gnulib module stat should be tested. */ ++#define GNULIB_TEST_STAT 1 ++ ++/* Define to 1 when the gnulib module strerror should be tested. */ ++#define GNULIB_TEST_STRERROR 1 ++ ++/* Define to 1 when the gnulib module strnlen should be tested. */ ++#define GNULIB_TEST_STRNLEN 1 ++ ++/* Define to 1 when the gnulib module wcwidth should be tested. */ ++#define GNULIB_TEST_WCWIDTH 1 ++ ++/* Define to 1 if you have `alloca', as a function or macro. */ ++#define HAVE_ALLOCA 1 ++ ++/* Define to 1 if you have and it should be used (not on Ultrix). ++ */ ++/* #undef HAVE_ALLOCA_H */ ++ ++/* Define to 1 if you have the `argz_count' function. */ ++/* #undef HAVE_ARGZ_COUNT */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_ARGZ_H */ ++ ++/* Define to 1 if you have the `argz_next' function. */ ++/* #undef HAVE_ARGZ_NEXT */ ++ ++/* Define to 1 if you have the `argz_stringify' function. */ ++/* #undef HAVE_ARGZ_STRINGIFY */ ++ ++/* Define to 1 if you have the `asprintf' function. */ ++/* #undef HAVE_ASPRINTF */ ++ ++/* Define to 1 if you have the `atexit' function. */ ++#define HAVE_ATEXIT 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_BP_SYM_H */ ++ ++/* Define to 1 if the compiler understands __builtin_expect. */ ++/* #undef HAVE_BUILTIN_EXPECT */ ++ ++/* Define to 1 if you have the `canonicalize_file_name' function. */ ++/* #undef HAVE_CANONICALIZE_FILE_NAME */ ++ ++/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the ++ CoreFoundation framework. */ ++/* #undef HAVE_CFLOCALECOPYCURRENT */ ++ ++/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in ++ the CoreFoundation framework. */ ++/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ ++ ++/* Define if the GNU dcgettext() function is already present or preinstalled. ++ */ ++/* #undef HAVE_DCGETTEXT */ ++ ++/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_CLEARERR_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you ++ don't. */ ++#define HAVE_DECL_FEOF_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FERROR_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FFLUSH_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FGETS_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FPUTC_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FPUTS_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FREAD_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_FWRITE_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_GETCHAR_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you ++ don't. */ ++#define HAVE_DECL_GETC_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. ++ */ ++#define HAVE_DECL_GETENV 1 ++ ++/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you ++ don't. */ ++/* #undef HAVE_DECL_GETOPT_CLIP */ ++ ++/* Define to 1 if you have the declaration of `optreset', and to 0 if you ++ don't. */ ++/* #undef HAVE_DECL_OPTRESET */ ++ ++/* Define to 1 if you have the declaration of `program_invocation_name', and ++ to 0 if you don't. */ ++#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0 ++ ++/* Define to 1 if you have the declaration of `program_invocation_short_name', ++ and to 0 if you don't. */ ++#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0 ++ ++/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if ++ you don't. */ ++#define HAVE_DECL_PUTCHAR_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you ++ don't. */ ++#define HAVE_DECL_PUTC_UNLOCKED 0 ++ ++/* Define to 1 if you have the declaration of `strerror', and to 0 if you ++ don't. */ ++#define HAVE_DECL_STRERROR 1 ++ ++/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you ++ don't. */ ++#define HAVE_DECL_STRERROR_R 0 ++ ++/* Define to 1 if you have the declaration of `strnlen', and to 0 if you ++ don't. */ ++#define HAVE_DECL_STRNLEN 1 ++ ++/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you ++ don't. */ ++#define HAVE_DECL_WCWIDTH 0 ++ ++/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you ++ don't. */ ++#define HAVE_DECL__SNPRINTF 1 ++ ++/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you ++ don't. */ ++#define HAVE_DECL__SNWPRINTF 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_DLFCN_H */ ++ ++/* Define if you have the declaration of environ. */ ++/* #undef HAVE_ENVIRON_DECL */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_ERRNO_H 1 ++ ++/* Define to 1 if you have the `fwprintf' function. */ ++#define HAVE_FWPRINTF 1 ++ ++/* Define to 1 if you have the `getcwd' function. */ ++#define HAVE_GETCWD 1 ++ ++/* Define to 1 if you have the `getegid' function. */ ++/* #undef HAVE_GETEGID */ ++ ++/* Define to 1 if you have the `geteuid' function. */ ++/* #undef HAVE_GETEUID */ ++ ++/* Define to 1 if you have the `getgid' function. */ ++/* #undef HAVE_GETGID */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_GETOPT_H */ ++ ++/* Define to 1 if you have the `getopt_long_only' function. */ ++/* #undef HAVE_GETOPT_LONG_ONLY */ ++ ++/* Define to 1 if you have the `getpagesize' function. */ ++/* #undef HAVE_GETPAGESIZE */ ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++/* #undef HAVE_GETTEXT */ ++ ++/* Define to 1 if you have the `getuid' function. */ ++/* #undef HAVE_GETUID */ ++ ++/* Define if you have the iconv() function and it works. */ ++/* #undef HAVE_ICONV */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_ICONV_H */ ++ ++/* Define if you have the 'intmax_t' type in or . */ ++/* #undef HAVE_INTMAX_T */ ++#ifndef _MSC_VER ++#define HAVE_INTMAX_T 1 ++#else /* _MSC_VER */ ++/* #undef HAVE_INTMAX_T */ ++#endif /* _MSC_VER */ ++ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_INTTYPES_H */ ++#ifndef _MSC_VER ++#define HAVE_INTTYPES_H 1 ++#else /* _MSC_VER */ ++/* #undef HAVE_INTTYPES_H */ ++#endif /* _MSC_VER */ ++ ++ ++/* Define if exists, doesn't clash with , and ++ declares uintmax_t. */ ++/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */ ++#ifndef _MSC_VER ++#define HAVE_INTTYPES_H_WITH_UINTMAX 1 ++#else /* _MSC_VER */ ++/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */ ++#endif /* _MSC_VER */ ++ ++ ++/* Define to 1 if you have the `iswblank' function. */ ++/* #undef HAVE_ISWBLANK */ ++ ++/* Define to 1 if you have the `iswcntrl' function. */ ++#define HAVE_ISWCNTRL 1 ++ ++/* Define if you have and nl_langinfo(CODESET). */ ++/* #undef HAVE_LANGINFO_CODESET */ ++ ++/* Define if your file defines LC_MESSAGES. */ ++/* #undef HAVE_LC_MESSAGES */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_LIMITS_H 1 ++ ++/* Define to 1 if the system has the type `long long int'. */ ++#define HAVE_LONG_LONG_INT 1 ++ ++/* Define to 1 if you have the `lstat' function. */ ++/* #undef HAVE_LSTAT */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_MACH_O_DYLD_H */ ++ ++/* Define if the 'malloc' function is POSIX compliant. */ ++/* #undef HAVE_MALLOC_POSIX */ ++ ++/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including ++ config.h and . */ ++/* #undef HAVE_MAP_ANONYMOUS */ ++ ++/* Define to 1 if you have the `mbrtowc' function. */ ++#define HAVE_MBRTOWC 1 ++ ++/* Define to 1 if you have the `mbsinit' function. */ ++/* #undef HAVE_MBSINIT */ ++ ++/* Define to 1 if you have the `mbslen' function. */ ++/* #undef HAVE_MBSLEN */ ++ ++/* Define to 1 if declares mbstate_t. */ ++#define HAVE_MBSTATE_T 1 ++ ++/* Define to 1 if you have the `memchr' function. */ ++#define HAVE_MEMCHR 1 ++ ++/* Define to 1 if you have the `memmove' function. */ ++#define HAVE_MEMMOVE 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mempcpy' function. */ ++/* #undef HAVE_MEMPCPY */ ++ ++/* Define to 1 if you have a working `mmap' system call. */ ++/* #undef HAVE_MMAP */ ++ ++/* Define to 1 if you have the `mprotect' function. */ ++/* #undef HAVE_MPROTECT */ ++ ++/* Define to 1 if you have the `munmap' function. */ ++/* #undef HAVE_MUNMAP */ ++ ++/* Define to 1 if you have the `newlocale' function. */ ++/* #undef HAVE_NEWLOCALE */ ++ ++/* Define to 1 if you have the `pathconf' function. */ ++/* #undef HAVE_PATHCONF */ ++ ++/* Define if your printf() function supports format strings with positions. */ ++/* #undef HAVE_POSIX_PRINTF */ ++ ++/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ ++/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */ ++ ++/* Define if the POSIX multithreading library has read/write locks. */ ++/* #undef HAVE_PTHREAD_RWLOCK */ ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_RANDOM_H */ ++ ++/* Define to 1 if atoll is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_ATOLL */ ++ ++/* Define to 1 if btowc is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_BTOWC 1 ++ ++/* Define to 1 if canonicalize_file_name is declared even after undefining ++ macros. */ ++/* #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME */ ++ ++/* Define to 1 if chown is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_CHOWN */ ++ ++/* Define to 1 if dprintf is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_DPRINTF */ ++ ++/* Define to 1 if dup2 is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_DUP2 1 ++ ++/* Define to 1 if dup3 is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_DUP3 */ ++ ++/* Define to 1 if endusershell is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_ENDUSERSHELL */ ++ ++/* Define to 1 if environ is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_ENVIRON */ ++ ++/* Define to 1 if euidaccess is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_EUIDACCESS */ ++ ++/* Define to 1 if faccessat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FACCESSAT */ ++ ++/* Define to 1 if fchdir is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FCHDIR */ ++ ++/* Define to 1 if fchmodat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FCHMODAT */ ++ ++/* Define to 1 if fchownat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FCHOWNAT */ ++ ++/* Define to 1 if fpurge is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FPURGE */ ++ ++/* Define to 1 if fseeko is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FSEEKO */ ++ ++/* Define to 1 if fstatat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FSTATAT */ ++ ++/* Define to 1 if fsync is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FSYNC */ ++ ++/* Define to 1 if ftello is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FTELLO */ ++ ++/* Define to 1 if ftruncate is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FTRUNCATE */ ++ ++/* Define to 1 if futimens is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_FUTIMENS */ ++ ++/* Define to 1 if getcwd is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETCWD */ ++ ++/* Define to 1 if getdelim is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETDELIM */ ++ ++/* Define to 1 if getdomainname is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETDOMAINNAME */ ++ ++/* Define to 1 if getdtablesize is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETDTABLESIZE */ ++ ++/* Define to 1 if getgroups is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETGROUPS */ ++ ++/* Define to 1 if gethostname is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETHOSTNAME */ ++ ++/* Define to 1 if getline is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETLINE */ ++ ++/* Define to 1 if getloadavg is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETLOADAVG */ ++ ++/* Define to 1 if getlogin is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETLOGIN */ ++ ++/* Define to 1 if getlogin_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETLOGIN_R */ ++ ++/* Define to 1 if getpagesize is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETPAGESIZE */ ++ ++/* Define to 1 if getsubopt is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETSUBOPT */ ++ ++/* Define to 1 if getusershell is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GETUSERSHELL */ ++ ++/* Define to 1 if grantpt is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_GRANTPT */ ++ ++/* Define to 1 if initstat_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_INITSTAT_R */ ++ ++/* Define to 1 if lchmod is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_LCHMOD */ ++ ++/* Define to 1 if lchown is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_LCHOWN */ ++ ++/* Define to 1 if link is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_LINK */ ++ ++/* Define to 1 if linkat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_LINKAT */ ++ ++/* Define to 1 if lseek is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_LSEEK 1 ++ ++/* Define to 1 if lstat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_LSTAT */ ++ ++/* Define to 1 if mbrlen is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_MBRLEN 1 ++ ++/* Define to 1 if mbrtowc is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_MBRTOWC 1 ++ ++/* Define to 1 if mbsinit is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_MBSINIT 1 ++ ++/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MBSNRTOWCS */ ++ ++/* Define to 1 if mbsrtowcs is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_MBSRTOWCS 1 ++ ++/* Define to 1 if memmem is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MEMMEM */ ++ ++/* Define to 1 if mempcpy is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MEMPCPY */ ++ ++/* Define to 1 if memrchr is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MEMRCHR */ ++ ++/* Define to 1 if mkdirat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKDIRAT */ ++ ++/* Define to 1 if mkdtemp is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKDTEMP */ ++ ++/* Define to 1 if mkfifo is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKFIFO */ ++ ++/* Define to 1 if mkfifoat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKFIFOAT */ ++ ++/* Define to 1 if mknod is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKNOD */ ++ ++/* Define to 1 if mknodat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKNODAT */ ++ ++/* Define to 1 if mkostemp is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKOSTEMP */ ++ ++/* Define to 1 if mkostemps is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKOSTEMPS */ ++ ++/* Define to 1 if mkstemp is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKSTEMP */ ++ ++/* Define to 1 if mkstemps is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_MKSTEMPS */ ++ ++/* Define to 1 if pipe2 is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_PIPE2 */ ++ ++/* Define to 1 if popen is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_POPEN */ ++ ++/* Define to 1 if pread is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_PREAD */ ++ ++/* Define to 1 if ptsname is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_PTSNAME */ ++ ++/* Define to 1 if pwrite is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_PWRITE */ ++ ++/* Define to 1 if random_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_RANDOM_R */ ++ ++/* Define to 1 if rawmemchr is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_RAWMEMCHR */ ++ ++/* Define to 1 if readlink is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_READLINK */ ++ ++/* Define to 1 if readlinkat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_READLINKAT */ ++ ++/* Define to 1 if realpath is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_REALPATH */ ++ ++/* Define to 1 if renameat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_RENAMEAT */ ++ ++/* Define to 1 if rmdir is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_RMDIR */ ++ ++/* Define to 1 if rpmatch is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_RPMATCH */ ++ ++/* Define to 1 if setenv is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SETENV */ ++ ++/* Define to 1 if setstate_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SETSTATE_R */ ++ ++/* Define to 1 if setusershell is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SETUSERSHELL */ ++ ++/* Define to 1 if sigaction is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGACTION */ ++ ++/* Define to 1 if sigaddset is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGADDSET */ ++ ++/* Define to 1 if sigdelset is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGDELSET */ ++ ++/* Define to 1 if sigemptyset is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGEMPTYSET */ ++ ++/* Define to 1 if sigfillset is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGFILLSET */ ++ ++/* Define to 1 if sigismember is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGISMEMBER */ ++ ++/* Define to 1 if sigpending is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGPENDING */ ++ ++/* Define to 1 if sigprocmask is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SIGPROCMASK */ ++ ++/* Define to 1 if sleep is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SLEEP */ ++ ++/* Define to 1 if snprintf is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SNPRINTF */ ++ ++/* Define to 1 if srandom_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SRANDOM_R */ ++ ++/* Define to 1 if stat is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_STAT 1 ++ ++/* Define to 1 if stpcpy is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STPCPY */ ++ ++/* Define to 1 if stpncpy is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STPNCPY */ ++ ++/* Define to 1 if strcasestr is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRCASESTR */ ++ ++/* Define to 1 if strchrnul is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRCHRNUL */ ++ ++/* Define to 1 if strdup is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_STRDUP 1 ++ ++/* Define to 1 if strncat is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_STRNCAT 1 ++ ++/* Define to 1 if strndup is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRNDUP */ ++ ++/* Define to 1 if strnlen is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_STRNLEN 1 ++ ++/* Define to 1 if strpbrk is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_STRPBRK 1 ++ ++/* Define to 1 if strsep is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRSEP */ ++ ++/* Define to 1 if strsignal is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRSIGNAL */ ++ ++/* Define to 1 if strtod is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_STRTOD 1 ++ ++/* Define to 1 if strtok_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRTOK_R */ ++ ++/* Define to 1 if strtoll is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRTOLL */ ++ ++/* Define to 1 if strtoull is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRTOULL */ ++ ++/* Define to 1 if strverscmp is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_STRVERSCMP */ ++ ++/* Define to 1 if symlink is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SYMLINK */ ++ ++/* Define to 1 if symlinkat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_SYMLINKAT */ ++ ++/* Define to 1 if tmpfile is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_TMPFILE 1 ++ ++/* Define to 1 if ttyname_r is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_TTYNAME_R */ ++ ++/* Define to 1 if unlink is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_UNLINK 1 ++ ++/* Define to 1 if unlinkat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_UNLINKAT */ ++ ++/* Define to 1 if unlockpt is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_UNLOCKPT */ ++ ++/* Define to 1 if unsetenv is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_UNSETENV */ ++ ++/* Define to 1 if usleep is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_USLEEP */ ++ ++/* Define to 1 if utimensat is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_UTIMENSAT */ ++ ++/* Define to 1 if vdprintf is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_VDPRINTF */ ++ ++/* Define to 1 if vsnprintf is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_VSNPRINTF 1 ++ ++/* Define to 1 if wcrtomb is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_WCRTOMB 1 ++ ++/* Define to 1 if wcsnrtombs is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_WCSNRTOMBS */ ++ ++/* Define to 1 if wcsrtombs is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_WCSRTOMBS 1 ++ ++/* Define to 1 if wctob is declared even after undefining macros. */ ++#define HAVE_RAW_DECL_WCTOB 1 ++ ++/* Define to 1 if wcwidth is declared even after undefining macros. */ ++/* #undef HAVE_RAW_DECL_WCWIDTH */ ++ ++/* Define to 1 if you have the `readlink' function. */ ++/* #undef HAVE_READLINK */ ++ ++/* Define to 1 if you have the `realpath' function. */ ++/* #undef HAVE_REALPATH */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SEARCH_H 1 ++ ++/* Define to 1 if you have the `setenv' function. */ ++/* #undef HAVE_SETENV */ ++ ++/* Define to 1 if you have the `setlocale' function. */ ++#define HAVE_SETLOCALE 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SIGNAL_H 1 ++ ++/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ ++#define HAVE_SIGNED_SIG_ATOMIC_T 1 ++ ++/* Define to 1 if 'wchar_t' is a signed integer type. */ ++/* #undef HAVE_SIGNED_WCHAR_T */ ++ ++/* Define to 1 if 'wint_t' is a signed integer type. */ ++/* #undef HAVE_SIGNED_WINT_T */ ++ ++/* Define to 1 if the system has the type `sigset_t'. */ ++/* #undef HAVE_SIGSET_T */ ++ ++/* Define to 1 if you have the `snprintf' function. */ ++/* #undef HAVE_SNPRINTF */ ++ ++/* Define to 1 if stdbool.h conforms to C99. */ ++/* #undef HAVE_STDBOOL_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDDEF_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_STDINT_H */ ++ ++/* Define if exists, doesn't clash with , and declares ++ uintmax_t. */ ++/* #undef HAVE_STDINT_H_WITH_UINTMAX */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDIO_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the `stpcpy' function. */ ++/* #undef HAVE_STPCPY */ ++ ++/* Define to 1 if you have the `strcasecmp' function. */ ++/* #undef HAVE_STRCASECMP */ ++ ++/* Define to 1 if you have the `strdup' function. */ ++#define HAVE_STRDUP 1 ++ ++/* Define to 1 if you have the `strerror_r' function. */ ++/* #undef HAVE_STRERROR_R */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_STRINGS_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the `strnlen' function. */ ++#define HAVE_STRNLEN 1 ++ ++/* Define to 1 if you have the `strtol' function. */ ++#define HAVE_STRTOL 1 ++ ++/* Define to 1 if you have the `strtoul' function. */ ++#define HAVE_STRTOUL 1 ++ ++/* Define to 1 if the system has the type `struct random_data'. */ ++/* #undef HAVE_STRUCT_RANDOM_DATA */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_BITYPES_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_INTTYPES_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_MMAN_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_PARAM_H */ ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_SOCKET_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_SYS_TIME_H */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_TIME_H 1 ++ ++/* Define to 1 if you have the `tsearch' function. */ ++/* #undef HAVE_TSEARCH */ ++ ++/* Define if you have the 'uintmax_t' type in or . */ ++/* #undef HAVE_UINTMAX_T */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to 1 if the system has the type `unsigned long long int'. */ ++#define HAVE_UNSIGNED_LONG_LONG_INT 1 ++ ++/* Define to 1 if you have the `uselocale' function. */ ++/* #undef HAVE_USELOCALE */ ++ ++/* Define to 1 or 0, depending whether the compiler supports simple visibility ++ declarations. */ ++#define HAVE_VISIBILITY 0 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_WCHAR_H 1 ++ ++/* Define if you have the 'wchar_t' type. */ ++#define HAVE_WCHAR_T 1 ++ ++/* Define to 1 if you have the `wcrtomb' function. */ ++#define HAVE_WCRTOMB 1 ++ ++/* Define to 1 if you have the `wcslen' function. */ ++#define HAVE_WCSLEN 1 ++ ++/* Define to 1 if you have the `wcsnlen' function. */ ++#define HAVE_WCSNLEN 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_WCTYPE_H 1 ++ ++/* Define to 1 if you have the `wcwidth' function. */ ++/* #undef HAVE_WCWIDTH */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_WINSOCK2_H 1 ++ ++/* Define if you have the 'wint_t' type. */ ++#define HAVE_WINT_T 1 ++ ++/* Define to 1 if O_NOATIME works. */ ++#define HAVE_WORKING_O_NOATIME 0 ++ ++/* Define to 1 if O_NOFOLLOW works. */ ++#define HAVE_WORKING_O_NOFOLLOW 0 ++ ++/* Define to 1 if the system has the type `_Bool'. */ ++/* #undef HAVE__BOOL */ ++ ++/* Define to 1 if you have the `_NSGetExecutablePath' function. */ ++/* #undef HAVE__NSGETEXECUTABLEPATH */ ++ ++/* Define to 1 if you have the `__fsetlocking' function. */ ++/* #undef HAVE___FSETLOCKING */ ++ ++/* Define as const if the declaration of iconv() needs const. */ ++/* #undef ICONV_CONST */ ++ ++/* Define to a symbolic name denoting the flavor of iconv_open() ++ implementation. */ ++/* #undef ICONV_FLAVOR */ ++ ++/* Define to the value of ${prefix}, as a string. */ ++#define INSTALLPREFIX "." ++ ++/* Define if integer division by zero raises signal SIGFPE. */ ++#define INTDIV0_RAISES_SIGFPE 0 ++ ++#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR ++# define ISSLASH(C) ((C) == '/' || (C) == '\\') ++#else ++# define ISSLASH(C) ((C) == '/') ++#endif ++ ++/* Define to 1 if `lstat' dereferences a symlink specified with a trailing ++ slash. */ ++/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#define LT_OBJDIR ".libs/" ++ ++/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ ++#define MALLOC_0_IS_NONNULL 1 ++ ++/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ ++/* #undef MAP_ANONYMOUS */ ++ ++/* Define if the mbrtowc function has the NULL string argument bug. */ ++/* #undef MBRTOWC_NULL_ARG_BUG */ ++ ++/* Define if the mbrtowc function does not return 0 for a NUL character. */ ++/* #undef MBRTOWC_NUL_RETVAL_BUG */ ++ ++/* Define if the mbrtowc function returns a wrong return value. */ ++/* #undef MBRTOWC_RETVAL_BUG */ ++ ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++#define NO_MINUS_C_MINUS_O 1 ++ ++/* Name of package */ ++#define PACKAGE "gettext-runtime" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the home page for this package. */ ++#define PACKAGE_URL "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define if exists and defines unusable PRI* macros. */ ++/* #undef PRI_MACROS_BROKEN */ ++ ++/* Define if the pthread_in_use() detection is hard. */ ++/* #undef PTHREAD_IN_USE_DETECTION_HARD */ ++ ++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type ++ 'ptrdiff_t'. */ ++#define PTRDIFF_T_SUFFIX ++ ++/* Define to 1 if readlink fails to recognize a trailing slash. */ ++/* #undef READLINK_TRAILING_SLASH_BUG */ ++ ++/* Define to 1 if stat needs help when passed a directory name with a trailing ++ slash */ ++#define REPLACE_FUNC_STAT_DIR 1 ++ ++/* Define to 1 if stat needs help when passed a file name with a trailing ++ slash */ ++/* #undef REPLACE_FUNC_STAT_FILE */ ++ ++/* Define this to 1 if strerror is broken. */ ++#define REPLACE_STRERROR 1 ++ ++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type ++ 'sig_atomic_t'. */ ++#define SIG_ATOMIC_T_SUFFIX ++ ++/* Define as the maximum value of type 'size_t', if the system doesn't define ++ it. */ ++#ifndef SIZE_MAX ++/* # undef SIZE_MAX */ ++#endif ++ ++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type ++ 'size_t'. */ ++#define SIZE_T_SUFFIX u ++ ++/* If using the C implementation of alloca, define if you know the ++ direction of stack growth for your system; otherwise it will be ++ automatically deduced at runtime. ++ STACK_DIRECTION > 0 => grows toward higher addresses ++ STACK_DIRECTION < 0 => grows toward lower addresses ++ STACK_DIRECTION = 0 => direction of growth unknown */ ++/* #undef STACK_DIRECTION */ ++ ++/* Define to 1 if the `S_IS*' macros in do not work properly. */ ++/* #undef STAT_MACROS_BROKEN */ ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if strerror_r returns char *. */ ++/* #undef STRERROR_R_CHAR_P */ ++ ++/* Define to the prefix of C symbols at the assembler and linker level, either ++ an underscore or empty. */ ++#define USER_LABEL_PREFIX ++ ++/* Define if the POSIX multithreading library can be used. */ ++/* #undef USE_POSIX_THREADS */ ++ ++/* Define if references to the POSIX multithreading library should be made ++ weak. */ ++/* #undef USE_POSIX_THREADS_WEAK */ ++ ++/* Define if the GNU Pth multithreading library can be used. */ ++/* #undef USE_PTH_THREADS */ ++ ++/* Define if references to the GNU Pth multithreading library should be made ++ weak. */ ++/* #undef USE_PTH_THREADS_WEAK */ ++ ++/* Define if the old Solaris multithreading library can be used. */ ++/* #undef USE_SOLARIS_THREADS */ ++ ++/* Define if references to the old Solaris multithreading library should be ++ made weak. */ ++/* #undef USE_SOLARIS_THREADS_WEAK */ ++ ++/* Define to 1 if you want getc etc. to use unlocked I/O if available. ++ Unlocked I/O can improve performance in unithreaded apps, but it is not ++ safe for multithreaded apps. */ ++#define USE_UNLOCKED_IO 1 ++ ++/* Define if the Win32 multithreading API can be used. */ ++/* #undef USE_WIN32_THREADS */ ++ ++/* Version number of package */ ++#define VERSION "0.18.1" ++ ++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type ++ 'wchar_t'. */ ++#define WCHAR_T_SUFFIX ++ ++/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type ++ 'wint_t'. */ ++#define WINT_T_SUFFIX ++ ++/* Define to 1 if on MINIX. */ ++/* #undef _MINIX */ ++ ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++/* #undef _POSIX_1_SOURCE */ ++ ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++/* #undef _POSIX_SOURCE */ ++ ++/* Define to 500 only on HP-UX. */ ++/* #undef _XOPEN_SOURCE */ ++ ++/* Enable extensions on AIX 3, Interix. */ ++#ifndef _ALL_SOURCE ++# define _ALL_SOURCE 1 ++#endif ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# define _GNU_SOURCE 1 ++#endif ++/* Enable threading extensions on Solaris. */ ++#ifndef _POSIX_PTHREAD_SEMANTICS ++# define _POSIX_PTHREAD_SEMANTICS 1 ++#endif ++/* Enable extensions on HP NonStop. */ ++#ifndef _TANDEM_SOURCE ++# define _TANDEM_SOURCE 1 ++#endif ++/* Enable general extensions on Solaris. */ ++#ifndef __EXTENSIONS__ ++# define __EXTENSIONS__ 1 ++#endif ++ ++ ++/* Define to rpl_ if the getopt replacement functions and variables should be ++ used. */ ++#define __GETOPT_PREFIX rpl_ ++ ++/* Define to `int' if doesn't define. */ ++#define gid_t int ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++#define inline __inline ++#endif ++ ++/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports ++ the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of ++ earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. ++ __APPLE__ && __MACH__ test for MacOS X. ++ __APPLE_CC__ tests for the Apple compiler and its version. ++ __STDC_VERSION__ tests for the C99 mode. */ ++#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ ++# define __GNUC_STDC_INLINE__ 1 ++#endif ++ ++/* Define to a type if does not define. */ ++/* #undef mbstate_t */ ++ ++/* Define to the type of st_nlink in struct stat, or a supertype. */ ++#define nlink_t int ++ ++/* Define as the type of the result of subtracting two pointers, if the system ++ doesn't define it. */ ++/* #undef ptrdiff_t */ ++ ++/* Define to the equivalent of the C99 'restrict' keyword, or to ++ nothing if this is not supported. Do not define if restrict is ++ supported directly. */ ++#define restrict /**/ ++/* Work around a bug in Sun C++: it does not support _Restrict or ++ __restrict__, even though the corresponding Sun C compiler ends up with ++ "#define restrict _Restrict" or "#define restrict __restrict__" in the ++ previous line. Perhaps some future version of Sun C++ will work with ++ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ ++#if defined __SUNPRO_CC && !defined __RESTRICT ++# define _Restrict ++# define __restrict__ ++#endif ++ ++/* Define to `unsigned int' if does not define. */ ++/* #undef size_t */ ++ ++/* Define as a signed type of the same size as size_t. */ ++#define ssize_t int ++ ++/* Define to `int' if doesn't define. */ ++#define uid_t int ++ ++/* Define to unsigned long or unsigned long long if and ++ don't define. */ ++#define uintmax_t unsigned long long ++ ++/* Define as a marker that can be attached to declarations that might not ++ be used. This helps to reduce warnings, such as from ++ GCC -Wunused-parameter. */ ++#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) ++# define _GL_UNUSED __attribute__ ((__unused__)) ++#else ++# define _GL_UNUSED ++#endif ++/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name ++ is a misnomer outside of parameter lists. */ ++#define _UNUSED_PARAMETER_ _GL_UNUSED ++ + -+# --- Targets ---------------------------------- + -+.INCLUDE : target.mk ++#define __libc_lock_t gl_lock_t ++#define __libc_lock_define gl_lock_define ++#define __libc_lock_define_initialized gl_lock_define_initialized ++#define __libc_lock_init gl_lock_init ++#define __libc_lock_lock gl_lock_lock ++#define __libc_lock_unlock gl_lock_unlock ++#define __libc_lock_recursive_t gl_recursive_lock_t ++#define __libc_lock_define_recursive gl_recursive_lock_define ++#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized ++#define __libc_lock_init_recursive gl_recursive_lock_init ++#define __libc_lock_lock_recursive gl_recursive_lock_lock ++#define __libc_lock_unlock_recursive gl_recursive_lock_unlock ++#define glthread_in_use libintl_thread_in_use ++#define glthread_lock_init_func libintl_lock_init_func ++#define glthread_lock_lock_func libintl_lock_lock_func ++#define glthread_lock_unlock_func libintl_lock_unlock_func ++#define glthread_lock_destroy_func libintl_lock_destroy_func ++#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded ++#define glthread_rwlock_init_func libintl_rwlock_init_func ++#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded ++#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func ++#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded ++#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func ++#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded ++#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func ++#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded ++#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func ++#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded ++#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func ++#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded ++#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func ++#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded ++#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func ++#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded ++#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func ++#define glthread_once_func libintl_once_func ++#define glthread_once_singlethreaded libintl_once_singlethreaded ++#define glthread_once_multithreaded libintl_once_multithreaded + -+# --- filter file ------------------------------ + -+$(MISC)$/$(SHL1TARGET).flt: makefile.mk -+ @echo CLEAR_THE_FILE > $@ + ---- misc/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c 2010-06-06 14:49:57.000000000 +0200 -+++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c 2011-03-09 11:51:02.615094200 +0100 -@@ -75,6 +74,9 @@ - # include "c-ctype.h" - #endif - -+typedef __int64 intmax_t; ++/* On Windows, variables that may be in a DLL must be marked specially. */ ++#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER ++# define DLL_VARIABLE __declspec (dllimport) ++#else ++# define DLL_VARIABLE ++#endif + ++/* Extra OS/2 (emx+gcc) defines. */ ++#ifdef __EMX__ ++# include "intl/os2compat.h" ++#endif + - #ifdef STATIC - STATIC - #endif ---- misc/gettext-0.18.1.1/gettext-runtime/config.h Wed Aug 20 14:33:55 2008 -+++ misc/build/gettext-0.18.1.1/gettext-runtime/config.h Wed Aug 20 14:26:42 2008 -@@ -1 +1,1288 @@ --dummy ++#elif defined (__APPLE__) +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + @@ -143,10 +1434,10 @@ +#define BITSIZEOF_SIZE_T 32 + +/* Define to the number of bits in type 'wchar_t'. */ -+#define BITSIZEOF_WCHAR_T 16 ++#define BITSIZEOF_WCHAR_T 32 + +/* Define to the number of bits in type 'wint_t'. */ -+#define BITSIZEOF_WINT_T 16 ++#define BITSIZEOF_WINT_T 32 + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. @@ -163,7 +1454,7 @@ +/* #undef C_ALLOCA */ + +/* Define to 1 if // is a file system root distinct from /. */ -+#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1 ++/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ @@ -175,15 +1466,15 @@ +/* Define on systems for which file names may have a so-called `drive letter' + prefix, define this to compute the length of that prefix, including the + colon. */ -+#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 1 ++#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 0 + +/* Define if the backslash character may also serve as a file name component + separator. */ -+#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 1 ++#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0 + +/* Define if a drive letter prefix denotes a relative path if it is not + followed by a file name component separator. */ -+#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1 ++#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 + +/* Define to 1 if realpath() can malloc memory, always gives an absolute path, + and handles trailing slash correctly. */ @@ -258,7 +1549,7 @@ + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ -+/* #undef HAVE_ALLOCA_H */ ++#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the `argz_count' function. */ +/* #undef HAVE_ARGZ_COUNT */ @@ -273,7 +1564,7 @@ +/* #undef HAVE_ARGZ_STRINGIFY */ + +/* Define to 1 if you have the `asprintf' function. */ -+/* #undef HAVE_ASPRINTF */ ++#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the `atexit' function. */ +#define HAVE_ATEXIT 1 @@ -282,18 +1573,18 @@ +/* #undef HAVE_BP_SYM_H */ + +/* Define to 1 if the compiler understands __builtin_expect. */ -+/* #undef HAVE_BUILTIN_EXPECT */ ++#define HAVE_BUILTIN_EXPECT 1 + +/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ -+/* #undef HAVE_CFLOCALECOPYCURRENT */ ++#define HAVE_CFLOCALECOPYCURRENT 1 + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ -+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ ++#define HAVE_CFPREFERENCESCOPYAPPVALUE 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ @@ -301,15 +1592,15 @@ + +/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if + you don't. */ -+#define HAVE_DECL_CLEARERR_UNLOCKED 0 ++#define HAVE_DECL_CLEARERR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ -+#define HAVE_DECL_FEOF_UNLOCKED 0 ++#define HAVE_DECL_FEOF_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if + you don't. */ -+#define HAVE_DECL_FERROR_UNLOCKED 0 ++#define HAVE_DECL_FERROR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if + you don't. */ @@ -337,11 +1628,11 @@ + +/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if + you don't. */ -+#define HAVE_DECL_GETCHAR_UNLOCKED 0 ++#define HAVE_DECL_GETCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ -+#define HAVE_DECL_GETC_UNLOCKED 0 ++#define HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ @@ -353,7 +1644,7 @@ + +/* Define to 1 if you have the declaration of `optreset', and to 0 if you + don't. */ -+/* #undef HAVE_DECL_OPTRESET */ ++#define HAVE_DECL_OPTRESET 1 + +/* Define to 1 if you have the declaration of `program_invocation_name', and + to 0 if you don't. */ @@ -365,38 +1656,38 @@ + +/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if + you don't. */ -+#define HAVE_DECL_PUTCHAR_UNLOCKED 0 ++#define HAVE_DECL_PUTCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you + don't. */ -+#define HAVE_DECL_PUTC_UNLOCKED 0 ++#define HAVE_DECL_PUTC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ -+#define HAVE_DECL_STRERROR 1 ++/* #undef HAVE_DECL_STRERROR */ + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ -+#define HAVE_DECL_STRERROR_R 0 ++#define HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ -+#define HAVE_DECL_STRNLEN 1 ++#define HAVE_DECL_STRNLEN 0 + +/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you + don't. */ -+#define HAVE_DECL_WCWIDTH 0 ++#define HAVE_DECL_WCWIDTH 1 + +/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you + don't. */ -+#define HAVE_DECL__SNPRINTF 1 ++#define HAVE_DECL__SNPRINTF 0 + +/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you + don't. */ -+#define HAVE_DECL__SNWPRINTF 1 ++#define HAVE_DECL__SNWPRINTF 0 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_DLFCN_H */ ++#define HAVE_DLFCN_H 1 + +/* Define if you have the declaration of environ. */ +/* #undef HAVE_ENVIRON_DECL */ @@ -411,74 +1702,56 @@ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getegid' function. */ -+/* #undef HAVE_GETEGID */ ++#define HAVE_GETEGID 1 + +/* Define to 1 if you have the `geteuid' function. */ -+/* #undef HAVE_GETEUID */ ++#define HAVE_GETEUID 1 + +/* Define to 1 if you have the `getgid' function. */ -+/* #undef HAVE_GETGID */ ++#define HAVE_GETGID 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_GETOPT_H */ ++#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long_only' function. */ -+/* #undef HAVE_GETOPT_LONG_ONLY */ ++#define HAVE_GETOPT_LONG_ONLY 1 + +/* Define to 1 if you have the `getpagesize' function. */ -+/* #undef HAVE_GETPAGESIZE */ ++#define HAVE_GETPAGESIZE 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `getuid' function. */ -+/* #undef HAVE_GETUID */ ++#define HAVE_GETUID 1 + +/* Define if you have the iconv() function and it works. */ -+/* #undef HAVE_ICONV */ ++#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_ICONV_H */ ++#define HAVE_ICONV_H 1 + +/* Define if you have the 'intmax_t' type in or . */ -+/* #undef HAVE_INTMAX_T */ -+#ifndef _MSC_VER +#define HAVE_INTMAX_T 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_INTMAX_T */ -+#endif /* _MSC_VER */ -+ + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_INTTYPES_H */ -+#ifndef _MSC_VER +#define HAVE_INTTYPES_H 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_INTTYPES_H */ -+#endif /* _MSC_VER */ -+ + +/* Define if exists, doesn't clash with , and + declares uintmax_t. */ -+/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */ -+#ifndef _MSC_VER +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */ -+#endif /* _MSC_VER */ -+ + +/* Define to 1 if you have the `iswblank' function. */ -+/* #undef HAVE_ISWBLANK */ ++#define HAVE_ISWBLANK 1 + +/* Define to 1 if you have the `iswcntrl' function. */ +#define HAVE_ISWCNTRL 1 + +/* Define if you have and nl_langinfo(CODESET). */ -+/* #undef HAVE_LANGINFO_CODESET */ ++#define HAVE_LANGINFO_CODESET 1 + +/* Define if your file defines LC_MESSAGES. */ -+/* #undef HAVE_LC_MESSAGES */ ++#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 @@ -487,23 +1760,23 @@ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the `lstat' function. */ -+/* #undef HAVE_LSTAT */ ++#define HAVE_LSTAT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACH_O_DYLD_H */ + +/* Define if the 'malloc' function is POSIX compliant. */ -+/* #undef HAVE_MALLOC_POSIX */ ++#define HAVE_MALLOC_POSIX 1 + +/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including + config.h and . */ -+/* #undef HAVE_MAP_ANONYMOUS */ ++#define HAVE_MAP_ANONYMOUS 1 + +/* Define to 1 if you have the `mbrtowc' function. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if you have the `mbsinit' function. */ -+/* #undef HAVE_MBSINIT */ ++#define HAVE_MBSINIT 1 + +/* Define to 1 if you have the `mbslen' function. */ +/* #undef HAVE_MBSLEN */ @@ -524,28 +1797,28 @@ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have a working `mmap' system call. */ -+/* #undef HAVE_MMAP */ ++#define HAVE_MMAP 1 + +/* Define to 1 if you have the `mprotect' function. */ -+/* #undef HAVE_MPROTECT */ ++#define HAVE_MPROTECT 1 + +/* Define to 1 if you have the `munmap' function. */ -+/* #undef HAVE_MUNMAP */ ++#define HAVE_MUNMAP 1 + +/* Define to 1 if you have the `newlocale' function. */ -+/* #undef HAVE_NEWLOCALE */ ++#define HAVE_NEWLOCALE 1 + +/* Define to 1 if you have the `pathconf' function. */ -+/* #undef HAVE_PATHCONF */ ++#define HAVE_PATHCONF 1 + +/* Define if your printf() function supports format strings with positions. */ -+/* #undef HAVE_POSIX_PRINTF */ ++#define HAVE_POSIX_PRINTF 1 + +/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ -+/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */ ++#define HAVE_PTHREAD_MUTEX_RECURSIVE 1 + +/* Define if the POSIX multithreading library has read/write locks. */ -+/* #undef HAVE_PTHREAD_RWLOCK */ ++#define HAVE_PTHREAD_RWLOCK 1 + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 @@ -554,7 +1827,7 @@ +/* #undef HAVE_RANDOM_H */ + +/* Define to 1 if atoll is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_ATOLL */ ++#define HAVE_RAW_DECL_ATOLL 1 + +/* Define to 1 if btowc is declared even after undefining macros. */ +#define HAVE_RAW_DECL_BTOWC 1 @@ -564,7 +1837,7 @@ +/* #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if chown is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_CHOWN */ ++#define HAVE_RAW_DECL_CHOWN 1 + +/* Define to 1 if dprintf is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_DPRINTF */ @@ -576,7 +1849,7 @@ +/* #undef HAVE_RAW_DECL_DUP3 */ + +/* Define to 1 if endusershell is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_ENDUSERSHELL */ ++#define HAVE_RAW_DECL_ENDUSERSHELL 1 + +/* Define to 1 if environ is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_ENVIRON */ @@ -588,7 +1861,7 @@ +/* #undef HAVE_RAW_DECL_FACCESSAT */ + +/* Define to 1 if fchdir is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_FCHDIR */ ++#define HAVE_RAW_DECL_FCHDIR 1 + +/* Define to 1 if fchmodat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FCHMODAT */ @@ -597,67 +1870,67 @@ +/* #undef HAVE_RAW_DECL_FCHOWNAT */ + +/* Define to 1 if fpurge is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_FPURGE */ ++#define HAVE_RAW_DECL_FPURGE 1 + +/* Define to 1 if fseeko is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_FSEEKO */ ++#define HAVE_RAW_DECL_FSEEKO 1 + +/* Define to 1 if fstatat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FSTATAT */ + +/* Define to 1 if fsync is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_FSYNC */ ++#define HAVE_RAW_DECL_FSYNC 1 + +/* Define to 1 if ftello is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_FTELLO */ ++#define HAVE_RAW_DECL_FTELLO 1 + +/* Define to 1 if ftruncate is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_FTRUNCATE */ ++#define HAVE_RAW_DECL_FTRUNCATE 1 + +/* Define to 1 if futimens is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_FUTIMENS */ + +/* Define to 1 if getcwd is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETCWD */ ++#define HAVE_RAW_DECL_GETCWD 1 + +/* Define to 1 if getdelim is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETDELIM */ + +/* Define to 1 if getdomainname is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETDOMAINNAME */ ++#define HAVE_RAW_DECL_GETDOMAINNAME 1 + +/* Define to 1 if getdtablesize is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETDTABLESIZE */ ++#define HAVE_RAW_DECL_GETDTABLESIZE 1 + +/* Define to 1 if getgroups is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETGROUPS */ ++#define HAVE_RAW_DECL_GETGROUPS 1 + +/* Define to 1 if gethostname is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETHOSTNAME */ ++#define HAVE_RAW_DECL_GETHOSTNAME 1 + +/* Define to 1 if getline is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_GETLINE */ + +/* Define to 1 if getloadavg is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETLOADAVG */ ++#define HAVE_RAW_DECL_GETLOADAVG 1 + +/* Define to 1 if getlogin is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETLOGIN */ ++#define HAVE_RAW_DECL_GETLOGIN 1 + +/* Define to 1 if getlogin_r is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETLOGIN_R */ ++#define HAVE_RAW_DECL_GETLOGIN_R 1 + +/* Define to 1 if getpagesize is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETPAGESIZE */ ++#define HAVE_RAW_DECL_GETPAGESIZE 1 + +/* Define to 1 if getsubopt is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETSUBOPT */ ++#define HAVE_RAW_DECL_GETSUBOPT 1 + +/* Define to 1 if getusershell is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GETUSERSHELL */ ++#define HAVE_RAW_DECL_GETUSERSHELL 1 + +/* Define to 1 if grantpt is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_GRANTPT */ ++#define HAVE_RAW_DECL_GRANTPT 1 + +/* Define to 1 if initstat_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_INITSTAT_R */ @@ -666,10 +1939,10 @@ +/* #undef HAVE_RAW_DECL_LCHMOD */ + +/* Define to 1 if lchown is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_LCHOWN */ ++#define HAVE_RAW_DECL_LCHOWN 1 + +/* Define to 1 if link is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_LINK */ ++#define HAVE_RAW_DECL_LINK 1 + +/* Define to 1 if linkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_LINKAT */ @@ -678,7 +1951,7 @@ +#define HAVE_RAW_DECL_LSEEK 1 + +/* Define to 1 if lstat is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_LSTAT */ ++#define HAVE_RAW_DECL_LSTAT 1 + +/* Define to 1 if mbrlen is declared even after undefining macros. */ +#define HAVE_RAW_DECL_MBRLEN 1 @@ -690,7 +1963,7 @@ +#define HAVE_RAW_DECL_MBSINIT 1 + +/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_MBSNRTOWCS */ ++#define HAVE_RAW_DECL_MBSNRTOWCS 1 + +/* Define to 1 if mbsrtowcs is declared even after undefining macros. */ +#define HAVE_RAW_DECL_MBSRTOWCS 1 @@ -711,13 +1984,13 @@ +/* #undef HAVE_RAW_DECL_MKDTEMP */ + +/* Define to 1 if mkfifo is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_MKFIFO */ ++#define HAVE_RAW_DECL_MKFIFO 1 + +/* Define to 1 if mkfifoat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKFIFOAT */ + +/* Define to 1 if mknod is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_MKNOD */ ++#define HAVE_RAW_DECL_MKNOD 1 + +/* Define to 1 if mknodat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKNODAT */ @@ -729,7 +2002,7 @@ +/* #undef HAVE_RAW_DECL_MKOSTEMPS */ + +/* Define to 1 if mkstemp is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_MKSTEMP */ ++#define HAVE_RAW_DECL_MKSTEMP 1 + +/* Define to 1 if mkstemps is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_MKSTEMPS */ @@ -738,16 +2011,16 @@ +/* #undef HAVE_RAW_DECL_PIPE2 */ + +/* Define to 1 if popen is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_POPEN */ ++#define HAVE_RAW_DECL_POPEN 1 + +/* Define to 1 if pread is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_PREAD */ ++#define HAVE_RAW_DECL_PREAD 1 + +/* Define to 1 if ptsname is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_PTSNAME */ ++#define HAVE_RAW_DECL_PTSNAME 1 + +/* Define to 1 if pwrite is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_PWRITE */ ++#define HAVE_RAW_DECL_PWRITE 1 + +/* Define to 1 if random_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RANDOM_R */ @@ -756,61 +2029,61 @@ +/* #undef HAVE_RAW_DECL_RAWMEMCHR */ + +/* Define to 1 if readlink is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_READLINK */ ++#define HAVE_RAW_DECL_READLINK 1 + +/* Define to 1 if readlinkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_READLINKAT */ + +/* Define to 1 if realpath is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_REALPATH */ ++#define HAVE_RAW_DECL_REALPATH 1 + +/* Define to 1 if renameat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RENAMEAT */ + +/* Define to 1 if rmdir is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_RMDIR */ ++#define HAVE_RAW_DECL_RMDIR 1 + +/* Define to 1 if rpmatch is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_RPMATCH */ + +/* Define to 1 if setenv is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SETENV */ ++#define HAVE_RAW_DECL_SETENV 1 + +/* Define to 1 if setstate_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SETSTATE_R */ + +/* Define to 1 if setusershell is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SETUSERSHELL */ ++#define HAVE_RAW_DECL_SETUSERSHELL 1 + +/* Define to 1 if sigaction is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGACTION */ ++#define HAVE_RAW_DECL_SIGACTION 1 + +/* Define to 1 if sigaddset is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGADDSET */ ++#define HAVE_RAW_DECL_SIGADDSET 1 + +/* Define to 1 if sigdelset is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGDELSET */ ++#define HAVE_RAW_DECL_SIGDELSET 1 + +/* Define to 1 if sigemptyset is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGEMPTYSET */ ++#define HAVE_RAW_DECL_SIGEMPTYSET 1 + +/* Define to 1 if sigfillset is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGFILLSET */ ++#define HAVE_RAW_DECL_SIGFILLSET 1 + +/* Define to 1 if sigismember is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGISMEMBER */ ++#define HAVE_RAW_DECL_SIGISMEMBER 1 + +/* Define to 1 if sigpending is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGPENDING */ ++#define HAVE_RAW_DECL_SIGPENDING 1 + +/* Define to 1 if sigprocmask is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SIGPROCMASK */ ++#define HAVE_RAW_DECL_SIGPROCMASK 1 + +/* Define to 1 if sleep is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SLEEP */ ++#define HAVE_RAW_DECL_SLEEP 1 + +/* Define to 1 if snprintf is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SNPRINTF */ ++#define HAVE_RAW_DECL_SNPRINTF 1 + +/* Define to 1 if srandom_r is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SRANDOM_R */ @@ -819,13 +2092,13 @@ +#define HAVE_RAW_DECL_STAT 1 + +/* Define to 1 if stpcpy is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STPCPY */ ++#define HAVE_RAW_DECL_STPCPY 1 + +/* Define to 1 if stpncpy is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STPNCPY */ + +/* Define to 1 if strcasestr is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STRCASESTR */ ++#define HAVE_RAW_DECL_STRCASESTR 1 + +/* Define to 1 if strchrnul is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRCHRNUL */ @@ -840,34 +2113,34 @@ +/* #undef HAVE_RAW_DECL_STRNDUP */ + +/* Define to 1 if strnlen is declared even after undefining macros. */ -+#define HAVE_RAW_DECL_STRNLEN 1 ++/* #undef HAVE_RAW_DECL_STRNLEN */ + +/* Define to 1 if strpbrk is declared even after undefining macros. */ +#define HAVE_RAW_DECL_STRPBRK 1 + +/* Define to 1 if strsep is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STRSEP */ ++#define HAVE_RAW_DECL_STRSEP 1 + +/* Define to 1 if strsignal is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STRSIGNAL */ ++#define HAVE_RAW_DECL_STRSIGNAL 1 + +/* Define to 1 if strtod is declared even after undefining macros. */ +#define HAVE_RAW_DECL_STRTOD 1 + +/* Define to 1 if strtok_r is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STRTOK_R */ ++#define HAVE_RAW_DECL_STRTOK_R 1 + +/* Define to 1 if strtoll is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STRTOLL */ ++#define HAVE_RAW_DECL_STRTOLL 1 + +/* Define to 1 if strtoull is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_STRTOULL */ ++#define HAVE_RAW_DECL_STRTOULL 1 + +/* Define to 1 if strverscmp is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_STRVERSCMP */ + +/* Define to 1 if symlink is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_SYMLINK */ ++#define HAVE_RAW_DECL_SYMLINK 1 + +/* Define to 1 if symlinkat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_SYMLINKAT */ @@ -876,7 +2149,7 @@ +#define HAVE_RAW_DECL_TMPFILE 1 + +/* Define to 1 if ttyname_r is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_TTYNAME_R */ ++#define HAVE_RAW_DECL_TTYNAME_R 1 + +/* Define to 1 if unlink is declared even after undefining macros. */ +#define HAVE_RAW_DECL_UNLINK 1 @@ -885,13 +2158,13 @@ +/* #undef HAVE_RAW_DECL_UNLINKAT */ + +/* Define to 1 if unlockpt is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_UNLOCKPT */ ++#define HAVE_RAW_DECL_UNLOCKPT 1 + +/* Define to 1 if unsetenv is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_UNSETENV */ ++#define HAVE_RAW_DECL_UNSETENV 1 + +/* Define to 1 if usleep is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_USLEEP */ ++#define HAVE_RAW_DECL_USLEEP 1 + +/* Define to 1 if utimensat is declared even after undefining macros. */ +/* #undef HAVE_RAW_DECL_UTIMENSAT */ @@ -906,7 +2179,7 @@ +#define HAVE_RAW_DECL_WCRTOMB 1 + +/* Define to 1 if wcsnrtombs is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_WCSNRTOMBS */ ++#define HAVE_RAW_DECL_WCSNRTOMBS 1 + +/* Define to 1 if wcsrtombs is declared even after undefining macros. */ +#define HAVE_RAW_DECL_WCSRTOMBS 1 @@ -915,19 +2188,19 @@ +#define HAVE_RAW_DECL_WCTOB 1 + +/* Define to 1 if wcwidth is declared even after undefining macros. */ -+/* #undef HAVE_RAW_DECL_WCWIDTH */ ++#define HAVE_RAW_DECL_WCWIDTH 1 + +/* Define to 1 if you have the `readlink' function. */ -+/* #undef HAVE_READLINK */ ++#define HAVE_READLINK 1 + +/* Define to 1 if you have the `realpath' function. */ -+/* #undef HAVE_REALPATH */ ++#define HAVE_REALPATH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SEARCH_H 1 + +/* Define to 1 if you have the `setenv' function. */ -+/* #undef HAVE_SETENV */ ++#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 @@ -939,29 +2212,29 @@ +#define HAVE_SIGNED_SIG_ATOMIC_T 1 + +/* Define to 1 if 'wchar_t' is a signed integer type. */ -+/* #undef HAVE_SIGNED_WCHAR_T */ ++#define HAVE_SIGNED_WCHAR_T 1 + +/* Define to 1 if 'wint_t' is a signed integer type. */ -+/* #undef HAVE_SIGNED_WINT_T */ ++#define HAVE_SIGNED_WINT_T 1 + +/* Define to 1 if the system has the type `sigset_t'. */ +/* #undef HAVE_SIGSET_T */ + +/* Define to 1 if you have the `snprintf' function. */ -+/* #undef HAVE_SNPRINTF */ ++#define HAVE_SNPRINTF 1 + +/* Define to 1 if stdbool.h conforms to C99. */ -+/* #undef HAVE_STDBOOL_H */ ++#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_STDINT_H */ ++#define HAVE_STDINT_H 1 + +/* Define if exists, doesn't clash with , and declares + uintmax_t. */ -+/* #undef HAVE_STDINT_H_WITH_UINTMAX */ ++#define HAVE_STDINT_H_WITH_UINTMAX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 @@ -970,25 +2243,25 @@ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ -+/* #undef HAVE_STPCPY */ ++#define HAVE_STPCPY 1 + +/* Define to 1 if you have the `strcasecmp' function. */ -+/* #undef HAVE_STRCASECMP */ ++#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror_r' function. */ -+/* #undef HAVE_STRERROR_R */ ++#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_STRINGS_H */ ++#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strnlen' function. */ -+#define HAVE_STRNLEN 1 ++/* #undef HAVE_STRNLEN */ + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 @@ -1006,19 +2279,19 @@ +/* #undef HAVE_SYS_INTTYPES_H */ + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_MMAN_H */ ++#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_PARAM_H */ ++#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_SOCKET_H */ ++#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ -+/* #undef HAVE_SYS_TIME_H */ ++#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 @@ -1027,10 +2300,10 @@ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the `tsearch' function. */ -+/* #undef HAVE_TSEARCH */ ++#define HAVE_TSEARCH 1 + +/* Define if you have the 'uintmax_t' type in or . */ -+/* #undef HAVE_UINTMAX_T */ ++#define HAVE_UINTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 @@ -1039,11 +2312,11 @@ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the `uselocale' function. */ -+/* #undef HAVE_USELOCALE */ ++#define HAVE_USELOCALE 1 + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ -+#define HAVE_VISIBILITY 0 ++#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 @@ -1058,16 +2331,16 @@ +#define HAVE_WCSLEN 1 + +/* Define to 1 if you have the `wcsnlen' function. */ -+#define HAVE_WCSNLEN 1 ++/* #undef HAVE_WCSNLEN */ + +/* Define to 1 if you have the header file. */ +#define HAVE_WCTYPE_H 1 + +/* Define to 1 if you have the `wcwidth' function. */ -+/* #undef HAVE_WCWIDTH */ ++#define HAVE_WCWIDTH 1 + +/* Define to 1 if you have the header file. */ -+#define HAVE_WINSOCK2_H 1 ++/* #undef HAVE_WINSOCK2_H */ + +/* Define if you have the 'wint_t' type. */ +#define HAVE_WINT_T 1 @@ -1076,10 +2349,10 @@ +#define HAVE_WORKING_O_NOATIME 0 + +/* Define to 1 if O_NOFOLLOW works. */ -+#define HAVE_WORKING_O_NOFOLLOW 0 ++#define HAVE_WORKING_O_NOFOLLOW 1 + +/* Define to 1 if the system has the type `_Bool'. */ -+/* #undef HAVE__BOOL */ ++#define HAVE__BOOL 1 + +/* Define to 1 if you have the `_NSGetExecutablePath' function. */ +/* #undef HAVE__NSGETEXECUTABLEPATH */ @@ -1088,17 +2361,17 @@ +/* #undef HAVE___FSETLOCKING */ + +/* Define as const if the declaration of iconv() needs const. */ -+/* #undef ICONV_CONST */ ++#define ICONV_CONST const + +/* Define to a symbolic name denoting the flavor of iconv_open() + implementation. */ +/* #undef ICONV_FLAVOR */ + +/* Define to the value of ${prefix}, as a string. */ -+#define INSTALLPREFIX "." ++#define INSTALLPREFIX "/Users/tml/lo-macosx/gettext/./unxmacxi.pro/misc" + +/* Define if integer division by zero raises signal SIGFPE. */ -+#define INTDIV0_RAISES_SIGFPE 0 ++#define INTDIV0_RAISES_SIGFPE 1 + +#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR +# define ISSLASH(C) ((C) == '/' || (C) == '\\') @@ -1118,7 +2391,7 @@ +#define MALLOC_0_IS_NONNULL 1 + +/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ -+/* #undef MAP_ANONYMOUS */ ++#define MAP_ANONYMOUS MAP_ANON + +/* Define if the mbrtowc function has the NULL string argument bug. */ +/* #undef MBRTOWC_NULL_ARG_BUG */ @@ -1130,7 +2403,7 @@ +/* #undef MBRTOWC_RETVAL_BUG */ + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -+#define NO_MINUS_C_MINUS_O 1 ++/* #undef NO_MINUS_C_MINUS_O */ + +/* Name of package */ +#define PACKAGE "gettext-runtime" @@ -1164,18 +2437,18 @@ +#define PTRDIFF_T_SUFFIX + +/* Define to 1 if readlink fails to recognize a trailing slash. */ -+/* #undef READLINK_TRAILING_SLASH_BUG */ ++#define READLINK_TRAILING_SLASH_BUG 1 + +/* Define to 1 if stat needs help when passed a directory name with a trailing + slash */ -+#define REPLACE_FUNC_STAT_DIR 1 ++/* #undef REPLACE_FUNC_STAT_DIR */ + +/* Define to 1 if stat needs help when passed a file name with a trailing + slash */ -+/* #undef REPLACE_FUNC_STAT_FILE */ ++#define REPLACE_FUNC_STAT_FILE 1 + +/* Define this to 1 if strerror is broken. */ -+#define REPLACE_STRERROR 1 ++/* #undef REPLACE_STRERROR */ + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'sig_atomic_t'. */ @@ -1189,7 +2462,7 @@ + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'size_t'. */ -+#define SIZE_T_SUFFIX u ++#define SIZE_T_SUFFIX ul + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be @@ -1210,10 +2483,10 @@ + +/* Define to the prefix of C symbols at the assembler and linker level, either + an underscore or empty. */ -+#define USER_LABEL_PREFIX ++#define USER_LABEL_PREFIX _ + +/* Define if the POSIX multithreading library can be used. */ -+/* #undef USE_POSIX_THREADS */ ++#define USE_POSIX_THREADS 1 + +/* Define if references to the POSIX multithreading library should be made + weak. */ @@ -1292,12 +2565,12 @@ +#define __GETOPT_PREFIX rpl_ + +/* Define to `int' if doesn't define. */ -+#define gid_t int ++/* #undef gid_t */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus -+#define inline __inline ++/* #undef inline */ +#endif + +/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports @@ -1314,7 +2587,7 @@ +/* #undef mbstate_t */ + +/* Define to the type of st_nlink in struct stat, or a supertype. */ -+#define nlink_t int ++/* #undef nlink_t */ + +/* Define as the type of the result of subtracting two pointers, if the system + doesn't define it. */ @@ -1323,7 +2596,7 @@ +/* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is + supported directly. */ -+#define restrict /**/ ++#define restrict __restrict +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the @@ -1338,14 +2611,14 @@ +/* #undef size_t */ + +/* Define as a signed type of the same size as size_t. */ -+#define ssize_t int ++/* #undef ssize_t */ + +/* Define to `int' if doesn't define. */ -+#define uid_t int ++/* #undef uid_t */ + +/* Define to unsigned long or unsigned long long if and + don't define. */ -+#define uintmax_t unsigned long long ++/* #undef uintmax_t */ + +/* Define as a marker that can be attached to declarations that might not + be used. This helps to reduce warnings, such as from @@ -1413,10 +2686,10 @@ +#ifdef __EMX__ +# include "intl/os2compat.h" +#endif -+ ++#endif --- misc/gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h Wed Aug 20 14:33:55 2008 +++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h Wed Aug 20 14:26:42 2008 -@@ -1 +1,473 @@ +@@ -1,1 +1,477 @@ -dummy +/* Message catalogs for internationalization. + Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc. @@ -1448,7 +2721,7 @@ +#endif + +#include -+#if (defined __APPLE__ && defined __MACH__) && 0 ++#if (defined __APPLE__ && defined __MACH__) && HAVE_NEWLOCALE +# include +#endif + @@ -1485,7 +2758,11 @@ + +/* Version number: (major<<16) + (minor<<8) + subminor */ +#define LIBINTL_VERSION 0x001201 -+extern LIBINTL_DLL_EXPORTED __declspec (dllimport) int libintl_version; ++extern LIBINTL_DLL_EXPORTED ++#ifdef _WIN32 ++ __declspec (dllimport) ++#endif ++ int libintl_version; + + +/* We redirect the functions to those prefixed with "libintl_". This is @@ -1861,7 +3138,7 @@ +#define setlocale libintl_setlocale +extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *); + -+#if 0 ++#if HAVE_NEWLOCALE + +#undef newlocale +#define newlocale libintl_newlocale diff --git a/gettext/makefile.mk b/gettext/makefile.mk index 5569a31ff6c1..3b52dea41569 100644 --- a/gettext/makefile.mk +++ b/gettext/makefile.mk @@ -51,6 +51,7 @@ PATCH_FILES= .IF "$(OS)"=="MACOSX" + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-curses --without-emacs --without-git --disable-java @@ -85,7 +86,24 @@ OUT2BIN+=gettext-tools$/src$/.libs$/msgunfmt OUT2BIN+=gettext-tools$/src$/.libs$/msguniq OUT2BIN+=gettext-tools$/src$/.libs$/urlget OUT2BIN+=gettext-tools$/src$/.libs$/xgettext + +.ELIF "$(OS)"=="IOS" + +BUILD_DIR=gettext-runtime$/intl +BUILD_ACTION=dmake +.IF "$(VERBOSE)"!="" +BUILD_ACTION+=VERBOSE=t +.ENDIF +PATCH_FILES=gettext-0.18.1.1.patch +ADDITIONAL_FILES=\ + gettext-runtime/intl/makefile.mk \ + gettext-runtime/intl/libgnuintl.h \ + gettext-runtime/intl/libintl.h \ + gettext-runtime/config.h +OUT2INC+=gettext-runtime$/intl$/libintl.h + .ELIF "$(OS)"=="WNT" + BUILD_DIR=gettext-runtime$/intl BUILD_ACTION=dmake PATCH_FILES=gettext-0.18.1.1.patch -- cgit From e5c37050bab08fdfc08febf5a243372686ef423d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 02:57:36 +0300 Subject: Drop unnecessary quotes around platform triplets --- berkeleydb/makefile.mk | 2 +- cairo/cairo/makefile.mk | 2 +- cairo/pixman/makefile.mk | 2 +- curl/makefile.mk | 2 +- expat/makefile.mk | 2 +- hunspell/makefile.mk | 2 +- libxml2/makefile.mk | 2 +- libxslt/makefile.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 8345124de5de..f755075e9f16 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -104,7 +104,7 @@ CONFIGURE_FLAGS+= --enable-shared CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF # just pass ARCH_FLAGS to native build diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index a077ec98af05..0d3cd3344332 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -152,7 +152,7 @@ CONFIGURE_FLAGS=--disable-static --enable-xlib .ENDIF CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 1f61bfa897a6..83ea75922178 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -127,7 +127,7 @@ CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) diff --git a/curl/makefile.mk b/curl/makefile.mk index 6be9def7754f..c3a36b201fd8 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -87,7 +87,7 @@ CONFIGURE_FLAGS=--disable-static CONFIGURE_FLAGS+= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_DIR=$(CONFIGURE_DIR)$/lib diff --git a/expat/makefile.mk b/expat/makefile.mk index 6084cf54bddd..efcd82270ff4 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -56,7 +56,7 @@ CONFIGURE_ACTION=.$/configure .ENDIF .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_DIR=lib diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index a28d63e0dd1f..d1498cdb8483 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -67,7 +67,7 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 37c0efa99add..78511bfbf82b 100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -111,7 +111,7 @@ BUILD_DIR=$(CONFIGURE_DIR) CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug .ENDIF .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF .ENDIF diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index b3567d2e8793..f9ca45113634 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -124,7 +124,7 @@ CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes .IF "$(CROSS_COMPILING)"!="" -CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -- cgit -- cgit -- cgit From 9eeeab292cf799a839439310feeee9ac752b0013 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 30 May 2011 15:07:49 +0100 Subject: allow building non-system cairo with system libpng14 --- cairo/cairo-1.8.0.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch index e693eb4cc019..d18396c0ac03 100644 --- a/cairo/cairo-1.8.0.patch +++ b/cairo/cairo-1.8.0.patch @@ -186,6 +186,15 @@ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure { echo "$as_me:$LINENO: checking for X" >&5 +@@ -31723,7 +31723,7 @@ + + if test "x$png_REQUIRES" = x; then + # libpng13 is GnuWin32's libpng-1.2.8 :-( +- for l in libpng12 libpng13 libpng10 ; do ++ for l in libpng12 libpng13 libpng14 libpng10 ; do + if $PKG_CONFIG --exists $l ; then + png_REQUIRES=$l + use_png=yes @@ -34097,7 +34129,7 @@ # The ps backend requires zlib. -- cgit From 5a4e27252d9a86b22d2f152f590cd1cb54fe027f Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 30 May 2011 16:37:15 +0200 Subject: remove double "=" from assignment to STATIC_OR_SHARED --- icu/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index b23aa6667c1d..684785500c31 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -110,7 +110,7 @@ CONFIGURE_DIR=source .IF "$(OS)"=="IOS" STATIC_OR_SHARED=--enable-static --disable-shared .ELSE -STATIC_OR_SHARED==--disable-static --enable-shared +STATIC_OR_SHARED=--disable-static --enable-shared .ENDIF .IF "$(CROSS_COMPILING)"!="" -- cgit From 743840a403640c86dbd60cef9a3ff296c21e4287 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 17:50:27 +0300 Subject: We build graphite as a static library, drop conditional dllimport/export We would need to pass -DGR2_STATIC when compiling graphite-using code otherwise. Also make patch apply without fuzz. --- graphite/graphite2-0.9.2.patch | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch index 35f0bd23650b..aca8b63ea254 100644 --- a/graphite/graphite2-0.9.2.patch +++ b/graphite/graphite2-0.9.2.patch @@ -371,15 +371,13 @@ diff -r 5369cdd12120 src/gr_slot.cpp diff current src/List.h --- misc/build/graphite2-0.9.2/src/List.h Sat Feb 12 22:54:16 2011 +0700 +++ misc/build/graphite2-0.9.2/src/List.h Fri Feb 18 16:05:40 2011 +0700 -@@ -51,6 +51,6 @@ +@@ -51,5 +51,5 @@ template Vector(I first, const I last) : m_first(0), m_last(0), m_end(0) { insert(begin(), first, last); } - ~Vector() { free(m_first); } + ~Vector() { clear(); free(m_first); } iterator begin() { return m_first; } - const_iterator begin() const { return m_first; } - --- misc/graphite2-0.9.2/src/Code.cpp 2011-02-12 16:54:16.000000000 +0100 +++ misc/build/graphite2-0.9.2/src/Code.cpp 2011-03-11 11:28:11.700215286 +0100 @@ -168,7 +168,7 @@ @@ -393,12 +391,24 @@ diff current src/List.h 0,0,0,0,0,0,0,0, --- misc/graphite2-0.9.2/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100 +++ misc/build/graphite2-0.9.2/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100 -@@ -36,7 +36,7 @@ - }; +@@ -36,19 +36,7 @@ // Definitions for library publicly exported symbols --#if defined _WIN32 || defined __CYGWIN__ -+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC - #ifdef GR2_EXPORTING - #ifdef __GNUC__ - #define GR2_API __attribute__((dllexport)) + #if defined _WIN32 || defined __CYGWIN__ +- #ifdef GR2_EXPORTING +- #ifdef __GNUC__ +- #define GR2_API __attribute__((dllexport)) +- #else +- #define GR2_API __declspec(dllexport) +- #endif +- #else +- #ifdef __GNUC__ +- #define GR2_API __attribute__((dllimport)) +- #else +- #define GR2_API __declspec(dllimport) +- #endif +- #endif ++ #define GR2_API + #define GR2_LOCAL + #else + #if __GNUC__ >= 4 -- cgit From 44e6861f7e35e52fe66a3be6386b540a4e53e9ec Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 30 May 2011 21:27:17 +0200 Subject: fix build on Mac (add LIBXML_CFLAGS, disable unneeded intltool-xml check) --- libgsf/libgsf-1.14.19.patch | 9 +++++++++ libgsf/makefile.mk | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch index a39758367f83..12d20c660129 100644 --- a/libgsf/libgsf-1.14.19.patch +++ b/libgsf/libgsf-1.14.19.patch @@ -18,3 +18,12 @@ +@@ -11963,7 +11963,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 + $as_echo "$IT_PERL_VERSION" >&6; } + fi +-if test "x" != "xno-xml"; then ++if test "xno-xml" != "xno-xml"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 + $as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index fc2897deaec1..955925ff7ce2 100755 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -37,8 +37,8 @@ TARGET=so_libgsf .IF "$(SYSTEM_LIBGSF)" == "YES" all: - @echo "An already available installation of gdk-pixbuf should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of gdk-pixbuf should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -67,7 +67,7 @@ CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR)" \ --without-python \ --without-bonobo \ -- cgit From 1619af48efb8bf41919fd82490df4f88c2b4889c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 28 May 2011 16:05:52 +0300 Subject: Propagate verbosity --- pango/makefile.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pango/makefile.mk b/pango/makefile.mk index fddbbecf83a1..6e9165e8ecf5 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -67,7 +67,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" CONFIGURE_ACTION+="--without-x" -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) +.IF "$(VERBOSE)"!="" +VFLAG=V=1 +.ENDIF +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER -- cgit From 26257421474037dba35c87a5428dd7881d414352 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 23:41:34 +0300 Subject: Propagate verbosity --- glib/makefile.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/glib/makefile.mk b/glib/makefile.mk index 70736ff88386..d24e40a631f2 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -58,7 +58,12 @@ CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/externa CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) + +.IF "$(VERBOSE)"!="" +VFLAG=V=1 +.ENDIF + +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) EXTRPATH=LOADER OUT2LIB+=gio/.libs/libgio-2.0.0.dylib -- cgit From 920be578407784ad4ddabcd921e187fa3e0a1f54 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 23:47:53 +0300 Subject: Deliver also the built glib-compile-schemas It is needed in case a native internal GLib build is used when cross-compiling GLib. --- glib/makefile.mk | 1 + glib/prj/d.lst | 1 + 2 files changed, 2 insertions(+) diff --git a/glib/makefile.mk b/glib/makefile.mk index d24e40a631f2..7e355d488dba 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -74,6 +74,7 @@ OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib OUT2BIN+=gobject/glib-mkenums OUT2BIN+=gobject/.libs/glib-genmarshal +OUT2BIN+=gio/.libs/glib-compile-schemas OUT2INC+=glib/glib.h OUT2INC+=glib/glib-object.h diff --git a/glib/prj/d.lst b/glib/prj/d.lst index 851265ca79a2..5ec89f19a4e4 100644 --- a/glib/prj/d.lst +++ b/glib/prj/d.lst @@ -13,6 +13,7 @@ symlink: %_DEST%\lib%_EXT%\libgobject-2.0.0.dylib %_DEST%\lib%_EXT%\libgobject-2 ..\%__SRC%\bin\glib-mkenums %_DEST%\bin%_EXT%\glib-mkenums ..\%__SRC%\bin\glib-genmarshal %_DEST%\bin%_EXT%\glib-genmarshal ..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin%_EXT%\glib-genmarshal.exe +..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin%_EXT%\glib-compile-schemas ..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib%_EXT%\gio-2.0.lib ..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib%_EXT%\gmodule-2.0.lib ..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib -- cgit From 896eac5669806b0d8e74049572ae0959b6c4bc7a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 30 May 2011 03:11:48 +0300 Subject: Deliver a static libintl.a, too --- gettext/prj/d.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/gettext/prj/d.lst b/gettext/prj/d.lst index 09e9ea1c2e60..205abacc1435 100644 --- a/gettext/prj/d.lst +++ b/gettext/prj/d.lst @@ -10,6 +10,7 @@ symlink: %_DEST%\lib%_EXT%\libgettextsrc-0.18.1.dylib %_DEST%\lib%_EXT%\libgette symlink: %_DEST%\lib%_EXT%\libintl.8.dylib %_DEST%\lib%_EXT%\libintl.dylib ..\%__SRC%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextlib-0.18.1.dylib symlink: %_DEST%\lib%_EXT%\libgettextlib-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextlib.dylib +..\%__SRC%\lib\libintl.a %_DEST%\lib%_EXT%\libintl.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\bin\msgattrib %_DEST%\bin%_EXT%\msgattrib ..\%__SRC%\bin\msgcat %_DEST%\bin%_EXT%\msgcat -- cgit From d49fe1968a4b5a3c79fa71177bcdeeb702db264e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 31 May 2011 01:15:54 +0300 Subject: Improve gettext build for iOS --- gettext/gettext-0.18.1.1.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch index 72970b663bec..016b65d8838b 100644 --- a/gettext/gettext-0.18.1.1.patch +++ b/gettext/gettext-0.18.1.1.patch @@ -2721,7 +2721,7 @@ +#endif + +#include -+#if (defined __APPLE__ && defined __MACH__) && HAVE_NEWLOCALE ++#if (defined __APPLE__ && defined __MACH__) +# include +#endif + @@ -3016,7 +3016,7 @@ + or gettext() but for which the format string could be the return value + of _() or gettext() need to add this #include. Oh well. */ + -+#if !0 ++#if !(defined __APPLE__ && defined __MACH__) + +#include +#include @@ -3138,7 +3138,7 @@ +#define setlocale libintl_setlocale +extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *); + -+#if HAVE_NEWLOCALE ++#if (defined __APPLE__ && defined __MACH__) + +#undef newlocale +#define newlocale libintl_newlocale @@ -3194,7 +3194,7 @@ +#define _LIBINTL_H 1 + +#include -+#if (defined __APPLE__ && defined __MACH__) && 0 ++#if (defined __APPLE__ && defined __MACH__) +# include +#endif + @@ -3485,7 +3485,7 @@ + or gettext() but for which the format string could be the return value + of _() or gettext() need to add this #include. Oh well. */ + -+#if !0 ++#if !(defined __APPLE__ && defined __MACH__) + +#include +#include @@ -3607,7 +3607,7 @@ +#define setlocale libintl_setlocale +extern char *setlocale (int, const char *); + -+#if 0 ++#if (defined __APPLE__ && defined __MACH__) + +#undef newlocale +#define newlocale libintl_newlocale -- cgit From b61b156d52d24a7cfc42fb47d922bbc292bc6835 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 31 May 2011 01:25:03 +0300 Subject: Enable building glib for iOS Pass --build and --host options to the configure script. Pass a bunch of a priori cached test results for stuff that can't be determined when cross-compiling. Link with the CoreFoundation framework. Build static archives. Patch out the compile-time USE_LIBICONV_GNU and _LIBICONV_H test from gconvert.c as it for some reason fails for iOS. --- glib/glib-2.28.1.patch | 17 +++++++++++++++++ glib/makefile.mk | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch index cadcc4db2cb8..da993817da7f 100644 --- a/glib/glib-2.28.1.patch +++ b/glib/glib-2.28.1.patch @@ -39,3 +39,20 @@ #include "gthreadprivate.h" /** +--- misc/glib-2.28.1/glib/gconvert.c ++++ misc/build/glib-2.28.1/glib/gconvert.c +@@ -58,13 +58,6 @@ + + #include "glibintl.h" + +-#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) +-#error GNU libiconv in use but included iconv.h not from libiconv +-#endif +-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) +-#error GNU libiconv not in use but included iconv.h is from libiconv +-#endif +- + + /** + * SECTION:conversions + diff --git a/glib/makefile.mk b/glib/makefile.mk index 7e355d488dba..7d65bad2aa32 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -48,15 +48,32 @@ TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION) TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e -.IF "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS" PATCH_FILES=glib-2.28.1.patch -CONFIGURE_FLAGS=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS= \ + glib_cv_stack_grows=no \ + glib_cv_uscore=yes \ + ac_cv_func_posix_getpwuid_r=yes \ + ac_cv_func_posix_getgrgid_r=yes \ + ac_cv_func__NSGetEnviron=no \ + --disable-shared +FRAMEWORK=-framework CoreFoundation +.ELSE +CONFIGURE_FLAGS=--disable-static +.ENDIF + +CONFIGURE_FLAGS+=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CONFIGURE_FLAGS+=--disable-fam CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX" CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" -CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) $(FRAMEWORK)" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure .IF "$(VERBOSE)"!="" @@ -66,6 +83,9 @@ VFLAG=V=1 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) EXTRPATH=LOADER + +.IF "$(OS)"=="MACOSX" + OUT2LIB+=gio/.libs/libgio-2.0.0.dylib OUT2LIB+=glib/.libs/libglib-2.0.0.dylib OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib @@ -76,6 +96,16 @@ OUT2BIN+=gobject/glib-mkenums OUT2BIN+=gobject/.libs/glib-genmarshal OUT2BIN+=gio/.libs/glib-compile-schemas +.ELIF "$(OS)"=="IOS" + +OUT2LIB+=gio/.libs/libgio-2.0.a +OUT2LIB+=glib/.libs/libglib-2.0.a +OUT2LIB+=gmodule/.libs/libgmodule-2.0.a +OUT2LIB+=gobject/.libs/libgobject-2.0.a +OUT2LIB+=gthread/.libs/libgthread-2.0.a + +.ENDIF + OUT2INC+=glib/glib.h OUT2INC+=glib/glib-object.h OUT2INC+=glib/glibconfig.h -- cgit From 04eef8e27332aaba82016e7b0e6790f4b90814e7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 31 May 2011 15:29:14 +0300 Subject: Set also CXXFLAGS --- pango/makefile.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/pango/makefile.mk b/pango/makefile.mk index 6e9165e8ecf5..d202de296654 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -58,6 +58,7 @@ CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ LDFLAGS="$(CONFIGURE_LDFLAGS)" \ CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \ CAIRO_LIBS="-lcairo" \ -- cgit From b344b037047273fb063483c2c4655060b798c275 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 31 May 2011 23:46:00 +0300 Subject: Bin redundancy --- glib/makefile.mk | 218 ++----------------------------------------------------- 1 file changed, 5 insertions(+), 213 deletions(-) diff --git a/glib/makefile.mk b/glib/makefile.mk index 7d65bad2aa32..d93f864c5c8d 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -106,222 +106,14 @@ OUT2LIB+=gthread/.libs/libgthread-2.0.a .ENDIF -OUT2INC+=glib/glib.h -OUT2INC+=glib/glib-object.h -OUT2INC+=glib/glibconfig.h -OUT2INC+=gmodule/gmodule.h - -OUT2INC+=gio/gdesktopappinfo.h -OUT2INC+=gio/gunixcredentialsmessage.h -OUT2INC+=gio/gunixinputstream.h -OUT2INC+=gio/gunixsocketaddress.h -OUT2INC+=gio/gfiledescriptorbased.h -OUT2INC+=gio/gunixfdlist.h -OUT2INC+=gio/gunixmounts.h -OUT2INC+=gio/gunixconnection.h -OUT2INC+=gio/gunixfdmessage.h -OUT2INC+=gio/gunixoutputstream.h - - -OUT2INC+=gio/gaction.h -OUT2INC+=gio/gfileicon.h -OUT2INC+=gio/gproxyaddressenumerator.h -OUT2INC+=gio/gactiongroup.h -OUT2INC+=gio/gfileinfo.h -OUT2INC+=gio/gproxyresolver.h -OUT2INC+=gio/gappinfo.h -OUT2INC+=gio/gfileinputstream.h -OUT2INC+=gio/gresolver.h -OUT2INC+=gio/gapplication.h -OUT2INC+=gio/gfileiostream.h -OUT2INC+=gio/gseekable.h -OUT2INC+=gio/gapplicationcommandline.h -OUT2INC+=gio/gfilemonitor.h -OUT2INC+=gio/gsettings.h -OUT2INC+=gio/gasyncinitable.h -OUT2INC+=gio/gfilenamecompleter.h -OUT2INC+=gio/gsettingsbackend.h -OUT2INC+=gio/gasyncresult.h -OUT2INC+=gio/gfileoutputstream.h -OUT2INC+=gio/gsimpleaction.h -OUT2INC+=gio/gbufferedinputstream.h -OUT2INC+=gio/gfilterinputstream.h -OUT2INC+=gio/gsimpleactiongroup.h -OUT2INC+=gio/gbufferedoutputstream.h -OUT2INC+=gio/gfilteroutputstream.h -OUT2INC+=gio/gsimpleasyncresult.h -OUT2INC+=gio/gcancellable.h -OUT2INC+=gio/gicon.h -OUT2INC+=gio/gsimplepermission.h -OUT2INC+=gio/gcharsetconverter.h -OUT2INC+=gio/ginetaddress.h -OUT2INC+=gio/gsocket.h -OUT2INC+=gio/gcontenttype.h -OUT2INC+=gio/ginetsocketaddress.h -OUT2INC+=gio/gsocketaddress.h -OUT2INC+=gio/gconverter.h -OUT2INC+=gio/ginitable.h -OUT2INC+=gio/gsocketaddressenumerator.h -OUT2INC+=gio/gconverterinputstream.h -OUT2INC+=gio/ginputstream.h -OUT2INC+=gio/gsocketclient.h -OUT2INC+=gio/gconverteroutputstream.h -OUT2INC+=gio/gio.h -OUT2INC+=gio/gsocketconnectable.h -OUT2INC+=gio/gcredentials.h -OUT2INC+=gio/gioenums.h -OUT2INC+=gio/gsocketconnection.h -OUT2INC+=gio/gdatainputstream.h -OUT2INC+=gio/gioenumtypes.h -OUT2INC+=gio/gsocketcontrolmessage.h -OUT2INC+=gio/gdataoutputstream.h -OUT2INC+=gio/gioerror.h -OUT2INC+=gio/gsocketlistener.h -OUT2INC+=gio/gdbusaddress.h -OUT2INC+=gio/giomodule.h -OUT2INC+=gio/gsocketservice.h -OUT2INC+=gio/gdbusauthobserver.h -OUT2INC+=gio/gioscheduler.h -OUT2INC+=gio/gsrvtarget.h -OUT2INC+=gio/gdbusconnection.h -OUT2INC+=gio/giostream.h -OUT2INC+=gio/gtcpconnection.h -OUT2INC+=gio/gdbuserror.h -OUT2INC+=gio/giotypes.h -OUT2INC+=gio/gtcpwrapperconnection.h -OUT2INC+=gio/gdbusintrospection.h -OUT2INC+=gio/gloadableicon.h -OUT2INC+=gio/gthemedicon.h -OUT2INC+=gio/gdbusmessage.h -OUT2INC+=gio/gmemoryinputstream.h -OUT2INC+=gio/gthreadedsocketservice.h -OUT2INC+=gio/gdbusmethodinvocation.h -OUT2INC+=gio/gmemoryoutputstream.h -OUT2INC+=gio/gtlsbackend.h -OUT2INC+=gio/gdbusnameowning.h -OUT2INC+=gio/gmount.h -OUT2INC+=gio/gtlscertificate.h -OUT2INC+=gio/gdbusnamewatching.h -OUT2INC+=gio/gmountoperation.h -OUT2INC+=gio/gtlsclientconnection.h -OUT2INC+=gio/gdbusproxy.h -OUT2INC+=gio/gnativevolumemonitor.h -OUT2INC+=gio/gtlsconnection.h -OUT2INC+=gio/gdbusserver.h -OUT2INC+=gio/gnetworkaddress.h -OUT2INC+=gio/gtlsserverconnection.h -OUT2INC+=gio/gdbusutils.h -OUT2INC+=gio/gnetworkservice.h -OUT2INC+=gio/gvfs.h -OUT2INC+=gio/gdrive.h -OUT2INC+=gio/goutputstream.h -OUT2INC+=gio/gvolume.h -OUT2INC+=gio/gemblem.h -OUT2INC+=gio/gpermission.h -OUT2INC+=gio/gvolumemonitor.h -OUT2INC+=gio/gemblemedicon.h -OUT2INC+=gio/gpollableinputstream.h -OUT2INC+=gio/gzlibcompressor.h -OUT2INC+=gio/gfile.h -OUT2INC+=gio/gpollableoutputstream.h -OUT2INC+=gio/gzlibdecompressor.h -OUT2INC+=gio/gfileattribute.h -OUT2INC+=gio/gproxy.h -OUT2INC+=gio/gfileenumerator.h -OUT2INC+=gio/gproxyaddress.h - -OUT2INC+=glib/galloca.h -OUT2INC+=glib/gconvert.h -OUT2INC+=glib/gi18n.h -OUT2INC+=glib/goption.h -OUT2INC+=glib/gscanner.h -OUT2INC+=glib/gthreadpool.h -OUT2INC+=glib/garray.h -OUT2INC+=glib/gdataset.h -OUT2INC+=glib/giochannel.h -OUT2INC+=glib/gpattern.h -OUT2INC+=glib/gsequence.h -OUT2INC+=glib/gtimer.h -OUT2INC+=glib/gasyncqueue.h -OUT2INC+=glib/gdate.h -OUT2INC+=glib/gkeyfile.h -OUT2INC+=glib/gpoll.h -OUT2INC+=glib/gshell.h -OUT2INC+=glib/gtimezone.h -OUT2INC+=glib/gatomic.h -OUT2INC+=glib/gdatetime.h -OUT2INC+=glib/glist.h -OUT2INC+=glib/gprimes.h -OUT2INC+=glib/gslice.h -OUT2INC+=glib/gtree.h -OUT2INC+=glib/gbacktrace.h -OUT2INC+=glib/gdir.h -OUT2INC+=glib/gmacros.h -OUT2INC+=glib/gprintf.h -OUT2INC+=glib/gslist.h -OUT2INC+=glib/gtypes.h -OUT2INC+=glib/gbase64.h -OUT2INC+=glib/gerror.h -OUT2INC+=glib/gmain.h -OUT2INC+=glib/gqsort.h -OUT2INC+=glib/gspawn.h -OUT2INC+=glib/gunicode.h -OUT2INC+=glib/gbitlock.h -OUT2INC+=glib/gfileutils.h -OUT2INC+=glib/gmappedfile.h -OUT2INC+=glib/gquark.h -OUT2INC+=glib/gstdio.h -OUT2INC+=glib/gurifuncs.h -OUT2INC+=glib/gbookmarkfile.h -OUT2INC+=glib/ghash.h -OUT2INC+=glib/gmarkup.h -OUT2INC+=glib/gqueue.h -OUT2INC+=glib/gstrfuncs.h -OUT2INC+=glib/gutils.h -OUT2INC+=glib/gcache.h -OUT2INC+=glib/ghook.h -OUT2INC+=glib/gmem.h -OUT2INC+=glib/grand.h -OUT2INC+=glib/gstring.h -OUT2INC+=glib/gvariant.h -OUT2INC+=glib/gchecksum.h -OUT2INC+=glib/ghostutils.h -OUT2INC+=glib/gmessages.h -OUT2INC+=glib/gregex.h -OUT2INC+=glib/gtestutils.h -OUT2INC+=glib/gvarianttype.h -OUT2INC+=glib/gcompletion.h -OUT2INC+=glib/gi18n-lib.h -OUT2INC+=glib/gnode.h -OUT2INC+=glib/grel.h -OUT2INC+=glib/gthread.h -OUT2INC+=glib/gwin32.h - - -OUT2INC+=gobject/gbinding.h -OUT2INC+=gobject/gmarshal.h -OUT2INC+=gobject/gparamspecs.h -OUT2INC+=gobject/gtypemodule.h -OUT2INC+=gobject/gvaluecollector.h -OUT2INC+=gobject/gboxed.h -OUT2INC+=gobject/gobject.h -OUT2INC+=gobject/gsignal.h -OUT2INC+=gobject/gtypeplugin.h -OUT2INC+=gobject/gvaluetypes.h -OUT2INC+=gobject/gclosure.h -OUT2INC+=gobject/gobjectnotifyqueue.c -OUT2INC+=gobject/gsourceclosure.h -OUT2INC+=gobject/gvalue.h -OUT2INC+=gobject/genums.h -OUT2INC+=gobject/gparam.h -OUT2INC+=gobject/gtype.h -OUT2INC+=gobject/gvaluearray.h - .ELIF "$(OS)"=="WNT" + CONVERTFILES=gobject/gmarshal.c PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch + CONFIGURE_ACTION= + ADDITIONAL_FILES= config.h \ gio/gvdb/makefile.msc \ gio/win32/makefile.msc \ @@ -355,6 +147,8 @@ OUT2LIB+=gthread/gthread-2.0.lib OUT2INC+=build$/win32$/make.msc OUT2INC+=build$/win32$/module.defs +.ENDIF + OUT2INC+=glib/glib.h OUT2INC+=glib/glib-object.h OUT2INC+=glib/glibconfig.h @@ -565,8 +359,6 @@ OUT2INC+=gobject/genums.h OUT2INC+=gobject/gparam.h OUT2INC+=gobject/gtype.h OUT2INC+=gobject/gvaluearray.h -.ELSE -.ENDIF # --- Targets ------------------------------------------------------ -- cgit From c7af239047bec413859ede9ad6c9bfdd8dffa567 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 1 Jun 2011 01:28:58 +0300 Subject: Pass dmake's -P to gnumake as -j --- glib/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glib/makefile.mk b/glib/makefile.mk index d93f864c5c8d..5ef6e757ef08 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -80,7 +80,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure VFLAG=V=1 .ENDIF -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS) EXTRPATH=LOADER -- cgit From 4670d2d486a179ec23da8997ce15120aa0ff00e8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 1 Jun 2011 01:29:30 +0300 Subject: Set EXTRPATH only on MACOSX --- glib/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glib/makefile.mk b/glib/makefile.mk index 5ef6e757ef08..d228187c30f2 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -82,10 +82,10 @@ VFLAG=V=1 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS) -EXTRPATH=LOADER - .IF "$(OS)"=="MACOSX" +EXTRPATH=LOADER + OUT2LIB+=gio/.libs/libgio-2.0.0.dylib OUT2LIB+=glib/.libs/libglib-2.0.0.dylib OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib -- cgit From 709b77eda273915ea5cb34302448d8da91557c6f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 1 Jun 2011 01:30:11 +0300 Subject: Don't use libintl in glib Patch out the chunk of GLib's configure script that looks for libintl. Take care of fallout in a couple of places in GLib sources. The end result is that GLib doesn't use any libintl (gettext etc) functionality. Which is nice, as we then shouldn't need to build gettext. No functionality should be lost, as we weren't delivering any GLib message catalogs anyway, so none of the gettext calls at least here would ever have found any localised messages. --- glib/glib-2.28.1.patch | 782 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 782 insertions(+) diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch index da993817da7f..0242d600cad2 100644 --- a/glib/glib-2.28.1.patch +++ b/glib/glib-2.28.1.patch @@ -56,3 +56,785 @@ /** * SECTION:conversions +--- misc/glib-2.28.1/configure ++++ misc/build/glib-2.28.1/configure +@@ -7988,719 +7988,6 @@ + CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS' + + +- for ac_header in locale.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +-if test "x$ac_cv_header_locale_h" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LOCALE_H 1 +-_ACEOF +- +-fi +- +-done +- +- if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +-$as_echo_n "checking for LC_MESSAGES... " >&6; } +-if ${am_cv_val_LC_MESSAGES+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-return LC_MESSAGES +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- am_cv_val_LC_MESSAGES=yes +-else +- am_cv_val_LC_MESSAGES=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +-$as_echo "$am_cv_val_LC_MESSAGES" >&6; } +- if test $am_cv_val_LC_MESSAGES = yes; then +- +-$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h +- +- fi +- fi +- USE_NLS=yes +- +- +- gt_cv_have_gettext=no +- +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= +- +- ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +-if test "x$ac_cv_header_libintl_h" = xyes; then : +- gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" +- +- # +- # First check in libc +- # +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 +-$as_echo_n "checking for ngettext in libc... " >&6; } +-if ${gt_cv_func_ngettext_libc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +- +-int +-main () +-{ +-return !ngettext ("","", 1) +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- gt_cv_func_ngettext_libc=yes +-else +- gt_cv_func_ngettext_libc=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +-$as_echo "$gt_cv_func_ngettext_libc" >&6; } +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 +-$as_echo_n "checking for dgettext in libc... " >&6; } +-if ${gt_cv_func_dgettext_libc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +- +-int +-main () +-{ +-return !dgettext ("","") +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- gt_cv_func_dgettext_libc=yes +-else +- gt_cv_func_dgettext_libc=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +-$as_echo "$gt_cv_func_dgettext_libc" >&6; } +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- for ac_func in bind_textdomain_codeset +-do : +- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +-_ACEOF +- +-fi +-done +- +- fi +- +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if ${ac_cv_lib_intl_bindtextdomain+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bindtextdomain (); +-int +-main () +-{ +-return bindtextdomain (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_intl_bindtextdomain=yes +-else +- ac_cv_lib_intl_bindtextdomain=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_ngettext+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char ngettext (); +-int +-main () +-{ +-return ngettext (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_intl_ngettext=yes +-else +- ac_cv_lib_intl_ngettext=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = xyes; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +-$as_echo_n "checking for dgettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_dgettext+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dgettext (); +-int +-main () +-{ +-return dgettext (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_intl_dgettext=yes +-else +- ac_cv_lib_intl_dgettext=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = xyes; then : +- gt_cv_func_dgettext_libintl=yes +-fi +- +-fi +- +-fi +- +- +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 +-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +-$as_echo "" >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_ngettext+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl -liconv $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char ngettext (); +-int +-main () +-{ +-return ngettext (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_intl_ngettext=yes +-else +- ac_cv_lib_intl_ngettext=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = xyes; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +-$as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_dcgettext+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl -liconv $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dcgettext (); +-int +-main () +-{ +-return dcgettext (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_intl_dcgettext=yes +-else +- ac_cv_lib_intl_dcgettext=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : +- gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv +-else +- : +-fi +- +-else +- : +-fi +- +- fi +- +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- for ac_func in bind_textdomain_codeset +-do : +- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +-_ACEOF +- +-fi +-done +- +- LIBS="$glib_save_LIBS" +- +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi +- +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- +-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h +- +- # Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_MSGFMT+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case "$MSGFMT" in +- /*) +- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then +- ac_cv_path_MSGFMT="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" +- ;; +-esac +-fi +-MSGFMT="$ac_cv_path_MSGFMT" +-if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +-$as_echo "$MSGFMT" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- for ac_func in dcgettext +-do : +- ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +-if test "x$ac_cv_func_dcgettext" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_DCGETTEXT 1 +-_ACEOF +- +-fi +-done +- +- MSGFMT_OPTS= +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 +-$as_echo_n "checking if msgfmt accepts -c... " >&6; } +- cat >conftest.foo <<_ACEOF +- +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +- +-_ACEOF +-if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 +- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-echo "$as_me: failed input was:" >&5 +-sed 's/^/| /' conftest.foo >&5 +-fi +- +- # Extract the first word of "gmsgfmt", so it can be a program name with args. +-set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_GMSGFMT+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $GMSGFMT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +- ;; +-esac +-fi +-GMSGFMT=$ac_cv_path_GMSGFMT +-if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +-$as_echo "$GMSGFMT" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- # Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_XGETTEXT+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case "$XGETTEXT" in +- /*) +- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then +- ac_cv_path_XGETTEXT="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" +- ;; +-esac +-fi +-XGETTEXT="$ac_cv_path_XGETTEXT" +-if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +-$as_echo "$XGETTEXT" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- CATOBJEXT=.gmo +- DATADIRNAME=share +-else +- case $host in +- *-*-solaris*) +- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +- CATOBJEXT=.gmo +- DATADIRNAME=share +-else +- CATOBJEXT=.mo +- DATADIRNAME=lib +-fi +- +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- +-fi +- +- +- +- if test "$gt_cv_have_gettext" = "yes" ; then +- +-$as_echo "#define ENABLE_NLS 1" >>confdefs.h +- +- fi +- +- if test "$XGETTEXT" != ":"; then +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } +- XGETTEXT=":" +- fi +- fi +- +- # We need to process the po/ directory. +- POSUB=po +- +- ac_config_commands="$ac_config_commands default-1" +- +- +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done +- +- +- +- +- +- +- +- +- +- +- +- +- +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 +-$as_echo_n "checking for catalogs to be installed... " >&6; } +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +-$as_echo "$LINGUAS" >&6; } +- fi +- +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi +- +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- +- +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- +- +-if test "$gt_cv_have_gettext" != "yes" ; then +- as_fn_error $? " +-*** You must have either have gettext support in your C library, or use the +-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html +-" "$LINENO" 5 +-fi +- +-LIBS="$INTLLIBS $LIBS" +- + GETTEXT_PACKAGE=glib20 + + +--- misc/glib-2.28.1/Makefile.in ++++ misc/build/glib-2.28.1/Makefile.in +@@ -422,7 +422,7 @@ + gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in + TEST_PROGS = + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} +-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs ++SUBDIRS = . m4macros glib gmodule gthread gobject gio tests + DIST_SUBDIRS = $(SUBDIRS) build + bin_SCRIPTS = glib-gettextize + AM_CPPFLAGS = \ +--- misc/glib-2.28.1/glib/gi18n.h ++++ misc/build/glib-2.28.1/glib/gi18n.h +@@ -20,15 +20,10 @@ + #ifndef __G_I18N_H__ + #define __G_I18N_H__ + +-#include +- +-#include +-#include +- +-#define _(String) gettext (String) +-#define Q_(String) g_dpgettext (NULL, String, 0) +-#define N_(String) (String) +-#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1) ++#define _(String) (String) ++#define Q_(String) (String) ++#define N_(String) (String) ++#define C_(Context,String) (String) + #define NC_(Context, String) (String) + + #endif /* __G_I18N_H__ */ +--- misc/glib-2.28.1/gio/tests/gsettings.c ++++ misc/build/glib-2.28.1/gio/tests/gsettings.c +@@ -1,7 +1,9 @@ ++#include "config.h" ++ + #include + #include +-#include + #include ++#include "glibintl.h" + #include + #define G_SETTINGS_ENABLE_BACKEND + #include +--- misc/glib-2.28.1/gio/tests/gschema-compile.c ++++ misc/build/glib-2.28.1/gio/tests/gschema-compile.c +@@ -1,8 +1,10 @@ ++#include "config.h" ++ + #include + #include + #include +-#include + #include ++#include "glibintl.h" + #include + + typedef struct { -- cgit From 29a73db64c144fdfdfe05e25c3b9c4f16f856e69 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 1 Jun 2011 01:53:34 +0300 Subject: Simply add if false around the chunk to bypass instead --- glib/glib-2.28.1.patch | 725 +------------------------------------------------ 1 file changed, 11 insertions(+), 714 deletions(-) diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch index 0242d600cad2..aa6cf5a0ab08 100644 --- a/glib/glib-2.28.1.patch +++ b/glib/glib-2.28.1.patch @@ -58,723 +58,20 @@ --- misc/glib-2.28.1/configure +++ misc/build/glib-2.28.1/configure -@@ -7988,719 +7988,6 @@ +@@ -7988,6 +7988,7 @@ CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS' -- for ac_header in locale.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" --if test "x$ac_cv_header_locale_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LOCALE_H 1 --_ACEOF -- --fi -- --done -- -- if test $ac_cv_header_locale_h = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 --$as_echo_n "checking for LC_MESSAGES... " >&6; } --if ${am_cv_val_LC_MESSAGES+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --int --main () --{ --return LC_MESSAGES -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- am_cv_val_LC_MESSAGES=yes --else -- am_cv_val_LC_MESSAGES=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 --$as_echo "$am_cv_val_LC_MESSAGES" >&6; } -- if test $am_cv_val_LC_MESSAGES = yes; then -- --$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h -- -- fi -- fi -- USE_NLS=yes -- -- -- gt_cv_have_gettext=no -- -- CATOBJEXT=NONE -- XGETTEXT=: -- INTLLIBS= -- -- ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" --if test "x$ac_cv_header_libintl_h" = xyes; then : -- gt_cv_func_dgettext_libintl="no" -- libintl_extra_libs="" -- -- # -- # First check in libc -- # -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 --$as_echo_n "checking for ngettext in libc... " >&6; } --if ${gt_cv_func_ngettext_libc+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include -- --int --main () --{ --return !ngettext ("","", 1) -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- gt_cv_func_ngettext_libc=yes --else -- gt_cv_func_ngettext_libc=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 --$as_echo "$gt_cv_func_ngettext_libc" >&6; } -- -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 --$as_echo_n "checking for dgettext in libc... " >&6; } --if ${gt_cv_func_dgettext_libc+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include -- --int --main () --{ --return !dgettext ("","") -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- gt_cv_func_dgettext_libc=yes --else -- gt_cv_func_dgettext_libc=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 --$as_echo "$gt_cv_func_dgettext_libc" >&6; } -- fi -- -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- for ac_func in bind_textdomain_codeset --do : -- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" --if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_BIND_TEXTDOMAIN_CODESET 1 --_ACEOF -- --fi --done -- -- fi -- -- # -- # If we don't have everything we want, check in libintl -- # -- if test "$gt_cv_func_dgettext_libc" != "yes" \ -- || test "$gt_cv_func_ngettext_libc" != "yes" \ -- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 --$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } --if ${ac_cv_lib_intl_bindtextdomain+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char bindtextdomain (); --int --main () --{ --return bindtextdomain (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_intl_bindtextdomain=yes --else -- ac_cv_lib_intl_bindtextdomain=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 --$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } --if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 --$as_echo_n "checking for ngettext in -lintl... " >&6; } --if ${ac_cv_lib_intl_ngettext+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char ngettext (); --int --main () --{ --return ngettext (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_intl_ngettext=yes --else -- ac_cv_lib_intl_ngettext=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 --$as_echo "$ac_cv_lib_intl_ngettext" >&6; } --if test "x$ac_cv_lib_intl_ngettext" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 --$as_echo_n "checking for dgettext in -lintl... " >&6; } --if ${ac_cv_lib_intl_dgettext+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dgettext (); --int --main () --{ --return dgettext (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_intl_dgettext=yes --else -- ac_cv_lib_intl_dgettext=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 --$as_echo "$ac_cv_lib_intl_dgettext" >&6; } --if test "x$ac_cv_lib_intl_dgettext" = xyes; then : -- gt_cv_func_dgettext_libintl=yes --fi -- --fi -- --fi -- -- -- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 --$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 --$as_echo "" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 --$as_echo_n "checking for ngettext in -lintl... " >&6; } --if ${ac_cv_lib_intl_ngettext+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl -liconv $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char ngettext (); --int --main () --{ --return ngettext (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_intl_ngettext=yes --else -- ac_cv_lib_intl_ngettext=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 --$as_echo "$ac_cv_lib_intl_ngettext" >&6; } --if test "x$ac_cv_lib_intl_ngettext" = xyes; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 --$as_echo_n "checking for dcgettext in -lintl... " >&6; } --if ${ac_cv_lib_intl_dcgettext+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl -liconv $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dcgettext (); --int --main () --{ --return dcgettext (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_intl_dcgettext=yes --else -- ac_cv_lib_intl_dcgettext=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 --$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } --if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : -- gt_cv_func_dgettext_libintl=yes -- libintl_extra_libs=-liconv --else -- : --fi -- --else -- : --fi -- -- fi -- -- # -- # If we found libintl, then check in it for bind_textdomain_codeset(); -- # we'll prefer libc if neither have bind_textdomain_codeset(), -- # and both have dgettext and ngettext -- # -- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $libintl_extra_libs" -- unset ac_cv_func_bind_textdomain_codeset -- for ac_func in bind_textdomain_codeset --do : -- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" --if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_BIND_TEXTDOMAIN_CODESET 1 --_ACEOF -- --fi --done -- -- LIBS="$glib_save_LIBS" -- -- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -- gt_cv_func_dgettext_libc=no -- else -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- && test "$gt_cv_func_ngettext_libc" = "yes"; then -- gt_cv_func_dgettext_libintl=no -- fi -- fi -- fi -- fi -- -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- || test "$gt_cv_func_dgettext_libintl" = "yes"; then -- gt_cv_have_gettext=yes -- fi -- -- if test "$gt_cv_func_dgettext_libintl" = "yes"; then -- INTLLIBS="-lintl $libintl_extra_libs" -- fi -- -- if test "$gt_cv_have_gettext" = "yes"; then -- --$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h -- -- # Extract the first word of "msgfmt", so it can be a program name with args. --set dummy msgfmt; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_MSGFMT+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case "$MSGFMT" in -- /*) -- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -- ac_cv_path_MSGFMT="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -- ;; --esac --fi --MSGFMT="$ac_cv_path_MSGFMT" --if test "$MSGFMT" != "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 --$as_echo "$MSGFMT" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- if test "$MSGFMT" != "no"; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS $INTLLIBS" -- for ac_func in dcgettext --do : -- ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" --if test "x$ac_cv_func_dcgettext" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_DCGETTEXT 1 --_ACEOF -- --fi --done -- -- MSGFMT_OPTS= -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 --$as_echo_n "checking if msgfmt accepts -c... " >&6; } -- cat >conftest.foo <<_ACEOF -- --msgid "" --msgstr "" --"Content-Type: text/plain; charset=UTF-8\n" --"Project-Id-Version: test 1.0\n" --"PO-Revision-Date: 2007-02-15 12:01+0100\n" --"Last-Translator: test \n" --"Language-Team: C \n" --"MIME-Version: 1.0\n" --"Content-Transfer-Encoding: 8bit\n" -- --_ACEOF --if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 -- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --echo "$as_me: failed input was:" >&5 --sed 's/^/| /' conftest.foo >&5 --fi -- -- # Extract the first word of "gmsgfmt", so it can be a program name with args. --set dummy gmsgfmt; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_GMSGFMT+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $GMSGFMT in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -- ;; --esac --fi --GMSGFMT=$ac_cv_path_GMSGFMT --if test -n "$GMSGFMT"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 --$as_echo "$GMSGFMT" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- # Extract the first word of "xgettext", so it can be a program name with args. --set dummy xgettext; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_XGETTEXT+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case "$XGETTEXT" in -- /*) -- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -- ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -- ;; --esac --fi --XGETTEXT="$ac_cv_path_XGETTEXT" --if test "$XGETTEXT" != ":"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 --$as_echo "$XGETTEXT" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ --extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- CATOBJEXT=.gmo -- DATADIRNAME=share --else -- case $host in -- *-*-solaris*) -- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" --if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : -- CATOBJEXT=.gmo -- DATADIRNAME=share --else -- CATOBJEXT=.mo -- DATADIRNAME=lib --fi -- -- ;; -- *) -- CATOBJEXT=.mo -- DATADIRNAME=lib -- ;; -- esac --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- LIBS="$glib_save_LIBS" -- INSTOBJEXT=.mo -- else -- gt_cv_have_gettext=no -- fi -- fi -- --fi -- -- -- -- if test "$gt_cv_have_gettext" = "yes" ; then -- --$as_echo "#define ENABLE_NLS 1" >>confdefs.h -- -- fi -- -- if test "$XGETTEXT" != ":"; then -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 --$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } -- XGETTEXT=":" -- fi -- fi -- -- # We need to process the po/ directory. -- POSUB=po -- -- ac_config_commands="$ac_config_commands default-1" -- -- -- for lang in $ALL_LINGUAS; do -- GMOFILES="$GMOFILES $lang.gmo" -- POFILES="$POFILES $lang.po" -- done -- -- -- -- -- -- -- -- -- -- -- -- -- -- if test "$gt_cv_have_gettext" = "yes"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 --$as_echo_n "checking for catalogs to be installed... " >&6; } -- NEW_LINGUAS= -- for presentlang in $ALL_LINGUAS; do -- useit=no -- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -- desiredlanguages="$LINGUAS" -- else -- desiredlanguages="$ALL_LINGUAS" -- fi -- for desiredlang in $desiredlanguages; do -- # Use the presentlang catalog if desiredlang is -- # a. equal to presentlang, or -- # b. a variant of presentlang (because in this case, -- # presentlang can be used as a fallback for messages -- # which are not translated in the desiredlang catalog). -- case "$desiredlang" in -- "$presentlang"*) useit=yes;; -- esac -- done -- if test $useit = yes; then -- NEW_LINGUAS="$NEW_LINGUAS $presentlang" -- fi -- done -- LINGUAS=$NEW_LINGUAS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 --$as_echo "$LINGUAS" >&6; } -- fi -- -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -- fi -- fi -- -- MKINSTALLDIRS= -- if test -n "$ac_aux_dir"; then -- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -- fi -- if test -z "$MKINSTALLDIRS"; then -- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -- fi -- -- -- test -d po || mkdir po -- if test "x$srcdir" != "x."; then -- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -- posrcprefix="$srcdir/" -- else -- posrcprefix="../$srcdir/" -- fi -- else -- posrcprefix="../" -- fi -- rm -f po/POTFILES -- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -- < $srcdir/po/POTFILES.in > po/POTFILES -- -- --if test "$gt_cv_have_gettext" != "yes" ; then -- as_fn_error $? " --*** You must have either have gettext support in your C library, or use the --*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html --" "$LINENO" 5 --fi -- --LIBS="$INTLLIBS $LIBS" -- ++ if false; then + for ac_header in locale.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +@@ -8701,6 +8701,8 @@ + + LIBS="$INTLLIBS $LIBS" + ++fi ++ GETTEXT_PACKAGE=glib20 -- cgit From b51a5163e727c6cb5cd84cb1cca9ba31df69d1d7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 1 Jun 2011 02:10:02 +0300 Subject: Don't use libintl in gdk-pixbuf either --- gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 32 ++++++++++++++++++++++++++++++++ gdk-pixbuf/makefile.mk | 3 ++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch index 1bff29333b62..cbad8406ac44 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -22,3 +22,35 @@ # See if it's safe to turn G_DISABLE_DEPRECATED on. GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` +--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c +@@ -23,7 +23,9 @@ + + #include "config.h" + #include ++#ifdef ENABLE_NLS + #include ++#endif + + #include "gdk-pixbuf-transform.h" + #include "gdk-pixbuf-private.h" +@@ -336,15 +336,19 @@ + const gchar * + gdk_pixbuf_gettext (const gchar *msgid) + { ++#ifdef ENABLE_NLS + static gsize gettext_initialized = FALSE; + + if (G_UNLIKELY (g_once_init_enter (&gettext_initialized))) { + bindtextdomain (GETTEXT_PACKAGE, GDK_PIXBUF_LOCALEDIR); + #ifdef HAVE_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + #endif + g_once_init_leave (&gettext_initialized, TRUE); + } + + return g_dgettext (GETTEXT_PACKAGE, msgid); ++#else ++ return msgid; ++#endif + } diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 663f0f252a47..e280f1d54183 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -56,8 +56,9 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_LIBS=" " \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ + --disable-nls \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ - LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl" \ + LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ --disable-glibtest --without-libtiff --without-libjpeg BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -- cgit From 78727badb0b021725992e3abba1abc40dd1b0feb Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 1 Jun 2011 02:50:54 +0200 Subject: disable obsolete python check, no traces of the greport tool anymore --- glib/glib-2.28.1.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch index aa6cf5a0ab08..49a6faa9c2a5 100644 --- a/glib/glib-2.28.1.patch +++ b/glib/glib-2.28.1.patch @@ -58,6 +58,22 @@ --- misc/glib-2.28.1/configure +++ misc/build/glib-2.28.1/configure +@@ -7097,6 +7097,7 @@ + fi + + ++if false; then + # Need suitable python path for greport + + +@@ -7325,6 +7326,7 @@ + + + ++fi + + + @@ -7988,6 +7988,7 @@ CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS' -- cgit From 7327f1c78b017d3664d07e0f72d832dce20338c9 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 1 Jun 2011 16:48:12 +0200 Subject: compile gdk-pixbuf against SDK (Mac) --- gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 2 +- gdk-pixbuf/makefile.mk | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch index cbad8406ac44..e86a70d662d0 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -5,7 +5,7 @@ - -+if 0; then ++if false; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index e280f1d54183..961184481c04 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_gdk-pixbuf .IF "$(SYSTEM_GDKPIXBUF)" == "YES" all: - @echo "An already available installation of gdk-pixbuf should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of gdk-pixbuf should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -57,29 +57,30 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ --disable-nls \ + CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ - LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ + LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ --disable-glibtest --without-libtiff --without-libjpeg BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER -OUT2LIB+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0.0.dylib - -OUT2BIN+=gdk-pixbuf$/.libs/gdk-pixbuf-query-loaders - -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-core.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-io.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-simple-anim.h -OUT2INC+=gdk-pixbuf$/gdk-pixdata.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-enum-types.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-loader.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h +OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib + +OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders + +OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h +OUT2INC+=gdk-pixbuf/gdk-pixdata.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h .ELIF "$(OS)"=="WNT" -- cgit From 0af50489ac15a6608a86424e8d03d642d8621f75 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 1 Jun 2011 17:04:49 +0200 Subject: link against the SDK (Mac) --- libcroco/makefile.mk | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 926cbf8b415b..814f80404ad4 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_libcroco .IF "$(SYSTEM_LIBCROCO)" == "YES" all: - @echo "An already available installation of libcroco should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of libcroco should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -57,11 +57,11 @@ LIBXML2_INCLUDE=-I/usr/include/libxml2 LIBXML2_INCLUDE= .ENDIF CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - .$/configure \ - --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 $(LIBXML2_INCLUDE)" \ - LDFLAGS="-L$(SOLARLIBDIR)" \ - GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \ + ./configure \ + --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 $(LIBXML2_INCLUDE)" \ + LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ + GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ LIBXML2_CFLAGS=" " \ LIBXML2_LIBS="-lxml2" @@ -73,36 +73,36 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER -OUT2LIB+=src$/.libs$/libcroco-0.6.3.0.1.dylib - -OUT2INC+=src$/cr-additional-sel.h -OUT2INC+=src$/cr-input.h -OUT2INC+=src$/cr-rgb.h -OUT2INC+=src$/cr-stylesheet.h -OUT2INC+=src$/cr-attr-sel.h -OUT2INC+=src$/cr-num.h -OUT2INC+=src$/cr-sel-eng.h -OUT2INC+=src$/cr-term.h -OUT2INC+=src$/cr-cascade.h -OUT2INC+=src$/cr-om-parser.h -OUT2INC+=src$/cr-selector.h -OUT2INC+=src$/cr-tknzr.h -OUT2INC+=src$/cr-declaration.h -OUT2INC+=src$/cr-parser.h -OUT2INC+=src$/cr-simple-sel.h -OUT2INC+=src$/cr-token.h -OUT2INC+=src$/cr-doc-handler.h -OUT2INC+=src$/cr-parsing-location.h -OUT2INC+=src$/cr-statement.h -OUT2INC+=src$/cr-utils.h -OUT2INC+=src$/cr-enc-handler.h -OUT2INC+=src$/cr-prop-list.h -OUT2INC+=src$/cr-string.h -OUT2INC+=src$/libcroco-config.h -OUT2INC+=src$/cr-fonts.h -OUT2INC+=src$/cr-pseudo.h -OUT2INC+=src$/cr-style.h -OUT2INC+=src$/libcroco.h +OUT2LIB+=src/.libs/libcroco-0.6.3.0.1.dylib + +OUT2INC+=src/cr-additional-sel.h +OUT2INC+=src/cr-input.h +OUT2INC+=src/cr-rgb.h +OUT2INC+=src/cr-stylesheet.h +OUT2INC+=src/cr-attr-sel.h +OUT2INC+=src/cr-num.h +OUT2INC+=src/cr-sel-eng.h +OUT2INC+=src/cr-term.h +OUT2INC+=src/cr-cascade.h +OUT2INC+=src/cr-om-parser.h +OUT2INC+=src/cr-selector.h +OUT2INC+=src/cr-tknzr.h +OUT2INC+=src/cr-declaration.h +OUT2INC+=src/cr-parser.h +OUT2INC+=src/cr-simple-sel.h +OUT2INC+=src/cr-token.h +OUT2INC+=src/cr-doc-handler.h +OUT2INC+=src/cr-parsing-location.h +OUT2INC+=src/cr-statement.h +OUT2INC+=src/cr-utils.h +OUT2INC+=src/cr-enc-handler.h +OUT2INC+=src/cr-prop-list.h +OUT2INC+=src/cr-string.h +OUT2INC+=src/libcroco-config.h +OUT2INC+=src/cr-fonts.h +OUT2INC+=src/cr-pseudo.h +OUT2INC+=src/cr-style.h +OUT2INC+=src/libcroco.h .ELIF "$(OS)"=="WNT" BUILD_ACTION=dmake -- cgit -- cgit -- cgit From d06189201b05e034f4f99384557dbe50e9d09312 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 2 Jun 2011 13:32:03 +0300 Subject: Make io-png.c actually compile with the libpng 1.5 we include --- gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch index e86a70d662d0..726ca895643f 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -54,3 +54,67 @@ + return msgid; +#endif } +From: Maarten Bosmans +Date: Mon, 24 Jan 2011 10:39:22 +0000 +Subject: Use png_jmpbuf macro + +This makes the png loader compatible with libpng 1.5 + +diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c +index 79c81fd..76f3304 100644 +--- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c ++++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c +@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr, + error_msg); + } + +- longjmp (png_save_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_save_ptr), 1); + } + + static void +@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error) + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + g_free (rows); + + if (pixbuf) +@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func, + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context, + lc->error = error; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (lc->png_read_ptr))) { + lc->error = NULL; + return FALSE; + } else { +@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr, + error_msg); + } + +- longjmp (png_read_ptr->jmpbuf, 1); ++ longjmp (png_jmpbuf (png_read_ptr), 1); + } + + static void +@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf, + success = FALSE; + goto cleanup; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + success = FALSE; + goto cleanup; + } -- cgit From b0d2187bd68c8cfe0a02c18c993996e24419acc7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 2 Jun 2011 13:38:25 +0300 Subject: Make gdk-pixbuf build better Pass the -I options needed in CPPFLAGS, not CFLAGS. Explicitly disable dynamic loading of loaders. Pass an explicit list of loaders to build in statically. Do include the jpeg loader. --- gdk-pixbuf/makefile.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 961184481c04..023b26d7ab82 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -55,12 +55,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ BASE_DEPENDENCIES_LIBS=" " \ .$/configure \ + CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \ + LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ --disable-nls \ - CPPFLAGS="$(EXTRA_CDEFS)" \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ - LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ - --disable-glibtest --without-libtiff --without-libjpeg + --disable-modules \ + --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \ + --disable-glibtest --without-libtiff --without-libjasper BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From 341ed60308dd9e8df1ecc139e74a554a87d66fa7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 2 Jun 2011 13:41:26 +0300 Subject: We don't need gdk-pixbuf-query-loaders Especially not now with --disable-modules. --- gdk-pixbuf/makefile.mk | 2 -- gdk-pixbuf/prj/d.lst | 1 - 2 files changed, 3 deletions(-) diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 023b26d7ab82..1e89debb1612 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -70,8 +70,6 @@ BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib -OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders - OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst index ef7776aab1b7..54f62a12dfe1 100755 --- a/gdk-pixbuf/prj/d.lst +++ b/gdk-pixbuf/prj/d.lst @@ -16,6 +16,5 @@ mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf ..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dylib -..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib -- cgit From afb200198f48c6f5ab50fadd35fd9c073a9bd03a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 2 Jun 2011 15:06:00 +0300 Subject: No need to build a SVG gdk-pixbuf loader --- gdk-pixbuf/makefile.mk | 2 ++ gdk-pixbuf/prj/d.lst | 1 + librsvg/makefile.mk | 1 + 3 files changed, 4 insertions(+) diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 1e89debb1612..023b26d7ab82 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -70,6 +70,8 @@ BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib +OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders + OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst index 54f62a12dfe1..ef7776aab1b7 100755 --- a/gdk-pixbuf/prj/d.lst +++ b/gdk-pixbuf/prj/d.lst @@ -16,5 +16,6 @@ mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf ..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dylib +..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 5744dc73d6ff..4ab786b17d58 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -62,6 +62,7 @@ CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ + --disable-pixbuf-loader \ LIBRSVG_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo $(LIBXML_CFLAGS)" \ LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \ GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \ -- cgit From 1a68be8d98c1127cd2e82899ae1e84f310d8d3a0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 2 Jun 2011 15:15:24 +0300 Subject: Revert accidentally commmitted change --- gdk-pixbuf/makefile.mk | 2 -- gdk-pixbuf/prj/d.lst | 1 - 2 files changed, 3 deletions(-) diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 023b26d7ab82..1e89debb1612 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -70,8 +70,6 @@ BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib -OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders - OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst index ef7776aab1b7..54f62a12dfe1 100755 --- a/gdk-pixbuf/prj/d.lst +++ b/gdk-pixbuf/prj/d.lst @@ -16,6 +16,5 @@ mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf ..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dylib -..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib -- cgit From e1962b641d34c577c87dc7d5297472d862fc8e6f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 2 Jun 2011 16:00:52 +0300 Subject: There is no 0 command, it's called false --- librsvg/librsvg-2.32.1.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch index 8d2368e11e39..0b7534d8119e 100644 --- a/librsvg/librsvg-2.32.1.patch +++ b/librsvg/librsvg-2.32.1.patch @@ -15,7 +15,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gio 2.24 is available" >&5 $as_echo_n "checking whether gio 2.24 is available... " >&6; } -+if 0 ; then ++if false; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.24.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.24.0") 2>&5 -- cgit From c0d180b4b14c6edd18ea19b5811c012a15395cff Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 2 Jun 2011 18:49:37 +0200 Subject: link against the SDK (Mac) --- libgsf/makefile.mk | 100 ++++++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index 955925ff7ce2..7e4613fde6c2 100755 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -68,7 +68,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ - LDFLAGS="-L$(SOLARLIBDIR)" \ + LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ --without-python \ --without-bonobo \ --with-bz2 \ @@ -94,57 +94,57 @@ BUILD_DIR=$(CONFIGURE_DIR) .IF "$(OS)"=="MACOSX" EXTRPATH=LOADER -OUT2LIB+=gsf$/.libs$/libgsf-1.114.dylib +OUT2LIB+=gsf/.libs/libgsf-1.114.dylib .ENDIF -OUT2INC+=gsf$/gsf-blob.h -OUT2INC+=gsf$/gsf-input-impl.h -OUT2INC+=gsf$/gsf-outfile.h -OUT2INC+=gsf$/gsf-clip-data.h -OUT2INC+=gsf$/gsf-input-iochannel.h -OUT2INC+=gsf$/gsf-output-bzip.h -OUT2INC+=gsf$/gsf-doc-meta-data.h -OUT2INC+=gsf$/gsf-input-memory.h -OUT2INC+=gsf$/gsf-output-csv.h -OUT2INC+=gsf$/gsf-docprop-vector.h -OUT2INC+=gsf$/gsf-input-proxy.h -OUT2INC+=gsf$/gsf-output-gio.h -OUT2INC+=gsf$/gsf-impl-utils.h -OUT2INC+=gsf$/gsf-input-stdio.h -OUT2INC+=gsf$/gsf-output-gzip.h -OUT2INC+=gsf$/gsf-infile-impl.h -OUT2INC+=gsf$/gsf-input-textline.h -OUT2INC+=gsf$/gsf-output-iconv.h -OUT2INC+=gsf$/gsf-infile-msole.h -OUT2INC+=gsf$/gsf-input.h -OUT2INC+=gsf$/gsf-output-impl.h -OUT2INC+=gsf$/gsf-infile-msvba.h -OUT2INC+=gsf$/gsf-libxml.h -OUT2INC+=gsf$/gsf-output-iochannel.h -OUT2INC+=gsf$/gsf-infile-stdio.h -OUT2INC+=gsf$/gsf-meta-names.h -OUT2INC+=gsf$/gsf-output-memory.h -OUT2INC+=gsf$/gsf-infile-tar.h -OUT2INC+=gsf$/gsf-msole-utils.h -OUT2INC+=gsf$/gsf-output-stdio.h -OUT2INC+=gsf$/gsf-infile-zip.h -OUT2INC+=gsf$/gsf-open-pkg-utils.h -OUT2INC+=gsf$/gsf-output.h -OUT2INC+=gsf$/gsf-infile.h -OUT2INC+=gsf$/gsf-opendoc-utils.h -OUT2INC+=gsf$/gsf-shared-memory.h -OUT2INC+=gsf$/gsf-input-bzip.h -OUT2INC+=gsf$/gsf-outfile-impl.h -OUT2INC+=gsf$/gsf-structured-blob.h -OUT2INC+=gsf$/gsf-input-gio.h -OUT2INC+=gsf$/gsf-outfile-msole.h -OUT2INC+=gsf$/gsf-timestamp.h -OUT2INC+=gsf$/gsf-input-gzip.h -OUT2INC+=gsf$/gsf-outfile-stdio.h -OUT2INC+=gsf$/gsf-utils.h -OUT2INC+=gsf$/gsf-input-http.h -OUT2INC+=gsf$/gsf-outfile-zip.h -OUT2INC+=gsf$/gsf.h +OUT2INC+=gsf/gsf-blob.h +OUT2INC+=gsf/gsf-input-impl.h +OUT2INC+=gsf/gsf-outfile.h +OUT2INC+=gsf/gsf-clip-data.h +OUT2INC+=gsf/gsf-input-iochannel.h +OUT2INC+=gsf/gsf-output-bzip.h +OUT2INC+=gsf/gsf-doc-meta-data.h +OUT2INC+=gsf/gsf-input-memory.h +OUT2INC+=gsf/gsf-output-csv.h +OUT2INC+=gsf/gsf-docprop-vector.h +OUT2INC+=gsf/gsf-input-proxy.h +OUT2INC+=gsf/gsf-output-gio.h +OUT2INC+=gsf/gsf-impl-utils.h +OUT2INC+=gsf/gsf-input-stdio.h +OUT2INC+=gsf/gsf-output-gzip.h +OUT2INC+=gsf/gsf-infile-impl.h +OUT2INC+=gsf/gsf-input-textline.h +OUT2INC+=gsf/gsf-output-iconv.h +OUT2INC+=gsf/gsf-infile-msole.h +OUT2INC+=gsf/gsf-input.h +OUT2INC+=gsf/gsf-output-impl.h +OUT2INC+=gsf/gsf-infile-msvba.h +OUT2INC+=gsf/gsf-libxml.h +OUT2INC+=gsf/gsf-output-iochannel.h +OUT2INC+=gsf/gsf-infile-stdio.h +OUT2INC+=gsf/gsf-meta-names.h +OUT2INC+=gsf/gsf-output-memory.h +OUT2INC+=gsf/gsf-infile-tar.h +OUT2INC+=gsf/gsf-msole-utils.h +OUT2INC+=gsf/gsf-output-stdio.h +OUT2INC+=gsf/gsf-infile-zip.h +OUT2INC+=gsf/gsf-open-pkg-utils.h +OUT2INC+=gsf/gsf-output.h +OUT2INC+=gsf/gsf-infile.h +OUT2INC+=gsf/gsf-opendoc-utils.h +OUT2INC+=gsf/gsf-shared-memory.h +OUT2INC+=gsf/gsf-input-bzip.h +OUT2INC+=gsf/gsf-outfile-impl.h +OUT2INC+=gsf/gsf-structured-blob.h +OUT2INC+=gsf/gsf-input-gio.h +OUT2INC+=gsf/gsf-outfile-msole.h +OUT2INC+=gsf/gsf-timestamp.h +OUT2INC+=gsf/gsf-input-gzip.h +OUT2INC+=gsf/gsf-outfile-stdio.h +OUT2INC+=gsf/gsf-utils.h +OUT2INC+=gsf/gsf-input-http.h +OUT2INC+=gsf/gsf-outfile-zip.h +OUT2INC+=gsf/gsf.h .ENDIF -- cgit From 211a54b31ff6f71bf4a1883f4ed81b3fa9f2e135 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 2 Jun 2011 19:05:59 +0200 Subject: link against the SDK (Mac) --- librsvg/makefile.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 4ab786b17d58..af082c3eb5c9 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_librsvg .IF "$(SYSTEM_LIBRSVG)" == "YES" all: - @echo "An already available installation of librsvg should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of librsvg should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -57,21 +57,21 @@ PATCH_FILES=librsvg-2.32.1.patch LIBXML_LIBS=-lxml2 .ENDIF -CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)" +CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure \ - --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) +CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ + --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader \ - LIBRSVG_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo $(LIBXML_CFLAGS)" \ + LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \ LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \ - GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \ + GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \ - GTHREAD_CFLAGS=-I$(SOLARINCDIR)$/external/$glib-2.0 \ + GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \ GTHREAD_LIBS=-lgthread-2.0 \ - LIBCROCO_CFLAGS="-I$(SOLARINCDIR)$/external$/libcroco-0.6" \ + LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \ LIBCROCO_LIBS=-lcroco-0.6 \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \ LDFLAGS="$(CONFIGURE_LDFLAGS)" CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" @@ -81,7 +81,7 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER -OUT2LIB+=.libs$/librsvg-2.2.dylib +OUT2LIB+=.libs/librsvg-2.2.dylib OUT2INC+=librsvg-enum-types.h OUT2INC+=librsvg-features.h -- cgit From 0d8c55026535256128d66f6d0d484a5af9c2d464 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Thu, 2 Jun 2011 22:33:25 +0200 Subject: (minor) EXTRA_CDEFS are preprocessor plags --- icu/makefile.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index 684785500c31..6395e1f7bbe6 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -75,9 +75,9 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) +icu_CFLAGS+=-O $(ARCH_FLAGS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) -icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) +icu_CXXFLAGS+=-O $(ARCH_FLAGS) # remove conversion and transliteration data to reduce binary size. CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ; @@ -117,7 +117,7 @@ STATIC_OR_SHARED=--disable-static --enable-shared BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(ICU_NATIVE_BUILD_ROOT) .ENDIF -CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ +CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ ./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT)' CONFIGURE_FLAGS= -- cgit From 56f35e6b3924b0c36146c33dc8c7dcf2c04b39da Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:27:35 +0300 Subject: Drop %_EXT% which was always empty --- berkeleydb/prj/d.lst | 16 +- boost/prj/d.lst | 2412 +++++++++++++++++++++++++------------------------- cairo/prj/d.lst | 28 +- curl/prj/d.lst | 24 +- expat/prj/d.lst | 28 +- gdk-pixbuf/prj/d.lst | 36 +- gettext/prj/d.lst | 62 +- glib/prj/d.lst | 466 +++++----- graphite/prj/d.lst | 16 +- hunspell/prj/d.lst | 10 +- icu/prj/d.lst | 58 +- jpeg/prj/d.lst | 20 +- libcroco/prj/d.lst | 72 +- libgsf/prj/d.lst | 110 +-- libpng/prj/d.lst | 16 +- librsvg/prj/d.lst | 22 +- libxml2/prj/d.lst | 18 +- libxslt/prj/d.lst | 24 +- more_fonts/prj/d.lst | 22 +- moz/prj/d.lst | 506 +++++------ neon/prj/d.lst | 16 +- nss/prj/d.lst | 52 +- pango/prj/d.lst | 80 +- python/prj/d.lst | 302 +++---- saxon/prj/d.lst | 2 +- stax/prj/d.lst | 2 +- zlib/prj/d.lst | 22 +- 27 files changed, 2221 insertions(+), 2221 deletions(-) diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst index 6324294fa16d..1d50f617a1e6 100644 --- a/berkeleydb/prj/d.lst +++ b/berkeleydb/prj/d.lst @@ -1,12 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\berkeleydb +mkdir: %_DEST%\inc\berkeleydb -..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h +..\%__SRC%\inc\db.h %_DEST%\inc\berkeleydb\db.h -..\%__SRC%\lib\libdb47.lib %_DEST%\lib%_EXT%\libdb47.lib -..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib%_EXT%\libdb-4.7.a -..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib%_EXT%\libdb-4.7.so -..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib%_EXT%\libdb-4.7.dylib -..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib%_EXT%\libdb-4.7.a -..\%__SRC%\bin\libdb47.dll %_DEST%\bin%_EXT%\libdb47.dll +..\%__SRC%\lib\libdb47.lib %_DEST%\lib\libdb47.lib +..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so +..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib +..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll diff --git a/boost/prj/d.lst b/boost/prj/d.lst index cfdae10219cd..03a72927d227 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -1,1207 +1,1207 @@ -mkdir: %_DEST%\inc%_EXT%\boost -mkdir: %_DEST%\inc%_EXT%\boost\accumulators -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\framework -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\framework\accumulators -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\framework\parameters -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\numeric -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\numeric\detail -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\numeric\functional -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\statistics -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\statistics\parameters -mkdir: %_DEST%\inc%_EXT%\boost\accumulators\statistics\variates -mkdir: %_DEST%\inc%_EXT%\boost\algorithm -mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string -mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\detail -mkdir: %_DEST%\inc%_EXT%\boost\algorithm\string\std -mkdir: %_DEST%\inc%_EXT%\boost\archive -mkdir: %_DEST%\inc%_EXT%\boost\archive\detail -mkdir: %_DEST%\inc%_EXT%\boost\archive\impl -mkdir: %_DEST%\inc%_EXT%\boost\archive\iterators -mkdir: %_DEST%\inc%_EXT%\boost\asio -mkdir: %_DEST%\inc%_EXT%\boost\asio\detail -mkdir: %_DEST%\inc%_EXT%\boost\asio\detail\impl -mkdir: %_DEST%\inc%_EXT%\boost\asio\impl -mkdir: %_DEST%\inc%_EXT%\boost\asio\ip -mkdir: %_DEST%\inc%_EXT%\boost\asio\ip\detail -mkdir: %_DEST%\inc%_EXT%\boost\asio\ip\detail\impl -mkdir: %_DEST%\inc%_EXT%\boost\asio\ip\impl -mkdir: %_DEST%\inc%_EXT%\boost\asio\local -mkdir: %_DEST%\inc%_EXT%\boost\asio\local\detail -mkdir: %_DEST%\inc%_EXT%\boost\asio\local\detail\impl -mkdir: %_DEST%\inc%_EXT%\boost\asio\posix -mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl -mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl\detail -mkdir: %_DEST%\inc%_EXT%\boost\asio\windows -mkdir: %_DEST%\inc%_EXT%\boost\assign -mkdir: %_DEST%\inc%_EXT%\boost\assign\std -mkdir: %_DEST%\inc%_EXT%\boost\bimap -mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor -mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\detail -mkdir: %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\support -mkdir: %_DEST%\inc%_EXT%\boost\bimap\detail -mkdir: %_DEST%\inc%_EXT%\boost\bimap\detail\debug -mkdir: %_DEST%\inc%_EXT%\boost\bimap\detail\test -mkdir: %_DEST%\inc%_EXT%\boost\bimap\property_map -mkdir: %_DEST%\inc%_EXT%\boost\bimap\relation -mkdir: %_DEST%\inc%_EXT%\boost\bimap\relation\detail -mkdir: %_DEST%\inc%_EXT%\boost\bimap\relation\support -mkdir: %_DEST%\inc%_EXT%\boost\bimap\support -mkdir: %_DEST%\inc%_EXT%\boost\bimap\tags -mkdir: %_DEST%\inc%_EXT%\boost\bimap\tags\support -mkdir: %_DEST%\inc%_EXT%\boost\bimap\views -mkdir: %_DEST%\inc%_EXT%\boost\bind -mkdir: %_DEST%\inc%_EXT%\boost\circular_buffer -mkdir: %_DEST%\inc%_EXT%\boost\compatibility\cpp_c_headers -mkdir: %_DEST%\inc%_EXT%\boost\concept -mkdir: %_DEST%\inc%_EXT%\boost\concept_check -mkdir: %_DEST%\inc%_EXT%\boost\concept\detail -mkdir: %_DEST%\inc%_EXT%\boost\config -mkdir: %_DEST%\inc%_EXT%\boost\config\abi -mkdir: %_DEST%\inc%_EXT%\boost\config\compiler -mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1 -mkdir: %_DEST%\inc%_EXT%\boost\config\platform -mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib -mkdir: %_DEST%\inc%_EXT%\boost\date_time -mkdir: %_DEST%\inc%_EXT%\boost\date_time\gregorian -mkdir: %_DEST%\inc%_EXT%\boost\date_time\local_time -mkdir: %_DEST%\inc%_EXT%\boost\date_time\posix_time -mkdir: %_DEST%\inc%_EXT%\boost\detail -mkdir: %_DEST%\inc%_EXT%\boost\dynamic_bitset -mkdir: %_DEST%\inc%_EXT%\boost\exception -mkdir: %_DEST%\inc%_EXT%\boost\exception\detail -mkdir: %_DEST%\inc%_EXT%\boost\filesystem -mkdir: %_DEST%\inc%_EXT%\boost\filesystem\detail -mkdir: %_DEST%\inc%_EXT%\boost\filesystem\v2 -mkdir: %_DEST%\inc%_EXT%\boost\filesystem\v3 -mkdir: %_DEST%\inc%_EXT%\boost\flyweight -mkdir: %_DEST%\inc%_EXT%\boost\flyweight\detail -mkdir: %_DEST%\inc%_EXT%\boost\format -mkdir: %_DEST%\inc%_EXT%\boost\format\detail -mkdir: %_DEST%\inc%_EXT%\boost\function -mkdir: %_DEST%\inc%_EXT%\boost\functional -mkdir: %_DEST%\inc%_EXT%\boost\functional\detail -mkdir: %_DEST%\inc%_EXT%\boost\functional\hash -mkdir: %_DEST%\inc%_EXT%\boost\functional\hash\detail -mkdir: %_DEST%\inc%_EXT%\boost\function\detail -mkdir: %_DEST%\inc%_EXT%\boost\function_types -mkdir: %_DEST%\inc%_EXT%\boost\function_types\config -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\classifier_impl -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\components_impl -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\encoding -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_cc_loop -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_retag_default_cc -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_tags -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\pp_variate_loop -mkdir: %_DEST%\inc%_EXT%\boost\function_types\detail\synthesize_impl -mkdir: %_DEST%\inc%_EXT%\boost\fusion -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\array -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\class -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\class\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\struct -mkdir: %_DEST%\inc%_EXT%\boost\fusion\adapted\struct\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\ext_ -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\query -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\ext_ -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation -mkdir: %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\deque -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\deque\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\ext_ -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\generation -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\list -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\list\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\map -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\map\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\set -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\set\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\vector -mkdir: %_DEST%\inc%_EXT%\boost\fusion\container\vector\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\adapter -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\adapter\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\generation -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\generation\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\invocation -mkdir: %_DEST%\inc%_EXT%\boost\fusion\functional\invocation\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\include -mkdir: %_DEST%\inc%_EXT%\boost\fusion\iterator -mkdir: %_DEST%\inc%_EXT%\boost\fusion\iterator\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\iterator\mpl -mkdir: %_DEST%\inc%_EXT%\boost\fusion\mpl -mkdir: %_DEST%\inc%_EXT%\boost\fusion\mpl\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic\ext_ -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\io -mkdir: %_DEST%\inc%_EXT%\boost\fusion\sequence\io\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\support -mkdir: %_DEST%\inc%_EXT%\boost\fusion\support\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\support\ext_ -mkdir: %_DEST%\inc%_EXT%\boost\fusion\tuple -mkdir: %_DEST%\inc%_EXT%\boost\fusion\tuple\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\ext_ -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\filter_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\filter_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\joint_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\joint_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\nview -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\nview\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\single_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\single_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\transform_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\transform_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\zip_view -mkdir: %_DEST%\inc%_EXT%\boost\fusion\view\zip_view\detail -mkdir: %_DEST%\inc%_EXT%\boost\gil -mkdir: %_DEST%\inc%_EXT%\boost\gil\extension\dynamic_image -mkdir: %_DEST%\inc%_EXT%\boost\gil\extension\io -mkdir: %_DEST%\inc%_EXT%\boost\graph -mkdir: %_DEST%\inc%_EXT%\boost\graph\detail -mkdir: %_DEST%\inc%_EXT%\boost\graph\distributed -mkdir: %_DEST%\inc%_EXT%\boost\graph\distributed\adjlist -mkdir: %_DEST%\inc%_EXT%\boost\graph\distributed\detail -mkdir: %_DEST%\inc%_EXT%\boost\graph\parallel -mkdir: %_DEST%\inc%_EXT%\boost\graph\parallel\detail -mkdir: %_DEST%\inc%_EXT%\boost\graph\planar_detail -mkdir: %_DEST%\inc%_EXT%\boost\graph\property_maps -mkdir: %_DEST%\inc%_EXT%\boost\integer -mkdir: %_DEST%\inc%_EXT%\boost\interprocess -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\allocators -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\allocators\detail -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\containers -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\containers\container -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\containers\container\detail -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\detail -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\indexes -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\ipc -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\mem_algo -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\mem_algo\detail -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr\detail -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\streams -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync\emulation -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync\posix -mkdir: %_DEST%\inc%_EXT%\boost\interprocess\sync\xsi -mkdir: %_DEST%\inc%_EXT%\boost\intrusive -mkdir: %_DEST%\inc%_EXT%\boost\intrusive\detail -mkdir: %_DEST%\inc%_EXT%\boost\io -mkdir: %_DEST%\inc%_EXT%\boost\io\detail -mkdir: %_DEST%\inc%_EXT%\boost\iostreams -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\adapter -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\broken_overload_resolution -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\config -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\streambuf -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\detail\vc6 -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\device -mkdir: %_DEST%\inc%_EXT%\boost\iostreams\filter -mkdir: %_DEST%\inc%_EXT%\boost\iterator -mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail -mkdir: %_DEST%\inc%_EXT%\boost\lambda -mkdir: %_DEST%\inc%_EXT%\boost\lambda\detail -mkdir: %_DEST%\inc%_EXT%\boost\logic -mkdir: %_DEST%\inc%_EXT%\boost\math -mkdir: %_DEST%\inc%_EXT%\boost\math\bindings -mkdir: %_DEST%\inc%_EXT%\boost\math\bindings\detail -mkdir: %_DEST%\inc%_EXT%\boost\math\complex -mkdir: %_DEST%\inc%_EXT%\boost\math\concepts -mkdir: %_DEST%\inc%_EXT%\boost\math\constants -mkdir: %_DEST%\inc%_EXT%\boost\math\distributions -mkdir: %_DEST%\inc%_EXT%\boost\math\distributions\detail -mkdir: %_DEST%\inc%_EXT%\boost\math\policies -mkdir: %_DEST%\inc%_EXT%\boost\math\special_functions -mkdir: %_DEST%\inc%_EXT%\boost\math\special_functions\detail -mkdir: %_DEST%\inc%_EXT%\boost\math\tools -mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail -mkdir: %_DEST%\inc%_EXT%\boost\mpi -mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives -mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail -mkdir: %_DEST%\inc%_EXT%\boost\mpi\python -mkdir: %_DEST%\inc%_EXT%\boost\mpl -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc_pre590 -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\dmc -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c -mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\test -mkdir: %_DEST%\inc%_EXT%\boost\mpl\limits -mkdir: %_DEST%\inc%_EXT%\boost\mpl\list -mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain -mkdir: %_DEST%\inc%_EXT%\boost\mpl\map -mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\no_ctps -mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\plain -mkdir: %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\typeof_based -mkdir: %_DEST%\inc%_EXT%\boost\mpl\math -mkdir: %_DEST%\inc%_EXT%\boost\mpl\multiset -mkdir: %_DEST%\inc%_EXT%\boost\mpl\multiset\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\set -mkdir: %_DEST%\inc%_EXT%\boost\mpl\set\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\set\aux_\preprocessed\plain -mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector -mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps -mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain -mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based -mkdir: %_DEST%\inc%_EXT%\boost\msm -mkdir: %_DEST%\inc%_EXT%\boost\msm\back -mkdir: %_DEST%\inc%_EXT%\boost\msm\front -mkdir: %_DEST%\inc%_EXT%\boost\msm\front\detail -mkdir: %_DEST%\inc%_EXT%\boost\msm\front\euml -mkdir: %_DEST%\inc%_EXT%\boost\multi_array -mkdir: %_DEST%\inc%_EXT%\boost\multi_index -mkdir: %_DEST%\inc%_EXT%\boost\multi_index\detail -mkdir: %_DEST%\inc%_EXT%\boost\numeric -mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion -mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail -mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval -mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\compare -mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\detail -mkdir: %_DEST%\inc%_EXT%\boost\numeric\interval\ext -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\experimental -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\operation -mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\traits -mkdir: %_DEST%\inc%_EXT%\boost\optional -mkdir: %_DEST%\inc%_EXT%\boost\parameter -mkdir: %_DEST%\inc%_EXT%\boost\parameter\aux_ -mkdir: %_DEST%\inc%_EXT%\boost\parameter\aux_\preprocessor -mkdir: %_DEST%\inc%_EXT%\boost\parameter\aux_\python -mkdir: %_DEST%\inc%_EXT%\boost\pending -mkdir: %_DEST%\inc%_EXT%\boost\pending\detail -mkdir: %_DEST%\inc%_EXT%\boost\polygon -mkdir: %_DEST%\inc%_EXT%\boost\polygon\detail -mkdir: %_DEST%\inc%_EXT%\boost\pool -mkdir: %_DEST%\inc%_EXT%\boost\pool\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\array -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\comparison -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\config -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\dmc -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\debug -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\detail\dmc -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\facilities -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\dmc -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\logical -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\punctuation -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\dmc -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\selection -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail -mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple -mkdir: %_DEST%\inc%_EXT%\boost\program_options -mkdir: %_DEST%\inc%_EXT%\boost\program_options\detail -mkdir: %_DEST%\inc%_EXT%\boost\property_map -mkdir: %_DEST%\inc%_EXT%\boost\property_map\parallel -mkdir: %_DEST%\inc%_EXT%\boost\property_map\parallel\impl -mkdir: %_DEST%\inc%_EXT%\boost\property_tree -mkdir: %_DEST%\inc%_EXT%\boost\property_tree\detail -mkdir: %_DEST%\inc%_EXT%\boost\proto -mkdir: %_DEST%\inc%_EXT%\boost\proto\context -mkdir: %_DEST%\inc%_EXT%\boost\proto\detail -mkdir: %_DEST%\inc%_EXT%\boost\proto\transform -mkdir: %_DEST%\inc%_EXT%\boost\ptr_container -mkdir: %_DEST%\inc%_EXT%\boost\ptr_container\detail -mkdir: %_DEST%\inc%_EXT%\boost\python -mkdir: %_DEST%\inc%_EXT%\boost\python\converter -mkdir: %_DEST%\inc%_EXT%\boost\python\detail -mkdir: %_DEST%\inc%_EXT%\boost\python\object -mkdir: %_DEST%\inc%_EXT%\boost\python\suite\indexing -mkdir: %_DEST%\inc%_EXT%\boost\python\suite\indexing\detail -mkdir: %_DEST%\inc%_EXT%\boost\random -mkdir: %_DEST%\inc%_EXT%\boost\random\detail -mkdir: %_DEST%\inc%_EXT%\boost\range -mkdir: %_DEST%\inc%_EXT%\boost\range\adaptor -mkdir: %_DEST%\inc%_EXT%\boost\range\algorithm -mkdir: %_DEST%\inc%_EXT%\boost\range\algorithm_ext -mkdir: %_DEST%\inc%_EXT%\boost\range\detail -mkdir: %_DEST%\inc%_EXT%\boost\range\detail\vc6 -mkdir: %_DEST%\inc%_EXT%\boost\regex -mkdir: %_DEST%\inc%_EXT%\boost\regex\config -mkdir: %_DEST%\inc%_EXT%\boost\regex\pending -mkdir: %_DEST%\inc%_EXT%\boost\regex\v4 -mkdir: %_DEST%\inc%_EXT%\boost\serialization -mkdir: %_DEST%\inc%_EXT%\boost\serialization\detail -mkdir: %_DEST%\inc%_EXT%\boost\signals -mkdir: %_DEST%\inc%_EXT%\boost\signals2 -mkdir: %_DEST%\inc%_EXT%\boost\signals2\detail -mkdir: %_DEST%\inc%_EXT%\boost\signals\detail -mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr -mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit -mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor -mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives -mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner -mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug -mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic -mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\action -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\auto -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\auxiliary -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\binary -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\char -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\directive -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\operator -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\karma\string -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer\lexertl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\lex\qi -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\fusion -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\action -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\auto -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\auxiliary -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\binary -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\char -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\directive -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\operator -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\string -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\qi\string\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\algorithm -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\auto -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\auxiliary -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding\unicode -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\char_set -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\integer -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\containers -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\conversion -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tokeniser -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tree -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\partition -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators\detail -mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\support\nonterminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\include -mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator -mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta -mkdir: %_DEST%\inc%_EXT%\boost\spirit\phoenix -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\directive -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\nonterminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\directive -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\nonterminal -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\primitive -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\home\support -mkdir: %_DEST%\inc%_EXT%\boost\spirit\repository\include -mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols -mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree -mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility -mkdir: %_DEST%\inc%_EXT%\boost\statechart -mkdir: %_DEST%\inc%_EXT%\boost\statechart\detail -mkdir: %_DEST%\inc%_EXT%\boost\system -mkdir: %_DEST%\inc%_EXT%\boost\test -mkdir: %_DEST%\inc%_EXT%\boost\test\detail -mkdir: %_DEST%\inc%_EXT%\boost\test\impl -mkdir: %_DEST%\inc%_EXT%\boost\test\included -mkdir: %_DEST%\inc%_EXT%\boost\test\output -mkdir: %_DEST%\inc%_EXT%\boost\test\utils -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\basic_cstring -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\iterator -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\detail -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\iface -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\env -mkdir: %_DEST%\inc%_EXT%\boost\test\utils\runtime\file -mkdir: %_DEST%\inc%_EXT%\boost\thread -mkdir: %_DEST%\inc%_EXT%\boost\thread\detail -mkdir: %_DEST%\inc%_EXT%\boost\thread\pthread -mkdir: %_DEST%\inc%_EXT%\boost\thread\win32 -mkdir: %_DEST%\inc%_EXT%\boost\tr1 -mkdir: %_DEST%\inc%_EXT%\boost\tr1\detail -mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1 -mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1\bcc32 -mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1\sun -mkdir: %_DEST%\inc%_EXT%\boost\tuple -mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail -mkdir: %_DEST%\inc%_EXT%\boost\typeof -mkdir: %_DEST%\inc%_EXT%\boost\typeof\dmc -mkdir: %_DEST%\inc%_EXT%\boost\typeof\msvc -mkdir: %_DEST%\inc%_EXT%\boost\typeof\std -mkdir: %_DEST%\inc%_EXT%\boost\type_traits -mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail -mkdir: %_DEST%\inc%_EXT%\boost\type_traits\msvc -mkdir: %_DEST%\inc%_EXT%\boost\units -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\angle -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\astronomical -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\cgs -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\imperial -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\metric -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\si -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\temperature -mkdir: %_DEST%\inc%_EXT%\boost\units\base_units\us -mkdir: %_DEST%\inc%_EXT%\boost\units\detail -mkdir: %_DEST%\inc%_EXT%\boost\units\physical_dimensions -mkdir: %_DEST%\inc%_EXT%\boost\units\systems -mkdir: %_DEST%\inc%_EXT%\boost\units\systems\angle -mkdir: %_DEST%\inc%_EXT%\boost\units\systems\cgs -mkdir: %_DEST%\inc%_EXT%\boost\units\systems\detail -mkdir: %_DEST%\inc%_EXT%\boost\units\systems\si -mkdir: %_DEST%\inc%_EXT%\boost\units\systems\si\codata -mkdir: %_DEST%\inc%_EXT%\boost\units\systems\temperature -mkdir: %_DEST%\inc%_EXT%\boost\unordered -mkdir: %_DEST%\inc%_EXT%\boost\unordered\detail -mkdir: %_DEST%\inc%_EXT%\boost\utility -mkdir: %_DEST%\inc%_EXT%\boost\utility\detail -mkdir: %_DEST%\inc%_EXT%\boost\uuid -mkdir: %_DEST%\inc%_EXT%\boost\variant -mkdir: %_DEST%\inc%_EXT%\boost\variant\detail -mkdir: %_DEST%\inc%_EXT%\boost\wave -mkdir: %_DEST%\inc%_EXT%\boost\wave\cpplexer -mkdir: %_DEST%\inc%_EXT%\boost\wave\cpplexer\re2clex -mkdir: %_DEST%\inc%_EXT%\boost\wave\grammars -mkdir: %_DEST%\inc%_EXT%\boost\wave\util -mkdir: %_DEST%\inc%_EXT%\boost\xpressive -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\core -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\core\matcher -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\dynamic -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\static -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\static\transforms -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\utility -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\detail\utility\chset -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits -mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail +mkdir: %_DEST%\inc\boost +mkdir: %_DEST%\inc\boost\accumulators +mkdir: %_DEST%\inc\boost\accumulators\framework +mkdir: %_DEST%\inc\boost\accumulators\framework\accumulators +mkdir: %_DEST%\inc\boost\accumulators\framework\parameters +mkdir: %_DEST%\inc\boost\accumulators\numeric +mkdir: %_DEST%\inc\boost\accumulators\numeric\detail +mkdir: %_DEST%\inc\boost\accumulators\numeric\functional +mkdir: %_DEST%\inc\boost\accumulators\statistics +mkdir: %_DEST%\inc\boost\accumulators\statistics\parameters +mkdir: %_DEST%\inc\boost\accumulators\statistics\variates +mkdir: %_DEST%\inc\boost\algorithm +mkdir: %_DEST%\inc\boost\algorithm\string +mkdir: %_DEST%\inc\boost\algorithm\string\detail +mkdir: %_DEST%\inc\boost\algorithm\string\std +mkdir: %_DEST%\inc\boost\archive +mkdir: %_DEST%\inc\boost\archive\detail +mkdir: %_DEST%\inc\boost\archive\impl +mkdir: %_DEST%\inc\boost\archive\iterators +mkdir: %_DEST%\inc\boost\asio +mkdir: %_DEST%\inc\boost\asio\detail +mkdir: %_DEST%\inc\boost\asio\detail\impl +mkdir: %_DEST%\inc\boost\asio\impl +mkdir: %_DEST%\inc\boost\asio\ip +mkdir: %_DEST%\inc\boost\asio\ip\detail +mkdir: %_DEST%\inc\boost\asio\ip\detail\impl +mkdir: %_DEST%\inc\boost\asio\ip\impl +mkdir: %_DEST%\inc\boost\asio\local +mkdir: %_DEST%\inc\boost\asio\local\detail +mkdir: %_DEST%\inc\boost\asio\local\detail\impl +mkdir: %_DEST%\inc\boost\asio\posix +mkdir: %_DEST%\inc\boost\asio\ssl +mkdir: %_DEST%\inc\boost\asio\ssl\detail +mkdir: %_DEST%\inc\boost\asio\windows +mkdir: %_DEST%\inc\boost\assign +mkdir: %_DEST%\inc\boost\assign\std +mkdir: %_DEST%\inc\boost\bimap +mkdir: %_DEST%\inc\boost\bimap\container_adaptor +mkdir: %_DEST%\inc\boost\bimap\container_adaptor\detail +mkdir: %_DEST%\inc\boost\bimap\container_adaptor\support +mkdir: %_DEST%\inc\boost\bimap\detail +mkdir: %_DEST%\inc\boost\bimap\detail\debug +mkdir: %_DEST%\inc\boost\bimap\detail\test +mkdir: %_DEST%\inc\boost\bimap\property_map +mkdir: %_DEST%\inc\boost\bimap\relation +mkdir: %_DEST%\inc\boost\bimap\relation\detail +mkdir: %_DEST%\inc\boost\bimap\relation\support +mkdir: %_DEST%\inc\boost\bimap\support +mkdir: %_DEST%\inc\boost\bimap\tags +mkdir: %_DEST%\inc\boost\bimap\tags\support +mkdir: %_DEST%\inc\boost\bimap\views +mkdir: %_DEST%\inc\boost\bind +mkdir: %_DEST%\inc\boost\circular_buffer +mkdir: %_DEST%\inc\boost\compatibility\cpp_c_headers +mkdir: %_DEST%\inc\boost\concept +mkdir: %_DEST%\inc\boost\concept_check +mkdir: %_DEST%\inc\boost\concept\detail +mkdir: %_DEST%\inc\boost\config +mkdir: %_DEST%\inc\boost\config\abi +mkdir: %_DEST%\inc\boost\config\compiler +mkdir: %_DEST%\inc\boost\config\no_tr1 +mkdir: %_DEST%\inc\boost\config\platform +mkdir: %_DEST%\inc\boost\config\stdlib +mkdir: %_DEST%\inc\boost\date_time +mkdir: %_DEST%\inc\boost\date_time\gregorian +mkdir: %_DEST%\inc\boost\date_time\local_time +mkdir: %_DEST%\inc\boost\date_time\posix_time +mkdir: %_DEST%\inc\boost\detail +mkdir: %_DEST%\inc\boost\dynamic_bitset +mkdir: %_DEST%\inc\boost\exception +mkdir: %_DEST%\inc\boost\exception\detail +mkdir: %_DEST%\inc\boost\filesystem +mkdir: %_DEST%\inc\boost\filesystem\detail +mkdir: %_DEST%\inc\boost\filesystem\v2 +mkdir: %_DEST%\inc\boost\filesystem\v3 +mkdir: %_DEST%\inc\boost\flyweight +mkdir: %_DEST%\inc\boost\flyweight\detail +mkdir: %_DEST%\inc\boost\format +mkdir: %_DEST%\inc\boost\format\detail +mkdir: %_DEST%\inc\boost\function +mkdir: %_DEST%\inc\boost\functional +mkdir: %_DEST%\inc\boost\functional\detail +mkdir: %_DEST%\inc\boost\functional\hash +mkdir: %_DEST%\inc\boost\functional\hash\detail +mkdir: %_DEST%\inc\boost\function\detail +mkdir: %_DEST%\inc\boost\function_types +mkdir: %_DEST%\inc\boost\function_types\config +mkdir: %_DEST%\inc\boost\function_types\detail +mkdir: %_DEST%\inc\boost\function_types\detail\classifier_impl +mkdir: %_DEST%\inc\boost\function_types\detail\components_impl +mkdir: %_DEST%\inc\boost\function_types\detail\encoding +mkdir: %_DEST%\inc\boost\function_types\detail\pp_cc_loop +mkdir: %_DEST%\inc\boost\function_types\detail\pp_retag_default_cc +mkdir: %_DEST%\inc\boost\function_types\detail\pp_tags +mkdir: %_DEST%\inc\boost\function_types\detail\pp_variate_loop +mkdir: %_DEST%\inc\boost\function_types\detail\synthesize_impl +mkdir: %_DEST%\inc\boost\fusion +mkdir: %_DEST%\inc\boost\fusion\adapted +mkdir: %_DEST%\inc\boost\fusion\adapted\array +mkdir: %_DEST%\inc\boost\fusion\adapted\boost_array +mkdir: %_DEST%\inc\boost\fusion\adapted\boost_array\detail +mkdir: %_DEST%\inc\boost\fusion\adapted\boost_tuple +mkdir: %_DEST%\inc\boost\fusion\adapted\boost_tuple\detail +mkdir: %_DEST%\inc\boost\fusion\adapted\class +mkdir: %_DEST%\inc\boost\fusion\adapted\class\detail +mkdir: %_DEST%\inc\boost\fusion\adapted\mpl +mkdir: %_DEST%\inc\boost\fusion\adapted\mpl\detail +mkdir: %_DEST%\inc\boost\fusion\adapted\struct +mkdir: %_DEST%\inc\boost\fusion\adapted\struct\detail +mkdir: %_DEST%\inc\boost\fusion\algorithm +mkdir: %_DEST%\inc\boost\fusion\algorithm\iteration +mkdir: %_DEST%\inc\boost\fusion\algorithm\iteration\detail +mkdir: %_DEST%\inc\boost\fusion\algorithm\iteration\ext_ +mkdir: %_DEST%\inc\boost\fusion\algorithm\query +mkdir: %_DEST%\inc\boost\fusion\algorithm\query\detail +mkdir: %_DEST%\inc\boost\fusion\algorithm\query\ext_ +mkdir: %_DEST%\inc\boost\fusion\algorithm\transformation +mkdir: %_DEST%\inc\boost\fusion\algorithm\transformation\detail +mkdir: %_DEST%\inc\boost\fusion\container +mkdir: %_DEST%\inc\boost\fusion\container\deque +mkdir: %_DEST%\inc\boost\fusion\container\deque\detail +mkdir: %_DEST%\inc\boost\fusion\container\ext_ +mkdir: %_DEST%\inc\boost\fusion\container\generation +mkdir: %_DEST%\inc\boost\fusion\container\list +mkdir: %_DEST%\inc\boost\fusion\container\list\detail +mkdir: %_DEST%\inc\boost\fusion\container\map +mkdir: %_DEST%\inc\boost\fusion\container\map\detail +mkdir: %_DEST%\inc\boost\fusion\container\set +mkdir: %_DEST%\inc\boost\fusion\container\set\detail +mkdir: %_DEST%\inc\boost\fusion\container\vector +mkdir: %_DEST%\inc\boost\fusion\container\vector\detail +mkdir: %_DEST%\inc\boost\fusion\functional +mkdir: %_DEST%\inc\boost\fusion\functional\adapter +mkdir: %_DEST%\inc\boost\fusion\functional\adapter\detail +mkdir: %_DEST%\inc\boost\fusion\functional\generation +mkdir: %_DEST%\inc\boost\fusion\functional\generation\detail +mkdir: %_DEST%\inc\boost\fusion\functional\invocation +mkdir: %_DEST%\inc\boost\fusion\functional\invocation\detail +mkdir: %_DEST%\inc\boost\fusion\include +mkdir: %_DEST%\inc\boost\fusion\iterator +mkdir: %_DEST%\inc\boost\fusion\iterator\detail +mkdir: %_DEST%\inc\boost\fusion\iterator\mpl +mkdir: %_DEST%\inc\boost\fusion\mpl +mkdir: %_DEST%\inc\boost\fusion\mpl\detail +mkdir: %_DEST%\inc\boost\fusion\sequence +mkdir: %_DEST%\inc\boost\fusion\sequence\comparison +mkdir: %_DEST%\inc\boost\fusion\sequence\comparison\detail +mkdir: %_DEST%\inc\boost\fusion\sequence\intrinsic +mkdir: %_DEST%\inc\boost\fusion\sequence\intrinsic\ext_ +mkdir: %_DEST%\inc\boost\fusion\sequence\io +mkdir: %_DEST%\inc\boost\fusion\sequence\io\detail +mkdir: %_DEST%\inc\boost\fusion\support +mkdir: %_DEST%\inc\boost\fusion\support\detail +mkdir: %_DEST%\inc\boost\fusion\support\ext_ +mkdir: %_DEST%\inc\boost\fusion\tuple +mkdir: %_DEST%\inc\boost\fusion\tuple\detail +mkdir: %_DEST%\inc\boost\fusion\view +mkdir: %_DEST%\inc\boost\fusion\view\detail +mkdir: %_DEST%\inc\boost\fusion\view\ext_ +mkdir: %_DEST%\inc\boost\fusion\view\filter_view +mkdir: %_DEST%\inc\boost\fusion\view\filter_view\detail +mkdir: %_DEST%\inc\boost\fusion\view\iterator_range +mkdir: %_DEST%\inc\boost\fusion\view\iterator_range\detail +mkdir: %_DEST%\inc\boost\fusion\view\joint_view +mkdir: %_DEST%\inc\boost\fusion\view\joint_view\detail +mkdir: %_DEST%\inc\boost\fusion\view\nview +mkdir: %_DEST%\inc\boost\fusion\view\nview\detail +mkdir: %_DEST%\inc\boost\fusion\view\repetitive_view +mkdir: %_DEST%\inc\boost\fusion\view\repetitive_view\detail +mkdir: %_DEST%\inc\boost\fusion\view\reverse_view +mkdir: %_DEST%\inc\boost\fusion\view\reverse_view\detail +mkdir: %_DEST%\inc\boost\fusion\view\single_view +mkdir: %_DEST%\inc\boost\fusion\view\single_view\detail +mkdir: %_DEST%\inc\boost\fusion\view\transform_view +mkdir: %_DEST%\inc\boost\fusion\view\transform_view\detail +mkdir: %_DEST%\inc\boost\fusion\view\zip_view +mkdir: %_DEST%\inc\boost\fusion\view\zip_view\detail +mkdir: %_DEST%\inc\boost\gil +mkdir: %_DEST%\inc\boost\gil\extension\dynamic_image +mkdir: %_DEST%\inc\boost\gil\extension\io +mkdir: %_DEST%\inc\boost\graph +mkdir: %_DEST%\inc\boost\graph\detail +mkdir: %_DEST%\inc\boost\graph\distributed +mkdir: %_DEST%\inc\boost\graph\distributed\adjlist +mkdir: %_DEST%\inc\boost\graph\distributed\detail +mkdir: %_DEST%\inc\boost\graph\parallel +mkdir: %_DEST%\inc\boost\graph\parallel\detail +mkdir: %_DEST%\inc\boost\graph\planar_detail +mkdir: %_DEST%\inc\boost\graph\property_maps +mkdir: %_DEST%\inc\boost\integer +mkdir: %_DEST%\inc\boost\interprocess +mkdir: %_DEST%\inc\boost\interprocess\allocators +mkdir: %_DEST%\inc\boost\interprocess\allocators\detail +mkdir: %_DEST%\inc\boost\interprocess\containers +mkdir: %_DEST%\inc\boost\interprocess\containers\container +mkdir: %_DEST%\inc\boost\interprocess\containers\container\detail +mkdir: %_DEST%\inc\boost\interprocess\detail +mkdir: %_DEST%\inc\boost\interprocess\indexes +mkdir: %_DEST%\inc\boost\interprocess\ipc +mkdir: %_DEST%\inc\boost\interprocess\mem_algo +mkdir: %_DEST%\inc\boost\interprocess\mem_algo\detail +mkdir: %_DEST%\inc\boost\interprocess\smart_ptr +mkdir: %_DEST%\inc\boost\interprocess\smart_ptr\detail +mkdir: %_DEST%\inc\boost\interprocess\streams +mkdir: %_DEST%\inc\boost\interprocess\sync +mkdir: %_DEST%\inc\boost\interprocess\sync\emulation +mkdir: %_DEST%\inc\boost\interprocess\sync\posix +mkdir: %_DEST%\inc\boost\interprocess\sync\xsi +mkdir: %_DEST%\inc\boost\intrusive +mkdir: %_DEST%\inc\boost\intrusive\detail +mkdir: %_DEST%\inc\boost\io +mkdir: %_DEST%\inc\boost\io\detail +mkdir: %_DEST%\inc\boost\iostreams +mkdir: %_DEST%\inc\boost\iostreams\detail +mkdir: %_DEST%\inc\boost\iostreams\detail\adapter +mkdir: %_DEST%\inc\boost\iostreams\detail\broken_overload_resolution +mkdir: %_DEST%\inc\boost\iostreams\detail\config +mkdir: %_DEST%\inc\boost\iostreams\detail\streambuf +mkdir: %_DEST%\inc\boost\iostreams\detail\vc6 +mkdir: %_DEST%\inc\boost\iostreams\device +mkdir: %_DEST%\inc\boost\iostreams\filter +mkdir: %_DEST%\inc\boost\iterator +mkdir: %_DEST%\inc\boost\iterator\detail +mkdir: %_DEST%\inc\boost\lambda +mkdir: %_DEST%\inc\boost\lambda\detail +mkdir: %_DEST%\inc\boost\logic +mkdir: %_DEST%\inc\boost\math +mkdir: %_DEST%\inc\boost\math\bindings +mkdir: %_DEST%\inc\boost\math\bindings\detail +mkdir: %_DEST%\inc\boost\math\complex +mkdir: %_DEST%\inc\boost\math\concepts +mkdir: %_DEST%\inc\boost\math\constants +mkdir: %_DEST%\inc\boost\math\distributions +mkdir: %_DEST%\inc\boost\math\distributions\detail +mkdir: %_DEST%\inc\boost\math\policies +mkdir: %_DEST%\inc\boost\math\special_functions +mkdir: %_DEST%\inc\boost\math\special_functions\detail +mkdir: %_DEST%\inc\boost\math\tools +mkdir: %_DEST%\inc\boost\math\tools\detail +mkdir: %_DEST%\inc\boost\mpi +mkdir: %_DEST%\inc\boost\mpi\collectives +mkdir: %_DEST%\inc\boost\mpi\detail +mkdir: %_DEST%\inc\boost\mpi\python +mkdir: %_DEST%\inc\boost\mpl +mkdir: %_DEST%\inc\boost\mpl\aux_ +mkdir: %_DEST%\inc\boost\mpl\aux_\config +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\bcc +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\bcc551 +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\bcc_pre590 +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\dmc +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\gcc +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\msvc60 +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\msvc70 +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\mwcw +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\no_ctps +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\no_ttp +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessed\plain +mkdir: %_DEST%\inc\boost\mpl\aux_\preprocessor +mkdir: %_DEST%\inc\boost\mpl\aux_\range_c +mkdir: %_DEST%\inc\boost\mpl\aux_\test +mkdir: %_DEST%\inc\boost\mpl\limits +mkdir: %_DEST%\inc\boost\mpl\list +mkdir: %_DEST%\inc\boost\mpl\list\aux_ +mkdir: %_DEST%\inc\boost\mpl\list\aux_\preprocessed\plain +mkdir: %_DEST%\inc\boost\mpl\map +mkdir: %_DEST%\inc\boost\mpl\map\aux_ +mkdir: %_DEST%\inc\boost\mpl\map\aux_\preprocessed\no_ctps +mkdir: %_DEST%\inc\boost\mpl\map\aux_\preprocessed\plain +mkdir: %_DEST%\inc\boost\mpl\map\aux_\preprocessed\typeof_based +mkdir: %_DEST%\inc\boost\mpl\math +mkdir: %_DEST%\inc\boost\mpl\multiset +mkdir: %_DEST%\inc\boost\mpl\multiset\aux_ +mkdir: %_DEST%\inc\boost\mpl\set +mkdir: %_DEST%\inc\boost\mpl\set\aux_ +mkdir: %_DEST%\inc\boost\mpl\set\aux_\preprocessed\plain +mkdir: %_DEST%\inc\boost\mpl\vector +mkdir: %_DEST%\inc\boost\mpl\vector\aux_ +mkdir: %_DEST%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps +mkdir: %_DEST%\inc\boost\mpl\vector\aux_\preprocessed\plain +mkdir: %_DEST%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based +mkdir: %_DEST%\inc\boost\msm +mkdir: %_DEST%\inc\boost\msm\back +mkdir: %_DEST%\inc\boost\msm\front +mkdir: %_DEST%\inc\boost\msm\front\detail +mkdir: %_DEST%\inc\boost\msm\front\euml +mkdir: %_DEST%\inc\boost\multi_array +mkdir: %_DEST%\inc\boost\multi_index +mkdir: %_DEST%\inc\boost\multi_index\detail +mkdir: %_DEST%\inc\boost\numeric +mkdir: %_DEST%\inc\boost\numeric\conversion +mkdir: %_DEST%\inc\boost\numeric\conversion\detail +mkdir: %_DEST%\inc\boost\numeric\interval +mkdir: %_DEST%\inc\boost\numeric\interval\compare +mkdir: %_DEST%\inc\boost\numeric\interval\detail +mkdir: %_DEST%\inc\boost\numeric\interval\ext +mkdir: %_DEST%\inc\boost\numeric\ublas +mkdir: %_DEST%\inc\boost\numeric\ublas\detail +mkdir: %_DEST%\inc\boost\numeric\ublas\experimental +mkdir: %_DEST%\inc\boost\numeric\ublas\operation +mkdir: %_DEST%\inc\boost\numeric\ublas\traits +mkdir: %_DEST%\inc\boost\optional +mkdir: %_DEST%\inc\boost\parameter +mkdir: %_DEST%\inc\boost\parameter\aux_ +mkdir: %_DEST%\inc\boost\parameter\aux_\preprocessor +mkdir: %_DEST%\inc\boost\parameter\aux_\python +mkdir: %_DEST%\inc\boost\pending +mkdir: %_DEST%\inc\boost\pending\detail +mkdir: %_DEST%\inc\boost\polygon +mkdir: %_DEST%\inc\boost\polygon\detail +mkdir: %_DEST%\inc\boost\pool +mkdir: %_DEST%\inc\boost\pool\detail +mkdir: %_DEST%\inc\boost\preprocessor +mkdir: %_DEST%\inc\boost\preprocessor\arithmetic +mkdir: %_DEST%\inc\boost\preprocessor\arithmetic\detail +mkdir: %_DEST%\inc\boost\preprocessor\array +mkdir: %_DEST%\inc\boost\preprocessor\comparison +mkdir: %_DEST%\inc\boost\preprocessor\config +mkdir: %_DEST%\inc\boost\preprocessor\control +mkdir: %_DEST%\inc\boost\preprocessor\control\detail +mkdir: %_DEST%\inc\boost\preprocessor\control\detail\dmc +mkdir: %_DEST%\inc\boost\preprocessor\control\detail\edg +mkdir: %_DEST%\inc\boost\preprocessor\control\detail\msvc +mkdir: %_DEST%\inc\boost\preprocessor\debug +mkdir: %_DEST%\inc\boost\preprocessor\detail +mkdir: %_DEST%\inc\boost\preprocessor\detail\dmc +mkdir: %_DEST%\inc\boost\preprocessor\facilities +mkdir: %_DEST%\inc\boost\preprocessor\iteration +mkdir: %_DEST%\inc\boost\preprocessor\iteration\detail +mkdir: %_DEST%\inc\boost\preprocessor\iteration\detail\bounds +mkdir: %_DEST%\inc\boost\preprocessor\iteration\detail\iter +mkdir: %_DEST%\inc\boost\preprocessor\list +mkdir: %_DEST%\inc\boost\preprocessor\list\detail +mkdir: %_DEST%\inc\boost\preprocessor\list\detail\dmc +mkdir: %_DEST%\inc\boost\preprocessor\list\detail\edg +mkdir: %_DEST%\inc\boost\preprocessor\logical +mkdir: %_DEST%\inc\boost\preprocessor\punctuation +mkdir: %_DEST%\inc\boost\preprocessor\repetition +mkdir: %_DEST%\inc\boost\preprocessor\repetition\detail +mkdir: %_DEST%\inc\boost\preprocessor\repetition\detail\dmc +mkdir: %_DEST%\inc\boost\preprocessor\repetition\detail\edg +mkdir: %_DEST%\inc\boost\preprocessor\repetition\detail\msvc +mkdir: %_DEST%\inc\boost\preprocessor\selection +mkdir: %_DEST%\inc\boost\preprocessor\seq +mkdir: %_DEST%\inc\boost\preprocessor\seq\detail +mkdir: %_DEST%\inc\boost\preprocessor\slot +mkdir: %_DEST%\inc\boost\preprocessor\slot\detail +mkdir: %_DEST%\inc\boost\preprocessor\tuple +mkdir: %_DEST%\inc\boost\program_options +mkdir: %_DEST%\inc\boost\program_options\detail +mkdir: %_DEST%\inc\boost\property_map +mkdir: %_DEST%\inc\boost\property_map\parallel +mkdir: %_DEST%\inc\boost\property_map\parallel\impl +mkdir: %_DEST%\inc\boost\property_tree +mkdir: %_DEST%\inc\boost\property_tree\detail +mkdir: %_DEST%\inc\boost\proto +mkdir: %_DEST%\inc\boost\proto\context +mkdir: %_DEST%\inc\boost\proto\detail +mkdir: %_DEST%\inc\boost\proto\transform +mkdir: %_DEST%\inc\boost\ptr_container +mkdir: %_DEST%\inc\boost\ptr_container\detail +mkdir: %_DEST%\inc\boost\python +mkdir: %_DEST%\inc\boost\python\converter +mkdir: %_DEST%\inc\boost\python\detail +mkdir: %_DEST%\inc\boost\python\object +mkdir: %_DEST%\inc\boost\python\suite\indexing +mkdir: %_DEST%\inc\boost\python\suite\indexing\detail +mkdir: %_DEST%\inc\boost\random +mkdir: %_DEST%\inc\boost\random\detail +mkdir: %_DEST%\inc\boost\range +mkdir: %_DEST%\inc\boost\range\adaptor +mkdir: %_DEST%\inc\boost\range\algorithm +mkdir: %_DEST%\inc\boost\range\algorithm_ext +mkdir: %_DEST%\inc\boost\range\detail +mkdir: %_DEST%\inc\boost\range\detail\vc6 +mkdir: %_DEST%\inc\boost\regex +mkdir: %_DEST%\inc\boost\regex\config +mkdir: %_DEST%\inc\boost\regex\pending +mkdir: %_DEST%\inc\boost\regex\v4 +mkdir: %_DEST%\inc\boost\serialization +mkdir: %_DEST%\inc\boost\serialization\detail +mkdir: %_DEST%\inc\boost\signals +mkdir: %_DEST%\inc\boost\signals2 +mkdir: %_DEST%\inc\boost\signals2\detail +mkdir: %_DEST%\inc\boost\signals\detail +mkdir: %_DEST%\inc\boost\smart_ptr +mkdir: %_DEST%\inc\boost\smart_ptr\detail +mkdir: %_DEST%\inc\boost\spirit +mkdir: %_DEST%\inc\boost\spirit\actor +mkdir: %_DEST%\inc\boost\spirit\attribute +mkdir: %_DEST%\inc\boost\spirit\core +mkdir: %_DEST%\inc\boost\spirit\core\composite +mkdir: %_DEST%\inc\boost\spirit\core\non_terminal +mkdir: %_DEST%\inc\boost\spirit\core\primitives +mkdir: %_DEST%\inc\boost\spirit\core\scanner +mkdir: %_DEST%\inc\boost\spirit\debug +mkdir: %_DEST%\inc\boost\spirit\dynamic +mkdir: %_DEST%\inc\boost\spirit\error_handling +mkdir: %_DEST%\inc\boost\spirit\home +mkdir: %_DEST%\inc\boost\spirit\home\classic +mkdir: %_DEST%\inc\boost\spirit\home\classic\actor +mkdir: %_DEST%\inc\boost\spirit\home\classic\attribute +mkdir: %_DEST%\inc\boost\spirit\home\classic\core +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\composite +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\composite\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\non_terminal +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\non_terminal\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\primitives +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\primitives\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\scanner +mkdir: %_DEST%\inc\boost\spirit\home\classic\core\scanner\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\debug +mkdir: %_DEST%\inc\boost\spirit\home\classic\debug\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\dynamic +mkdir: %_DEST%\inc\boost\spirit\home\classic\dynamic\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\error_handling +mkdir: %_DEST%\inc\boost\spirit\home\classic\error_handling\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\iterator +mkdir: %_DEST%\inc\boost\spirit\home\classic\iterator\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\meta +mkdir: %_DEST%\inc\boost\spirit\home\classic\meta\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\phoenix +mkdir: %_DEST%\inc\boost\spirit\home\classic\symbols +mkdir: %_DEST%\inc\boost\spirit\home\classic\symbols\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\tree +mkdir: %_DEST%\inc\boost\spirit\home\classic\tree\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\utility +mkdir: %_DEST%\inc\boost\spirit\home\classic\utility\impl +mkdir: %_DEST%\inc\boost\spirit\home\classic\utility\impl\chset +mkdir: %_DEST%\inc\boost\spirit\home\karma +mkdir: %_DEST%\inc\boost\spirit\home\karma\action +mkdir: %_DEST%\inc\boost\spirit\home\karma\auto +mkdir: %_DEST%\inc\boost\spirit\home\karma\auxiliary +mkdir: %_DEST%\inc\boost\spirit\home\karma\binary +mkdir: %_DEST%\inc\boost\spirit\home\karma\char +mkdir: %_DEST%\inc\boost\spirit\home\karma\detail +mkdir: %_DEST%\inc\boost\spirit\home\karma\directive +mkdir: %_DEST%\inc\boost\spirit\home\karma\nonterminal +mkdir: %_DEST%\inc\boost\spirit\home\karma\nonterminal\detail +mkdir: %_DEST%\inc\boost\spirit\home\karma\numeric +mkdir: %_DEST%\inc\boost\spirit\home\karma\numeric\detail +mkdir: %_DEST%\inc\boost\spirit\home\karma\operator +mkdir: %_DEST%\inc\boost\spirit\home\karma\stream +mkdir: %_DEST%\inc\boost\spirit\home\karma\stream\detail +mkdir: %_DEST%\inc\boost\spirit\home\karma\string +mkdir: %_DEST%\inc\boost\spirit\home\lex +mkdir: %_DEST%\inc\boost\spirit\home\lex\detail +mkdir: %_DEST%\inc\boost\spirit\home\lex\lexer +mkdir: %_DEST%\inc\boost\spirit\home\lex\lexer\lexertl +mkdir: %_DEST%\inc\boost\spirit\home\lex\qi +mkdir: %_DEST%\inc\boost\spirit\home\phoenix +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\bind +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\bind\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\core +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\core\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\function +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\function\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\fusion +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\object +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\object\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\operator +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\operator\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\scope +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\scope\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\statement +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\statement\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\stl +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\stl\algorithm +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\stl\algorithm\detail +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\stl\container +mkdir: %_DEST%\inc\boost\spirit\home\phoenix\stl\container\detail +mkdir: %_DEST%\inc\boost\spirit\home\qi +mkdir: %_DEST%\inc\boost\spirit\home\qi\action +mkdir: %_DEST%\inc\boost\spirit\home\qi\auto +mkdir: %_DEST%\inc\boost\spirit\home\qi\auxiliary +mkdir: %_DEST%\inc\boost\spirit\home\qi\binary +mkdir: %_DEST%\inc\boost\spirit\home\qi\char +mkdir: %_DEST%\inc\boost\spirit\home\qi\detail +mkdir: %_DEST%\inc\boost\spirit\home\qi\directive +mkdir: %_DEST%\inc\boost\spirit\home\qi\nonterminal +mkdir: %_DEST%\inc\boost\spirit\home\qi\nonterminal\detail +mkdir: %_DEST%\inc\boost\spirit\home\qi\numeric +mkdir: %_DEST%\inc\boost\spirit\home\qi\numeric\detail +mkdir: %_DEST%\inc\boost\spirit\home\qi\operator +mkdir: %_DEST%\inc\boost\spirit\home\qi\stream +mkdir: %_DEST%\inc\boost\spirit\home\qi\stream\detail +mkdir: %_DEST%\inc\boost\spirit\home\qi\string +mkdir: %_DEST%\inc\boost\spirit\home\qi\string\detail +mkdir: %_DEST%\inc\boost\spirit\home\support +mkdir: %_DEST%\inc\boost\spirit\home\support\algorithm +mkdir: %_DEST%\inc\boost\spirit\home\support\auto +mkdir: %_DEST%\inc\boost\spirit\home\support\auxiliary +mkdir: %_DEST%\inc\boost\spirit\home\support\char_encoding +mkdir: %_DEST%\inc\boost\spirit\home\support\char_encoding\unicode +mkdir: %_DEST%\inc\boost\spirit\home\support\char_set +mkdir: %_DEST%\inc\boost\spirit\home\support\detail +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\integer +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer\containers +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer\conversion +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer\parser +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer\parser\tokeniser +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer\parser\tree +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\lexer\partition +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\math +mkdir: %_DEST%\inc\boost\spirit\home\support\detail\math\detail +mkdir: %_DEST%\inc\boost\spirit\home\support\iterators +mkdir: %_DEST%\inc\boost\spirit\home\support\iterators\detail +mkdir: %_DEST%\inc\boost\spirit\home\support\nonterminal +mkdir: %_DEST%\inc\boost\spirit\include +mkdir: %_DEST%\inc\boost\spirit\iterator +mkdir: %_DEST%\inc\boost\spirit\meta +mkdir: %_DEST%\inc\boost\spirit\phoenix +mkdir: %_DEST%\inc\boost\spirit\repository\home +mkdir: %_DEST%\inc\boost\spirit\repository\home\karma +mkdir: %_DEST%\inc\boost\spirit\repository\home\karma\directive +mkdir: %_DEST%\inc\boost\spirit\repository\home\karma\nonterminal +mkdir: %_DEST%\inc\boost\spirit\repository\home\qi +mkdir: %_DEST%\inc\boost\spirit\repository\home\qi\directive +mkdir: %_DEST%\inc\boost\spirit\repository\home\qi\nonterminal +mkdir: %_DEST%\inc\boost\spirit\repository\home\qi\primitive +mkdir: %_DEST%\inc\boost\spirit\repository\home\support +mkdir: %_DEST%\inc\boost\spirit\repository\include +mkdir: %_DEST%\inc\boost\spirit\symbols +mkdir: %_DEST%\inc\boost\spirit\tree +mkdir: %_DEST%\inc\boost\spirit\utility +mkdir: %_DEST%\inc\boost\statechart +mkdir: %_DEST%\inc\boost\statechart\detail +mkdir: %_DEST%\inc\boost\system +mkdir: %_DEST%\inc\boost\test +mkdir: %_DEST%\inc\boost\test\detail +mkdir: %_DEST%\inc\boost\test\impl +mkdir: %_DEST%\inc\boost\test\included +mkdir: %_DEST%\inc\boost\test\output +mkdir: %_DEST%\inc\boost\test\utils +mkdir: %_DEST%\inc\boost\test\utils\basic_cstring +mkdir: %_DEST%\inc\boost\test\utils\iterator +mkdir: %_DEST%\inc\boost\test\utils\runtime +mkdir: %_DEST%\inc\boost\test\utils\runtime\cla +mkdir: %_DEST%\inc\boost\test\utils\runtime\cla\detail +mkdir: %_DEST%\inc\boost\test\utils\runtime\cla\iface +mkdir: %_DEST%\inc\boost\test\utils\runtime\env +mkdir: %_DEST%\inc\boost\test\utils\runtime\file +mkdir: %_DEST%\inc\boost\thread +mkdir: %_DEST%\inc\boost\thread\detail +mkdir: %_DEST%\inc\boost\thread\pthread +mkdir: %_DEST%\inc\boost\thread\win32 +mkdir: %_DEST%\inc\boost\tr1 +mkdir: %_DEST%\inc\boost\tr1\detail +mkdir: %_DEST%\inc\boost\tr1\tr1 +mkdir: %_DEST%\inc\boost\tr1\tr1\bcc32 +mkdir: %_DEST%\inc\boost\tr1\tr1\sun +mkdir: %_DEST%\inc\boost\tuple +mkdir: %_DEST%\inc\boost\tuple\detail +mkdir: %_DEST%\inc\boost\typeof +mkdir: %_DEST%\inc\boost\typeof\dmc +mkdir: %_DEST%\inc\boost\typeof\msvc +mkdir: %_DEST%\inc\boost\typeof\std +mkdir: %_DEST%\inc\boost\type_traits +mkdir: %_DEST%\inc\boost\type_traits\detail +mkdir: %_DEST%\inc\boost\type_traits\msvc +mkdir: %_DEST%\inc\boost\units +mkdir: %_DEST%\inc\boost\units\base_units\angle +mkdir: %_DEST%\inc\boost\units\base_units\astronomical +mkdir: %_DEST%\inc\boost\units\base_units\cgs +mkdir: %_DEST%\inc\boost\units\base_units\imperial +mkdir: %_DEST%\inc\boost\units\base_units\metric +mkdir: %_DEST%\inc\boost\units\base_units\si +mkdir: %_DEST%\inc\boost\units\base_units\temperature +mkdir: %_DEST%\inc\boost\units\base_units\us +mkdir: %_DEST%\inc\boost\units\detail +mkdir: %_DEST%\inc\boost\units\physical_dimensions +mkdir: %_DEST%\inc\boost\units\systems +mkdir: %_DEST%\inc\boost\units\systems\angle +mkdir: %_DEST%\inc\boost\units\systems\cgs +mkdir: %_DEST%\inc\boost\units\systems\detail +mkdir: %_DEST%\inc\boost\units\systems\si +mkdir: %_DEST%\inc\boost\units\systems\si\codata +mkdir: %_DEST%\inc\boost\units\systems\temperature +mkdir: %_DEST%\inc\boost\unordered +mkdir: %_DEST%\inc\boost\unordered\detail +mkdir: %_DEST%\inc\boost\utility +mkdir: %_DEST%\inc\boost\utility\detail +mkdir: %_DEST%\inc\boost\uuid +mkdir: %_DEST%\inc\boost\variant +mkdir: %_DEST%\inc\boost\variant\detail +mkdir: %_DEST%\inc\boost\wave +mkdir: %_DEST%\inc\boost\wave\cpplexer +mkdir: %_DEST%\inc\boost\wave\cpplexer\re2clex +mkdir: %_DEST%\inc\boost\wave\grammars +mkdir: %_DEST%\inc\boost\wave\util +mkdir: %_DEST%\inc\boost\xpressive +mkdir: %_DEST%\inc\boost\xpressive\detail +mkdir: %_DEST%\inc\boost\xpressive\detail\core +mkdir: %_DEST%\inc\boost\xpressive\detail\core\matcher +mkdir: %_DEST%\inc\boost\xpressive\detail\dynamic +mkdir: %_DEST%\inc\boost\xpressive\detail\static +mkdir: %_DEST%\inc\boost\xpressive\detail\static\transforms +mkdir: %_DEST%\inc\boost\xpressive\detail\utility +mkdir: %_DEST%\inc\boost\xpressive\detail\utility\chset +mkdir: %_DEST%\inc\boost\xpressive\traits +mkdir: %_DEST%\inc\boost\xpressive\traits\detail -..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost -..\%__SRC%\inc\boost\accumulators\* %_DEST%\inc%_EXT%\boost\accumulators -..\%__SRC%\inc\boost\accumulators\framework\accumulators\* %_DEST%\inc%_EXT%\boost\accumulators\framework\accumulators -..\%__SRC%\inc\boost\accumulators\framework\* %_DEST%\inc%_EXT%\boost\accumulators\framework -..\%__SRC%\inc\boost\accumulators\framework\parameters\* %_DEST%\inc%_EXT%\boost\accumulators\framework\parameters -..\%__SRC%\inc\boost\accumulators\numeric\* %_DEST%\inc%_EXT%\boost\accumulators\numeric -..\%__SRC%\inc\boost\accumulators\numeric\detail\* %_DEST%\inc%_EXT%\boost\accumulators\numeric\detail -..\%__SRC%\inc\boost\accumulators\numeric\functional\* %_DEST%\inc%_EXT%\boost\accumulators\numeric\functional -..\%__SRC%\inc\boost\accumulators\statistics\* %_DEST%\inc%_EXT%\boost\accumulators\statistics -..\%__SRC%\inc\boost\accumulators\statistics\parameters\* %_DEST%\inc%_EXT%\boost\accumulators\statistics\parameters -..\%__SRC%\inc\boost\accumulators\statistics\variates\* %_DEST%\inc%_EXT%\boost\accumulators\statistics\variates -..\%__SRC%\inc\boost\algorithm\* %_DEST%\inc%_EXT%\boost\algorithm -..\%__SRC%\inc\boost\algorithm\string\* %_DEST%\inc%_EXT%\boost\algorithm\string -..\%__SRC%\inc\boost\algorithm\string\detail\* %_DEST%\inc%_EXT%\boost\algorithm\string\detail -..\%__SRC%\inc\boost\algorithm\string\std\* %_DEST%\inc%_EXT%\boost\algorithm\string\std -..\%__SRC%\inc\boost\archive\* %_DEST%\inc%_EXT%\boost\archive -..\%__SRC%\inc\boost\archive\detail\* %_DEST%\inc%_EXT%\boost\archive\detail -..\%__SRC%\inc\boost\archive\impl\* %_DEST%\inc%_EXT%\boost\archive\impl -..\%__SRC%\inc\boost\archive\iterators\* %_DEST%\inc%_EXT%\boost\archive\iterators -..\%__SRC%\inc\boost\asio\* %_DEST%\inc%_EXT%\boost\asio -..\%__SRC%\inc\boost\asio\detail\* %_DEST%\inc%_EXT%\boost\asio\detail -..\%__SRC%\inc\boost\asio\detail\impl\* %_DEST%\inc%_EXT%\boost\asio\detail\impl -..\%__SRC%\inc\boost\asio\impl\* %_DEST%\inc%_EXT%\boost\asio\impl -..\%__SRC%\inc\boost\asio\ip\* %_DEST%\inc%_EXT%\boost\asio\ip -..\%__SRC%\inc\boost\asio\ip\detail\* %_DEST%\inc%_EXT%\boost\asio\ip\detail -..\%__SRC%\inc\boost\asio\ip\detail\impl\* %_DEST%\inc%_EXT%\boost\asio\ip\detail\impl -..\%__SRC%\inc\boost\asio\ip\impl\* %_DEST%\inc%_EXT%\boost\asio\ip\impl -..\%__SRC%\inc\boost\asio\local\* %_DEST%\inc%_EXT%\boost\asio\local -..\%__SRC%\inc\boost\asio\local\detail\* %_DEST%\inc%_EXT%\boost\asio\local\detail -..\%__SRC%\inc\boost\asio\local\detail\impl\* %_DEST%\inc%_EXT%\boost\asio\local\detail\impl -..\%__SRC%\inc\boost\asio\posix\* %_DEST%\inc%_EXT%\boost\asio\posix -..\%__SRC%\inc\boost\asio\ssl\* %_DEST%\inc%_EXT%\boost\asio\ssl -..\%__SRC%\inc\boost\asio\ssl\detail\* %_DEST%\inc%_EXT%\boost\asio\ssl\detail -..\%__SRC%\inc\boost\asio\windows\* %_DEST%\inc%_EXT%\boost\asio\windows -..\%__SRC%\inc\boost\assign\* %_DEST%\inc%_EXT%\boost\assign -..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc%_EXT%\boost\assign\std -..\%__SRC%\inc\boost\bimap\container_adaptor\* %_DEST%\inc%_EXT%\boost\bimap\container_adaptor -..\%__SRC%\inc\boost\bimap\container_adaptor\detail\* %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\detail -..\%__SRC%\inc\boost\bimap\container_adaptor\support\* %_DEST%\inc%_EXT%\boost\bimap\container_adaptor\support -..\%__SRC%\inc\boost\bimap\* %_DEST%\inc%_EXT%\boost\bimap -..\%__SRC%\inc\boost\bimap\detail\debug\* %_DEST%\inc%_EXT%\boost\bimap\detail\debug -..\%__SRC%\inc\boost\bimap\detail\* %_DEST%\inc%_EXT%\boost\bimap\detail -..\%__SRC%\inc\boost\bimap\detail\test\* %_DEST%\inc%_EXT%\boost\bimap\detail\test -..\%__SRC%\inc\boost\bimap\property_map\* %_DEST%\inc%_EXT%\boost\bimap\property_map -..\%__SRC%\inc\boost\bimap\relation\* %_DEST%\inc%_EXT%\boost\bimap\relation -..\%__SRC%\inc\boost\bimap\relation\detail\* %_DEST%\inc%_EXT%\boost\bimap\relation\detail -..\%__SRC%\inc\boost\bimap\relation\support\* %_DEST%\inc%_EXT%\boost\bimap\relation\support -..\%__SRC%\inc\boost\bimap\support\* %_DEST%\inc%_EXT%\boost\bimap\support -..\%__SRC%\inc\boost\bimap\tags\* %_DEST%\inc%_EXT%\boost\bimap\tags -..\%__SRC%\inc\boost\bimap\tags\support\* %_DEST%\inc%_EXT%\boost\bimap\tags\support -..\%__SRC%\inc\boost\bimap\views\* %_DEST%\inc%_EXT%\boost\bimap\views -..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind -..\%__SRC%\inc\boost\circular_buffer\* %_DEST%\inc%_EXT%\boost\circular_buffer -..\%__SRC%\inc\boost\compatibility\cpp_c_headers\* %_DEST%\inc%_EXT%\boost\compatibility\cpp_c_headers -..\%__SRC%\inc\boost\concept_check\* %_DEST%\inc%_EXT%\boost\concept_check -..\%__SRC%\inc\boost\concept\* %_DEST%\inc%_EXT%\boost\concept -..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc%_EXT%\boost\concept\detail -..\%__SRC%\inc\boost\config\abi\* %_DEST%\inc%_EXT%\boost\config\abi -..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler -..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config -..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1 -..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform -..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib -..\%__SRC%\inc\boost\date_time\* %_DEST%\inc%_EXT%\boost\date_time -..\%__SRC%\inc\boost\date_time\gregorian\* %_DEST%\inc%_EXT%\boost\date_time\gregorian -..\%__SRC%\inc\boost\date_time\local_time\* %_DEST%\inc%_EXT%\boost\date_time\local_time -..\%__SRC%\inc\boost\date_time\posix_time\* %_DEST%\inc%_EXT%\boost\date_time\posix_time -..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail -..\%__SRC%\inc\boost\dynamic_bitset\* %_DEST%\inc%_EXT%\boost\dynamic_bitset -..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception -..\%__SRC%\inc\boost\exception\detail\* %_DEST%\inc%_EXT%\boost\exception\detail -..\%__SRC%\inc\boost\filesystem\* %_DEST%\inc%_EXT%\boost\filesystem -..\%__SRC%\inc\boost\filesystem\detail\* %_DEST%\inc%_EXT%\boost\filesystem\detail -..\%__SRC%\inc\boost\filesystem\v2\* %_DEST%\inc%_EXT%\boost\filesystem\v2 -..\%__SRC%\inc\boost\filesystem\v3\* %_DEST%\inc%_EXT%\boost\filesystem\v3 -..\%__SRC%\inc\boost\flyweight\* %_DEST%\inc%_EXT%\boost\flyweight -..\%__SRC%\inc\boost\flyweight\detail\* %_DEST%\inc%_EXT%\boost\flyweight\detail -..\%__SRC%\inc\boost\format\* %_DEST%\inc%_EXT%\boost\format -..\%__SRC%\inc\boost\format\detail\* %_DEST%\inc%_EXT%\boost\format\detail -..\%__SRC%\inc\boost\functional\* %_DEST%\inc%_EXT%\boost\functional -..\%__SRC%\inc\boost\functional\detail\* %_DEST%\inc%_EXT%\boost\functional\detail -..\%__SRC%\inc\boost\functional\hash\* %_DEST%\inc%_EXT%\boost\functional\hash -..\%__SRC%\inc\boost\functional\hash\detail\* %_DEST%\inc%_EXT%\boost\functional\hash\detail -..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function -..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail -..\%__SRC%\inc\boost\function_types\config\* %_DEST%\inc%_EXT%\boost\function_types\config -..\%__SRC%\inc\boost\function_types\* %_DEST%\inc%_EXT%\boost\function_types -..\%__SRC%\inc\boost\function_types\detail\classifier_impl\* %_DEST%\inc%_EXT%\boost\function_types\detail\classifier_impl -..\%__SRC%\inc\boost\function_types\detail\components_impl\* %_DEST%\inc%_EXT%\boost\function_types\detail\components_impl -..\%__SRC%\inc\boost\function_types\detail\* %_DEST%\inc%_EXT%\boost\function_types\detail -..\%__SRC%\inc\boost\function_types\detail\encoding\* %_DEST%\inc%_EXT%\boost\function_types\detail\encoding -..\%__SRC%\inc\boost\function_types\detail\pp_cc_loop\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_cc_loop -..\%__SRC%\inc\boost\function_types\detail\pp_retag_default_cc\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_retag_default_cc -..\%__SRC%\inc\boost\function_types\detail\pp_tags\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_tags -..\%__SRC%\inc\boost\function_types\detail\pp_variate_loop\* %_DEST%\inc%_EXT%\boost\function_types\detail\pp_variate_loop -..\%__SRC%\inc\boost\function_types\detail\synthesize_impl\* %_DEST%\inc%_EXT%\boost\function_types\detail\synthesize_impl -..\%__SRC%\inc\boost\fusion\adapted\array\* %_DEST%\inc%_EXT%\boost\fusion\adapted\array -..\%__SRC%\inc\boost\fusion\adapted\boost_array\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array -..\%__SRC%\inc\boost\fusion\adapted\boost_array\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_array\detail -..\%__SRC%\inc\boost\fusion\adapted\boost_tuple\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple -..\%__SRC%\inc\boost\fusion\adapted\boost_tuple\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\boost_tuple\detail -..\%__SRC%\inc\boost\fusion\adapted\class\* %_DEST%\inc%_EXT%\boost\fusion\adapted\class -..\%__SRC%\inc\boost\fusion\adapted\class\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\class\detail -..\%__SRC%\inc\boost\fusion\adapted\* %_DEST%\inc%_EXT%\boost\fusion\adapted -..\%__SRC%\inc\boost\fusion\adapted\mpl\* %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl -..\%__SRC%\inc\boost\fusion\adapted\mpl\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\mpl\detail -..\%__SRC%\inc\boost\fusion\adapted\struct\* %_DEST%\inc%_EXT%\boost\fusion\adapted\struct -..\%__SRC%\inc\boost\fusion\adapted\struct\detail\* %_DEST%\inc%_EXT%\boost\fusion\adapted\struct\detail -..\%__SRC%\inc\boost\fusion\algorithm\* %_DEST%\inc%_EXT%\boost\fusion\algorithm -..\%__SRC%\inc\boost\fusion\algorithm\iteration\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration -..\%__SRC%\inc\boost\fusion\algorithm\iteration\detail\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\detail -..\%__SRC%\inc\boost\fusion\algorithm\iteration\ext_\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\iteration\ext_ -..\%__SRC%\inc\boost\fusion\algorithm\query\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\query -..\%__SRC%\inc\boost\fusion\algorithm\query\detail\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\detail -..\%__SRC%\inc\boost\fusion\algorithm\query\ext_\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\query\ext_ -..\%__SRC%\inc\boost\fusion\algorithm\transformation\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation -..\%__SRC%\inc\boost\fusion\algorithm\transformation\detail\* %_DEST%\inc%_EXT%\boost\fusion\algorithm\transformation\detail -..\%__SRC%\inc\boost\fusion\container\deque\* %_DEST%\inc%_EXT%\boost\fusion\container\deque -..\%__SRC%\inc\boost\fusion\container\deque\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\deque\detail -..\%__SRC%\inc\boost\fusion\container\* %_DEST%\inc%_EXT%\boost\fusion\container -..\%__SRC%\inc\boost\fusion\container\ext_\* %_DEST%\inc%_EXT%\boost\fusion\container\ext_ -..\%__SRC%\inc\boost\fusion\container\generation\* %_DEST%\inc%_EXT%\boost\fusion\container\generation -..\%__SRC%\inc\boost\fusion\container\list\* %_DEST%\inc%_EXT%\boost\fusion\container\list -..\%__SRC%\inc\boost\fusion\container\list\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\list\detail -..\%__SRC%\inc\boost\fusion\container\map\* %_DEST%\inc%_EXT%\boost\fusion\container\map -..\%__SRC%\inc\boost\fusion\container\map\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\map\detail -..\%__SRC%\inc\boost\fusion\container\set\* %_DEST%\inc%_EXT%\boost\fusion\container\set -..\%__SRC%\inc\boost\fusion\container\set\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\set\detail -..\%__SRC%\inc\boost\fusion\container\vector\* %_DEST%\inc%_EXT%\boost\fusion\container\vector -..\%__SRC%\inc\boost\fusion\container\vector\detail\* %_DEST%\inc%_EXT%\boost\fusion\container\vector\detail -..\%__SRC%\inc\boost\fusion\* %_DEST%\inc%_EXT%\boost\fusion -..\%__SRC%\inc\boost\fusion\functional\adapter\* %_DEST%\inc%_EXT%\boost\fusion\functional\adapter -..\%__SRC%\inc\boost\fusion\functional\adapter\detail\* %_DEST%\inc%_EXT%\boost\fusion\functional\adapter\detail -..\%__SRC%\inc\boost\fusion\functional\* %_DEST%\inc%_EXT%\boost\fusion\functional -..\%__SRC%\inc\boost\fusion\functional\generation\* %_DEST%\inc%_EXT%\boost\fusion\functional\generation -..\%__SRC%\inc\boost\fusion\functional\generation\detail\* %_DEST%\inc%_EXT%\boost\fusion\functional\generation\detail -..\%__SRC%\inc\boost\fusion\functional\invocation\* %_DEST%\inc%_EXT%\boost\fusion\functional\invocation -..\%__SRC%\inc\boost\fusion\functional\invocation\detail\* %_DEST%\inc%_EXT%\boost\fusion\functional\invocation\detail -..\%__SRC%\inc\boost\fusion\include\* %_DEST%\inc%_EXT%\boost\fusion\include -..\%__SRC%\inc\boost\fusion\iterator\* %_DEST%\inc%_EXT%\boost\fusion\iterator -..\%__SRC%\inc\boost\fusion\iterator\detail\* %_DEST%\inc%_EXT%\boost\fusion\iterator\detail -..\%__SRC%\inc\boost\fusion\iterator\mpl\* %_DEST%\inc%_EXT%\boost\fusion\iterator\mpl -..\%__SRC%\inc\boost\fusion\mpl\* %_DEST%\inc%_EXT%\boost\fusion\mpl -..\%__SRC%\inc\boost\fusion\mpl\detail\* %_DEST%\inc%_EXT%\boost\fusion\mpl\detail -..\%__SRC%\inc\boost\fusion\sequence\comparison\* %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison -..\%__SRC%\inc\boost\fusion\sequence\comparison\detail\* %_DEST%\inc%_EXT%\boost\fusion\sequence\comparison\detail -..\%__SRC%\inc\boost\fusion\sequence\* %_DEST%\inc%_EXT%\boost\fusion\sequence -..\%__SRC%\inc\boost\fusion\sequence\intrinsic\* %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic -..\%__SRC%\inc\boost\fusion\sequence\intrinsic\ext_\* %_DEST%\inc%_EXT%\boost\fusion\sequence\intrinsic\ext_ -..\%__SRC%\inc\boost\fusion\sequence\io\* %_DEST%\inc%_EXT%\boost\fusion\sequence\io -..\%__SRC%\inc\boost\fusion\sequence\io\detail\* %_DEST%\inc%_EXT%\boost\fusion\sequence\io\detail -..\%__SRC%\inc\boost\fusion\support\* %_DEST%\inc%_EXT%\boost\fusion\support -..\%__SRC%\inc\boost\fusion\support\detail\* %_DEST%\inc%_EXT%\boost\fusion\support\detail -..\%__SRC%\inc\boost\fusion\support\ext_\* %_DEST%\inc%_EXT%\boost\fusion\support\ext_ -..\%__SRC%\inc\boost\fusion\tuple\* %_DEST%\inc%_EXT%\boost\fusion\tuple -..\%__SRC%\inc\boost\fusion\tuple\detail\* %_DEST%\inc%_EXT%\boost\fusion\tuple\detail -..\%__SRC%\inc\boost\fusion\view\* %_DEST%\inc%_EXT%\boost\fusion\view -..\%__SRC%\inc\boost\fusion\view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\detail -..\%__SRC%\inc\boost\fusion\view\ext_\* %_DEST%\inc%_EXT%\boost\fusion\view\ext_ -..\%__SRC%\inc\boost\fusion\view\filter_view\* %_DEST%\inc%_EXT%\boost\fusion\view\filter_view -..\%__SRC%\inc\boost\fusion\view\filter_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\filter_view\detail -..\%__SRC%\inc\boost\fusion\view\iterator_range\* %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range -..\%__SRC%\inc\boost\fusion\view\iterator_range\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\iterator_range\detail -..\%__SRC%\inc\boost\fusion\view\joint_view\* %_DEST%\inc%_EXT%\boost\fusion\view\joint_view -..\%__SRC%\inc\boost\fusion\view\joint_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\joint_view\detail -..\%__SRC%\inc\boost\fusion\view\nview\* %_DEST%\inc%_EXT%\boost\fusion\view\nview -..\%__SRC%\inc\boost\fusion\view\nview\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\nview\detail -..\%__SRC%\inc\boost\fusion\view\repetitive_view\* %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view -..\%__SRC%\inc\boost\fusion\view\repetitive_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\repetitive_view\detail -..\%__SRC%\inc\boost\fusion\view\reverse_view\* %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view -..\%__SRC%\inc\boost\fusion\view\reverse_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\reverse_view\detail -..\%__SRC%\inc\boost\fusion\view\single_view\* %_DEST%\inc%_EXT%\boost\fusion\view\single_view -..\%__SRC%\inc\boost\fusion\view\single_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\single_view\detail -..\%__SRC%\inc\boost\fusion\view\transform_view\* %_DEST%\inc%_EXT%\boost\fusion\view\transform_view -..\%__SRC%\inc\boost\fusion\view\transform_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\transform_view\detail -..\%__SRC%\inc\boost\fusion\view\zip_view\* %_DEST%\inc%_EXT%\boost\fusion\view\zip_view -..\%__SRC%\inc\boost\fusion\view\zip_view\detail\* %_DEST%\inc%_EXT%\boost\fusion\view\zip_view\detail -..\%__SRC%\inc\boost\gil\* %_DEST%\inc%_EXT%\boost\gil -..\%__SRC%\inc\boost\gil\extension\dynamic_image\* %_DEST%\inc%_EXT%\boost\gil\extension\dynamic_image -..\%__SRC%\inc\boost\gil\extension\io\* %_DEST%\inc%_EXT%\boost\gil\extension\io -..\%__SRC%\inc\boost\graph\* %_DEST%\inc%_EXT%\boost\graph -..\%__SRC%\inc\boost\graph\detail\* %_DEST%\inc%_EXT%\boost\graph\detail -..\%__SRC%\inc\boost\graph\distributed\adjlist\* %_DEST%\inc%_EXT%\boost\graph\distributed\adjlist -..\%__SRC%\inc\boost\graph\distributed\* %_DEST%\inc%_EXT%\boost\graph\distributed -..\%__SRC%\inc\boost\graph\distributed\detail\* %_DEST%\inc%_EXT%\boost\graph\distributed\detail -..\%__SRC%\inc\boost\graph\parallel\* %_DEST%\inc%_EXT%\boost\graph\parallel -..\%__SRC%\inc\boost\graph\parallel\detail\* %_DEST%\inc%_EXT%\boost\graph\parallel\detail -..\%__SRC%\inc\boost\graph\planar_detail\* %_DEST%\inc%_EXT%\boost\graph\planar_detail -..\%__SRC%\inc\boost\graph\property_maps\* %_DEST%\inc%_EXT%\boost\graph\property_maps -..\%__SRC%\inc\boost\integer\* %_DEST%\inc%_EXT%\boost\integer -..\%__SRC%\inc\boost\interprocess\allocators\* %_DEST%\inc%_EXT%\boost\interprocess\allocators -..\%__SRC%\inc\boost\interprocess\allocators\detail\* %_DEST%\inc%_EXT%\boost\interprocess\allocators\detail -..\%__SRC%\inc\boost\interprocess\containers\container\* %_DEST%\inc%_EXT%\boost\interprocess\containers\container -..\%__SRC%\inc\boost\interprocess\containers\container\detail\* %_DEST%\inc%_EXT%\boost\interprocess\containers\container\detail -..\%__SRC%\inc\boost\interprocess\containers\* %_DEST%\inc%_EXT%\boost\interprocess\containers -..\%__SRC%\inc\boost\interprocess\* %_DEST%\inc%_EXT%\boost\interprocess -..\%__SRC%\inc\boost\interprocess\detail\* %_DEST%\inc%_EXT%\boost\interprocess\detail -..\%__SRC%\inc\boost\interprocess\indexes\* %_DEST%\inc%_EXT%\boost\interprocess\indexes -..\%__SRC%\inc\boost\interprocess\ipc\* %_DEST%\inc%_EXT%\boost\interprocess\ipc -..\%__SRC%\inc\boost\interprocess\mem_algo\* %_DEST%\inc%_EXT%\boost\interprocess\mem_algo -..\%__SRC%\inc\boost\interprocess\mem_algo\detail\* %_DEST%\inc%_EXT%\boost\interprocess\mem_algo\detail -..\%__SRC%\inc\boost\interprocess\smart_ptr\* %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr -..\%__SRC%\inc\boost\interprocess\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\interprocess\smart_ptr\detail -..\%__SRC%\inc\boost\interprocess\streams\* %_DEST%\inc%_EXT%\boost\interprocess\streams -..\%__SRC%\inc\boost\interprocess\sync\* %_DEST%\inc%_EXT%\boost\interprocess\sync -..\%__SRC%\inc\boost\interprocess\sync\emulation\* %_DEST%\inc%_EXT%\boost\interprocess\sync\emulation -..\%__SRC%\inc\boost\interprocess\sync\posix\* %_DEST%\inc%_EXT%\boost\interprocess\sync\posix -..\%__SRC%\inc\boost\interprocess\sync\xsi\* %_DEST%\inc%_EXT%\boost\interprocess\sync\xsi -..\%__SRC%\inc\boost\intrusive\* %_DEST%\inc%_EXT%\boost\intrusive -..\%__SRC%\inc\boost\intrusive\detail\* %_DEST%\inc%_EXT%\boost\intrusive\detail -..\%__SRC%\inc\boost\io\* %_DEST%\inc%_EXT%\boost\io -..\%__SRC%\inc\boost\io\detail\* %_DEST%\inc%_EXT%\boost\io\detail -..\%__SRC%\inc\boost\iostreams\* %_DEST%\inc%_EXT%\boost\iostreams -..\%__SRC%\inc\boost\iostreams\detail\adapter\* %_DEST%\inc%_EXT%\boost\iostreams\detail\adapter -..\%__SRC%\inc\boost\iostreams\detail\broken_overload_resolution\* %_DEST%\inc%_EXT%\boost\iostreams\detail\broken_overload_resolution -..\%__SRC%\inc\boost\iostreams\detail\config\* %_DEST%\inc%_EXT%\boost\iostreams\detail\config -..\%__SRC%\inc\boost\iostreams\detail\* %_DEST%\inc%_EXT%\boost\iostreams\detail -..\%__SRC%\inc\boost\iostreams\detail\streambuf\* %_DEST%\inc%_EXT%\boost\iostreams\detail\streambuf -..\%__SRC%\inc\boost\iostreams\detail\vc6\* %_DEST%\inc%_EXT%\boost\iostreams\detail\vc6 -..\%__SRC%\inc\boost\iostreams\device\* %_DEST%\inc%_EXT%\boost\iostreams\device -..\%__SRC%\inc\boost\iostreams\filter\* %_DEST%\inc%_EXT%\boost\iostreams\filter -..\%__SRC%\inc\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator -..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail -..\%__SRC%\inc\boost\lambda\* %_DEST%\inc%_EXT%\boost\lambda -..\%__SRC%\inc\boost\lambda\detail\* %_DEST%\inc%_EXT%\boost\lambda\detail -..\%__SRC%\inc\boost\logic\* %_DEST%\inc%_EXT%\boost\logic -..\%__SRC%\inc\boost\math\bindings\* %_DEST%\inc%_EXT%\boost\math\bindings -..\%__SRC%\inc\boost\math\bindings\detail\* %_DEST%\inc%_EXT%\boost\math\bindings\detail -..\%__SRC%\inc\boost\math\complex\* %_DEST%\inc%_EXT%\boost\math\complex -..\%__SRC%\inc\boost\math\concepts\* %_DEST%\inc%_EXT%\boost\math\concepts -..\%__SRC%\inc\boost\math\constants\* %_DEST%\inc%_EXT%\boost\math\constants -..\%__SRC%\inc\boost\math\* %_DEST%\inc%_EXT%\boost\math -..\%__SRC%\inc\boost\math\distributions\* %_DEST%\inc%_EXT%\boost\math\distributions -..\%__SRC%\inc\boost\math\distributions\detail\* %_DEST%\inc%_EXT%\boost\math\distributions\detail -..\%__SRC%\inc\boost\math\policies\* %_DEST%\inc%_EXT%\boost\math\policies -..\%__SRC%\inc\boost\math\special_functions\* %_DEST%\inc%_EXT%\boost\math\special_functions -..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail -..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools -..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail -..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives -..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi -..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail -..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python -..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config -..\%__SRC%\inc\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_ -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551 -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc_pre590\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc_pre590 -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\dmc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\dmc -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60 -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70 -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\mwcw\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ttp\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp -..\%__SRC%\inc\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain -..\%__SRC%\inc\boost\mpl\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor -..\%__SRC%\inc\boost\mpl\aux_\range_c\* %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c -..\%__SRC%\inc\boost\mpl\aux_\test\* %_DEST%\inc%_EXT%\boost\mpl\aux_\test -..\%__SRC%\inc\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl -..\%__SRC%\inc\boost\mpl\limits\* %_DEST%\inc%_EXT%\boost\mpl\limits -..\%__SRC%\inc\boost\mpl\list\aux_\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_ -..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain -..\%__SRC%\inc\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list -..\%__SRC%\inc\boost\mpl\map\aux_\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_ -..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\no_ctps -..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\plain -..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\map\aux_\preprocessed\typeof_based -..\%__SRC%\inc\boost\mpl\map\* %_DEST%\inc%_EXT%\boost\mpl\map -..\%__SRC%\inc\boost\mpl\math\* %_DEST%\inc%_EXT%\boost\mpl\math -..\%__SRC%\inc\boost\mpl\multiset\aux_\* %_DEST%\inc%_EXT%\boost\mpl\multiset\aux_ -..\%__SRC%\inc\boost\mpl\multiset\* %_DEST%\inc%_EXT%\boost\mpl\multiset -..\%__SRC%\inc\boost\mpl\set\aux_\* %_DEST%\inc%_EXT%\boost\mpl\set\aux_ -..\%__SRC%\inc\boost\mpl\set\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\set\aux_\preprocessed\plain -..\%__SRC%\inc\boost\mpl\set\* %_DEST%\inc%_EXT%\boost\mpl\set -..\%__SRC%\inc\boost\mpl\vector\aux_\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_ -..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps -..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain -..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based -..\%__SRC%\inc\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector -..\%__SRC%\inc\boost\msm\back\* %_DEST%\inc%_EXT%\boost\msm\back -..\%__SRC%\inc\boost\msm\* %_DEST%\inc%_EXT%\boost\msm -..\%__SRC%\inc\boost\msm\front\* %_DEST%\inc%_EXT%\boost\msm\front -..\%__SRC%\inc\boost\msm\front\detail\* %_DEST%\inc%_EXT%\boost\msm\front\detail -..\%__SRC%\inc\boost\msm\front\euml\* %_DEST%\inc%_EXT%\boost\msm\front\euml -..\%__SRC%\inc\boost\multi_array\* %_DEST%\inc%_EXT%\boost\multi_array -..\%__SRC%\inc\boost\multi_index\* %_DEST%\inc%_EXT%\boost\multi_index -..\%__SRC%\inc\boost\multi_index\detail\* %_DEST%\inc%_EXT%\boost\multi_index\detail -..\%__SRC%\inc\boost\numeric\conversion\* %_DEST%\inc%_EXT%\boost\numeric\conversion -..\%__SRC%\inc\boost\numeric\conversion\detail\* %_DEST%\inc%_EXT%\boost\numeric\conversion\detail -..\%__SRC%\inc\boost\numeric\* %_DEST%\inc%_EXT%\boost\numeric -..\%__SRC%\inc\boost\numeric\interval\compare\* %_DEST%\inc%_EXT%\boost\numeric\interval\compare -..\%__SRC%\inc\boost\numeric\interval\* %_DEST%\inc%_EXT%\boost\numeric\interval -..\%__SRC%\inc\boost\numeric\interval\detail\* %_DEST%\inc%_EXT%\boost\numeric\interval\detail -..\%__SRC%\inc\boost\numeric\interval\ext\* %_DEST%\inc%_EXT%\boost\numeric\interval\ext -..\%__SRC%\inc\boost\numeric\ublas\* %_DEST%\inc%_EXT%\boost\numeric\ublas -..\%__SRC%\inc\boost\numeric\ublas\detail\* %_DEST%\inc%_EXT%\boost\numeric\ublas\detail -..\%__SRC%\inc\boost\numeric\ublas\experimental\* %_DEST%\inc%_EXT%\boost\numeric\ublas\experimental -..\%__SRC%\inc\boost\numeric\ublas\operation\* %_DEST%\inc%_EXT%\boost\numeric\ublas\operation -..\%__SRC%\inc\boost\numeric\ublas\traits\* %_DEST%\inc%_EXT%\boost\numeric\ublas\traits -..\%__SRC%\inc\boost\optional\* %_DEST%\inc%_EXT%\boost\optional -..\%__SRC%\inc\boost\parameter\aux_\* %_DEST%\inc%_EXT%\boost\parameter\aux_ -..\%__SRC%\inc\boost\parameter\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\parameter\aux_\preprocessor -..\%__SRC%\inc\boost\parameter\aux_\python\* %_DEST%\inc%_EXT%\boost\parameter\aux_\python -..\%__SRC%\inc\boost\parameter\* %_DEST%\inc%_EXT%\boost\parameter -..\%__SRC%\inc\boost\pending\* %_DEST%\inc%_EXT%\boost\pending -..\%__SRC%\inc\boost\pending\detail\* %_DEST%\inc%_EXT%\boost\pending\detail -..\%__SRC%\inc\boost\polygon\* %_DEST%\inc%_EXT%\boost\polygon -..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc%_EXT%\boost\polygon\detail -..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool -..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail -..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic -..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail -..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array -..\%__SRC%\inc\boost\preprocessor\comparison\* %_DEST%\inc%_EXT%\boost\preprocessor\comparison -..\%__SRC%\inc\boost\preprocessor\config\* %_DEST%\inc%_EXT%\boost\preprocessor\config -..\%__SRC%\inc\boost\preprocessor\control\* %_DEST%\inc%_EXT%\boost\preprocessor\control -..\%__SRC%\inc\boost\preprocessor\control\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail -..\%__SRC%\inc\boost\preprocessor\control\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\dmc -..\%__SRC%\inc\boost\preprocessor\control\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg -..\%__SRC%\inc\boost\preprocessor\control\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc -..\%__SRC%\inc\boost\preprocessor\debug\* %_DEST%\inc%_EXT%\boost\preprocessor\debug -..\%__SRC%\inc\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor -..\%__SRC%\inc\boost\preprocessor\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\detail -..\%__SRC%\inc\boost\preprocessor\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\detail\dmc -..\%__SRC%\inc\boost\preprocessor\facilities\* %_DEST%\inc%_EXT%\boost\preprocessor\facilities -..\%__SRC%\inc\boost\preprocessor\iteration\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration -..\%__SRC%\inc\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds -..\%__SRC%\inc\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail -..\%__SRC%\inc\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter -..\%__SRC%\inc\boost\preprocessor\list\* %_DEST%\inc%_EXT%\boost\preprocessor\list -..\%__SRC%\inc\boost\preprocessor\list\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail -..\%__SRC%\inc\boost\preprocessor\list\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\dmc -..\%__SRC%\inc\boost\preprocessor\list\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg -..\%__SRC%\inc\boost\preprocessor\logical\* %_DEST%\inc%_EXT%\boost\preprocessor\logical -..\%__SRC%\inc\boost\preprocessor\punctuation\* %_DEST%\inc%_EXT%\boost\preprocessor\punctuation -..\%__SRC%\inc\boost\preprocessor\repetition\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition -..\%__SRC%\inc\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail -..\%__SRC%\inc\boost\preprocessor\repetition\detail\dmc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\dmc -..\%__SRC%\inc\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg -..\%__SRC%\inc\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc -..\%__SRC%\inc\boost\preprocessor\selection\* %_DEST%\inc%_EXT%\boost\preprocessor\selection -..\%__SRC%\inc\boost\preprocessor\seq\* %_DEST%\inc%_EXT%\boost\preprocessor\seq -..\%__SRC%\inc\boost\preprocessor\seq\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail -..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot -..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail -..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple -..\%__SRC%\inc\boost\program_options\* %_DEST%\inc%_EXT%\boost\program_options -..\%__SRC%\inc\boost\program_options\detail\* %_DEST%\inc%_EXT%\boost\program_options\detail -..\%__SRC%\inc\boost\property_map\* %_DEST%\inc%_EXT%\boost\property_map -..\%__SRC%\inc\boost\property_map\parallel\* %_DEST%\inc%_EXT%\boost\property_map\parallel -..\%__SRC%\inc\boost\property_map\parallel\impl\* %_DEST%\inc%_EXT%\boost\property_map\parallel\impl -..\%__SRC%\inc\boost\property_tree\* %_DEST%\inc%_EXT%\boost\property_tree -..\%__SRC%\inc\boost\property_tree\detail\* %_DEST%\inc%_EXT%\boost\property_tree\detail -..\%__SRC%\inc\boost\proto\context\* %_DEST%\inc%_EXT%\boost\proto\context -..\%__SRC%\inc\boost\proto\* %_DEST%\inc%_EXT%\boost\proto -..\%__SRC%\inc\boost\proto\detail\* %_DEST%\inc%_EXT%\boost\proto\detail -..\%__SRC%\inc\boost\proto\transform\* %_DEST%\inc%_EXT%\boost\proto\transform -..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc%_EXT%\boost\ptr_container -..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc%_EXT%\boost\ptr_container\detail -..\%__SRC%\inc\boost\python\converter\* %_DEST%\inc%_EXT%\boost\python\converter -..\%__SRC%\inc\boost\python\* %_DEST%\inc%_EXT%\boost\python -..\%__SRC%\inc\boost\python\detail\* %_DEST%\inc%_EXT%\boost\python\detail -..\%__SRC%\inc\boost\python\object\* %_DEST%\inc%_EXT%\boost\python\object -..\%__SRC%\inc\boost\python\suite\indexing\* %_DEST%\inc%_EXT%\boost\python\suite\indexing -..\%__SRC%\inc\boost\python\suite\indexing\detail\* %_DEST%\inc%_EXT%\boost\python\suite\indexing\detail -..\%__SRC%\inc\boost\random\* %_DEST%\inc%_EXT%\boost\random -..\%__SRC%\inc\boost\random\detail\* %_DEST%\inc%_EXT%\boost\random\detail -..\%__SRC%\inc\boost\range\adaptor\* %_DEST%\inc%_EXT%\boost\range\adaptor -..\%__SRC%\inc\boost\range\algorithm\* %_DEST%\inc%_EXT%\boost\range\algorithm -..\%__SRC%\inc\boost\range\algorithm_ext\* %_DEST%\inc%_EXT%\boost\range\algorithm_ext -..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range -..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc%_EXT%\boost\range\detail -..\%__SRC%\inc\boost\range\detail\vc6\* %_DEST%\inc%_EXT%\boost\range\detail\vc6 -..\%__SRC%\inc\boost\regex\config\* %_DEST%\inc%_EXT%\boost\regex\config -..\%__SRC%\inc\boost\regex\* %_DEST%\inc%_EXT%\boost\regex -..\%__SRC%\inc\boost\regex\pending\* %_DEST%\inc%_EXT%\boost\regex\pending -..\%__SRC%\inc\boost\regex\v4\* %_DEST%\inc%_EXT%\boost\regex\v4 -..\%__SRC%\inc\boost\serialization\* %_DEST%\inc%_EXT%\boost\serialization -..\%__SRC%\inc\boost\serialization\detail\* %_DEST%\inc%_EXT%\boost\serialization\detail -..\%__SRC%\inc\boost\signals2\* %_DEST%\inc%_EXT%\boost\signals2 -..\%__SRC%\inc\boost\signals2\detail\* %_DEST%\inc%_EXT%\boost\signals2\detail -..\%__SRC%\inc\boost\signals\* %_DEST%\inc%_EXT%\boost\signals -..\%__SRC%\inc\boost\signals\detail\* %_DEST%\inc%_EXT%\boost\signals\detail -..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr -..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail -..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor -..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute -..\%__SRC%\inc\boost\spirit\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\core\composite -..\%__SRC%\inc\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core -..\%__SRC%\inc\boost\spirit\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal -..\%__SRC%\inc\boost\spirit\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives -..\%__SRC%\inc\boost\spirit\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner -..\%__SRC%\inc\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug -..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit -..\%__SRC%\inc\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic -..\%__SRC%\inc\boost\spirit\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\error_handling -..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor -..\%__SRC%\inc\boost\spirit\home\classic\attribute\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\attribute -..\%__SRC%\inc\boost\spirit\home\classic\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite -..\%__SRC%\inc\boost\spirit\home\classic\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl -..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core -..\%__SRC%\inc\boost\spirit\home\classic\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl -..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal -..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl -..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives -..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl -..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner -..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl -..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug -..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl -..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic -..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic -..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\dynamic\impl -..\%__SRC%\inc\boost\spirit\home\classic\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling -..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl -..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator -..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl -..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta -..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl -..\%__SRC%\inc\boost\spirit\home\classic\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\phoenix -..\%__SRC%\inc\boost\spirit\home\classic\symbols\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols -..\%__SRC%\inc\boost\spirit\home\classic\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\symbols\impl -..\%__SRC%\inc\boost\spirit\home\classic\tree\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree -..\%__SRC%\inc\boost\spirit\home\classic\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\tree\impl -..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility -..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset -..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl -..\%__SRC%\inc\boost\spirit\home\* %_DEST%\inc%_EXT%\boost\spirit\home -..\%__SRC%\inc\boost\spirit\home\karma\action\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\action -..\%__SRC%\inc\boost\spirit\home\karma\auto\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\auto -..\%__SRC%\inc\boost\spirit\home\karma\auxiliary\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\auxiliary -..\%__SRC%\inc\boost\spirit\home\karma\binary\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\binary -..\%__SRC%\inc\boost\spirit\home\karma\char\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\char -..\%__SRC%\inc\boost\spirit\home\karma\* %_DEST%\inc%_EXT%\boost\spirit\home\karma -..\%__SRC%\inc\boost\spirit\home\karma\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\detail -..\%__SRC%\inc\boost\spirit\home\karma\directive\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\directive -..\%__SRC%\inc\boost\spirit\home\karma\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal -..\%__SRC%\inc\boost\spirit\home\karma\nonterminal\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\nonterminal\detail -..\%__SRC%\inc\boost\spirit\home\karma\numeric\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric -..\%__SRC%\inc\boost\spirit\home\karma\numeric\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\numeric\detail -..\%__SRC%\inc\boost\spirit\home\karma\operator\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\operator -..\%__SRC%\inc\boost\spirit\home\karma\stream\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream -..\%__SRC%\inc\boost\spirit\home\karma\stream\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\stream\detail -..\%__SRC%\inc\boost\spirit\home\karma\string\* %_DEST%\inc%_EXT%\boost\spirit\home\karma\string -..\%__SRC%\inc\boost\spirit\home\lex\* %_DEST%\inc%_EXT%\boost\spirit\home\lex -..\%__SRC%\inc\boost\spirit\home\lex\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\detail -..\%__SRC%\inc\boost\spirit\home\lex\lexer\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer -..\%__SRC%\inc\boost\spirit\home\lex\lexer\lexertl\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\lexer\lexertl -..\%__SRC%\inc\boost\spirit\home\lex\qi\* %_DEST%\inc%_EXT%\boost\spirit\home\lex\qi -..\%__SRC%\inc\boost\spirit\home\phoenix\bind\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind -..\%__SRC%\inc\boost\spirit\home\phoenix\bind\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\bind\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\core\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core -..\%__SRC%\inc\boost\spirit\home\phoenix\core\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\core\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix -..\%__SRC%\inc\boost\spirit\home\phoenix\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\function\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function -..\%__SRC%\inc\boost\spirit\home\phoenix\function\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\function\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\fusion\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\fusion -..\%__SRC%\inc\boost\spirit\home\phoenix\object\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object -..\%__SRC%\inc\boost\spirit\home\phoenix\object\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\object\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\operator\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator -..\%__SRC%\inc\boost\spirit\home\phoenix\operator\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\operator\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\scope\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope -..\%__SRC%\inc\boost\spirit\home\phoenix\scope\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\scope\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\statement\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement -..\%__SRC%\inc\boost\spirit\home\phoenix\statement\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\statement\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\stl\algorithm\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm -..\%__SRC%\inc\boost\spirit\home\phoenix\stl\algorithm\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\algorithm\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\stl\container\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container -..\%__SRC%\inc\boost\spirit\home\phoenix\stl\container\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl\container\detail -..\%__SRC%\inc\boost\spirit\home\phoenix\stl\* %_DEST%\inc%_EXT%\boost\spirit\home\phoenix\stl -..\%__SRC%\inc\boost\spirit\home\qi\action\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\action -..\%__SRC%\inc\boost\spirit\home\qi\auto\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\auto -..\%__SRC%\inc\boost\spirit\home\qi\auxiliary\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\auxiliary -..\%__SRC%\inc\boost\spirit\home\qi\binary\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\binary -..\%__SRC%\inc\boost\spirit\home\qi\char\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\char -..\%__SRC%\inc\boost\spirit\home\qi\* %_DEST%\inc%_EXT%\boost\spirit\home\qi -..\%__SRC%\inc\boost\spirit\home\qi\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\detail -..\%__SRC%\inc\boost\spirit\home\qi\directive\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\directive -..\%__SRC%\inc\boost\spirit\home\qi\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal -..\%__SRC%\inc\boost\spirit\home\qi\nonterminal\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\nonterminal\detail -..\%__SRC%\inc\boost\spirit\home\qi\numeric\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric -..\%__SRC%\inc\boost\spirit\home\qi\numeric\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\numeric\detail -..\%__SRC%\inc\boost\spirit\home\qi\operator\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\operator -..\%__SRC%\inc\boost\spirit\home\qi\stream\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream -..\%__SRC%\inc\boost\spirit\home\qi\stream\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\stream\detail -..\%__SRC%\inc\boost\spirit\home\qi\string\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\string -..\%__SRC%\inc\boost\spirit\home\qi\string\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\qi\string\detail -..\%__SRC%\inc\boost\spirit\home\support\algorithm\* %_DEST%\inc%_EXT%\boost\spirit\home\support\algorithm -..\%__SRC%\inc\boost\spirit\home\support\auto\* %_DEST%\inc%_EXT%\boost\spirit\home\support\auto -..\%__SRC%\inc\boost\spirit\home\support\auxiliary\* %_DEST%\inc%_EXT%\boost\spirit\home\support\auxiliary -..\%__SRC%\inc\boost\spirit\home\support\char_encoding\* %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding -..\%__SRC%\inc\boost\spirit\home\support\char_encoding\unicode\* %_DEST%\inc%_EXT%\boost\spirit\home\support\char_encoding\unicode -..\%__SRC%\inc\boost\spirit\home\support\char_set\* %_DEST%\inc%_EXT%\boost\spirit\home\support\char_set -..\%__SRC%\inc\boost\spirit\home\support\* %_DEST%\inc%_EXT%\boost\spirit\home\support -..\%__SRC%\inc\boost\spirit\home\support\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail -..\%__SRC%\inc\boost\spirit\home\support\detail\integer\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\integer -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\containers\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\containers -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\conversion\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\conversion -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\tokeniser\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tokeniser -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\tree\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\parser\tree -..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\partition\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\lexer\partition -..\%__SRC%\inc\boost\spirit\home\support\detail\math\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math -..\%__SRC%\inc\boost\spirit\home\support\detail\math\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\support\detail\math\detail -..\%__SRC%\inc\boost\spirit\home\support\iterators\* %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators -..\%__SRC%\inc\boost\spirit\home\support\iterators\detail\* %_DEST%\inc%_EXT%\boost\spirit\home\support\iterators\detail -..\%__SRC%\inc\boost\spirit\home\support\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\home\support\nonterminal -..\%__SRC%\inc\boost\spirit\include\* %_DEST%\inc%_EXT%\boost\spirit\include -..\%__SRC%\inc\boost\spirit\iterator\* %_DEST%\inc%_EXT%\boost\spirit\iterator -..\%__SRC%\inc\boost\spirit\meta\* %_DEST%\inc%_EXT%\boost\spirit\meta -..\%__SRC%\inc\boost\spirit\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\phoenix -..\%__SRC%\inc\boost\spirit\repository\home\* %_DEST%\inc%_EXT%\boost\spirit\repository\home -..\%__SRC%\inc\boost\spirit\repository\home\karma\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma -..\%__SRC%\inc\boost\spirit\repository\home\karma\directive\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\directive -..\%__SRC%\inc\boost\spirit\repository\home\karma\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\karma\nonterminal -..\%__SRC%\inc\boost\spirit\repository\home\qi\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi -..\%__SRC%\inc\boost\spirit\repository\home\qi\directive\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\directive -..\%__SRC%\inc\boost\spirit\repository\home\qi\nonterminal\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\nonterminal -..\%__SRC%\inc\boost\spirit\repository\home\qi\primitive\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\qi\primitive -..\%__SRC%\inc\boost\spirit\repository\home\support\* %_DEST%\inc%_EXT%\boost\spirit\repository\home\support -..\%__SRC%\inc\boost\spirit\repository\include\* %_DEST%\inc%_EXT%\boost\spirit\repository\include -..\%__SRC%\inc\boost\spirit\symbols\* %_DEST%\inc%_EXT%\boost\spirit\symbols -..\%__SRC%\inc\boost\spirit\tree\* %_DEST%\inc%_EXT%\boost\spirit\tree -..\%__SRC%\inc\boost\spirit\utility\* %_DEST%\inc%_EXT%\boost\spirit\utility -..\%__SRC%\inc\boost\statechart\* %_DEST%\inc%_EXT%\boost\statechart -..\%__SRC%\inc\boost\statechart\detail\* %_DEST%\inc%_EXT%\boost\statechart\detail -..\%__SRC%\inc\boost\system\* %_DEST%\inc%_EXT%\boost\system -..\%__SRC%\inc\boost\test\* %_DEST%\inc%_EXT%\boost\test -..\%__SRC%\inc\boost\test\detail\* %_DEST%\inc%_EXT%\boost\test\detail -..\%__SRC%\inc\boost\test\impl\* %_DEST%\inc%_EXT%\boost\test\impl -..\%__SRC%\inc\boost\test\included\* %_DEST%\inc%_EXT%\boost\test\included -..\%__SRC%\inc\boost\test\output\* %_DEST%\inc%_EXT%\boost\test\output -..\%__SRC%\inc\boost\test\utils\basic_cstring\* %_DEST%\inc%_EXT%\boost\test\utils\basic_cstring -..\%__SRC%\inc\boost\test\utils\* %_DEST%\inc%_EXT%\boost\test\utils -..\%__SRC%\inc\boost\test\utils\iterator\* %_DEST%\inc%_EXT%\boost\test\utils\iterator -..\%__SRC%\inc\boost\test\utils\runtime\cla\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla -..\%__SRC%\inc\boost\test\utils\runtime\cla\detail\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\detail -..\%__SRC%\inc\boost\test\utils\runtime\cla\iface\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\cla\iface -..\%__SRC%\inc\boost\test\utils\runtime\* %_DEST%\inc%_EXT%\boost\test\utils\runtime -..\%__SRC%\inc\boost\test\utils\runtime\env\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\env -..\%__SRC%\inc\boost\test\utils\runtime\file\* %_DEST%\inc%_EXT%\boost\test\utils\runtime\file -..\%__SRC%\inc\boost\thread\* %_DEST%\inc%_EXT%\boost\thread -..\%__SRC%\inc\boost\thread\detail\* %_DEST%\inc%_EXT%\boost\thread\detail -..\%__SRC%\inc\boost\thread\pthread\* %_DEST%\inc%_EXT%\boost\thread\pthread -..\%__SRC%\inc\boost\thread\win32\* %_DEST%\inc%_EXT%\boost\thread\win32 -..\%__SRC%\inc\boost\tr1\* %_DEST%\inc%_EXT%\boost\tr1 -..\%__SRC%\inc\boost\tr1\detail\* %_DEST%\inc%_EXT%\boost\tr1\detail -..\%__SRC%\inc\boost\tr1\tr1\bcc32\* %_DEST%\inc%_EXT%\boost\tr1\tr1\bcc32 -..\%__SRC%\inc\boost\tr1\tr1\* %_DEST%\inc%_EXT%\boost\tr1\tr1 -..\%__SRC%\inc\boost\tr1\tr1\sun\* %_DEST%\inc%_EXT%\boost\tr1\tr1\sun -..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple -..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail -..\%__SRC%\inc\boost\typeof\* %_DEST%\inc%_EXT%\boost\typeof -..\%__SRC%\inc\boost\typeof\dmc\* %_DEST%\inc%_EXT%\boost\typeof\dmc -..\%__SRC%\inc\boost\typeof\msvc\* %_DEST%\inc%_EXT%\boost\typeof\msvc -..\%__SRC%\inc\boost\typeof\std\* %_DEST%\inc%_EXT%\boost\typeof\std -..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits -..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail -..\%__SRC%\inc\boost\type_traits\msvc\* %_DEST%\inc%_EXT%\boost\type_traits\msvc -..\%__SRC%\inc\boost\units\base_units\angle\* %_DEST%\inc%_EXT%\boost\units\base_units\angle -..\%__SRC%\inc\boost\units\base_units\astronomical\* %_DEST%\inc%_EXT%\boost\units\base_units\astronomical -..\%__SRC%\inc\boost\units\base_units\cgs\* %_DEST%\inc%_EXT%\boost\units\base_units\cgs -..\%__SRC%\inc\boost\units\base_units\imperial\* %_DEST%\inc%_EXT%\boost\units\base_units\imperial -..\%__SRC%\inc\boost\units\base_units\metric\* %_DEST%\inc%_EXT%\boost\units\base_units\metric -..\%__SRC%\inc\boost\units\base_units\si\* %_DEST%\inc%_EXT%\boost\units\base_units\si -..\%__SRC%\inc\boost\units\base_units\temperature\* %_DEST%\inc%_EXT%\boost\units\base_units\temperature -..\%__SRC%\inc\boost\units\base_units\us\* %_DEST%\inc%_EXT%\boost\units\base_units\us -..\%__SRC%\inc\boost\units\* %_DEST%\inc%_EXT%\boost\units -..\%__SRC%\inc\boost\units\detail\* %_DEST%\inc%_EXT%\boost\units\detail -..\%__SRC%\inc\boost\units\physical_dimensions\* %_DEST%\inc%_EXT%\boost\units\physical_dimensions -..\%__SRC%\inc\boost\units\systems\angle\* %_DEST%\inc%_EXT%\boost\units\systems\angle -..\%__SRC%\inc\boost\units\systems\cgs\* %_DEST%\inc%_EXT%\boost\units\systems\cgs -..\%__SRC%\inc\boost\units\systems\* %_DEST%\inc%_EXT%\boost\units\systems -..\%__SRC%\inc\boost\units\systems\detail\* %_DEST%\inc%_EXT%\boost\units\systems\detail -..\%__SRC%\inc\boost\units\systems\si\codata\* %_DEST%\inc%_EXT%\boost\units\systems\si\codata -..\%__SRC%\inc\boost\units\systems\si\* %_DEST%\inc%_EXT%\boost\units\systems\si -..\%__SRC%\inc\boost\units\systems\temperature\* %_DEST%\inc%_EXT%\boost\units\systems\temperature -..\%__SRC%\inc\boost\unordered\* %_DEST%\inc%_EXT%\boost\unordered -..\%__SRC%\inc\boost\unordered\detail\* %_DEST%\inc%_EXT%\boost\unordered\detail -..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility -..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail -..\%__SRC%\inc\boost\uuid\* %_DEST%\inc%_EXT%\boost\uuid -..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant -..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail -..\%__SRC%\inc\boost\wave\cpplexer\* %_DEST%\inc%_EXT%\boost\wave\cpplexer -..\%__SRC%\inc\boost\wave\cpplexer\re2clex\* %_DEST%\inc%_EXT%\boost\wave\cpplexer\re2clex -..\%__SRC%\inc\boost\wave\* %_DEST%\inc%_EXT%\boost\wave -..\%__SRC%\inc\boost\wave\grammars\* %_DEST%\inc%_EXT%\boost\wave\grammars -..\%__SRC%\inc\boost\wave\util\* %_DEST%\inc%_EXT%\boost\wave\util -..\%__SRC%\inc\boost\xpressive\* %_DEST%\inc%_EXT%\boost\xpressive -..\%__SRC%\inc\boost\xpressive\detail\core\* %_DEST%\inc%_EXT%\boost\xpressive\detail\core -..\%__SRC%\inc\boost\xpressive\detail\core\matcher\* %_DEST%\inc%_EXT%\boost\xpressive\detail\core\matcher -..\%__SRC%\inc\boost\xpressive\detail\* %_DEST%\inc%_EXT%\boost\xpressive\detail -..\%__SRC%\inc\boost\xpressive\detail\dynamic\* %_DEST%\inc%_EXT%\boost\xpressive\detail\dynamic -..\%__SRC%\inc\boost\xpressive\detail\static\* %_DEST%\inc%_EXT%\boost\xpressive\detail\static -..\%__SRC%\inc\boost\xpressive\detail\static\transforms\* %_DEST%\inc%_EXT%\boost\xpressive\detail\static\transforms -..\%__SRC%\inc\boost\xpressive\detail\utility\chset\* %_DEST%\inc%_EXT%\boost\xpressive\detail\utility\chset -..\%__SRC%\inc\boost\xpressive\detail\utility\* %_DEST%\inc%_EXT%\boost\xpressive\detail\utility -..\%__SRC%\inc\boost\xpressive\traits\* %_DEST%\inc%_EXT%\boost\xpressive\traits -..\%__SRC%\inc\boost\xpressive\traits\detail\* %_DEST%\inc%_EXT%\boost\xpressive\traits\detail +..\%__SRC%\inc\boost\* %_DEST%\inc\boost +..\%__SRC%\inc\boost\accumulators\* %_DEST%\inc\boost\accumulators +..\%__SRC%\inc\boost\accumulators\framework\accumulators\* %_DEST%\inc\boost\accumulators\framework\accumulators +..\%__SRC%\inc\boost\accumulators\framework\* %_DEST%\inc\boost\accumulators\framework +..\%__SRC%\inc\boost\accumulators\framework\parameters\* %_DEST%\inc\boost\accumulators\framework\parameters +..\%__SRC%\inc\boost\accumulators\numeric\* %_DEST%\inc\boost\accumulators\numeric +..\%__SRC%\inc\boost\accumulators\numeric\detail\* %_DEST%\inc\boost\accumulators\numeric\detail +..\%__SRC%\inc\boost\accumulators\numeric\functional\* %_DEST%\inc\boost\accumulators\numeric\functional +..\%__SRC%\inc\boost\accumulators\statistics\* %_DEST%\inc\boost\accumulators\statistics +..\%__SRC%\inc\boost\accumulators\statistics\parameters\* %_DEST%\inc\boost\accumulators\statistics\parameters +..\%__SRC%\inc\boost\accumulators\statistics\variates\* %_DEST%\inc\boost\accumulators\statistics\variates +..\%__SRC%\inc\boost\algorithm\* %_DEST%\inc\boost\algorithm +..\%__SRC%\inc\boost\algorithm\string\* %_DEST%\inc\boost\algorithm\string +..\%__SRC%\inc\boost\algorithm\string\detail\* %_DEST%\inc\boost\algorithm\string\detail +..\%__SRC%\inc\boost\algorithm\string\std\* %_DEST%\inc\boost\algorithm\string\std +..\%__SRC%\inc\boost\archive\* %_DEST%\inc\boost\archive +..\%__SRC%\inc\boost\archive\detail\* %_DEST%\inc\boost\archive\detail +..\%__SRC%\inc\boost\archive\impl\* %_DEST%\inc\boost\archive\impl +..\%__SRC%\inc\boost\archive\iterators\* %_DEST%\inc\boost\archive\iterators +..\%__SRC%\inc\boost\asio\* %_DEST%\inc\boost\asio +..\%__SRC%\inc\boost\asio\detail\* %_DEST%\inc\boost\asio\detail +..\%__SRC%\inc\boost\asio\detail\impl\* %_DEST%\inc\boost\asio\detail\impl +..\%__SRC%\inc\boost\asio\impl\* %_DEST%\inc\boost\asio\impl +..\%__SRC%\inc\boost\asio\ip\* %_DEST%\inc\boost\asio\ip +..\%__SRC%\inc\boost\asio\ip\detail\* %_DEST%\inc\boost\asio\ip\detail +..\%__SRC%\inc\boost\asio\ip\detail\impl\* %_DEST%\inc\boost\asio\ip\detail\impl +..\%__SRC%\inc\boost\asio\ip\impl\* %_DEST%\inc\boost\asio\ip\impl +..\%__SRC%\inc\boost\asio\local\* %_DEST%\inc\boost\asio\local +..\%__SRC%\inc\boost\asio\local\detail\* %_DEST%\inc\boost\asio\local\detail +..\%__SRC%\inc\boost\asio\local\detail\impl\* %_DEST%\inc\boost\asio\local\detail\impl +..\%__SRC%\inc\boost\asio\posix\* %_DEST%\inc\boost\asio\posix +..\%__SRC%\inc\boost\asio\ssl\* %_DEST%\inc\boost\asio\ssl +..\%__SRC%\inc\boost\asio\ssl\detail\* %_DEST%\inc\boost\asio\ssl\detail +..\%__SRC%\inc\boost\asio\windows\* %_DEST%\inc\boost\asio\windows +..\%__SRC%\inc\boost\assign\* %_DEST%\inc\boost\assign +..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc\boost\assign\std +..\%__SRC%\inc\boost\bimap\container_adaptor\* %_DEST%\inc\boost\bimap\container_adaptor +..\%__SRC%\inc\boost\bimap\container_adaptor\detail\* %_DEST%\inc\boost\bimap\container_adaptor\detail +..\%__SRC%\inc\boost\bimap\container_adaptor\support\* %_DEST%\inc\boost\bimap\container_adaptor\support +..\%__SRC%\inc\boost\bimap\* %_DEST%\inc\boost\bimap +..\%__SRC%\inc\boost\bimap\detail\debug\* %_DEST%\inc\boost\bimap\detail\debug +..\%__SRC%\inc\boost\bimap\detail\* %_DEST%\inc\boost\bimap\detail +..\%__SRC%\inc\boost\bimap\detail\test\* %_DEST%\inc\boost\bimap\detail\test +..\%__SRC%\inc\boost\bimap\property_map\* %_DEST%\inc\boost\bimap\property_map +..\%__SRC%\inc\boost\bimap\relation\* %_DEST%\inc\boost\bimap\relation +..\%__SRC%\inc\boost\bimap\relation\detail\* %_DEST%\inc\boost\bimap\relation\detail +..\%__SRC%\inc\boost\bimap\relation\support\* %_DEST%\inc\boost\bimap\relation\support +..\%__SRC%\inc\boost\bimap\support\* %_DEST%\inc\boost\bimap\support +..\%__SRC%\inc\boost\bimap\tags\* %_DEST%\inc\boost\bimap\tags +..\%__SRC%\inc\boost\bimap\tags\support\* %_DEST%\inc\boost\bimap\tags\support +..\%__SRC%\inc\boost\bimap\views\* %_DEST%\inc\boost\bimap\views +..\%__SRC%\inc\boost\bind\* %_DEST%\inc\boost\bind +..\%__SRC%\inc\boost\circular_buffer\* %_DEST%\inc\boost\circular_buffer +..\%__SRC%\inc\boost\compatibility\cpp_c_headers\* %_DEST%\inc\boost\compatibility\cpp_c_headers +..\%__SRC%\inc\boost\concept_check\* %_DEST%\inc\boost\concept_check +..\%__SRC%\inc\boost\concept\* %_DEST%\inc\boost\concept +..\%__SRC%\inc\boost\concept\detail\* %_DEST%\inc\boost\concept\detail +..\%__SRC%\inc\boost\config\abi\* %_DEST%\inc\boost\config\abi +..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc\boost\config\compiler +..\%__SRC%\inc\boost\config\* %_DEST%\inc\boost\config +..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc\boost\config\no_tr1 +..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc\boost\config\platform +..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc\boost\config\stdlib +..\%__SRC%\inc\boost\date_time\* %_DEST%\inc\boost\date_time +..\%__SRC%\inc\boost\date_time\gregorian\* %_DEST%\inc\boost\date_time\gregorian +..\%__SRC%\inc\boost\date_time\local_time\* %_DEST%\inc\boost\date_time\local_time +..\%__SRC%\inc\boost\date_time\posix_time\* %_DEST%\inc\boost\date_time\posix_time +..\%__SRC%\inc\boost\detail\* %_DEST%\inc\boost\detail +..\%__SRC%\inc\boost\dynamic_bitset\* %_DEST%\inc\boost\dynamic_bitset +..\%__SRC%\inc\boost\exception\* %_DEST%\inc\boost\exception +..\%__SRC%\inc\boost\exception\detail\* %_DEST%\inc\boost\exception\detail +..\%__SRC%\inc\boost\filesystem\* %_DEST%\inc\boost\filesystem +..\%__SRC%\inc\boost\filesystem\detail\* %_DEST%\inc\boost\filesystem\detail +..\%__SRC%\inc\boost\filesystem\v2\* %_DEST%\inc\boost\filesystem\v2 +..\%__SRC%\inc\boost\filesystem\v3\* %_DEST%\inc\boost\filesystem\v3 +..\%__SRC%\inc\boost\flyweight\* %_DEST%\inc\boost\flyweight +..\%__SRC%\inc\boost\flyweight\detail\* %_DEST%\inc\boost\flyweight\detail +..\%__SRC%\inc\boost\format\* %_DEST%\inc\boost\format +..\%__SRC%\inc\boost\format\detail\* %_DEST%\inc\boost\format\detail +..\%__SRC%\inc\boost\functional\* %_DEST%\inc\boost\functional +..\%__SRC%\inc\boost\functional\detail\* %_DEST%\inc\boost\functional\detail +..\%__SRC%\inc\boost\functional\hash\* %_DEST%\inc\boost\functional\hash +..\%__SRC%\inc\boost\functional\hash\detail\* %_DEST%\inc\boost\functional\hash\detail +..\%__SRC%\inc\boost\function\* %_DEST%\inc\boost\function +..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc\boost\function\detail +..\%__SRC%\inc\boost\function_types\config\* %_DEST%\inc\boost\function_types\config +..\%__SRC%\inc\boost\function_types\* %_DEST%\inc\boost\function_types +..\%__SRC%\inc\boost\function_types\detail\classifier_impl\* %_DEST%\inc\boost\function_types\detail\classifier_impl +..\%__SRC%\inc\boost\function_types\detail\components_impl\* %_DEST%\inc\boost\function_types\detail\components_impl +..\%__SRC%\inc\boost\function_types\detail\* %_DEST%\inc\boost\function_types\detail +..\%__SRC%\inc\boost\function_types\detail\encoding\* %_DEST%\inc\boost\function_types\detail\encoding +..\%__SRC%\inc\boost\function_types\detail\pp_cc_loop\* %_DEST%\inc\boost\function_types\detail\pp_cc_loop +..\%__SRC%\inc\boost\function_types\detail\pp_retag_default_cc\* %_DEST%\inc\boost\function_types\detail\pp_retag_default_cc +..\%__SRC%\inc\boost\function_types\detail\pp_tags\* %_DEST%\inc\boost\function_types\detail\pp_tags +..\%__SRC%\inc\boost\function_types\detail\pp_variate_loop\* %_DEST%\inc\boost\function_types\detail\pp_variate_loop +..\%__SRC%\inc\boost\function_types\detail\synthesize_impl\* %_DEST%\inc\boost\function_types\detail\synthesize_impl +..\%__SRC%\inc\boost\fusion\adapted\array\* %_DEST%\inc\boost\fusion\adapted\array +..\%__SRC%\inc\boost\fusion\adapted\boost_array\* %_DEST%\inc\boost\fusion\adapted\boost_array +..\%__SRC%\inc\boost\fusion\adapted\boost_array\detail\* %_DEST%\inc\boost\fusion\adapted\boost_array\detail +..\%__SRC%\inc\boost\fusion\adapted\boost_tuple\* %_DEST%\inc\boost\fusion\adapted\boost_tuple +..\%__SRC%\inc\boost\fusion\adapted\boost_tuple\detail\* %_DEST%\inc\boost\fusion\adapted\boost_tuple\detail +..\%__SRC%\inc\boost\fusion\adapted\class\* %_DEST%\inc\boost\fusion\adapted\class +..\%__SRC%\inc\boost\fusion\adapted\class\detail\* %_DEST%\inc\boost\fusion\adapted\class\detail +..\%__SRC%\inc\boost\fusion\adapted\* %_DEST%\inc\boost\fusion\adapted +..\%__SRC%\inc\boost\fusion\adapted\mpl\* %_DEST%\inc\boost\fusion\adapted\mpl +..\%__SRC%\inc\boost\fusion\adapted\mpl\detail\* %_DEST%\inc\boost\fusion\adapted\mpl\detail +..\%__SRC%\inc\boost\fusion\adapted\struct\* %_DEST%\inc\boost\fusion\adapted\struct +..\%__SRC%\inc\boost\fusion\adapted\struct\detail\* %_DEST%\inc\boost\fusion\adapted\struct\detail +..\%__SRC%\inc\boost\fusion\algorithm\* %_DEST%\inc\boost\fusion\algorithm +..\%__SRC%\inc\boost\fusion\algorithm\iteration\* %_DEST%\inc\boost\fusion\algorithm\iteration +..\%__SRC%\inc\boost\fusion\algorithm\iteration\detail\* %_DEST%\inc\boost\fusion\algorithm\iteration\detail +..\%__SRC%\inc\boost\fusion\algorithm\iteration\ext_\* %_DEST%\inc\boost\fusion\algorithm\iteration\ext_ +..\%__SRC%\inc\boost\fusion\algorithm\query\* %_DEST%\inc\boost\fusion\algorithm\query +..\%__SRC%\inc\boost\fusion\algorithm\query\detail\* %_DEST%\inc\boost\fusion\algorithm\query\detail +..\%__SRC%\inc\boost\fusion\algorithm\query\ext_\* %_DEST%\inc\boost\fusion\algorithm\query\ext_ +..\%__SRC%\inc\boost\fusion\algorithm\transformation\* %_DEST%\inc\boost\fusion\algorithm\transformation +..\%__SRC%\inc\boost\fusion\algorithm\transformation\detail\* %_DEST%\inc\boost\fusion\algorithm\transformation\detail +..\%__SRC%\inc\boost\fusion\container\deque\* %_DEST%\inc\boost\fusion\container\deque +..\%__SRC%\inc\boost\fusion\container\deque\detail\* %_DEST%\inc\boost\fusion\container\deque\detail +..\%__SRC%\inc\boost\fusion\container\* %_DEST%\inc\boost\fusion\container +..\%__SRC%\inc\boost\fusion\container\ext_\* %_DEST%\inc\boost\fusion\container\ext_ +..\%__SRC%\inc\boost\fusion\container\generation\* %_DEST%\inc\boost\fusion\container\generation +..\%__SRC%\inc\boost\fusion\container\list\* %_DEST%\inc\boost\fusion\container\list +..\%__SRC%\inc\boost\fusion\container\list\detail\* %_DEST%\inc\boost\fusion\container\list\detail +..\%__SRC%\inc\boost\fusion\container\map\* %_DEST%\inc\boost\fusion\container\map +..\%__SRC%\inc\boost\fusion\container\map\detail\* %_DEST%\inc\boost\fusion\container\map\detail +..\%__SRC%\inc\boost\fusion\container\set\* %_DEST%\inc\boost\fusion\container\set +..\%__SRC%\inc\boost\fusion\container\set\detail\* %_DEST%\inc\boost\fusion\container\set\detail +..\%__SRC%\inc\boost\fusion\container\vector\* %_DEST%\inc\boost\fusion\container\vector +..\%__SRC%\inc\boost\fusion\container\vector\detail\* %_DEST%\inc\boost\fusion\container\vector\detail +..\%__SRC%\inc\boost\fusion\* %_DEST%\inc\boost\fusion +..\%__SRC%\inc\boost\fusion\functional\adapter\* %_DEST%\inc\boost\fusion\functional\adapter +..\%__SRC%\inc\boost\fusion\functional\adapter\detail\* %_DEST%\inc\boost\fusion\functional\adapter\detail +..\%__SRC%\inc\boost\fusion\functional\* %_DEST%\inc\boost\fusion\functional +..\%__SRC%\inc\boost\fusion\functional\generation\* %_DEST%\inc\boost\fusion\functional\generation +..\%__SRC%\inc\boost\fusion\functional\generation\detail\* %_DEST%\inc\boost\fusion\functional\generation\detail +..\%__SRC%\inc\boost\fusion\functional\invocation\* %_DEST%\inc\boost\fusion\functional\invocation +..\%__SRC%\inc\boost\fusion\functional\invocation\detail\* %_DEST%\inc\boost\fusion\functional\invocation\detail +..\%__SRC%\inc\boost\fusion\include\* %_DEST%\inc\boost\fusion\include +..\%__SRC%\inc\boost\fusion\iterator\* %_DEST%\inc\boost\fusion\iterator +..\%__SRC%\inc\boost\fusion\iterator\detail\* %_DEST%\inc\boost\fusion\iterator\detail +..\%__SRC%\inc\boost\fusion\iterator\mpl\* %_DEST%\inc\boost\fusion\iterator\mpl +..\%__SRC%\inc\boost\fusion\mpl\* %_DEST%\inc\boost\fusion\mpl +..\%__SRC%\inc\boost\fusion\mpl\detail\* %_DEST%\inc\boost\fusion\mpl\detail +..\%__SRC%\inc\boost\fusion\sequence\comparison\* %_DEST%\inc\boost\fusion\sequence\comparison +..\%__SRC%\inc\boost\fusion\sequence\comparison\detail\* %_DEST%\inc\boost\fusion\sequence\comparison\detail +..\%__SRC%\inc\boost\fusion\sequence\* %_DEST%\inc\boost\fusion\sequence +..\%__SRC%\inc\boost\fusion\sequence\intrinsic\* %_DEST%\inc\boost\fusion\sequence\intrinsic +..\%__SRC%\inc\boost\fusion\sequence\intrinsic\ext_\* %_DEST%\inc\boost\fusion\sequence\intrinsic\ext_ +..\%__SRC%\inc\boost\fusion\sequence\io\* %_DEST%\inc\boost\fusion\sequence\io +..\%__SRC%\inc\boost\fusion\sequence\io\detail\* %_DEST%\inc\boost\fusion\sequence\io\detail +..\%__SRC%\inc\boost\fusion\support\* %_DEST%\inc\boost\fusion\support +..\%__SRC%\inc\boost\fusion\support\detail\* %_DEST%\inc\boost\fusion\support\detail +..\%__SRC%\inc\boost\fusion\support\ext_\* %_DEST%\inc\boost\fusion\support\ext_ +..\%__SRC%\inc\boost\fusion\tuple\* %_DEST%\inc\boost\fusion\tuple +..\%__SRC%\inc\boost\fusion\tuple\detail\* %_DEST%\inc\boost\fusion\tuple\detail +..\%__SRC%\inc\boost\fusion\view\* %_DEST%\inc\boost\fusion\view +..\%__SRC%\inc\boost\fusion\view\detail\* %_DEST%\inc\boost\fusion\view\detail +..\%__SRC%\inc\boost\fusion\view\ext_\* %_DEST%\inc\boost\fusion\view\ext_ +..\%__SRC%\inc\boost\fusion\view\filter_view\* %_DEST%\inc\boost\fusion\view\filter_view +..\%__SRC%\inc\boost\fusion\view\filter_view\detail\* %_DEST%\inc\boost\fusion\view\filter_view\detail +..\%__SRC%\inc\boost\fusion\view\iterator_range\* %_DEST%\inc\boost\fusion\view\iterator_range +..\%__SRC%\inc\boost\fusion\view\iterator_range\detail\* %_DEST%\inc\boost\fusion\view\iterator_range\detail +..\%__SRC%\inc\boost\fusion\view\joint_view\* %_DEST%\inc\boost\fusion\view\joint_view +..\%__SRC%\inc\boost\fusion\view\joint_view\detail\* %_DEST%\inc\boost\fusion\view\joint_view\detail +..\%__SRC%\inc\boost\fusion\view\nview\* %_DEST%\inc\boost\fusion\view\nview +..\%__SRC%\inc\boost\fusion\view\nview\detail\* %_DEST%\inc\boost\fusion\view\nview\detail +..\%__SRC%\inc\boost\fusion\view\repetitive_view\* %_DEST%\inc\boost\fusion\view\repetitive_view +..\%__SRC%\inc\boost\fusion\view\repetitive_view\detail\* %_DEST%\inc\boost\fusion\view\repetitive_view\detail +..\%__SRC%\inc\boost\fusion\view\reverse_view\* %_DEST%\inc\boost\fusion\view\reverse_view +..\%__SRC%\inc\boost\fusion\view\reverse_view\detail\* %_DEST%\inc\boost\fusion\view\reverse_view\detail +..\%__SRC%\inc\boost\fusion\view\single_view\* %_DEST%\inc\boost\fusion\view\single_view +..\%__SRC%\inc\boost\fusion\view\single_view\detail\* %_DEST%\inc\boost\fusion\view\single_view\detail +..\%__SRC%\inc\boost\fusion\view\transform_view\* %_DEST%\inc\boost\fusion\view\transform_view +..\%__SRC%\inc\boost\fusion\view\transform_view\detail\* %_DEST%\inc\boost\fusion\view\transform_view\detail +..\%__SRC%\inc\boost\fusion\view\zip_view\* %_DEST%\inc\boost\fusion\view\zip_view +..\%__SRC%\inc\boost\fusion\view\zip_view\detail\* %_DEST%\inc\boost\fusion\view\zip_view\detail +..\%__SRC%\inc\boost\gil\* %_DEST%\inc\boost\gil +..\%__SRC%\inc\boost\gil\extension\dynamic_image\* %_DEST%\inc\boost\gil\extension\dynamic_image +..\%__SRC%\inc\boost\gil\extension\io\* %_DEST%\inc\boost\gil\extension\io +..\%__SRC%\inc\boost\graph\* %_DEST%\inc\boost\graph +..\%__SRC%\inc\boost\graph\detail\* %_DEST%\inc\boost\graph\detail +..\%__SRC%\inc\boost\graph\distributed\adjlist\* %_DEST%\inc\boost\graph\distributed\adjlist +..\%__SRC%\inc\boost\graph\distributed\* %_DEST%\inc\boost\graph\distributed +..\%__SRC%\inc\boost\graph\distributed\detail\* %_DEST%\inc\boost\graph\distributed\detail +..\%__SRC%\inc\boost\graph\parallel\* %_DEST%\inc\boost\graph\parallel +..\%__SRC%\inc\boost\graph\parallel\detail\* %_DEST%\inc\boost\graph\parallel\detail +..\%__SRC%\inc\boost\graph\planar_detail\* %_DEST%\inc\boost\graph\planar_detail +..\%__SRC%\inc\boost\graph\property_maps\* %_DEST%\inc\boost\graph\property_maps +..\%__SRC%\inc\boost\integer\* %_DEST%\inc\boost\integer +..\%__SRC%\inc\boost\interprocess\allocators\* %_DEST%\inc\boost\interprocess\allocators +..\%__SRC%\inc\boost\interprocess\allocators\detail\* %_DEST%\inc\boost\interprocess\allocators\detail +..\%__SRC%\inc\boost\interprocess\containers\container\* %_DEST%\inc\boost\interprocess\containers\container +..\%__SRC%\inc\boost\interprocess\containers\container\detail\* %_DEST%\inc\boost\interprocess\containers\container\detail +..\%__SRC%\inc\boost\interprocess\containers\* %_DEST%\inc\boost\interprocess\containers +..\%__SRC%\inc\boost\interprocess\* %_DEST%\inc\boost\interprocess +..\%__SRC%\inc\boost\interprocess\detail\* %_DEST%\inc\boost\interprocess\detail +..\%__SRC%\inc\boost\interprocess\indexes\* %_DEST%\inc\boost\interprocess\indexes +..\%__SRC%\inc\boost\interprocess\ipc\* %_DEST%\inc\boost\interprocess\ipc +..\%__SRC%\inc\boost\interprocess\mem_algo\* %_DEST%\inc\boost\interprocess\mem_algo +..\%__SRC%\inc\boost\interprocess\mem_algo\detail\* %_DEST%\inc\boost\interprocess\mem_algo\detail +..\%__SRC%\inc\boost\interprocess\smart_ptr\* %_DEST%\inc\boost\interprocess\smart_ptr +..\%__SRC%\inc\boost\interprocess\smart_ptr\detail\* %_DEST%\inc\boost\interprocess\smart_ptr\detail +..\%__SRC%\inc\boost\interprocess\streams\* %_DEST%\inc\boost\interprocess\streams +..\%__SRC%\inc\boost\interprocess\sync\* %_DEST%\inc\boost\interprocess\sync +..\%__SRC%\inc\boost\interprocess\sync\emulation\* %_DEST%\inc\boost\interprocess\sync\emulation +..\%__SRC%\inc\boost\interprocess\sync\posix\* %_DEST%\inc\boost\interprocess\sync\posix +..\%__SRC%\inc\boost\interprocess\sync\xsi\* %_DEST%\inc\boost\interprocess\sync\xsi +..\%__SRC%\inc\boost\intrusive\* %_DEST%\inc\boost\intrusive +..\%__SRC%\inc\boost\intrusive\detail\* %_DEST%\inc\boost\intrusive\detail +..\%__SRC%\inc\boost\io\* %_DEST%\inc\boost\io +..\%__SRC%\inc\boost\io\detail\* %_DEST%\inc\boost\io\detail +..\%__SRC%\inc\boost\iostreams\* %_DEST%\inc\boost\iostreams +..\%__SRC%\inc\boost\iostreams\detail\adapter\* %_DEST%\inc\boost\iostreams\detail\adapter +..\%__SRC%\inc\boost\iostreams\detail\broken_overload_resolution\* %_DEST%\inc\boost\iostreams\detail\broken_overload_resolution +..\%__SRC%\inc\boost\iostreams\detail\config\* %_DEST%\inc\boost\iostreams\detail\config +..\%__SRC%\inc\boost\iostreams\detail\* %_DEST%\inc\boost\iostreams\detail +..\%__SRC%\inc\boost\iostreams\detail\streambuf\* %_DEST%\inc\boost\iostreams\detail\streambuf +..\%__SRC%\inc\boost\iostreams\detail\vc6\* %_DEST%\inc\boost\iostreams\detail\vc6 +..\%__SRC%\inc\boost\iostreams\device\* %_DEST%\inc\boost\iostreams\device +..\%__SRC%\inc\boost\iostreams\filter\* %_DEST%\inc\boost\iostreams\filter +..\%__SRC%\inc\boost\iterator\* %_DEST%\inc\boost\iterator +..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc\boost\iterator\detail +..\%__SRC%\inc\boost\lambda\* %_DEST%\inc\boost\lambda +..\%__SRC%\inc\boost\lambda\detail\* %_DEST%\inc\boost\lambda\detail +..\%__SRC%\inc\boost\logic\* %_DEST%\inc\boost\logic +..\%__SRC%\inc\boost\math\bindings\* %_DEST%\inc\boost\math\bindings +..\%__SRC%\inc\boost\math\bindings\detail\* %_DEST%\inc\boost\math\bindings\detail +..\%__SRC%\inc\boost\math\complex\* %_DEST%\inc\boost\math\complex +..\%__SRC%\inc\boost\math\concepts\* %_DEST%\inc\boost\math\concepts +..\%__SRC%\inc\boost\math\constants\* %_DEST%\inc\boost\math\constants +..\%__SRC%\inc\boost\math\* %_DEST%\inc\boost\math +..\%__SRC%\inc\boost\math\distributions\* %_DEST%\inc\boost\math\distributions +..\%__SRC%\inc\boost\math\distributions\detail\* %_DEST%\inc\boost\math\distributions\detail +..\%__SRC%\inc\boost\math\policies\* %_DEST%\inc\boost\math\policies +..\%__SRC%\inc\boost\math\special_functions\* %_DEST%\inc\boost\math\special_functions +..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc\boost\math\special_functions\detail +..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc\boost\math\tools +..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc\boost\math\tools\detail +..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc\boost\mpi\collectives +..\%__SRC%\inc\boost\mpi\* %_DEST%\inc\boost\mpi +..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc\boost\mpi\detail +..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc\boost\mpi\python +..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc\boost\mpl\aux_\config +..\%__SRC%\inc\boost\mpl\aux_\* %_DEST%\inc\boost\mpl\aux_ +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc\boost\mpl\aux_\preprocessed\bcc551 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc\boost\mpl\aux_\preprocessed\bcc +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc_pre590\* %_DEST%\inc\boost\mpl\aux_\preprocessed\bcc_pre590 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\dmc\* %_DEST%\inc\boost\mpl\aux_\preprocessed\dmc +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc\boost\mpl\aux_\preprocessed\gcc +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc\boost\mpl\aux_\preprocessed\msvc60 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc\boost\mpl\aux_\preprocessed\msvc70 +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\mwcw\* %_DEST%\inc\boost\mpl\aux_\preprocessed\mwcw +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ctps\* %_DEST%\inc\boost\mpl\aux_\preprocessed\no_ctps +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ttp\* %_DEST%\inc\boost\mpl\aux_\preprocessed\no_ttp +..\%__SRC%\inc\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc\boost\mpl\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\aux_\preprocessor\* %_DEST%\inc\boost\mpl\aux_\preprocessor +..\%__SRC%\inc\boost\mpl\aux_\range_c\* %_DEST%\inc\boost\mpl\aux_\range_c +..\%__SRC%\inc\boost\mpl\aux_\test\* %_DEST%\inc\boost\mpl\aux_\test +..\%__SRC%\inc\boost\mpl\* %_DEST%\inc\boost\mpl +..\%__SRC%\inc\boost\mpl\limits\* %_DEST%\inc\boost\mpl\limits +..\%__SRC%\inc\boost\mpl\list\aux_\* %_DEST%\inc\boost\mpl\list\aux_ +..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc\boost\mpl\list\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\list\* %_DEST%\inc\boost\mpl\list +..\%__SRC%\inc\boost\mpl\map\aux_\* %_DEST%\inc\boost\mpl\map\aux_ +..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\no_ctps\* %_DEST%\inc\boost\mpl\map\aux_\preprocessed\no_ctps +..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\plain\* %_DEST%\inc\boost\mpl\map\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\map\aux_\preprocessed\typeof_based\* %_DEST%\inc\boost\mpl\map\aux_\preprocessed\typeof_based +..\%__SRC%\inc\boost\mpl\map\* %_DEST%\inc\boost\mpl\map +..\%__SRC%\inc\boost\mpl\math\* %_DEST%\inc\boost\mpl\math +..\%__SRC%\inc\boost\mpl\multiset\aux_\* %_DEST%\inc\boost\mpl\multiset\aux_ +..\%__SRC%\inc\boost\mpl\multiset\* %_DEST%\inc\boost\mpl\multiset +..\%__SRC%\inc\boost\mpl\set\aux_\* %_DEST%\inc\boost\mpl\set\aux_ +..\%__SRC%\inc\boost\mpl\set\aux_\preprocessed\plain\* %_DEST%\inc\boost\mpl\set\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\set\* %_DEST%\inc\boost\mpl\set +..\%__SRC%\inc\boost\mpl\vector\aux_\* %_DEST%\inc\boost\mpl\vector\aux_ +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc\boost\mpl\vector\aux_\preprocessed\plain +..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based +..\%__SRC%\inc\boost\mpl\vector\* %_DEST%\inc\boost\mpl\vector +..\%__SRC%\inc\boost\msm\back\* %_DEST%\inc\boost\msm\back +..\%__SRC%\inc\boost\msm\* %_DEST%\inc\boost\msm +..\%__SRC%\inc\boost\msm\front\* %_DEST%\inc\boost\msm\front +..\%__SRC%\inc\boost\msm\front\detail\* %_DEST%\inc\boost\msm\front\detail +..\%__SRC%\inc\boost\msm\front\euml\* %_DEST%\inc\boost\msm\front\euml +..\%__SRC%\inc\boost\multi_array\* %_DEST%\inc\boost\multi_array +..\%__SRC%\inc\boost\multi_index\* %_DEST%\inc\boost\multi_index +..\%__SRC%\inc\boost\multi_index\detail\* %_DEST%\inc\boost\multi_index\detail +..\%__SRC%\inc\boost\numeric\conversion\* %_DEST%\inc\boost\numeric\conversion +..\%__SRC%\inc\boost\numeric\conversion\detail\* %_DEST%\inc\boost\numeric\conversion\detail +..\%__SRC%\inc\boost\numeric\* %_DEST%\inc\boost\numeric +..\%__SRC%\inc\boost\numeric\interval\compare\* %_DEST%\inc\boost\numeric\interval\compare +..\%__SRC%\inc\boost\numeric\interval\* %_DEST%\inc\boost\numeric\interval +..\%__SRC%\inc\boost\numeric\interval\detail\* %_DEST%\inc\boost\numeric\interval\detail +..\%__SRC%\inc\boost\numeric\interval\ext\* %_DEST%\inc\boost\numeric\interval\ext +..\%__SRC%\inc\boost\numeric\ublas\* %_DEST%\inc\boost\numeric\ublas +..\%__SRC%\inc\boost\numeric\ublas\detail\* %_DEST%\inc\boost\numeric\ublas\detail +..\%__SRC%\inc\boost\numeric\ublas\experimental\* %_DEST%\inc\boost\numeric\ublas\experimental +..\%__SRC%\inc\boost\numeric\ublas\operation\* %_DEST%\inc\boost\numeric\ublas\operation +..\%__SRC%\inc\boost\numeric\ublas\traits\* %_DEST%\inc\boost\numeric\ublas\traits +..\%__SRC%\inc\boost\optional\* %_DEST%\inc\boost\optional +..\%__SRC%\inc\boost\parameter\aux_\* %_DEST%\inc\boost\parameter\aux_ +..\%__SRC%\inc\boost\parameter\aux_\preprocessor\* %_DEST%\inc\boost\parameter\aux_\preprocessor +..\%__SRC%\inc\boost\parameter\aux_\python\* %_DEST%\inc\boost\parameter\aux_\python +..\%__SRC%\inc\boost\parameter\* %_DEST%\inc\boost\parameter +..\%__SRC%\inc\boost\pending\* %_DEST%\inc\boost\pending +..\%__SRC%\inc\boost\pending\detail\* %_DEST%\inc\boost\pending\detail +..\%__SRC%\inc\boost\polygon\* %_DEST%\inc\boost\polygon +..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc\boost\polygon\detail +..\%__SRC%\inc\boost\pool\* %_DEST%\inc\boost\pool +..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc\boost\pool\detail +..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc\boost\preprocessor\arithmetic +..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc\boost\preprocessor\arithmetic\detail +..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc\boost\preprocessor\array +..\%__SRC%\inc\boost\preprocessor\comparison\* %_DEST%\inc\boost\preprocessor\comparison +..\%__SRC%\inc\boost\preprocessor\config\* %_DEST%\inc\boost\preprocessor\config +..\%__SRC%\inc\boost\preprocessor\control\* %_DEST%\inc\boost\preprocessor\control +..\%__SRC%\inc\boost\preprocessor\control\detail\* %_DEST%\inc\boost\preprocessor\control\detail +..\%__SRC%\inc\boost\preprocessor\control\detail\dmc\* %_DEST%\inc\boost\preprocessor\control\detail\dmc +..\%__SRC%\inc\boost\preprocessor\control\detail\edg\* %_DEST%\inc\boost\preprocessor\control\detail\edg +..\%__SRC%\inc\boost\preprocessor\control\detail\msvc\* %_DEST%\inc\boost\preprocessor\control\detail\msvc +..\%__SRC%\inc\boost\preprocessor\debug\* %_DEST%\inc\boost\preprocessor\debug +..\%__SRC%\inc\boost\preprocessor\* %_DEST%\inc\boost\preprocessor +..\%__SRC%\inc\boost\preprocessor\detail\* %_DEST%\inc\boost\preprocessor\detail +..\%__SRC%\inc\boost\preprocessor\detail\dmc\* %_DEST%\inc\boost\preprocessor\detail\dmc +..\%__SRC%\inc\boost\preprocessor\facilities\* %_DEST%\inc\boost\preprocessor\facilities +..\%__SRC%\inc\boost\preprocessor\iteration\* %_DEST%\inc\boost\preprocessor\iteration +..\%__SRC%\inc\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc\boost\preprocessor\iteration\detail\bounds +..\%__SRC%\inc\boost\preprocessor\iteration\detail\* %_DEST%\inc\boost\preprocessor\iteration\detail +..\%__SRC%\inc\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc\boost\preprocessor\iteration\detail\iter +..\%__SRC%\inc\boost\preprocessor\list\* %_DEST%\inc\boost\preprocessor\list +..\%__SRC%\inc\boost\preprocessor\list\detail\* %_DEST%\inc\boost\preprocessor\list\detail +..\%__SRC%\inc\boost\preprocessor\list\detail\dmc\* %_DEST%\inc\boost\preprocessor\list\detail\dmc +..\%__SRC%\inc\boost\preprocessor\list\detail\edg\* %_DEST%\inc\boost\preprocessor\list\detail\edg +..\%__SRC%\inc\boost\preprocessor\logical\* %_DEST%\inc\boost\preprocessor\logical +..\%__SRC%\inc\boost\preprocessor\punctuation\* %_DEST%\inc\boost\preprocessor\punctuation +..\%__SRC%\inc\boost\preprocessor\repetition\* %_DEST%\inc\boost\preprocessor\repetition +..\%__SRC%\inc\boost\preprocessor\repetition\detail\* %_DEST%\inc\boost\preprocessor\repetition\detail +..\%__SRC%\inc\boost\preprocessor\repetition\detail\dmc\* %_DEST%\inc\boost\preprocessor\repetition\detail\dmc +..\%__SRC%\inc\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc\boost\preprocessor\repetition\detail\edg +..\%__SRC%\inc\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc\boost\preprocessor\repetition\detail\msvc +..\%__SRC%\inc\boost\preprocessor\selection\* %_DEST%\inc\boost\preprocessor\selection +..\%__SRC%\inc\boost\preprocessor\seq\* %_DEST%\inc\boost\preprocessor\seq +..\%__SRC%\inc\boost\preprocessor\seq\detail\* %_DEST%\inc\boost\preprocessor\seq\detail +..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc\boost\preprocessor\slot +..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc\boost\preprocessor\slot\detail +..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc\boost\preprocessor\tuple +..\%__SRC%\inc\boost\program_options\* %_DEST%\inc\boost\program_options +..\%__SRC%\inc\boost\program_options\detail\* %_DEST%\inc\boost\program_options\detail +..\%__SRC%\inc\boost\property_map\* %_DEST%\inc\boost\property_map +..\%__SRC%\inc\boost\property_map\parallel\* %_DEST%\inc\boost\property_map\parallel +..\%__SRC%\inc\boost\property_map\parallel\impl\* %_DEST%\inc\boost\property_map\parallel\impl +..\%__SRC%\inc\boost\property_tree\* %_DEST%\inc\boost\property_tree +..\%__SRC%\inc\boost\property_tree\detail\* %_DEST%\inc\boost\property_tree\detail +..\%__SRC%\inc\boost\proto\context\* %_DEST%\inc\boost\proto\context +..\%__SRC%\inc\boost\proto\* %_DEST%\inc\boost\proto +..\%__SRC%\inc\boost\proto\detail\* %_DEST%\inc\boost\proto\detail +..\%__SRC%\inc\boost\proto\transform\* %_DEST%\inc\boost\proto\transform +..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc\boost\ptr_container +..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc\boost\ptr_container\detail +..\%__SRC%\inc\boost\python\converter\* %_DEST%\inc\boost\python\converter +..\%__SRC%\inc\boost\python\* %_DEST%\inc\boost\python +..\%__SRC%\inc\boost\python\detail\* %_DEST%\inc\boost\python\detail +..\%__SRC%\inc\boost\python\object\* %_DEST%\inc\boost\python\object +..\%__SRC%\inc\boost\python\suite\indexing\* %_DEST%\inc\boost\python\suite\indexing +..\%__SRC%\inc\boost\python\suite\indexing\detail\* %_DEST%\inc\boost\python\suite\indexing\detail +..\%__SRC%\inc\boost\random\* %_DEST%\inc\boost\random +..\%__SRC%\inc\boost\random\detail\* %_DEST%\inc\boost\random\detail +..\%__SRC%\inc\boost\range\adaptor\* %_DEST%\inc\boost\range\adaptor +..\%__SRC%\inc\boost\range\algorithm\* %_DEST%\inc\boost\range\algorithm +..\%__SRC%\inc\boost\range\algorithm_ext\* %_DEST%\inc\boost\range\algorithm_ext +..\%__SRC%\inc\boost\range\* %_DEST%\inc\boost\range +..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc\boost\range\detail +..\%__SRC%\inc\boost\range\detail\vc6\* %_DEST%\inc\boost\range\detail\vc6 +..\%__SRC%\inc\boost\regex\config\* %_DEST%\inc\boost\regex\config +..\%__SRC%\inc\boost\regex\* %_DEST%\inc\boost\regex +..\%__SRC%\inc\boost\regex\pending\* %_DEST%\inc\boost\regex\pending +..\%__SRC%\inc\boost\regex\v4\* %_DEST%\inc\boost\regex\v4 +..\%__SRC%\inc\boost\serialization\* %_DEST%\inc\boost\serialization +..\%__SRC%\inc\boost\serialization\detail\* %_DEST%\inc\boost\serialization\detail +..\%__SRC%\inc\boost\signals2\* %_DEST%\inc\boost\signals2 +..\%__SRC%\inc\boost\signals2\detail\* %_DEST%\inc\boost\signals2\detail +..\%__SRC%\inc\boost\signals\* %_DEST%\inc\boost\signals +..\%__SRC%\inc\boost\signals\detail\* %_DEST%\inc\boost\signals\detail +..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc\boost\smart_ptr +..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc\boost\smart_ptr\detail +..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc\boost\spirit\actor +..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc\boost\spirit\attribute +..\%__SRC%\inc\boost\spirit\core\composite\* %_DEST%\inc\boost\spirit\core\composite +..\%__SRC%\inc\boost\spirit\core\* %_DEST%\inc\boost\spirit\core +..\%__SRC%\inc\boost\spirit\core\non_terminal\* %_DEST%\inc\boost\spirit\core\non_terminal +..\%__SRC%\inc\boost\spirit\core\primitives\* %_DEST%\inc\boost\spirit\core\primitives +..\%__SRC%\inc\boost\spirit\core\scanner\* %_DEST%\inc\boost\spirit\core\scanner +..\%__SRC%\inc\boost\spirit\debug\* %_DEST%\inc\boost\spirit\debug +..\%__SRC%\inc\boost\spirit\* %_DEST%\inc\boost\spirit +..\%__SRC%\inc\boost\spirit\dynamic\* %_DEST%\inc\boost\spirit\dynamic +..\%__SRC%\inc\boost\spirit\error_handling\* %_DEST%\inc\boost\spirit\error_handling +..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc\boost\spirit\home\classic\actor +..\%__SRC%\inc\boost\spirit\home\classic\attribute\* %_DEST%\inc\boost\spirit\home\classic\attribute +..\%__SRC%\inc\boost\spirit\home\classic\core\composite\* %_DEST%\inc\boost\spirit\home\classic\core\composite +..\%__SRC%\inc\boost\spirit\home\classic\core\composite\impl\* %_DEST%\inc\boost\spirit\home\classic\core\composite\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc\boost\spirit\home\classic\core +..\%__SRC%\inc\boost\spirit\home\classic\core\impl\* %_DEST%\inc\boost\spirit\home\classic\core\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\* %_DEST%\inc\boost\spirit\home\classic\core\non_terminal +..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\impl\* %_DEST%\inc\boost\spirit\home\classic\core\non_terminal\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\* %_DEST%\inc\boost\spirit\home\classic\core\primitives +..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\impl\* %_DEST%\inc\boost\spirit\home\classic\core\primitives\impl +..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\* %_DEST%\inc\boost\spirit\home\classic\core\scanner +..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\impl\* %_DEST%\inc\boost\spirit\home\classic\core\scanner\impl +..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc\boost\spirit\home\classic\debug +..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc\boost\spirit\home\classic\debug\impl +..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc\boost\spirit\home\classic +..\%__SRC%\inc\boost\spirit\home\classic\dynamic\* %_DEST%\inc\boost\spirit\home\classic\dynamic +..\%__SRC%\inc\boost\spirit\home\classic\dynamic\impl\* %_DEST%\inc\boost\spirit\home\classic\dynamic\impl +..\%__SRC%\inc\boost\spirit\home\classic\error_handling\* %_DEST%\inc\boost\spirit\home\classic\error_handling +..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc\boost\spirit\home\classic\error_handling\impl +..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc\boost\spirit\home\classic\iterator +..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc\boost\spirit\home\classic\iterator\impl +..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc\boost\spirit\home\classic\meta +..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc\boost\spirit\home\classic\meta\impl +..\%__SRC%\inc\boost\spirit\home\classic\phoenix\* %_DEST%\inc\boost\spirit\home\classic\phoenix +..\%__SRC%\inc\boost\spirit\home\classic\symbols\* %_DEST%\inc\boost\spirit\home\classic\symbols +..\%__SRC%\inc\boost\spirit\home\classic\symbols\impl\* %_DEST%\inc\boost\spirit\home\classic\symbols\impl +..\%__SRC%\inc\boost\spirit\home\classic\tree\* %_DEST%\inc\boost\spirit\home\classic\tree +..\%__SRC%\inc\boost\spirit\home\classic\tree\impl\* %_DEST%\inc\boost\spirit\home\classic\tree\impl +..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc\boost\spirit\home\classic\utility +..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc\boost\spirit\home\classic\utility\impl\chset +..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc\boost\spirit\home\classic\utility\impl +..\%__SRC%\inc\boost\spirit\home\* %_DEST%\inc\boost\spirit\home +..\%__SRC%\inc\boost\spirit\home\karma\action\* %_DEST%\inc\boost\spirit\home\karma\action +..\%__SRC%\inc\boost\spirit\home\karma\auto\* %_DEST%\inc\boost\spirit\home\karma\auto +..\%__SRC%\inc\boost\spirit\home\karma\auxiliary\* %_DEST%\inc\boost\spirit\home\karma\auxiliary +..\%__SRC%\inc\boost\spirit\home\karma\binary\* %_DEST%\inc\boost\spirit\home\karma\binary +..\%__SRC%\inc\boost\spirit\home\karma\char\* %_DEST%\inc\boost\spirit\home\karma\char +..\%__SRC%\inc\boost\spirit\home\karma\* %_DEST%\inc\boost\spirit\home\karma +..\%__SRC%\inc\boost\spirit\home\karma\detail\* %_DEST%\inc\boost\spirit\home\karma\detail +..\%__SRC%\inc\boost\spirit\home\karma\directive\* %_DEST%\inc\boost\spirit\home\karma\directive +..\%__SRC%\inc\boost\spirit\home\karma\nonterminal\* %_DEST%\inc\boost\spirit\home\karma\nonterminal +..\%__SRC%\inc\boost\spirit\home\karma\nonterminal\detail\* %_DEST%\inc\boost\spirit\home\karma\nonterminal\detail +..\%__SRC%\inc\boost\spirit\home\karma\numeric\* %_DEST%\inc\boost\spirit\home\karma\numeric +..\%__SRC%\inc\boost\spirit\home\karma\numeric\detail\* %_DEST%\inc\boost\spirit\home\karma\numeric\detail +..\%__SRC%\inc\boost\spirit\home\karma\operator\* %_DEST%\inc\boost\spirit\home\karma\operator +..\%__SRC%\inc\boost\spirit\home\karma\stream\* %_DEST%\inc\boost\spirit\home\karma\stream +..\%__SRC%\inc\boost\spirit\home\karma\stream\detail\* %_DEST%\inc\boost\spirit\home\karma\stream\detail +..\%__SRC%\inc\boost\spirit\home\karma\string\* %_DEST%\inc\boost\spirit\home\karma\string +..\%__SRC%\inc\boost\spirit\home\lex\* %_DEST%\inc\boost\spirit\home\lex +..\%__SRC%\inc\boost\spirit\home\lex\detail\* %_DEST%\inc\boost\spirit\home\lex\detail +..\%__SRC%\inc\boost\spirit\home\lex\lexer\* %_DEST%\inc\boost\spirit\home\lex\lexer +..\%__SRC%\inc\boost\spirit\home\lex\lexer\lexertl\* %_DEST%\inc\boost\spirit\home\lex\lexer\lexertl +..\%__SRC%\inc\boost\spirit\home\lex\qi\* %_DEST%\inc\boost\spirit\home\lex\qi +..\%__SRC%\inc\boost\spirit\home\phoenix\bind\* %_DEST%\inc\boost\spirit\home\phoenix\bind +..\%__SRC%\inc\boost\spirit\home\phoenix\bind\detail\* %_DEST%\inc\boost\spirit\home\phoenix\bind\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\core\* %_DEST%\inc\boost\spirit\home\phoenix\core +..\%__SRC%\inc\boost\spirit\home\phoenix\core\detail\* %_DEST%\inc\boost\spirit\home\phoenix\core\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\* %_DEST%\inc\boost\spirit\home\phoenix +..\%__SRC%\inc\boost\spirit\home\phoenix\detail\* %_DEST%\inc\boost\spirit\home\phoenix\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\function\* %_DEST%\inc\boost\spirit\home\phoenix\function +..\%__SRC%\inc\boost\spirit\home\phoenix\function\detail\* %_DEST%\inc\boost\spirit\home\phoenix\function\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\fusion\* %_DEST%\inc\boost\spirit\home\phoenix\fusion +..\%__SRC%\inc\boost\spirit\home\phoenix\object\* %_DEST%\inc\boost\spirit\home\phoenix\object +..\%__SRC%\inc\boost\spirit\home\phoenix\object\detail\* %_DEST%\inc\boost\spirit\home\phoenix\object\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\operator\* %_DEST%\inc\boost\spirit\home\phoenix\operator +..\%__SRC%\inc\boost\spirit\home\phoenix\operator\detail\* %_DEST%\inc\boost\spirit\home\phoenix\operator\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\scope\* %_DEST%\inc\boost\spirit\home\phoenix\scope +..\%__SRC%\inc\boost\spirit\home\phoenix\scope\detail\* %_DEST%\inc\boost\spirit\home\phoenix\scope\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\statement\* %_DEST%\inc\boost\spirit\home\phoenix\statement +..\%__SRC%\inc\boost\spirit\home\phoenix\statement\detail\* %_DEST%\inc\boost\spirit\home\phoenix\statement\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\algorithm\* %_DEST%\inc\boost\spirit\home\phoenix\stl\algorithm +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\algorithm\detail\* %_DEST%\inc\boost\spirit\home\phoenix\stl\algorithm\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\container\* %_DEST%\inc\boost\spirit\home\phoenix\stl\container +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\container\detail\* %_DEST%\inc\boost\spirit\home\phoenix\stl\container\detail +..\%__SRC%\inc\boost\spirit\home\phoenix\stl\* %_DEST%\inc\boost\spirit\home\phoenix\stl +..\%__SRC%\inc\boost\spirit\home\qi\action\* %_DEST%\inc\boost\spirit\home\qi\action +..\%__SRC%\inc\boost\spirit\home\qi\auto\* %_DEST%\inc\boost\spirit\home\qi\auto +..\%__SRC%\inc\boost\spirit\home\qi\auxiliary\* %_DEST%\inc\boost\spirit\home\qi\auxiliary +..\%__SRC%\inc\boost\spirit\home\qi\binary\* %_DEST%\inc\boost\spirit\home\qi\binary +..\%__SRC%\inc\boost\spirit\home\qi\char\* %_DEST%\inc\boost\spirit\home\qi\char +..\%__SRC%\inc\boost\spirit\home\qi\* %_DEST%\inc\boost\spirit\home\qi +..\%__SRC%\inc\boost\spirit\home\qi\detail\* %_DEST%\inc\boost\spirit\home\qi\detail +..\%__SRC%\inc\boost\spirit\home\qi\directive\* %_DEST%\inc\boost\spirit\home\qi\directive +..\%__SRC%\inc\boost\spirit\home\qi\nonterminal\* %_DEST%\inc\boost\spirit\home\qi\nonterminal +..\%__SRC%\inc\boost\spirit\home\qi\nonterminal\detail\* %_DEST%\inc\boost\spirit\home\qi\nonterminal\detail +..\%__SRC%\inc\boost\spirit\home\qi\numeric\* %_DEST%\inc\boost\spirit\home\qi\numeric +..\%__SRC%\inc\boost\spirit\home\qi\numeric\detail\* %_DEST%\inc\boost\spirit\home\qi\numeric\detail +..\%__SRC%\inc\boost\spirit\home\qi\operator\* %_DEST%\inc\boost\spirit\home\qi\operator +..\%__SRC%\inc\boost\spirit\home\qi\stream\* %_DEST%\inc\boost\spirit\home\qi\stream +..\%__SRC%\inc\boost\spirit\home\qi\stream\detail\* %_DEST%\inc\boost\spirit\home\qi\stream\detail +..\%__SRC%\inc\boost\spirit\home\qi\string\* %_DEST%\inc\boost\spirit\home\qi\string +..\%__SRC%\inc\boost\spirit\home\qi\string\detail\* %_DEST%\inc\boost\spirit\home\qi\string\detail +..\%__SRC%\inc\boost\spirit\home\support\algorithm\* %_DEST%\inc\boost\spirit\home\support\algorithm +..\%__SRC%\inc\boost\spirit\home\support\auto\* %_DEST%\inc\boost\spirit\home\support\auto +..\%__SRC%\inc\boost\spirit\home\support\auxiliary\* %_DEST%\inc\boost\spirit\home\support\auxiliary +..\%__SRC%\inc\boost\spirit\home\support\char_encoding\* %_DEST%\inc\boost\spirit\home\support\char_encoding +..\%__SRC%\inc\boost\spirit\home\support\char_encoding\unicode\* %_DEST%\inc\boost\spirit\home\support\char_encoding\unicode +..\%__SRC%\inc\boost\spirit\home\support\char_set\* %_DEST%\inc\boost\spirit\home\support\char_set +..\%__SRC%\inc\boost\spirit\home\support\* %_DEST%\inc\boost\spirit\home\support +..\%__SRC%\inc\boost\spirit\home\support\detail\* %_DEST%\inc\boost\spirit\home\support\detail +..\%__SRC%\inc\boost\spirit\home\support\detail\integer\* %_DEST%\inc\boost\spirit\home\support\detail\integer +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\containers\* %_DEST%\inc\boost\spirit\home\support\detail\lexer\containers +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\conversion\* %_DEST%\inc\boost\spirit\home\support\detail\lexer\conversion +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\* %_DEST%\inc\boost\spirit\home\support\detail\lexer +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\* %_DEST%\inc\boost\spirit\home\support\detail\lexer\parser +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\tokeniser\* %_DEST%\inc\boost\spirit\home\support\detail\lexer\parser\tokeniser +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\parser\tree\* %_DEST%\inc\boost\spirit\home\support\detail\lexer\parser\tree +..\%__SRC%\inc\boost\spirit\home\support\detail\lexer\partition\* %_DEST%\inc\boost\spirit\home\support\detail\lexer\partition +..\%__SRC%\inc\boost\spirit\home\support\detail\math\* %_DEST%\inc\boost\spirit\home\support\detail\math +..\%__SRC%\inc\boost\spirit\home\support\detail\math\detail\* %_DEST%\inc\boost\spirit\home\support\detail\math\detail +..\%__SRC%\inc\boost\spirit\home\support\iterators\* %_DEST%\inc\boost\spirit\home\support\iterators +..\%__SRC%\inc\boost\spirit\home\support\iterators\detail\* %_DEST%\inc\boost\spirit\home\support\iterators\detail +..\%__SRC%\inc\boost\spirit\home\support\nonterminal\* %_DEST%\inc\boost\spirit\home\support\nonterminal +..\%__SRC%\inc\boost\spirit\include\* %_DEST%\inc\boost\spirit\include +..\%__SRC%\inc\boost\spirit\iterator\* %_DEST%\inc\boost\spirit\iterator +..\%__SRC%\inc\boost\spirit\meta\* %_DEST%\inc\boost\spirit\meta +..\%__SRC%\inc\boost\spirit\phoenix\* %_DEST%\inc\boost\spirit\phoenix +..\%__SRC%\inc\boost\spirit\repository\home\* %_DEST%\inc\boost\spirit\repository\home +..\%__SRC%\inc\boost\spirit\repository\home\karma\* %_DEST%\inc\boost\spirit\repository\home\karma +..\%__SRC%\inc\boost\spirit\repository\home\karma\directive\* %_DEST%\inc\boost\spirit\repository\home\karma\directive +..\%__SRC%\inc\boost\spirit\repository\home\karma\nonterminal\* %_DEST%\inc\boost\spirit\repository\home\karma\nonterminal +..\%__SRC%\inc\boost\spirit\repository\home\qi\* %_DEST%\inc\boost\spirit\repository\home\qi +..\%__SRC%\inc\boost\spirit\repository\home\qi\directive\* %_DEST%\inc\boost\spirit\repository\home\qi\directive +..\%__SRC%\inc\boost\spirit\repository\home\qi\nonterminal\* %_DEST%\inc\boost\spirit\repository\home\qi\nonterminal +..\%__SRC%\inc\boost\spirit\repository\home\qi\primitive\* %_DEST%\inc\boost\spirit\repository\home\qi\primitive +..\%__SRC%\inc\boost\spirit\repository\home\support\* %_DEST%\inc\boost\spirit\repository\home\support +..\%__SRC%\inc\boost\spirit\repository\include\* %_DEST%\inc\boost\spirit\repository\include +..\%__SRC%\inc\boost\spirit\symbols\* %_DEST%\inc\boost\spirit\symbols +..\%__SRC%\inc\boost\spirit\tree\* %_DEST%\inc\boost\spirit\tree +..\%__SRC%\inc\boost\spirit\utility\* %_DEST%\inc\boost\spirit\utility +..\%__SRC%\inc\boost\statechart\* %_DEST%\inc\boost\statechart +..\%__SRC%\inc\boost\statechart\detail\* %_DEST%\inc\boost\statechart\detail +..\%__SRC%\inc\boost\system\* %_DEST%\inc\boost\system +..\%__SRC%\inc\boost\test\* %_DEST%\inc\boost\test +..\%__SRC%\inc\boost\test\detail\* %_DEST%\inc\boost\test\detail +..\%__SRC%\inc\boost\test\impl\* %_DEST%\inc\boost\test\impl +..\%__SRC%\inc\boost\test\included\* %_DEST%\inc\boost\test\included +..\%__SRC%\inc\boost\test\output\* %_DEST%\inc\boost\test\output +..\%__SRC%\inc\boost\test\utils\basic_cstring\* %_DEST%\inc\boost\test\utils\basic_cstring +..\%__SRC%\inc\boost\test\utils\* %_DEST%\inc\boost\test\utils +..\%__SRC%\inc\boost\test\utils\iterator\* %_DEST%\inc\boost\test\utils\iterator +..\%__SRC%\inc\boost\test\utils\runtime\cla\* %_DEST%\inc\boost\test\utils\runtime\cla +..\%__SRC%\inc\boost\test\utils\runtime\cla\detail\* %_DEST%\inc\boost\test\utils\runtime\cla\detail +..\%__SRC%\inc\boost\test\utils\runtime\cla\iface\* %_DEST%\inc\boost\test\utils\runtime\cla\iface +..\%__SRC%\inc\boost\test\utils\runtime\* %_DEST%\inc\boost\test\utils\runtime +..\%__SRC%\inc\boost\test\utils\runtime\env\* %_DEST%\inc\boost\test\utils\runtime\env +..\%__SRC%\inc\boost\test\utils\runtime\file\* %_DEST%\inc\boost\test\utils\runtime\file +..\%__SRC%\inc\boost\thread\* %_DEST%\inc\boost\thread +..\%__SRC%\inc\boost\thread\detail\* %_DEST%\inc\boost\thread\detail +..\%__SRC%\inc\boost\thread\pthread\* %_DEST%\inc\boost\thread\pthread +..\%__SRC%\inc\boost\thread\win32\* %_DEST%\inc\boost\thread\win32 +..\%__SRC%\inc\boost\tr1\* %_DEST%\inc\boost\tr1 +..\%__SRC%\inc\boost\tr1\detail\* %_DEST%\inc\boost\tr1\detail +..\%__SRC%\inc\boost\tr1\tr1\bcc32\* %_DEST%\inc\boost\tr1\tr1\bcc32 +..\%__SRC%\inc\boost\tr1\tr1\* %_DEST%\inc\boost\tr1\tr1 +..\%__SRC%\inc\boost\tr1\tr1\sun\* %_DEST%\inc\boost\tr1\tr1\sun +..\%__SRC%\inc\boost\tuple\* %_DEST%\inc\boost\tuple +..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc\boost\tuple\detail +..\%__SRC%\inc\boost\typeof\* %_DEST%\inc\boost\typeof +..\%__SRC%\inc\boost\typeof\dmc\* %_DEST%\inc\boost\typeof\dmc +..\%__SRC%\inc\boost\typeof\msvc\* %_DEST%\inc\boost\typeof\msvc +..\%__SRC%\inc\boost\typeof\std\* %_DEST%\inc\boost\typeof\std +..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc\boost\type_traits +..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc\boost\type_traits\detail +..\%__SRC%\inc\boost\type_traits\msvc\* %_DEST%\inc\boost\type_traits\msvc +..\%__SRC%\inc\boost\units\base_units\angle\* %_DEST%\inc\boost\units\base_units\angle +..\%__SRC%\inc\boost\units\base_units\astronomical\* %_DEST%\inc\boost\units\base_units\astronomical +..\%__SRC%\inc\boost\units\base_units\cgs\* %_DEST%\inc\boost\units\base_units\cgs +..\%__SRC%\inc\boost\units\base_units\imperial\* %_DEST%\inc\boost\units\base_units\imperial +..\%__SRC%\inc\boost\units\base_units\metric\* %_DEST%\inc\boost\units\base_units\metric +..\%__SRC%\inc\boost\units\base_units\si\* %_DEST%\inc\boost\units\base_units\si +..\%__SRC%\inc\boost\units\base_units\temperature\* %_DEST%\inc\boost\units\base_units\temperature +..\%__SRC%\inc\boost\units\base_units\us\* %_DEST%\inc\boost\units\base_units\us +..\%__SRC%\inc\boost\units\* %_DEST%\inc\boost\units +..\%__SRC%\inc\boost\units\detail\* %_DEST%\inc\boost\units\detail +..\%__SRC%\inc\boost\units\physical_dimensions\* %_DEST%\inc\boost\units\physical_dimensions +..\%__SRC%\inc\boost\units\systems\angle\* %_DEST%\inc\boost\units\systems\angle +..\%__SRC%\inc\boost\units\systems\cgs\* %_DEST%\inc\boost\units\systems\cgs +..\%__SRC%\inc\boost\units\systems\* %_DEST%\inc\boost\units\systems +..\%__SRC%\inc\boost\units\systems\detail\* %_DEST%\inc\boost\units\systems\detail +..\%__SRC%\inc\boost\units\systems\si\codata\* %_DEST%\inc\boost\units\systems\si\codata +..\%__SRC%\inc\boost\units\systems\si\* %_DEST%\inc\boost\units\systems\si +..\%__SRC%\inc\boost\units\systems\temperature\* %_DEST%\inc\boost\units\systems\temperature +..\%__SRC%\inc\boost\unordered\* %_DEST%\inc\boost\unordered +..\%__SRC%\inc\boost\unordered\detail\* %_DEST%\inc\boost\unordered\detail +..\%__SRC%\inc\boost\utility\* %_DEST%\inc\boost\utility +..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc\boost\utility\detail +..\%__SRC%\inc\boost\uuid\* %_DEST%\inc\boost\uuid +..\%__SRC%\inc\boost\variant\* %_DEST%\inc\boost\variant +..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc\boost\variant\detail +..\%__SRC%\inc\boost\wave\cpplexer\* %_DEST%\inc\boost\wave\cpplexer +..\%__SRC%\inc\boost\wave\cpplexer\re2clex\* %_DEST%\inc\boost\wave\cpplexer\re2clex +..\%__SRC%\inc\boost\wave\* %_DEST%\inc\boost\wave +..\%__SRC%\inc\boost\wave\grammars\* %_DEST%\inc\boost\wave\grammars +..\%__SRC%\inc\boost\wave\util\* %_DEST%\inc\boost\wave\util +..\%__SRC%\inc\boost\xpressive\* %_DEST%\inc\boost\xpressive +..\%__SRC%\inc\boost\xpressive\detail\core\* %_DEST%\inc\boost\xpressive\detail\core +..\%__SRC%\inc\boost\xpressive\detail\core\matcher\* %_DEST%\inc\boost\xpressive\detail\core\matcher +..\%__SRC%\inc\boost\xpressive\detail\* %_DEST%\inc\boost\xpressive\detail +..\%__SRC%\inc\boost\xpressive\detail\dynamic\* %_DEST%\inc\boost\xpressive\detail\dynamic +..\%__SRC%\inc\boost\xpressive\detail\static\* %_DEST%\inc\boost\xpressive\detail\static +..\%__SRC%\inc\boost\xpressive\detail\static\transforms\* %_DEST%\inc\boost\xpressive\detail\static\transforms +..\%__SRC%\inc\boost\xpressive\detail\utility\chset\* %_DEST%\inc\boost\xpressive\detail\utility\chset +..\%__SRC%\inc\boost\xpressive\detail\utility\* %_DEST%\inc\boost\xpressive\detail\utility +..\%__SRC%\inc\boost\xpressive\traits\* %_DEST%\inc\boost\xpressive\traits +..\%__SRC%\inc\boost\xpressive\traits\detail\* %_DEST%\inc\boost\xpressive\traits\detail diff --git a/cairo/prj/d.lst b/cairo/prj/d.lst index 6cd8613cf677..79ca424607a9 100644 --- a/cairo/prj/d.lst +++ b/cairo/prj/d.lst @@ -1,15 +1,15 @@ -mkdir: %_DEST%\inc%_EXT%\cairo -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\cairo -..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\cairo\cairo*.h -..\%__SRC%\inc\cairo*.h %_DEST%\inc%_EXT%\external\cairo\cairo*.h +mkdir: %_DEST%\inc\cairo +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\cairo +..\%__SRC%\inc\cairo*.h %_DEST%\inc\cairo\cairo*.h +..\%__SRC%\inc\cairo*.h %_DEST%\inc\external\cairo\cairo*.h -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\lib*.la %_DEST%\lib%_EXT%\lib*.la -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.dll.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so +..\%__SRC%\lib\lib*.so.* %_DEST%\lib\lib*.so.* +..\%__SRC%\lib\lib*.dylib %_DEST%\lib\lib*.dylib +..\%__SRC%\lib\lib*.a %_DEST%\lib\lib*.a +..\%__SRC%\lib\lib*.la %_DEST%\lib\lib*.la +..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\lib\*.dll %_DEST%\bin\*.dll +..\%__SRC%\bin\*.dll.a %_DEST%\lib\*.a diff --git a/curl/prj/d.lst b/curl/prj/d.lst index fe97f2044f23..162f4850d453 100644 --- a/curl/prj/d.lst +++ b/curl/prj/d.lst @@ -1,15 +1,15 @@ -mkdir: %_DEST%\inc%_EXT%\external\curl -..\%__SRC%\inc\easy.h %_DEST%\inc%_EXT%\external\curl\easy.h -..\%__SRC%\inc\curlver.h %_DEST%\inc%_EXT%\external\curl\curlver.h -..\%__SRC%\inc\curl.h %_DEST%\inc%_EXT%\external\curl\curl.h -..\%__SRC%\inc\mprintf.h %_DEST%\inc%_EXT%\external\curl\mprintf.h -..\%__SRC%\inc\multi.h %_DEST%\inc%_EXT%\external\curl\multi.h -..\%__SRC%\inc\stdcheaders.h %_DEST%\inc%_EXT%\external\curl\stdcheaders.h -..\%__SRC%\inc\types.h %_DEST%\inc%_EXT%\external\curl\types.h -..\%__SRC%\inc\curlbuild.h %_DEST%\inc%_EXT%\external\curl\curlbuild.h -..\%__SRC%\inc\curlrules.h %_DEST%\inc%_EXT%\external\curl\curlrules.h +mkdir: %_DEST%\inc\external\curl +..\%__SRC%\inc\easy.h %_DEST%\inc\external\curl\easy.h +..\%__SRC%\inc\curlver.h %_DEST%\inc\external\curl\curlver.h +..\%__SRC%\inc\curl.h %_DEST%\inc\external\curl\curl.h +..\%__SRC%\inc\mprintf.h %_DEST%\inc\external\curl\mprintf.h +..\%__SRC%\inc\multi.h %_DEST%\inc\external\curl\multi.h +..\%__SRC%\inc\stdcheaders.h %_DEST%\inc\external\curl\stdcheaders.h +..\%__SRC%\inc\types.h %_DEST%\inc\external\curl\types.h +..\%__SRC%\inc\curlbuild.h %_DEST%\inc\external\curl\curlbuild.h +..\%__SRC%\inc\curlrules.h %_DEST%\inc\external\curl\curlrules.h -..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.* +..\%__SRC%\bin\libcurl*.dll %_DEST%\bin\*.dll +..\%__SRC%\lib\libcurl.* %_DEST%\lib\libcurl.* linklib: libcurl.*.* \ No newline at end of file diff --git a/expat/prj/d.lst b/expat/prj/d.lst index 62e29c2c6005..887a0816a00f 100644 --- a/expat/prj/d.lst +++ b/expat/prj/d.lst @@ -1,15 +1,15 @@ -mkdir: %_DEST%\inc%_EXT%\external\expat -mkdir: %_DEST%\lib%_EXT%\x64 -..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h -..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h -..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib -..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib -..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib -..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a -..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a -..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a -..\%__SRC%\misc\_ooo_st_expat_xmltok.pdb %_DEST%\lib%_EXT%\_ooo_st_expat_xmltok.pdb -..\%__SRC%\misc\_ooo_st_expat_xmlparse.pdb %_DEST%\lib%_EXT%\_ooo_st_expat_xmlparse.pdb -..\%__SRC%\slb\x64\expat_xmltok.lib %_DEST%\lib%_EXT%\x64\expat_xmltok.lib -..\%__SRC%\slb\x64\expat_xmlparse.lib %_DEST%\lib%_EXT%\x64\expat_xmlparse.lib +mkdir: %_DEST%\inc\external\expat +mkdir: %_DEST%\lib\x64 +..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc\external\expat.h +..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc\external\expat_external.h +..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib\expat_xmltok.lib +..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib\expat_xmlparse.lib +..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib\ascii_expat_xmlparse.lib +..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib\libexpat_xmltok.a +..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib\libexpat_xmlparse.a +..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib\libascii_expat_xmlparse.a +..\%__SRC%\misc\_ooo_st_expat_xmltok.pdb %_DEST%\lib\_ooo_st_expat_xmltok.pdb +..\%__SRC%\misc\_ooo_st_expat_xmlparse.pdb %_DEST%\lib\_ooo_st_expat_xmlparse.pdb +..\%__SRC%\slb\x64\expat_xmltok.lib %_DEST%\lib\x64\expat_xmltok.lib +..\%__SRC%\slb\x64\expat_xmlparse.lib %_DEST%\lib\x64\expat_xmlparse.lib diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst index 54f62a12dfe1..a6dac87058e5 100755 --- a/gdk-pixbuf/prj/d.lst +++ b/gdk-pixbuf/prj/d.lst @@ -1,20 +1,20 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0 -mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\gdk-pixbuf-2.0 +mkdir: %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf -..\%__SRC%\inc\gdk-pixbuf-animation.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-animation.h -..\%__SRC%\inc\gdk-pixbuf-features.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-features.h -..\%__SRC%\inc\gdk-pixbuf-marshal.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-marshal.h -..\%__SRC%\inc\gdk-pixbuf.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf.h -..\%__SRC%\inc\gdk-pixbuf-core.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-core.h -..\%__SRC%\inc\gdk-pixbuf-io.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-io.h -..\%__SRC%\inc\gdk-pixbuf-simple-anim.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-simple-anim.h -..\%__SRC%\inc\gdk-pixdata.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixdata.h -..\%__SRC%\inc\gdk-pixbuf-enum-types.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-enum-types.h -..\%__SRC%\inc\gdk-pixbuf-loader.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-loader.h -..\%__SRC%\inc\gdk-pixbuf-transform.h %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-transform.h +..\%__SRC%\inc\gdk-pixbuf-animation.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-animation.h +..\%__SRC%\inc\gdk-pixbuf-features.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-features.h +..\%__SRC%\inc\gdk-pixbuf-marshal.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-marshal.h +..\%__SRC%\inc\gdk-pixbuf.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf.h +..\%__SRC%\inc\gdk-pixbuf-core.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-core.h +..\%__SRC%\inc\gdk-pixbuf-io.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-io.h +..\%__SRC%\inc\gdk-pixbuf-simple-anim.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-simple-anim.h +..\%__SRC%\inc\gdk-pixdata.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixdata.h +..\%__SRC%\inc\gdk-pixbuf-enum-types.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-enum-types.h +..\%__SRC%\inc\gdk-pixbuf-loader.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-loader.h +..\%__SRC%\inc\gdk-pixbuf-transform.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-transform.h -..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dylib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib +..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib\libgdk_pixbuf-2.0.0.dylib +symlink: %_DEST%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib\libgdk_pixbuf-2.0.dylib +..\%__SRC%\bin\*.dll %_DEST%\bin +..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib\gdk_pixbuf-2.0.lib diff --git a/gettext/prj/d.lst b/gettext/prj/d.lst index 205abacc1435..811b4b1c60fb 100644 --- a/gettext/prj/d.lst +++ b/gettext/prj/d.lst @@ -1,31 +1,31 @@ -mkdir: %_DEST%\inc%_EXT%\external -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h -..\%__SRC%\lib\libasprintf.0.dylib %_DEST%\lib%_EXT%\libasprintf.0.dylib -symlink: %_DEST%\lib%_EXT%\libasprintf.0.dylib %_DEST%\lib%_EXT%\libasprintf.dylib -..\%__SRC%\lib\libgettextpo.0.dylib %_DEST%\lib%_EXT%\libgettextpo.0.dylib -symlink: %_DEST%\lib%_EXT%\libgettextpo.0.dylib %_DEST%\lib%_EXT%\libgettextpo.dylib -..\%__SRC%\lib\libgettextsrc-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextsrc-0.18.1.dylib -symlink: %_DEST%\lib%_EXT%\libgettextsrc-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextsrc.dylib -..\%__SRC%\lib\libintl.8.dylib %_DEST%\lib%_EXT%\libintl.8.dylib -symlink: %_DEST%\lib%_EXT%\libintl.8.dylib %_DEST%\lib%_EXT%\libintl.dylib -..\%__SRC%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextlib-0.18.1.dylib -symlink: %_DEST%\lib%_EXT%\libgettextlib-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextlib.dylib -..\%__SRC%\lib\libintl.a %_DEST%\lib%_EXT%\libintl.a -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\%__SRC%\bin\msgattrib %_DEST%\bin%_EXT%\msgattrib -..\%__SRC%\bin\msgcat %_DEST%\bin%_EXT%\msgcat -..\%__SRC%\bin\msgcmp %_DEST%\bin%_EXT%\msgcmp -..\%__SRC%\bin\msgcomm %_DEST%\bin%_EXT%\msgcomm -..\%__SRC%\bin\msgconv %_DEST%\bin%_EXT%\msgconv -..\%__SRC%\bin\msgen %_DEST%\bin%_EXT%\msgen -..\%__SRC%\bin\msgexec %_DEST%\bin%_EXT%\msgexec -..\%__SRC%\bin\msgfilter %_DEST%\bin%_EXT%\msgfilter -..\%__SRC%\bin\msgfmt %_DEST%\bin%_EXT%\msgfmt -..\%__SRC%\bin\msggrep %_DEST%\bin%_EXT%\msggrep -..\%__SRC%\bin\msginit %_DEST%\bin%_EXT%\msginit -..\%__SRC%\bin\msgmerge %_DEST%\bin%_EXT%\msgmerge -..\%__SRC%\bin\msgunfmt %_DEST%\bin%_EXT%\msgunfmt -..\%__SRC%\bin\msguniq %_DEST%\bin%_EXT%\msguniq -..\%__SRC%\bin\urlget %_DEST%\bin%_EXT%\urlget -..\%__SRC%\bin\xgettext %_DEST%\bin%_EXT%\xgettext -..\%__SRC%\lib\iintl_t1.lib %_DEST%\lib%_EXT%\intl.lib +mkdir: %_DEST%\inc\external +..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h +..\%__SRC%\lib\libasprintf.0.dylib %_DEST%\lib\libasprintf.0.dylib +symlink: %_DEST%\lib\libasprintf.0.dylib %_DEST%\lib\libasprintf.dylib +..\%__SRC%\lib\libgettextpo.0.dylib %_DEST%\lib\libgettextpo.0.dylib +symlink: %_DEST%\lib\libgettextpo.0.dylib %_DEST%\lib\libgettextpo.dylib +..\%__SRC%\lib\libgettextsrc-0.18.1.dylib %_DEST%\lib\libgettextsrc-0.18.1.dylib +symlink: %_DEST%\lib\libgettextsrc-0.18.1.dylib %_DEST%\lib\libgettextsrc.dylib +..\%__SRC%\lib\libintl.8.dylib %_DEST%\lib\libintl.8.dylib +symlink: %_DEST%\lib\libintl.8.dylib %_DEST%\lib\libintl.dylib +..\%__SRC%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib\libgettextlib-0.18.1.dylib +symlink: %_DEST%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib\libgettextlib.dylib +..\%__SRC%\lib\libintl.a %_DEST%\lib\libintl.a +..\%__SRC%\bin\*.dll %_DEST%\bin +..\%__SRC%\bin\msgattrib %_DEST%\bin\msgattrib +..\%__SRC%\bin\msgcat %_DEST%\bin\msgcat +..\%__SRC%\bin\msgcmp %_DEST%\bin\msgcmp +..\%__SRC%\bin\msgcomm %_DEST%\bin\msgcomm +..\%__SRC%\bin\msgconv %_DEST%\bin\msgconv +..\%__SRC%\bin\msgen %_DEST%\bin\msgen +..\%__SRC%\bin\msgexec %_DEST%\bin\msgexec +..\%__SRC%\bin\msgfilter %_DEST%\bin\msgfilter +..\%__SRC%\bin\msgfmt %_DEST%\bin\msgfmt +..\%__SRC%\bin\msggrep %_DEST%\bin\msggrep +..\%__SRC%\bin\msginit %_DEST%\bin\msginit +..\%__SRC%\bin\msgmerge %_DEST%\bin\msgmerge +..\%__SRC%\bin\msgunfmt %_DEST%\bin\msgunfmt +..\%__SRC%\bin\msguniq %_DEST%\bin\msguniq +..\%__SRC%\bin\urlget %_DEST%\bin\urlget +..\%__SRC%\bin\xgettext %_DEST%\bin\xgettext +..\%__SRC%\lib\iintl_t1.lib %_DEST%\lib\intl.lib diff --git a/glib/prj/d.lst b/glib/prj/d.lst index 5ec89f19a4e4..751d5c65b295 100644 --- a/glib/prj/d.lst +++ b/glib/prj/d.lst @@ -1,240 +1,240 @@ -mkdir: %_DEST%\inc%_EXT%\external -..\%__SRC%\lib\libgio-2.0.0.dylib %_DEST%\lib%_EXT%\libgio-2.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libgio-2.0.0.dylib %_DEST%\lib%_EXT%\libgio-2.0.dylib -..\%__SRC%\lib\libgmodule-2.0.0.dylib %_DEST%\lib%_EXT%\libgmodule-2.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libgmodule-2.0.0.dylib %_DEST%\lib%_EXT%\libgmodule-2.0.dylib -..\%__SRC%\lib\libgthread-2.0.0.dylib %_DEST%\lib%_EXT%\libgthread-2.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libgthread-2.0.0.dylib %_DEST%\lib%_EXT%\libgthread-2.0.dylib -..\%__SRC%\lib\libglib-2.0.0.dylib %_DEST%\lib%_EXT%\libglib-2.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libglib-2.0.0.dylib %_DEST%\lib%_EXT%\libglib-2.0.dylib -..\%__SRC%\lib\libgobject-2.0.0.dylib %_DEST%\lib%_EXT%\libgobject-2.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libgobject-2.0.0.dylib %_DEST%\lib%_EXT%\libgobject-2.0.dylib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\%__SRC%\bin\glib-mkenums %_DEST%\bin%_EXT%\glib-mkenums -..\%__SRC%\bin\glib-genmarshal %_DEST%\bin%_EXT%\glib-genmarshal -..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin%_EXT%\glib-genmarshal.exe -..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin%_EXT%\glib-compile-schemas -..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib%_EXT%\gio-2.0.lib -..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib%_EXT%\gmodule-2.0.lib -..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib -..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib%_EXT%\glib-2.0.lib -..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib%_EXT%\gobject-2.0.lib +mkdir: %_DEST%\inc\external +..\%__SRC%\lib\libgio-2.0.0.dylib %_DEST%\lib\libgio-2.0.0.dylib +symlink: %_DEST%\lib\libgio-2.0.0.dylib %_DEST%\lib\libgio-2.0.dylib +..\%__SRC%\lib\libgmodule-2.0.0.dylib %_DEST%\lib\libgmodule-2.0.0.dylib +symlink: %_DEST%\lib\libgmodule-2.0.0.dylib %_DEST%\lib\libgmodule-2.0.dylib +..\%__SRC%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.0.dylib +symlink: %_DEST%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.dylib +..\%__SRC%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.0.dylib +symlink: %_DEST%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.dylib +..\%__SRC%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.0.dylib +symlink: %_DEST%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.dylib +..\%__SRC%\bin\*.dll %_DEST%\bin +..\%__SRC%\bin\glib-mkenums %_DEST%\bin\glib-mkenums +..\%__SRC%\bin\glib-genmarshal %_DEST%\bin\glib-genmarshal +..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin\glib-genmarshal.exe +..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin\glib-compile-schemas +..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib\gio-2.0.lib +..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib\gmodule-2.0.lib +..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib\gthread-2.0.lib +..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib\glib-2.0.lib +..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib\gobject-2.0.lib -mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0 -mkdir: %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio -..\%__SRC%\inc\gdesktopappinfo.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gdesktopappinfo.h -..\%__SRC%\inc\gunixcredentialsmessage.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixcredentialsmessage.h -..\%__SRC%\inc\gunixinputstream.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixinputstream.h -..\%__SRC%\inc\gunixsocketaddress.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixsocketaddress.h -..\%__SRC%\inc\gfiledescriptorbased.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gfiledescriptorbased.h -..\%__SRC%\inc\gunixfdlist.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixfdlist.h -..\%__SRC%\inc\gunixmounts.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixmounts.h -..\%__SRC%\inc\gunixconnection.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixconnection.h -..\%__SRC%\inc\gunixfdmessage.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixfdmessage.h -..\%__SRC%\inc\gunixoutputstream.h %_DEST%\inc%_EXT%\external\gio-unix-2.0\gio\gunixoutputstream.h +mkdir: %_DEST%\inc\external\gio-unix-2.0 +mkdir: %_DEST%\inc\external\gio-unix-2.0\gio +..\%__SRC%\inc\gdesktopappinfo.h %_DEST%\inc\external\gio-unix-2.0\gio\gdesktopappinfo.h +..\%__SRC%\inc\gunixcredentialsmessage.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixcredentialsmessage.h +..\%__SRC%\inc\gunixinputstream.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixinputstream.h +..\%__SRC%\inc\gunixsocketaddress.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixsocketaddress.h +..\%__SRC%\inc\gfiledescriptorbased.h %_DEST%\inc\external\gio-unix-2.0\gio\gfiledescriptorbased.h +..\%__SRC%\inc\gunixfdlist.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixfdlist.h +..\%__SRC%\inc\gunixmounts.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixmounts.h +..\%__SRC%\inc\gunixconnection.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixconnection.h +..\%__SRC%\inc\gunixfdmessage.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixfdmessage.h +..\%__SRC%\inc\gunixoutputstream.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixoutputstream.h -mkdir: %_DEST%\inc%_EXT%\external\glib-2.0 -..\%__SRC%\inc\glib-object.h %_DEST%\inc%_EXT%\external\glib-2.0\glib-object.h -..\%__SRC%\inc\glib.h %_DEST%\inc%_EXT%\external\glib-2.0\glib.h -..\%__SRC%\inc\glibconfig.h %_DEST%\inc%_EXT%\external\glib-2.0\glibconfig.h -..\%__SRC%\inc\gmodule.h %_DEST%\inc%_EXT%\external\glib-2.0\gmodule.h -..\%__SRC%\inc\make.msc %_DEST%\inc%_EXT%\external\glib-2.0\make.msc -..\%__SRC%\inc\module.defs %_DEST%\inc%_EXT%\external\glib-2.0\module.defs +mkdir: %_DEST%\inc\external\glib-2.0 +..\%__SRC%\inc\glib-object.h %_DEST%\inc\external\glib-2.0\glib-object.h +..\%__SRC%\inc\glib.h %_DEST%\inc\external\glib-2.0\glib.h +..\%__SRC%\inc\glibconfig.h %_DEST%\inc\external\glib-2.0\glibconfig.h +..\%__SRC%\inc\gmodule.h %_DEST%\inc\external\glib-2.0\gmodule.h +..\%__SRC%\inc\make.msc %_DEST%\inc\external\glib-2.0\make.msc +..\%__SRC%\inc\module.defs %_DEST%\inc\external\glib-2.0\module.defs -mkdir: %_DEST%\inc%_EXT%\external\glib-2.0\gio -..\%__SRC%\inc\gaction.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gaction.h -..\%__SRC%\inc\gfileicon.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileicon.h -..\%__SRC%\inc\gproxyaddressenumerator.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gproxyaddressenumerator.h -..\%__SRC%\inc\gactiongroup.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gactiongroup.h -..\%__SRC%\inc\gfileinfo.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileinfo.h -..\%__SRC%\inc\gproxyresolver.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gproxyresolver.h -..\%__SRC%\inc\gappinfo.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gappinfo.h -..\%__SRC%\inc\gfileinputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileinputstream.h -..\%__SRC%\inc\gresolver.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gresolver.h -..\%__SRC%\inc\gapplication.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gapplication.h -..\%__SRC%\inc\gfileiostream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileiostream.h -..\%__SRC%\inc\gseekable.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gseekable.h -..\%__SRC%\inc\gapplicationcommandline.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gapplicationcommandline.h -..\%__SRC%\inc\gfilemonitor.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfilemonitor.h -..\%__SRC%\inc\gsettings.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsettings.h -..\%__SRC%\inc\gasyncinitable.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gasyncinitable.h -..\%__SRC%\inc\gfilenamecompleter.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfilenamecompleter.h -..\%__SRC%\inc\gsettingsbackend.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsettingsbackend.h -..\%__SRC%\inc\gasyncresult.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gasyncresult.h -..\%__SRC%\inc\gfileoutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileoutputstream.h -..\%__SRC%\inc\gsimpleaction.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsimpleaction.h -..\%__SRC%\inc\gbufferedinputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gbufferedinputstream.h -..\%__SRC%\inc\gfilterinputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfilterinputstream.h -..\%__SRC%\inc\gsimpleactiongroup.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsimpleactiongroup.h -..\%__SRC%\inc\gbufferedoutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gbufferedoutputstream.h -..\%__SRC%\inc\gfilteroutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfilteroutputstream.h -..\%__SRC%\inc\gsimpleasyncresult.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsimpleasyncresult.h -..\%__SRC%\inc\gcancellable.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gcancellable.h -..\%__SRC%\inc\gicon.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gicon.h -..\%__SRC%\inc\gsimplepermission.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsimplepermission.h -..\%__SRC%\inc\gcharsetconverter.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gcharsetconverter.h -..\%__SRC%\inc\ginetaddress.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\ginetaddress.h -..\%__SRC%\inc\gsocket.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocket.h -..\%__SRC%\inc\gcontenttype.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gcontenttype.h -..\%__SRC%\inc\ginetsocketaddress.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\ginetsocketaddress.h -..\%__SRC%\inc\gsocketaddress.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketaddress.h -..\%__SRC%\inc\gconverter.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gconverter.h -..\%__SRC%\inc\ginitable.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\ginitable.h -..\%__SRC%\inc\gsocketaddressenumerator.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketaddressenumerator.h -..\%__SRC%\inc\gconverterinputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gconverterinputstream.h -..\%__SRC%\inc\ginputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\ginputstream.h -..\%__SRC%\inc\gsocketclient.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketclient.h -..\%__SRC%\inc\gconverteroutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gconverteroutputstream.h -..\%__SRC%\inc\gio.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gio.h -..\%__SRC%\inc\gsocketconnectable.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketconnectable.h -..\%__SRC%\inc\gcredentials.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gcredentials.h -..\%__SRC%\inc\gioenums.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gioenums.h -..\%__SRC%\inc\gsocketconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketconnection.h -..\%__SRC%\inc\gdatainputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdatainputstream.h -..\%__SRC%\inc\gioenumtypes.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gioenumtypes.h -..\%__SRC%\inc\gsocketcontrolmessage.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketcontrolmessage.h -..\%__SRC%\inc\gdataoutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdataoutputstream.h -..\%__SRC%\inc\gioerror.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gioerror.h -..\%__SRC%\inc\gsocketlistener.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketlistener.h -..\%__SRC%\inc\gdbusaddress.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusaddress.h -..\%__SRC%\inc\giomodule.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\giomodule.h -..\%__SRC%\inc\gsocketservice.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsocketservice.h -..\%__SRC%\inc\gdbusauthobserver.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusauthobserver.h -..\%__SRC%\inc\gioscheduler.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gioscheduler.h -..\%__SRC%\inc\gsrvtarget.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gsrvtarget.h -..\%__SRC%\inc\gdbusconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusconnection.h -..\%__SRC%\inc\giostream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\giostream.h -..\%__SRC%\inc\gtcpconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtcpconnection.h -..\%__SRC%\inc\gdbuserror.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbuserror.h -..\%__SRC%\inc\giotypes.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\giotypes.h -..\%__SRC%\inc\gtcpwrapperconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtcpwrapperconnection.h -..\%__SRC%\inc\gdbusintrospection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusintrospection.h -..\%__SRC%\inc\gloadableicon.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gloadableicon.h -..\%__SRC%\inc\gthemedicon.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gthemedicon.h -..\%__SRC%\inc\gdbusmessage.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusmessage.h -..\%__SRC%\inc\gmemoryinputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gmemoryinputstream.h -..\%__SRC%\inc\gthreadedsocketservice.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gthreadedsocketservice.h -..\%__SRC%\inc\gdbusmethodinvocation.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusmethodinvocation.h -..\%__SRC%\inc\gmemoryoutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gmemoryoutputstream.h -..\%__SRC%\inc\gtlsbackend.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtlsbackend.h -..\%__SRC%\inc\gdbusnameowning.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusnameowning.h -..\%__SRC%\inc\gmount.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gmount.h -..\%__SRC%\inc\gtlscertificate.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtlscertificate.h -..\%__SRC%\inc\gdbusnamewatching.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusnamewatching.h -..\%__SRC%\inc\gmountoperation.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gmountoperation.h -..\%__SRC%\inc\gtlsclientconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtlsclientconnection.h -..\%__SRC%\inc\gdbusproxy.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusproxy.h -..\%__SRC%\inc\gnativevolumemonitor.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gnativevolumemonitor.h -..\%__SRC%\inc\gtlsconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtlsconnection.h -..\%__SRC%\inc\gdbusserver.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusserver.h -..\%__SRC%\inc\gnetworkaddress.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gnetworkaddress.h -..\%__SRC%\inc\gtlsserverconnection.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gtlsserverconnection.h -..\%__SRC%\inc\gdbusutils.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdbusutils.h -..\%__SRC%\inc\gnetworkservice.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gnetworkservice.h -..\%__SRC%\inc\gvfs.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gvfs.h -..\%__SRC%\inc\gdrive.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gdrive.h -..\%__SRC%\inc\goutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\goutputstream.h -..\%__SRC%\inc\gvolume.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gvolume.h -..\%__SRC%\inc\gemblem.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gemblem.h -..\%__SRC%\inc\gpermission.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gpermission.h -..\%__SRC%\inc\gvolumemonitor.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gvolumemonitor.h -..\%__SRC%\inc\gemblemedicon.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gemblemedicon.h -..\%__SRC%\inc\gpollableinputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gpollableinputstream.h -..\%__SRC%\inc\gzlibcompressor.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gzlibcompressor.h -..\%__SRC%\inc\gfile.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfile.h -..\%__SRC%\inc\gpollableoutputstream.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gpollableoutputstream.h -..\%__SRC%\inc\gzlibdecompressor.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gzlibdecompressor.h -..\%__SRC%\inc\gfileattribute.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileattribute.h -..\%__SRC%\inc\gproxy.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gproxy.h -..\%__SRC%\inc\gfileenumerator.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gfileenumerator.h -..\%__SRC%\inc\gproxyaddress.h %_DEST%\inc%_EXT%\external\glib-2.0\gio\gproxyaddress.h +mkdir: %_DEST%\inc\external\glib-2.0\gio +..\%__SRC%\inc\gaction.h %_DEST%\inc\external\glib-2.0\gio\gaction.h +..\%__SRC%\inc\gfileicon.h %_DEST%\inc\external\glib-2.0\gio\gfileicon.h +..\%__SRC%\inc\gproxyaddressenumerator.h %_DEST%\inc\external\glib-2.0\gio\gproxyaddressenumerator.h +..\%__SRC%\inc\gactiongroup.h %_DEST%\inc\external\glib-2.0\gio\gactiongroup.h +..\%__SRC%\inc\gfileinfo.h %_DEST%\inc\external\glib-2.0\gio\gfileinfo.h +..\%__SRC%\inc\gproxyresolver.h %_DEST%\inc\external\glib-2.0\gio\gproxyresolver.h +..\%__SRC%\inc\gappinfo.h %_DEST%\inc\external\glib-2.0\gio\gappinfo.h +..\%__SRC%\inc\gfileinputstream.h %_DEST%\inc\external\glib-2.0\gio\gfileinputstream.h +..\%__SRC%\inc\gresolver.h %_DEST%\inc\external\glib-2.0\gio\gresolver.h +..\%__SRC%\inc\gapplication.h %_DEST%\inc\external\glib-2.0\gio\gapplication.h +..\%__SRC%\inc\gfileiostream.h %_DEST%\inc\external\glib-2.0\gio\gfileiostream.h +..\%__SRC%\inc\gseekable.h %_DEST%\inc\external\glib-2.0\gio\gseekable.h +..\%__SRC%\inc\gapplicationcommandline.h %_DEST%\inc\external\glib-2.0\gio\gapplicationcommandline.h +..\%__SRC%\inc\gfilemonitor.h %_DEST%\inc\external\glib-2.0\gio\gfilemonitor.h +..\%__SRC%\inc\gsettings.h %_DEST%\inc\external\glib-2.0\gio\gsettings.h +..\%__SRC%\inc\gasyncinitable.h %_DEST%\inc\external\glib-2.0\gio\gasyncinitable.h +..\%__SRC%\inc\gfilenamecompleter.h %_DEST%\inc\external\glib-2.0\gio\gfilenamecompleter.h +..\%__SRC%\inc\gsettingsbackend.h %_DEST%\inc\external\glib-2.0\gio\gsettingsbackend.h +..\%__SRC%\inc\gasyncresult.h %_DEST%\inc\external\glib-2.0\gio\gasyncresult.h +..\%__SRC%\inc\gfileoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gfileoutputstream.h +..\%__SRC%\inc\gsimpleaction.h %_DEST%\inc\external\glib-2.0\gio\gsimpleaction.h +..\%__SRC%\inc\gbufferedinputstream.h %_DEST%\inc\external\glib-2.0\gio\gbufferedinputstream.h +..\%__SRC%\inc\gfilterinputstream.h %_DEST%\inc\external\glib-2.0\gio\gfilterinputstream.h +..\%__SRC%\inc\gsimpleactiongroup.h %_DEST%\inc\external\glib-2.0\gio\gsimpleactiongroup.h +..\%__SRC%\inc\gbufferedoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gbufferedoutputstream.h +..\%__SRC%\inc\gfilteroutputstream.h %_DEST%\inc\external\glib-2.0\gio\gfilteroutputstream.h +..\%__SRC%\inc\gsimpleasyncresult.h %_DEST%\inc\external\glib-2.0\gio\gsimpleasyncresult.h +..\%__SRC%\inc\gcancellable.h %_DEST%\inc\external\glib-2.0\gio\gcancellable.h +..\%__SRC%\inc\gicon.h %_DEST%\inc\external\glib-2.0\gio\gicon.h +..\%__SRC%\inc\gsimplepermission.h %_DEST%\inc\external\glib-2.0\gio\gsimplepermission.h +..\%__SRC%\inc\gcharsetconverter.h %_DEST%\inc\external\glib-2.0\gio\gcharsetconverter.h +..\%__SRC%\inc\ginetaddress.h %_DEST%\inc\external\glib-2.0\gio\ginetaddress.h +..\%__SRC%\inc\gsocket.h %_DEST%\inc\external\glib-2.0\gio\gsocket.h +..\%__SRC%\inc\gcontenttype.h %_DEST%\inc\external\glib-2.0\gio\gcontenttype.h +..\%__SRC%\inc\ginetsocketaddress.h %_DEST%\inc\external\glib-2.0\gio\ginetsocketaddress.h +..\%__SRC%\inc\gsocketaddress.h %_DEST%\inc\external\glib-2.0\gio\gsocketaddress.h +..\%__SRC%\inc\gconverter.h %_DEST%\inc\external\glib-2.0\gio\gconverter.h +..\%__SRC%\inc\ginitable.h %_DEST%\inc\external\glib-2.0\gio\ginitable.h +..\%__SRC%\inc\gsocketaddressenumerator.h %_DEST%\inc\external\glib-2.0\gio\gsocketaddressenumerator.h +..\%__SRC%\inc\gconverterinputstream.h %_DEST%\inc\external\glib-2.0\gio\gconverterinputstream.h +..\%__SRC%\inc\ginputstream.h %_DEST%\inc\external\glib-2.0\gio\ginputstream.h +..\%__SRC%\inc\gsocketclient.h %_DEST%\inc\external\glib-2.0\gio\gsocketclient.h +..\%__SRC%\inc\gconverteroutputstream.h %_DEST%\inc\external\glib-2.0\gio\gconverteroutputstream.h +..\%__SRC%\inc\gio.h %_DEST%\inc\external\glib-2.0\gio\gio.h +..\%__SRC%\inc\gsocketconnectable.h %_DEST%\inc\external\glib-2.0\gio\gsocketconnectable.h +..\%__SRC%\inc\gcredentials.h %_DEST%\inc\external\glib-2.0\gio\gcredentials.h +..\%__SRC%\inc\gioenums.h %_DEST%\inc\external\glib-2.0\gio\gioenums.h +..\%__SRC%\inc\gsocketconnection.h %_DEST%\inc\external\glib-2.0\gio\gsocketconnection.h +..\%__SRC%\inc\gdatainputstream.h %_DEST%\inc\external\glib-2.0\gio\gdatainputstream.h +..\%__SRC%\inc\gioenumtypes.h %_DEST%\inc\external\glib-2.0\gio\gioenumtypes.h +..\%__SRC%\inc\gsocketcontrolmessage.h %_DEST%\inc\external\glib-2.0\gio\gsocketcontrolmessage.h +..\%__SRC%\inc\gdataoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gdataoutputstream.h +..\%__SRC%\inc\gioerror.h %_DEST%\inc\external\glib-2.0\gio\gioerror.h +..\%__SRC%\inc\gsocketlistener.h %_DEST%\inc\external\glib-2.0\gio\gsocketlistener.h +..\%__SRC%\inc\gdbusaddress.h %_DEST%\inc\external\glib-2.0\gio\gdbusaddress.h +..\%__SRC%\inc\giomodule.h %_DEST%\inc\external\glib-2.0\gio\giomodule.h +..\%__SRC%\inc\gsocketservice.h %_DEST%\inc\external\glib-2.0\gio\gsocketservice.h +..\%__SRC%\inc\gdbusauthobserver.h %_DEST%\inc\external\glib-2.0\gio\gdbusauthobserver.h +..\%__SRC%\inc\gioscheduler.h %_DEST%\inc\external\glib-2.0\gio\gioscheduler.h +..\%__SRC%\inc\gsrvtarget.h %_DEST%\inc\external\glib-2.0\gio\gsrvtarget.h +..\%__SRC%\inc\gdbusconnection.h %_DEST%\inc\external\glib-2.0\gio\gdbusconnection.h +..\%__SRC%\inc\giostream.h %_DEST%\inc\external\glib-2.0\gio\giostream.h +..\%__SRC%\inc\gtcpconnection.h %_DEST%\inc\external\glib-2.0\gio\gtcpconnection.h +..\%__SRC%\inc\gdbuserror.h %_DEST%\inc\external\glib-2.0\gio\gdbuserror.h +..\%__SRC%\inc\giotypes.h %_DEST%\inc\external\glib-2.0\gio\giotypes.h +..\%__SRC%\inc\gtcpwrapperconnection.h %_DEST%\inc\external\glib-2.0\gio\gtcpwrapperconnection.h +..\%__SRC%\inc\gdbusintrospection.h %_DEST%\inc\external\glib-2.0\gio\gdbusintrospection.h +..\%__SRC%\inc\gloadableicon.h %_DEST%\inc\external\glib-2.0\gio\gloadableicon.h +..\%__SRC%\inc\gthemedicon.h %_DEST%\inc\external\glib-2.0\gio\gthemedicon.h +..\%__SRC%\inc\gdbusmessage.h %_DEST%\inc\external\glib-2.0\gio\gdbusmessage.h +..\%__SRC%\inc\gmemoryinputstream.h %_DEST%\inc\external\glib-2.0\gio\gmemoryinputstream.h +..\%__SRC%\inc\gthreadedsocketservice.h %_DEST%\inc\external\glib-2.0\gio\gthreadedsocketservice.h +..\%__SRC%\inc\gdbusmethodinvocation.h %_DEST%\inc\external\glib-2.0\gio\gdbusmethodinvocation.h +..\%__SRC%\inc\gmemoryoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gmemoryoutputstream.h +..\%__SRC%\inc\gtlsbackend.h %_DEST%\inc\external\glib-2.0\gio\gtlsbackend.h +..\%__SRC%\inc\gdbusnameowning.h %_DEST%\inc\external\glib-2.0\gio\gdbusnameowning.h +..\%__SRC%\inc\gmount.h %_DEST%\inc\external\glib-2.0\gio\gmount.h +..\%__SRC%\inc\gtlscertificate.h %_DEST%\inc\external\glib-2.0\gio\gtlscertificate.h +..\%__SRC%\inc\gdbusnamewatching.h %_DEST%\inc\external\glib-2.0\gio\gdbusnamewatching.h +..\%__SRC%\inc\gmountoperation.h %_DEST%\inc\external\glib-2.0\gio\gmountoperation.h +..\%__SRC%\inc\gtlsclientconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsclientconnection.h +..\%__SRC%\inc\gdbusproxy.h %_DEST%\inc\external\glib-2.0\gio\gdbusproxy.h +..\%__SRC%\inc\gnativevolumemonitor.h %_DEST%\inc\external\glib-2.0\gio\gnativevolumemonitor.h +..\%__SRC%\inc\gtlsconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsconnection.h +..\%__SRC%\inc\gdbusserver.h %_DEST%\inc\external\glib-2.0\gio\gdbusserver.h +..\%__SRC%\inc\gnetworkaddress.h %_DEST%\inc\external\glib-2.0\gio\gnetworkaddress.h +..\%__SRC%\inc\gtlsserverconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsserverconnection.h +..\%__SRC%\inc\gdbusutils.h %_DEST%\inc\external\glib-2.0\gio\gdbusutils.h +..\%__SRC%\inc\gnetworkservice.h %_DEST%\inc\external\glib-2.0\gio\gnetworkservice.h +..\%__SRC%\inc\gvfs.h %_DEST%\inc\external\glib-2.0\gio\gvfs.h +..\%__SRC%\inc\gdrive.h %_DEST%\inc\external\glib-2.0\gio\gdrive.h +..\%__SRC%\inc\goutputstream.h %_DEST%\inc\external\glib-2.0\gio\goutputstream.h +..\%__SRC%\inc\gvolume.h %_DEST%\inc\external\glib-2.0\gio\gvolume.h +..\%__SRC%\inc\gemblem.h %_DEST%\inc\external\glib-2.0\gio\gemblem.h +..\%__SRC%\inc\gpermission.h %_DEST%\inc\external\glib-2.0\gio\gpermission.h +..\%__SRC%\inc\gvolumemonitor.h %_DEST%\inc\external\glib-2.0\gio\gvolumemonitor.h +..\%__SRC%\inc\gemblemedicon.h %_DEST%\inc\external\glib-2.0\gio\gemblemedicon.h +..\%__SRC%\inc\gpollableinputstream.h %_DEST%\inc\external\glib-2.0\gio\gpollableinputstream.h +..\%__SRC%\inc\gzlibcompressor.h %_DEST%\inc\external\glib-2.0\gio\gzlibcompressor.h +..\%__SRC%\inc\gfile.h %_DEST%\inc\external\glib-2.0\gio\gfile.h +..\%__SRC%\inc\gpollableoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gpollableoutputstream.h +..\%__SRC%\inc\gzlibdecompressor.h %_DEST%\inc\external\glib-2.0\gio\gzlibdecompressor.h +..\%__SRC%\inc\gfileattribute.h %_DEST%\inc\external\glib-2.0\gio\gfileattribute.h +..\%__SRC%\inc\gproxy.h %_DEST%\inc\external\glib-2.0\gio\gproxy.h +..\%__SRC%\inc\gfileenumerator.h %_DEST%\inc\external\glib-2.0\gio\gfileenumerator.h +..\%__SRC%\inc\gproxyaddress.h %_DEST%\inc\external\glib-2.0\gio\gproxyaddress.h -mkdir: %_DEST%\inc%_EXT%\external\glib-2.0\glib +mkdir: %_DEST%\inc\external\glib-2.0\glib -..\%__SRC%\inc\galloca.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\galloca.h -..\%__SRC%\inc\gconvert.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gconvert.h -..\%__SRC%\inc\gi18n.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gi18n.h -..\%__SRC%\inc\goption.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\goption.h -..\%__SRC%\inc\gscanner.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gscanner.h -..\%__SRC%\inc\gthreadpool.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gthreadpool.h -..\%__SRC%\inc\garray.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\garray.h -..\%__SRC%\inc\gdataset.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gdataset.h -..\%__SRC%\inc\giochannel.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\giochannel.h -..\%__SRC%\inc\gpattern.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gpattern.h -..\%__SRC%\inc\gsequence.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gsequence.h -..\%__SRC%\inc\gtimer.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gtimer.h -..\%__SRC%\inc\gasyncqueue.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gasyncqueue.h -..\%__SRC%\inc\gdate.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gdate.h -..\%__SRC%\inc\gkeyfile.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gkeyfile.h -..\%__SRC%\inc\gpoll.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gpoll.h -..\%__SRC%\inc\gshell.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gshell.h -..\%__SRC%\inc\gtimezone.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gtimezone.h -..\%__SRC%\inc\gatomic.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gatomic.h -..\%__SRC%\inc\gdatetime.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gdatetime.h -..\%__SRC%\inc\glist.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\glist.h -..\%__SRC%\inc\gprimes.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gprimes.h -..\%__SRC%\inc\gslice.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gslice.h -..\%__SRC%\inc\gtree.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gtree.h -..\%__SRC%\inc\gbacktrace.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gbacktrace.h -..\%__SRC%\inc\gdir.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gdir.h -..\%__SRC%\inc\gmacros.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gmacros.h -..\%__SRC%\inc\gprintf.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gprintf.h -..\%__SRC%\inc\gslist.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gslist.h -..\%__SRC%\inc\gtypes.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gtypes.h -..\%__SRC%\inc\gbase64.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gbase64.h -..\%__SRC%\inc\gerror.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gerror.h -..\%__SRC%\inc\gmain.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gmain.h -..\%__SRC%\inc\gqsort.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gqsort.h -..\%__SRC%\inc\gspawn.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gspawn.h -..\%__SRC%\inc\gunicode.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gunicode.h -..\%__SRC%\inc\gbitlock.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gbitlock.h -..\%__SRC%\inc\gfileutils.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gfileutils.h -..\%__SRC%\inc\gmappedfile.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gmappedfile.h -..\%__SRC%\inc\gquark.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gquark.h -..\%__SRC%\inc\gstdio.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gstdio.h -..\%__SRC%\inc\gurifuncs.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gurifuncs.h -..\%__SRC%\inc\gbookmarkfile.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gbookmarkfile.h -..\%__SRC%\inc\ghash.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\ghash.h -..\%__SRC%\inc\gmarkup.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gmarkup.h -..\%__SRC%\inc\gqueue.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gqueue.h -..\%__SRC%\inc\gstrfuncs.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gstrfuncs.h -..\%__SRC%\inc\gutils.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gutils.h -..\%__SRC%\inc\gcache.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gcache.h -..\%__SRC%\inc\ghook.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\ghook.h -..\%__SRC%\inc\gmem.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gmem.h -..\%__SRC%\inc\grand.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\grand.h -..\%__SRC%\inc\gstring.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gstring.h -..\%__SRC%\inc\gvariant.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gvariant.h -..\%__SRC%\inc\gchecksum.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gchecksum.h -..\%__SRC%\inc\ghostutils.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\ghostutils.h -..\%__SRC%\inc\gmessages.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gmessages.h -..\%__SRC%\inc\gregex.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gregex.h -..\%__SRC%\inc\gtestutils.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gtestutils.h -..\%__SRC%\inc\gvarianttype.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gvarianttype.h -..\%__SRC%\inc\gcompletion.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gcompletion.h -..\%__SRC%\inc\gi18n-lib.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gi18n-lib.h -..\%__SRC%\inc\gnode.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gnode.h -..\%__SRC%\inc\grel.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\grel.h -..\%__SRC%\inc\gthread.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gthread.h -..\%__SRC%\inc\gwin32.h %_DEST%\inc%_EXT%\external\glib-2.0\glib\gwin32.h +..\%__SRC%\inc\galloca.h %_DEST%\inc\external\glib-2.0\glib\galloca.h +..\%__SRC%\inc\gconvert.h %_DEST%\inc\external\glib-2.0\glib\gconvert.h +..\%__SRC%\inc\gi18n.h %_DEST%\inc\external\glib-2.0\glib\gi18n.h +..\%__SRC%\inc\goption.h %_DEST%\inc\external\glib-2.0\glib\goption.h +..\%__SRC%\inc\gscanner.h %_DEST%\inc\external\glib-2.0\glib\gscanner.h +..\%__SRC%\inc\gthreadpool.h %_DEST%\inc\external\glib-2.0\glib\gthreadpool.h +..\%__SRC%\inc\garray.h %_DEST%\inc\external\glib-2.0\glib\garray.h +..\%__SRC%\inc\gdataset.h %_DEST%\inc\external\glib-2.0\glib\gdataset.h +..\%__SRC%\inc\giochannel.h %_DEST%\inc\external\glib-2.0\glib\giochannel.h +..\%__SRC%\inc\gpattern.h %_DEST%\inc\external\glib-2.0\glib\gpattern.h +..\%__SRC%\inc\gsequence.h %_DEST%\inc\external\glib-2.0\glib\gsequence.h +..\%__SRC%\inc\gtimer.h %_DEST%\inc\external\glib-2.0\glib\gtimer.h +..\%__SRC%\inc\gasyncqueue.h %_DEST%\inc\external\glib-2.0\glib\gasyncqueue.h +..\%__SRC%\inc\gdate.h %_DEST%\inc\external\glib-2.0\glib\gdate.h +..\%__SRC%\inc\gkeyfile.h %_DEST%\inc\external\glib-2.0\glib\gkeyfile.h +..\%__SRC%\inc\gpoll.h %_DEST%\inc\external\glib-2.0\glib\gpoll.h +..\%__SRC%\inc\gshell.h %_DEST%\inc\external\glib-2.0\glib\gshell.h +..\%__SRC%\inc\gtimezone.h %_DEST%\inc\external\glib-2.0\glib\gtimezone.h +..\%__SRC%\inc\gatomic.h %_DEST%\inc\external\glib-2.0\glib\gatomic.h +..\%__SRC%\inc\gdatetime.h %_DEST%\inc\external\glib-2.0\glib\gdatetime.h +..\%__SRC%\inc\glist.h %_DEST%\inc\external\glib-2.0\glib\glist.h +..\%__SRC%\inc\gprimes.h %_DEST%\inc\external\glib-2.0\glib\gprimes.h +..\%__SRC%\inc\gslice.h %_DEST%\inc\external\glib-2.0\glib\gslice.h +..\%__SRC%\inc\gtree.h %_DEST%\inc\external\glib-2.0\glib\gtree.h +..\%__SRC%\inc\gbacktrace.h %_DEST%\inc\external\glib-2.0\glib\gbacktrace.h +..\%__SRC%\inc\gdir.h %_DEST%\inc\external\glib-2.0\glib\gdir.h +..\%__SRC%\inc\gmacros.h %_DEST%\inc\external\glib-2.0\glib\gmacros.h +..\%__SRC%\inc\gprintf.h %_DEST%\inc\external\glib-2.0\glib\gprintf.h +..\%__SRC%\inc\gslist.h %_DEST%\inc\external\glib-2.0\glib\gslist.h +..\%__SRC%\inc\gtypes.h %_DEST%\inc\external\glib-2.0\glib\gtypes.h +..\%__SRC%\inc\gbase64.h %_DEST%\inc\external\glib-2.0\glib\gbase64.h +..\%__SRC%\inc\gerror.h %_DEST%\inc\external\glib-2.0\glib\gerror.h +..\%__SRC%\inc\gmain.h %_DEST%\inc\external\glib-2.0\glib\gmain.h +..\%__SRC%\inc\gqsort.h %_DEST%\inc\external\glib-2.0\glib\gqsort.h +..\%__SRC%\inc\gspawn.h %_DEST%\inc\external\glib-2.0\glib\gspawn.h +..\%__SRC%\inc\gunicode.h %_DEST%\inc\external\glib-2.0\glib\gunicode.h +..\%__SRC%\inc\gbitlock.h %_DEST%\inc\external\glib-2.0\glib\gbitlock.h +..\%__SRC%\inc\gfileutils.h %_DEST%\inc\external\glib-2.0\glib\gfileutils.h +..\%__SRC%\inc\gmappedfile.h %_DEST%\inc\external\glib-2.0\glib\gmappedfile.h +..\%__SRC%\inc\gquark.h %_DEST%\inc\external\glib-2.0\glib\gquark.h +..\%__SRC%\inc\gstdio.h %_DEST%\inc\external\glib-2.0\glib\gstdio.h +..\%__SRC%\inc\gurifuncs.h %_DEST%\inc\external\glib-2.0\glib\gurifuncs.h +..\%__SRC%\inc\gbookmarkfile.h %_DEST%\inc\external\glib-2.0\glib\gbookmarkfile.h +..\%__SRC%\inc\ghash.h %_DEST%\inc\external\glib-2.0\glib\ghash.h +..\%__SRC%\inc\gmarkup.h %_DEST%\inc\external\glib-2.0\glib\gmarkup.h +..\%__SRC%\inc\gqueue.h %_DEST%\inc\external\glib-2.0\glib\gqueue.h +..\%__SRC%\inc\gstrfuncs.h %_DEST%\inc\external\glib-2.0\glib\gstrfuncs.h +..\%__SRC%\inc\gutils.h %_DEST%\inc\external\glib-2.0\glib\gutils.h +..\%__SRC%\inc\gcache.h %_DEST%\inc\external\glib-2.0\glib\gcache.h +..\%__SRC%\inc\ghook.h %_DEST%\inc\external\glib-2.0\glib\ghook.h +..\%__SRC%\inc\gmem.h %_DEST%\inc\external\glib-2.0\glib\gmem.h +..\%__SRC%\inc\grand.h %_DEST%\inc\external\glib-2.0\glib\grand.h +..\%__SRC%\inc\gstring.h %_DEST%\inc\external\glib-2.0\glib\gstring.h +..\%__SRC%\inc\gvariant.h %_DEST%\inc\external\glib-2.0\glib\gvariant.h +..\%__SRC%\inc\gchecksum.h %_DEST%\inc\external\glib-2.0\glib\gchecksum.h +..\%__SRC%\inc\ghostutils.h %_DEST%\inc\external\glib-2.0\glib\ghostutils.h +..\%__SRC%\inc\gmessages.h %_DEST%\inc\external\glib-2.0\glib\gmessages.h +..\%__SRC%\inc\gregex.h %_DEST%\inc\external\glib-2.0\glib\gregex.h +..\%__SRC%\inc\gtestutils.h %_DEST%\inc\external\glib-2.0\glib\gtestutils.h +..\%__SRC%\inc\gvarianttype.h %_DEST%\inc\external\glib-2.0\glib\gvarianttype.h +..\%__SRC%\inc\gcompletion.h %_DEST%\inc\external\glib-2.0\glib\gcompletion.h +..\%__SRC%\inc\gi18n-lib.h %_DEST%\inc\external\glib-2.0\glib\gi18n-lib.h +..\%__SRC%\inc\gnode.h %_DEST%\inc\external\glib-2.0\glib\gnode.h +..\%__SRC%\inc\grel.h %_DEST%\inc\external\glib-2.0\glib\grel.h +..\%__SRC%\inc\gthread.h %_DEST%\inc\external\glib-2.0\glib\gthread.h +..\%__SRC%\inc\gwin32.h %_DEST%\inc\external\glib-2.0\glib\gwin32.h -mkdir: %_DEST%\inc%_EXT%\external\glib-2.0\gobject -..\%__SRC%\inc\gbinding.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gbinding.h -..\%__SRC%\inc\gmarshal.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gmarshal.h -..\%__SRC%\inc\gparamspecs.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gparamspecs.h -..\%__SRC%\inc\gtypemodule.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gtypemodule.h -..\%__SRC%\inc\gvaluecollector.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gvaluecollector.h -..\%__SRC%\inc\gboxed.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gboxed.h -..\%__SRC%\inc\gobject.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gobject.h -..\%__SRC%\inc\gsignal.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gsignal.h -..\%__SRC%\inc\gtypeplugin.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gtypeplugin.h -..\%__SRC%\inc\gvaluetypes.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gvaluetypes.h -..\%__SRC%\inc\gclosure.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gclosure.h -..\%__SRC%\inc\gobjectnotifyqueue.c %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gobjectnotifyqueue.c -..\%__SRC%\inc\gsourceclosure.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gsourceclosure.h -..\%__SRC%\inc\gvalue.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gvalue.h -..\%__SRC%\inc\genums.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\genums.h -..\%__SRC%\inc\gparam.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gparam.h -..\%__SRC%\inc\gtype.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gtype.h -..\%__SRC%\inc\gvaluearray.h %_DEST%\inc%_EXT%\external\glib-2.0\gobject\gvaluearray.h +mkdir: %_DEST%\inc\external\glib-2.0\gobject +..\%__SRC%\inc\gbinding.h %_DEST%\inc\external\glib-2.0\gobject\gbinding.h +..\%__SRC%\inc\gmarshal.h %_DEST%\inc\external\glib-2.0\gobject\gmarshal.h +..\%__SRC%\inc\gparamspecs.h %_DEST%\inc\external\glib-2.0\gobject\gparamspecs.h +..\%__SRC%\inc\gtypemodule.h %_DEST%\inc\external\glib-2.0\gobject\gtypemodule.h +..\%__SRC%\inc\gvaluecollector.h %_DEST%\inc\external\glib-2.0\gobject\gvaluecollector.h +..\%__SRC%\inc\gboxed.h %_DEST%\inc\external\glib-2.0\gobject\gboxed.h +..\%__SRC%\inc\gobject.h %_DEST%\inc\external\glib-2.0\gobject\gobject.h +..\%__SRC%\inc\gsignal.h %_DEST%\inc\external\glib-2.0\gobject\gsignal.h +..\%__SRC%\inc\gtypeplugin.h %_DEST%\inc\external\glib-2.0\gobject\gtypeplugin.h +..\%__SRC%\inc\gvaluetypes.h %_DEST%\inc\external\glib-2.0\gobject\gvaluetypes.h +..\%__SRC%\inc\gclosure.h %_DEST%\inc\external\glib-2.0\gobject\gclosure.h +..\%__SRC%\inc\gobjectnotifyqueue.c %_DEST%\inc\external\glib-2.0\gobject\gobjectnotifyqueue.c +..\%__SRC%\inc\gsourceclosure.h %_DEST%\inc\external\glib-2.0\gobject\gsourceclosure.h +..\%__SRC%\inc\gvalue.h %_DEST%\inc\external\glib-2.0\gobject\gvalue.h +..\%__SRC%\inc\genums.h %_DEST%\inc\external\glib-2.0\gobject\genums.h +..\%__SRC%\inc\gparam.h %_DEST%\inc\external\glib-2.0\gobject\gparam.h +..\%__SRC%\inc\gtype.h %_DEST%\inc\external\glib-2.0\gobject\gtype.h +..\%__SRC%\inc\gvaluearray.h %_DEST%\inc\external\glib-2.0\gobject\gvaluearray.h diff --git a/graphite/prj/d.lst b/graphite/prj/d.lst index 065ee1acf29c..4add1c1483c6 100644 --- a/graphite/prj/d.lst +++ b/graphite/prj/d.lst @@ -1,12 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\graphite2 -..\%__SRC%\inc\graphite2\*.h %_DEST%\inc%_EXT%\graphite2\*.h +mkdir: %_DEST%\inc\graphite2 +..\%__SRC%\inc\graphite2\*.h %_DEST%\inc\graphite2\*.h -..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.* -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.pdb %_DEST%\bin%_EXT%\*.pdb +..\%__SRC%\lib\*.so.* %_DEST%\lib\*.so.* +..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\bin\*.pdb %_DEST%\bin\*.pdb linklib: libgraphite2.so.*.*.* linklib: libgraphite2.dylib.*.*.* diff --git a/hunspell/prj/d.lst b/hunspell/prj/d.lst index 10f44f4ae96d..da3b58c94567 100644 --- a/hunspell/prj/d.lst +++ b/hunspell/prj/d.lst @@ -1,6 +1,6 @@ -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\slb\libhunspell.lib %_DEST%\lib%_EXT%\libhunspell.lib +..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* +..\%__SRC%\slb\libhunspell.lib %_DEST%\lib\libhunspell.lib -mkdir: %_DEST%\inc%_EXT%\hunspell -..\%__SRC%\inc\*.hxx %_DEST%\inc%_EXT%\hunspell\*.hxx -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\hunspell\*.h +mkdir: %_DEST%\inc\hunspell +..\%__SRC%\inc\*.hxx %_DEST%\inc\hunspell\*.hxx +..\%__SRC%\inc\*.h %_DEST%\inc\hunspell\*.h diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 19992a2bb1fe..e13c1c167e43 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -1,38 +1,38 @@ -mkdir: %_DEST%\inc%_EXT%\icu -mkdir: %_DEST%\inc%_EXT%\external\icu -mkdir: %_DEST%\inc%_EXT%\external\layout -mkdir: %_DEST%\inc%_EXT%\external\unicode -..\%__SRC%\misc\build\icu\source\layout\*.h %_DEST%\inc%_EXT%\external\layout\*.h -..\%__SRC%\misc\build\icu\source\common\unicode\*.h %_DEST%\inc%_EXT%\external\unicode\*.h -..\%__SRC%\misc\build\icu\source\i18n\unicode\*.h %_DEST%\inc%_EXT%\external\unicode\*.h +mkdir: %_DEST%\inc\icu +mkdir: %_DEST%\inc\external\icu +mkdir: %_DEST%\inc\external\layout +mkdir: %_DEST%\inc\external\unicode +..\%__SRC%\misc\build\icu\source\layout\*.h %_DEST%\inc\external\layout\*.h +..\%__SRC%\misc\build\icu\source\common\unicode\*.h %_DEST%\inc\external\unicode\*.h +..\%__SRC%\misc\build\icu\source\i18n\unicode\*.h %_DEST%\inc\external\unicode\*.h -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\lib\icuin.lib %_DEST%\lib%_EXT%\iicui18n.lib -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib +..\%__SRC%\lib\icuin.lib %_DEST%\lib\iicui18n.lib +..\%__SRC%\lib\*.lib %_DEST%\lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\bin\genccode %_DEST%\bin%_EXT%\genccode -..\%__SRC%\bin\genccode.exe %_DEST%\bin%_EXT%\genccode.exe -..\%__SRC%\bin\genbrk %_DEST%\bin%_EXT%\genbrk -..\%__SRC%\bin\genbrk.exe %_DEST%\bin%_EXT%\genbrk.exe -..\%__SRC%\bin\gencmn %_DEST%\bin%_EXT%\gencmn -..\%__SRC%\bin\gencmn.exe %_DEST%\bin%_EXT%\gencmn.exe +..\%__SRC%\bin\genccode %_DEST%\bin\genccode +..\%__SRC%\bin\genccode.exe %_DEST%\bin\genccode.exe +..\%__SRC%\bin\genbrk %_DEST%\bin\genbrk +..\%__SRC%\bin\genbrk.exe %_DEST%\bin\genbrk.exe +..\%__SRC%\bin\gencmn %_DEST%\bin\gencmn +..\%__SRC%\bin\gencmn.exe %_DEST%\bin\gencmn.exe -..\%__SRC%\lib\libicudata.*.*.* %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicui18n.*.*.* %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicule.*.*.* %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicuuc.*.*.* %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicutu.*.*.* %_DEST%\lib%_EXT%\ +..\%__SRC%\lib\libicudata.*.*.* %_DEST%\lib\ +..\%__SRC%\lib\libicui18n.*.*.* %_DEST%\lib\ +..\%__SRC%\lib\libicule.*.*.* %_DEST%\lib\ +..\%__SRC%\lib\libicuuc.*.*.* %_DEST%\lib\ +..\%__SRC%\lib\libicutu.*.*.* %_DEST%\lib\ -..\%__SRC%\lib\libicudata.a %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicui18n.a %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicule.a %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicuuc.a %_DEST%\lib%_EXT%\ -..\%__SRC%\lib\libicutu.a %_DEST%\lib%_EXT%\ +..\%__SRC%\lib\libicudata.a %_DEST%\lib\ +..\%__SRC%\lib\libicui18n.a %_DEST%\lib\ +..\%__SRC%\lib\libicule.a %_DEST%\lib\ +..\%__SRC%\lib\libicuuc.a %_DEST%\lib\ +..\%__SRC%\lib\libicutu.a %_DEST%\lib\ -..\icuversion.mk %_DEST%\inc%_EXT%\icuversion.mk +..\icuversion.mk %_DEST%\inc\icuversion.mk linklib: libicudata.*.*.* linklib: libicui18n.*.*.* diff --git a/jpeg/prj/d.lst b/jpeg/prj/d.lst index 93c3de45c570..42e3945e8747 100644 --- a/jpeg/prj/d.lst +++ b/jpeg/prj/d.lst @@ -1,12 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\jpeg +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\jpeg -..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib -..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeg.lib -..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a -..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeg.a +..\%__SRC%\slb\jpeglib.lib %_DEST%\lib\jpeglib.lib +..\%__SRC%\slb\jpeglib.lib %_DEST%\lib\jpeg.lib +..\%__SRC%\lib\libjpeglib.a %_DEST%\lib\libjpeglib.a +..\%__SRC%\lib\libjpeglib.a %_DEST%\lib\libjpeg.a -..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jpeg\jerror.h -..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeg\jpeglib.h -..\%__SRC%\inc\jconfig.h %_DEST%\inc%_EXT%\external\jpeg\jconfig.h -..\%__SRC%\inc\jmorecfg.h %_DEST%\inc%_EXT%\external\jpeg\jmorecfg.h +..\%__SRC%\inc\jerror.h %_DEST%\inc\external\jpeg\jerror.h +..\%__SRC%\inc\jpeglib.h %_DEST%\inc\external\jpeg\jpeglib.h +..\%__SRC%\inc\jconfig.h %_DEST%\inc\external\jpeg\jconfig.h +..\%__SRC%\inc\jmorecfg.h %_DEST%\inc\external\jpeg\jmorecfg.h diff --git a/libcroco/prj/d.lst b/libcroco/prj/d.lst index f010d0024951..6c89b36fd4b8 100755 --- a/libcroco/prj/d.lst +++ b/libcroco/prj/d.lst @@ -1,39 +1,39 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\libcroco-0.6 -mkdir: %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\libcroco-0.6 +mkdir: %_DEST%\inc\external\libcroco-0.6\libcroco -..\%__SRC%\inc\cr-additional-sel.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-additional-sel.h -..\%__SRC%\inc\cr-input.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-input.h -..\%__SRC%\inc\cr-rgb.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-rgb.h -..\%__SRC%\inc\cr-stylesheet.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-stylesheet.h -..\%__SRC%\inc\cr-attr-sel.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-attr-sel.h -..\%__SRC%\inc\cr-num.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-num.h -..\%__SRC%\inc\cr-sel-eng.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-sel-eng.h -..\%__SRC%\inc\cr-term.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-term.h -..\%__SRC%\inc\cr-cascade.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-cascade.h -..\%__SRC%\inc\cr-om-parser.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-om-parser.h -..\%__SRC%\inc\cr-selector.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-selector.h -..\%__SRC%\inc\cr-tknzr.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-tknzr.h -..\%__SRC%\inc\cr-declaration.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-declaration.h -..\%__SRC%\inc\cr-parser.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-parser.h -..\%__SRC%\inc\cr-simple-sel.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-simple-sel.h -..\%__SRC%\inc\cr-token.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-token.h -..\%__SRC%\inc\cr-doc-handler.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-doc-handler.h -..\%__SRC%\inc\cr-parsing-location.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-parsing-location.h -..\%__SRC%\inc\cr-statement.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-statement.h -..\%__SRC%\inc\cr-utils.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-utils.h -..\%__SRC%\inc\cr-enc-handler.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-enc-handler.h -..\%__SRC%\inc\cr-prop-list.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-prop-list.h -..\%__SRC%\inc\cr-string.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-string.h -..\%__SRC%\inc\libcroco-config.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\libcroco-config.h -..\%__SRC%\inc\cr-fonts.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-fonts.h -..\%__SRC%\inc\cr-pseudo.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-pseudo.h -..\%__SRC%\inc\cr-style.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-style.h -..\%__SRC%\inc\libcroco.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\libcroco.h +..\%__SRC%\inc\cr-additional-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-additional-sel.h +..\%__SRC%\inc\cr-input.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-input.h +..\%__SRC%\inc\cr-rgb.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-rgb.h +..\%__SRC%\inc\cr-stylesheet.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-stylesheet.h +..\%__SRC%\inc\cr-attr-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-attr-sel.h +..\%__SRC%\inc\cr-num.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-num.h +..\%__SRC%\inc\cr-sel-eng.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-sel-eng.h +..\%__SRC%\inc\cr-term.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-term.h +..\%__SRC%\inc\cr-cascade.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-cascade.h +..\%__SRC%\inc\cr-om-parser.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-om-parser.h +..\%__SRC%\inc\cr-selector.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-selector.h +..\%__SRC%\inc\cr-tknzr.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-tknzr.h +..\%__SRC%\inc\cr-declaration.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-declaration.h +..\%__SRC%\inc\cr-parser.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-parser.h +..\%__SRC%\inc\cr-simple-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-simple-sel.h +..\%__SRC%\inc\cr-token.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-token.h +..\%__SRC%\inc\cr-doc-handler.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-doc-handler.h +..\%__SRC%\inc\cr-parsing-location.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-parsing-location.h +..\%__SRC%\inc\cr-statement.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-statement.h +..\%__SRC%\inc\cr-utils.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-utils.h +..\%__SRC%\inc\cr-enc-handler.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-enc-handler.h +..\%__SRC%\inc\cr-prop-list.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-prop-list.h +..\%__SRC%\inc\cr-string.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-string.h +..\%__SRC%\inc\libcroco-config.h %_DEST%\inc\external\libcroco-0.6\libcroco\libcroco-config.h +..\%__SRC%\inc\cr-fonts.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-fonts.h +..\%__SRC%\inc\cr-pseudo.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-pseudo.h +..\%__SRC%\inc\cr-style.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-style.h +..\%__SRC%\inc\libcroco.h %_DEST%\inc\external\libcroco-0.6\libcroco\libcroco.h -..\%__SRC%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib%_EXT%\libcroco-0.6.3.0.1.dylib -symlink: %_DEST%\lib%_EXT%\libcroco-0.6.3.0.1.dylib %_DEST%\lib%_EXT%\libcroco-0.6.3.dylib -symlink: %_DEST%\lib%_EXT%\libcroco-0.6.3.dylib %_DEST%\lib%_EXT%\libcroco-0.6.dylib +..\%__SRC%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib\libcroco-0.6.3.0.1.dylib +symlink: %_DEST%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib\libcroco-0.6.3.dylib +symlink: %_DEST%\lib\libcroco-0.6.3.dylib %_DEST%\lib\libcroco-0.6.dylib -..\%__SRC%\lib\ilibcroco-0.6-3_t1.lib %_DEST%\lib%_EXT%\libcroco-0.6-3.lib -..\%__SRC%\bin\libcroco-0.6-3.dll %_DEST%\bin%_EXT%\libcroco-0.6-3.dll +..\%__SRC%\lib\ilibcroco-0.6-3_t1.lib %_DEST%\lib\libcroco-0.6-3.lib +..\%__SRC%\bin\libcroco-0.6-3.dll %_DEST%\bin\libcroco-0.6-3.dll diff --git a/libgsf/prj/d.lst b/libgsf/prj/d.lst index c47826c5b410..04f57626185c 100755 --- a/libgsf/prj/d.lst +++ b/libgsf/prj/d.lst @@ -1,59 +1,59 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\libgsf-1 -mkdir: %_DEST%\inc%_EXT%\external\libgsf-1\gsf +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\libgsf-1 +mkdir: %_DEST%\inc\external\libgsf-1\gsf -..\%__SRC%\inc\gsf-blob.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-blob.h -..\%__SRC%\inc\gsf-input-impl.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-impl.h -..\%__SRC%\inc\gsf-outfile.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-outfile.h -..\%__SRC%\inc\gsf-clip-data.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-clip-data.h -..\%__SRC%\inc\gsf-input-iochannel.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-iochannel.h -..\%__SRC%\inc\gsf-output-bzip.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-bzip.h -..\%__SRC%\inc\gsf-doc-meta-data.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-doc-meta-data.h -..\%__SRC%\inc\gsf-input-memory.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-memory.h -..\%__SRC%\inc\gsf-output-csv.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-csv.h -..\%__SRC%\inc\gsf-docprop-vector.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-docprop-vector.h -..\%__SRC%\inc\gsf-input-proxy.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-proxy.h -..\%__SRC%\inc\gsf-output-gio.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-gio.h -..\%__SRC%\inc\gsf-impl-utils.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-impl-utils.h -..\%__SRC%\inc\gsf-input-stdio.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-stdio.h -..\%__SRC%\inc\gsf-output-gzip.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-gzip.h -..\%__SRC%\inc\gsf-infile-impl.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile-impl.h -..\%__SRC%\inc\gsf-input-textline.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-textline.h -..\%__SRC%\inc\gsf-output-iconv.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-iconv.h -..\%__SRC%\inc\gsf-infile-msole.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile-msole.h -..\%__SRC%\inc\gsf-input.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input.h -..\%__SRC%\inc\gsf-output-impl.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-impl.h -..\%__SRC%\inc\gsf-infile-msvba.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile-msvba.h -..\%__SRC%\inc\gsf-libxml.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-libxml.h -..\%__SRC%\inc\gsf-output-iochannel.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-iochannel.h -..\%__SRC%\inc\gsf-infile-stdio.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile-stdio.h -..\%__SRC%\inc\gsf-meta-names.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-meta-names.h -..\%__SRC%\inc\gsf-output-memory.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-memory.h -..\%__SRC%\inc\gsf-infile-tar.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile-tar.h -..\%__SRC%\inc\gsf-msole-utils.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-msole-utils.h -..\%__SRC%\inc\gsf-output-stdio.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output-stdio.h -..\%__SRC%\inc\gsf-infile-zip.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile-zip.h -..\%__SRC%\inc\gsf-open-pkg-utils.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-open-pkg-utils.h -..\%__SRC%\inc\gsf-output.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-output.h -..\%__SRC%\inc\gsf-infile.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-infile.h -..\%__SRC%\inc\gsf-opendoc-utils.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-opendoc-utils.h -..\%__SRC%\inc\gsf-shared-memory.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-shared-memory.h -..\%__SRC%\inc\gsf-input-bzip.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-bzip.h -..\%__SRC%\inc\gsf-outfile-impl.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-outfile-impl.h -..\%__SRC%\inc\gsf-structured-blob.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-structured-blob.h -..\%__SRC%\inc\gsf-input-gio.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-gio.h -..\%__SRC%\inc\gsf-outfile-msole.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-outfile-msole.h -..\%__SRC%\inc\gsf-timestamp.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-timestamp.h -..\%__SRC%\inc\gsf-input-gzip.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-gzip.h -..\%__SRC%\inc\gsf-outfile-stdio.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-outfile-stdio.h -..\%__SRC%\inc\gsf-utils.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-utils.h -..\%__SRC%\inc\gsf-input-http.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-input-http.h -..\%__SRC%\inc\gsf-outfile-zip.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf-outfile-zip.h -..\%__SRC%\inc\gsf.h %_DEST%\inc%_EXT%\external\libgsf-1\gsf\gsf.h +..\%__SRC%\inc\gsf-blob.h %_DEST%\inc\external\libgsf-1\gsf\gsf-blob.h +..\%__SRC%\inc\gsf-input-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-impl.h +..\%__SRC%\inc\gsf-outfile.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile.h +..\%__SRC%\inc\gsf-clip-data.h %_DEST%\inc\external\libgsf-1\gsf\gsf-clip-data.h +..\%__SRC%\inc\gsf-input-iochannel.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-iochannel.h +..\%__SRC%\inc\gsf-output-bzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-bzip.h +..\%__SRC%\inc\gsf-doc-meta-data.h %_DEST%\inc\external\libgsf-1\gsf\gsf-doc-meta-data.h +..\%__SRC%\inc\gsf-input-memory.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-memory.h +..\%__SRC%\inc\gsf-output-csv.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-csv.h +..\%__SRC%\inc\gsf-docprop-vector.h %_DEST%\inc\external\libgsf-1\gsf\gsf-docprop-vector.h +..\%__SRC%\inc\gsf-input-proxy.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-proxy.h +..\%__SRC%\inc\gsf-output-gio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-gio.h +..\%__SRC%\inc\gsf-impl-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-impl-utils.h +..\%__SRC%\inc\gsf-input-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-stdio.h +..\%__SRC%\inc\gsf-output-gzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-gzip.h +..\%__SRC%\inc\gsf-infile-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-impl.h +..\%__SRC%\inc\gsf-input-textline.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-textline.h +..\%__SRC%\inc\gsf-output-iconv.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-iconv.h +..\%__SRC%\inc\gsf-infile-msole.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-msole.h +..\%__SRC%\inc\gsf-input.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input.h +..\%__SRC%\inc\gsf-output-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-impl.h +..\%__SRC%\inc\gsf-infile-msvba.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-msvba.h +..\%__SRC%\inc\gsf-libxml.h %_DEST%\inc\external\libgsf-1\gsf\gsf-libxml.h +..\%__SRC%\inc\gsf-output-iochannel.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-iochannel.h +..\%__SRC%\inc\gsf-infile-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-stdio.h +..\%__SRC%\inc\gsf-meta-names.h %_DEST%\inc\external\libgsf-1\gsf\gsf-meta-names.h +..\%__SRC%\inc\gsf-output-memory.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-memory.h +..\%__SRC%\inc\gsf-infile-tar.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-tar.h +..\%__SRC%\inc\gsf-msole-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-msole-utils.h +..\%__SRC%\inc\gsf-output-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-stdio.h +..\%__SRC%\inc\gsf-infile-zip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-zip.h +..\%__SRC%\inc\gsf-open-pkg-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-open-pkg-utils.h +..\%__SRC%\inc\gsf-output.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output.h +..\%__SRC%\inc\gsf-infile.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile.h +..\%__SRC%\inc\gsf-opendoc-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-opendoc-utils.h +..\%__SRC%\inc\gsf-shared-memory.h %_DEST%\inc\external\libgsf-1\gsf\gsf-shared-memory.h +..\%__SRC%\inc\gsf-input-bzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-bzip.h +..\%__SRC%\inc\gsf-outfile-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-impl.h +..\%__SRC%\inc\gsf-structured-blob.h %_DEST%\inc\external\libgsf-1\gsf\gsf-structured-blob.h +..\%__SRC%\inc\gsf-input-gio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-gio.h +..\%__SRC%\inc\gsf-outfile-msole.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-msole.h +..\%__SRC%\inc\gsf-timestamp.h %_DEST%\inc\external\libgsf-1\gsf\gsf-timestamp.h +..\%__SRC%\inc\gsf-input-gzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-gzip.h +..\%__SRC%\inc\gsf-outfile-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-stdio.h +..\%__SRC%\inc\gsf-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-utils.h +..\%__SRC%\inc\gsf-input-http.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-http.h +..\%__SRC%\inc\gsf-outfile-zip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-zip.h +..\%__SRC%\inc\gsf.h %_DEST%\inc\external\libgsf-1\gsf\gsf.h -..\%__SRC%\lib\libgsf-1.114.dylib %_DEST%\lib%_EXT%\libgsf-1.114.dylib -symlink: %_DEST%\lib%_EXT%\libgsf-1.114.dylib %_DEST%\lib%_EXT%\libgsf-1.dylib +..\%__SRC%\lib\libgsf-1.114.dylib %_DEST%\lib\libgsf-1.114.dylib +symlink: %_DEST%\lib\libgsf-1.114.dylib %_DEST%\lib\libgsf-1.dylib -..\%__SRC%\bin\gsf-1.dll %_DEST%\bin%_EXT%\gsf-1.dll -..\%__SRC%\lib\igsf-1.lib %_DEST%\lib%_EXT%\igsf-1.lib +..\%__SRC%\bin\gsf-1.dll %_DEST%\bin\gsf-1.dll +..\%__SRC%\lib\igsf-1.lib %_DEST%\lib\igsf-1.lib diff --git a/libpng/prj/d.lst b/libpng/prj/d.lst index 80148b7e8f86..6f59c22d21bf 100755 --- a/libpng/prj/d.lst +++ b/libpng/prj/d.lst @@ -1,11 +1,11 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\libpng +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\libpng -..\%__SRC%\slb\libpng.lib %_DEST%\lib%_EXT%\libpng.lib -..\%__SRC%\lib\libpng.a %_DEST%\lib%_EXT%\libpng.a +..\%__SRC%\slb\libpng.lib %_DEST%\lib\libpng.lib +..\%__SRC%\lib\libpng.a %_DEST%\lib\libpng.a -..\%__SRC%\inc\png.h %_DEST%\inc%_EXT%\external\libpng\png.h -..\%__SRC%\inc\pnglibconf.h %_DEST%\inc%_EXT%\external\libpng\pnglibconf.h -..\%__SRC%\inc\pngconf.h %_DEST%\inc%_EXT%\external\libpng\pngconf.h -..\%__SRC%\inc\pngstruct.h %_DEST%\inc%_EXT%\external\libpng\pngstruct.h +..\%__SRC%\inc\png.h %_DEST%\inc\external\libpng\png.h +..\%__SRC%\inc\pnglibconf.h %_DEST%\inc\external\libpng\pnglibconf.h +..\%__SRC%\inc\pngconf.h %_DEST%\inc\external\libpng\pngconf.h +..\%__SRC%\inc\pngstruct.h %_DEST%\inc\external\libpng\pngstruct.h diff --git a/librsvg/prj/d.lst b/librsvg/prj/d.lst index 3e6f5de98364..710e55542f85 100755 --- a/librsvg/prj/d.lst +++ b/librsvg/prj/d.lst @@ -1,14 +1,14 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\librsvg-2.0 -mkdir: %_DEST%\inc%_EXT%\external\librsvg-2.0\librsvg +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\librsvg-2.0 +mkdir: %_DEST%\inc\external\librsvg-2.0\librsvg -..\%__SRC%\inc\rsvg.h %_DEST%\inc%_EXT%\external\librsvg-2.0\librsvg\rsvg.h -..\%__SRC%\inc\rsvg-cairo.h %_DEST%\inc%_EXT%\external\librsvg-2.0\librsvg\rsvg-cairo.h -..\%__SRC%\inc\rsvg-features.h %_DEST%\inc%_EXT%\external\librsvg-2.0\librsvg\rsvg-features.h -..\%__SRC%\inc\rsvg-enum-types.h %_DEST%\inc%_EXT%\external\librsvg-2.0\librsvg\rsvg-enum-types.h +..\%__SRC%\inc\rsvg.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg.h +..\%__SRC%\inc\rsvg-cairo.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg-cairo.h +..\%__SRC%\inc\rsvg-features.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg-features.h +..\%__SRC%\inc\rsvg-enum-types.h %_DEST%\inc\external\librsvg-2.0\librsvg\rsvg-enum-types.h -..\%__SRC%\lib\librsvg-2.2.dylib %_DEST%\lib%_EXT%\librsvg-2.2.dylib -symlink: %_DEST%\lib%_EXT%\librsvg-2.2.dylib %_DEST%\lib%_EXT%\librsvg-2.dylib +..\%__SRC%\lib\librsvg-2.2.dylib %_DEST%\lib\librsvg-2.2.dylib +symlink: %_DEST%\lib\librsvg-2.2.dylib %_DEST%\lib\librsvg-2.dylib -..\%__SRC%\lib\ilibrsvg-2-2.lib %_DEST%\lib%_EXT%\librsvg-2-2.lib -..\%__SRC%\bin\librsvg-2-2.dll %_DEST%\bin%_EXT%\librsvg-2-2.dll +..\%__SRC%\lib\ilibrsvg-2-2.lib %_DEST%\lib\librsvg-2-2.lib +..\%__SRC%\bin\librsvg-2-2.dll %_DEST%\bin\librsvg-2-2.dll diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst index 25be27ae947d..9b5d736dbe99 100644 --- a/libxml2/prj/d.lst +++ b/libxml2/prj/d.lst @@ -1,9 +1,9 @@ -mkdir: %_DEST%\inc%_EXT%\external\libxml -..\%__SRC%\inc\libxml\*.h %_DEST%\inc%_EXT%\external\libxml\*.h -..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib%_EXT%\libxml2.so.2 -symlink: %_DEST%\lib%_EXT%\libxml2.so.2 %_DEST%\lib%_EXT%\libxml2.so -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% -..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib%_EXT%\libxml2.a -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\%__SRC%\bin\xmllint* %_DEST%\bin%_EXT% -..\%__SRC%\bin\xml2-config* %_DEST%\bin%_EXT% +mkdir: %_DEST%\inc\external\libxml +..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h +..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2 +symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so +..\%__SRC%\lib\*.lib %_DEST%\lib +..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.a +..\%__SRC%\bin\*.dll %_DEST%\bin +..\%__SRC%\bin\xmllint* %_DEST%\bin +..\%__SRC%\bin\xml2-config* %_DEST%\bin diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index 4913b78c2824..74f759ebe85a 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -1,12 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\external\libxslt -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\libxslt\*.h -..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so.1 -symlink: %_DEST%\lib%_EXT%\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so -..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so.0 -symlink: %_DEST%\lib%_EXT%\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so -..\%__SRC%\lib\libxslt*.* %_DEST%\lib%_EXT%\libxslt*.* -..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\bin\lib*.dll %_DEST%\bin%_EXT% -..\%__SRC%\bin\xsltproc* %_DEST%\bin%_EXT% -..\%__SRC%\bin\xslt-config* %_DEST%\bin%_EXT% -..\libxsltversion.mk %_DEST%\inc%_EXT%\libxsltversion.mk +mkdir: %_DEST%\inc\external\libxslt +..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h +..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1 +symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so +..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0 +symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so +..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.* +..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a +..\%__SRC%\bin\lib*.dll %_DEST%\bin +..\%__SRC%\bin\xsltproc* %_DEST%\bin +..\%__SRC%\bin\xslt-config* %_DEST%\bin +..\libxsltversion.mk %_DEST%\inc\libxsltversion.mk diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 229521e2c4fd..14942645ff30 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -1,12 +1,12 @@ -mkdir: %COMMON_DEST%\pck%_EXT% -..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf +mkdir: %COMMON_DEST%\pck +..\fonts\fc_local.conf %COMMON_DEST%\pck\fc_local.conf # TODO: replace explicit versions by wildcard when the build system learns to handle them -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu -..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation -..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium -..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\LinLibertineG\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_LinLibertineG -..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\ttf\*.ttf %COMMON_DEST%\pck\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\LICENSE %COMMON_DEST%\pck\LICENSE_dejavu +..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf %COMMON_DEST%\pck\*.ttf +..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt %COMMON_DEST%\pck\LICENSE_liberation +..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck\*.ttf +..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck\LICENSE_gentium +..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck\*.ttf +..\%__SRC%\misc\build\LinLibertineG\OFL.txt %COMMON_DEST%\pck\LICENSE_LinLibertineG +..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %COMMON_DEST%\pck\*.ttf diff --git a/moz/prj/d.lst b/moz/prj/d.lst index 67bd28bb164b..1835ea726158 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -1,257 +1,257 @@ -mkdir: %_DEST%\inc%_EXT%\mozilla -mkdir: %COMMON_DEST%\inc%_EXT%\mozilla -mkdir: %_DEST%\inc%_EXT%\mozilla\absync -mkdir: %_DEST%\inc%_EXT%\mozilla\accessibility -mkdir: %_DEST%\inc%_EXT%\mozilla\AcctIdl -mkdir: %_DEST%\inc%_EXT%\mozilla\addrbook -mkdir: %_DEST%\inc%_EXT%\mozilla\appcomps -mkdir: %_DEST%\inc%_EXT%\mozilla\appshell -mkdir: %_DEST%\inc%_EXT%\mozilla\appstartup -mkdir: %_DEST%\inc%_EXT%\mozilla\bookmarks -mkdir: %_DEST%\inc%_EXT%\mozilla\caps -mkdir: %_DEST%\inc%_EXT%\mozilla\chardet -mkdir: %_DEST%\inc%_EXT%\mozilla\chrome -mkdir: %_DEST%\inc%_EXT%\mozilla\content -mkdir: %_DEST%\inc%_EXT%\mozilla\content_xsl -mkdir: %_DEST%\inc%_EXT%\mozilla\content_xul -mkdir: %_DEST%\inc%_EXT%\mozilla\cookie -mkdir: %_DEST%\inc%_EXT%\mozilla\docshell -mkdir: %_DEST%\inc%_EXT%\mozilla\dom -mkdir: %_DEST%\inc%_EXT%\mozilla\editor -mkdir: %_DEST%\inc%_EXT%\mozilla\embed_base -mkdir: %_DEST%\inc%_EXT%\mozilla\expat -mkdir: %_DEST%\inc%_EXT%\mozilla\exthandler -mkdir: %_DEST%\inc%_EXT%\mozilla\find -mkdir: %_DEST%\inc%_EXT%\mozilla\gfx -mkdir: %_DEST%\inc%_EXT%\mozilla\gfx2 -mkdir: %_DEST%\inc%_EXT%\mozilla\gfxwin -mkdir: %_DEST%\inc%_EXT%\mozilla\gkplugin -mkdir: %_DEST%\inc%_EXT%\mozilla\helperAppDlg -mkdir: %_DEST%\inc%_EXT%\mozilla\history -mkdir: %_DEST%\inc%_EXT%\mozilla\htmlparser -mkdir: %_DEST%\inc%_EXT%\mozilla\imgicon -mkdir: %_DEST%\inc%_EXT%\mozilla\imglib2 -mkdir: %_DEST%\inc%_EXT%\mozilla\import -mkdir: %_DEST%\inc%_EXT%\mozilla\intl -mkdir: %_DEST%\inc%_EXT%\mozilla\intlcmpt -mkdir: %_DEST%\inc%_EXT%\mozilla\jar -mkdir: %_DEST%\inc%_EXT%\mozilla\java -mkdir: %_DEST%\inc%_EXT%\mozilla\jpeg -mkdir: %_DEST%\inc%_EXT%\mozilla\js -mkdir: %_DEST%\inc%_EXT%\mozilla\jsconsole -mkdir: %_DEST%\inc%_EXT%\mozilla\jsurl -mkdir: %_DEST%\inc%_EXT%\mozilla\layout -mkdir: %_DEST%\inc%_EXT%\mozilla\layout_xul -mkdir: %_DEST%\inc%_EXT%\mozilla\ldap -mkdir: %_DEST%\inc%_EXT%\mozilla\ldap\ldap -mkdir: %_DEST%\inc%_EXT%\mozilla\ldap-nspr -mkdir: %_DEST%\inc%_EXT%\mozilla\locale -mkdir: %_DEST%\inc%_EXT%\mozilla\lwbrk -mkdir: %_DEST%\inc%_EXT%\mozilla\mailnews -mkdir: %_DEST%\inc%_EXT%\mozilla\mime -mkdir: %_DEST%\inc%_EXT%\mozilla\mimeemitter -mkdir: %_DEST%\inc%_EXT%\mozilla\mimetype -mkdir: %_DEST%\inc%_EXT%\mozilla\mng -mkdir: %_DEST%\inc%_EXT%\mozilla\mork -mkdir: %_DEST%\inc%_EXT%\mozilla\mozbrwsr -mkdir: %_DEST%\inc%_EXT%\mozilla\mozldap -mkdir: %_DEST%\inc%_EXT%\mozilla\mozreg -mkdir: %_DEST%\inc%_EXT%\mozilla\mpfilelocprovider -mkdir: %_DEST%\inc%_EXT%\mozilla\msgbase -mkdir: %_DEST%\inc%_EXT%\mozilla\msgbaseutil -mkdir: %_DEST%\inc%_EXT%\mozilla\msgcompo -mkdir: %_DEST%\inc%_EXT%\mozilla\msgdb -mkdir: %_DEST%\inc%_EXT%\mozilla\msgimap -mkdir: %_DEST%\inc%_EXT%\mozilla\msglocal -mkdir: %_DEST%\inc%_EXT%\mozilla\msgnews -mkdir: %_DEST%\inc%_EXT%\mozilla\msgsearch -mkdir: %_DEST%\inc%_EXT%\mozilla\necko -mkdir: %_DEST%\inc%_EXT%\mozilla\necko2 -mkdir: %_DEST%\inc%_EXT%\mozilla\nkcache -mkdir: %_DEST%\inc%_EXT%\mozilla\nspr -mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete -mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\private -mkdir: %_DEST%\inc%_EXT%\mozilla\nsprefm -mkdir: %_DEST%\inc%_EXT%\mozilla\nss -mkdir: %_DEST%\inc%_EXT%\mozilla\oji -mkdir: %_DEST%\inc%_EXT%\mozilla\obsolete -mkdir: %_DEST%\inc%_EXT%\mozilla\plugin -mkdir: %_DEST%\inc%_EXT%\mozilla\png -mkdir: %_DEST%\inc%_EXT%\mozilla\pref -mkdir: %_DEST%\inc%_EXT%\mozilla\prefmigr -mkdir: %_DEST%\inc%_EXT%\mozilla\profile -mkdir: %_DEST%\inc%_EXT%\mozilla\rdf -mkdir: %_DEST%\inc%_EXT%\mozilla\rdfutil -mkdir: %_DEST%\inc%_EXT%\mozilla\regviewer -mkdir: %_DEST%\inc%_EXT%\mozilla\related -mkdir: %_DEST%\inc%_EXT%\mozilla\search -mkdir: %_DEST%\inc%_EXT%\mozilla\setuprsc -mkdir: %_DEST%\inc%_EXT%\mozilla\shistory -mkdir: %_DEST%\inc%_EXT%\mozilla\sidebar -mkdir: %_DEST%\inc%_EXT%\mozilla\signonviewer -mkdir: %_DEST%\inc%_EXT%\mozilla\string -mkdir: %_DEST%\inc%_EXT%\mozilla\timer -mkdir: %_DEST%\inc%_EXT%\mozilla\transformiix -mkdir: %_DEST%\inc%_EXT%\mozilla\txmgr -mkdir: %_DEST%\inc%_EXT%\mozilla\txtsvc -mkdir: %_DEST%\inc%_EXT%\mozilla\uconv -mkdir: %_DEST%\inc%_EXT%\mozilla\unicharutil -mkdir: %_DEST%\inc%_EXT%\mozilla\uninstall -mkdir: %_DEST%\inc%_EXT%\mozilla\uriloader -mkdir: %_DEST%\inc%_EXT%\mozilla\urlbarhistory -mkdir: %_DEST%\inc%_EXT%\mozilla\util -mkdir: %_DEST%\inc%_EXT%\mozilla\view -mkdir: %_DEST%\inc%_EXT%\mozilla\wallet -mkdir: %_DEST%\inc%_EXT%\mozilla\walleteditor -mkdir: %_DEST%\inc%_EXT%\mozilla\walletpreview -mkdir: %_DEST%\inc%_EXT%\mozilla\webBrowser_core -mkdir: %_DEST%\inc%_EXT%\mozilla\webshell -mkdir: %_DEST%\inc%_EXT%\mozilla\widget -mkdir: %_DEST%\inc%_EXT%\mozilla\windowwatcher -mkdir: %_DEST%\inc%_EXT%\mozilla\xml-rpc -mkdir: %_DEST%\inc%_EXT%\mozilla\xmlextras -mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom -mkdir: %_DEST%\inc%_EXT%\mozilla\xpconnect -mkdir: %_DEST%\inc%_EXT%\mozilla\xpicleanup -mkdir: %_DEST%\inc%_EXT%\mozilla\xpinstall -mkdir: %_DEST%\inc%_EXT%\mozilla\xpnet -mkdir: %_DEST%\inc%_EXT%\mozilla\zlib -mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete +mkdir: %_DEST%\inc\mozilla +mkdir: %COMMON_DEST%\inc\mozilla +mkdir: %_DEST%\inc\mozilla\absync +mkdir: %_DEST%\inc\mozilla\accessibility +mkdir: %_DEST%\inc\mozilla\AcctIdl +mkdir: %_DEST%\inc\mozilla\addrbook +mkdir: %_DEST%\inc\mozilla\appcomps +mkdir: %_DEST%\inc\mozilla\appshell +mkdir: %_DEST%\inc\mozilla\appstartup +mkdir: %_DEST%\inc\mozilla\bookmarks +mkdir: %_DEST%\inc\mozilla\caps +mkdir: %_DEST%\inc\mozilla\chardet +mkdir: %_DEST%\inc\mozilla\chrome +mkdir: %_DEST%\inc\mozilla\content +mkdir: %_DEST%\inc\mozilla\content_xsl +mkdir: %_DEST%\inc\mozilla\content_xul +mkdir: %_DEST%\inc\mozilla\cookie +mkdir: %_DEST%\inc\mozilla\docshell +mkdir: %_DEST%\inc\mozilla\dom +mkdir: %_DEST%\inc\mozilla\editor +mkdir: %_DEST%\inc\mozilla\embed_base +mkdir: %_DEST%\inc\mozilla\expat +mkdir: %_DEST%\inc\mozilla\exthandler +mkdir: %_DEST%\inc\mozilla\find +mkdir: %_DEST%\inc\mozilla\gfx +mkdir: %_DEST%\inc\mozilla\gfx2 +mkdir: %_DEST%\inc\mozilla\gfxwin +mkdir: %_DEST%\inc\mozilla\gkplugin +mkdir: %_DEST%\inc\mozilla\helperAppDlg +mkdir: %_DEST%\inc\mozilla\history +mkdir: %_DEST%\inc\mozilla\htmlparser +mkdir: %_DEST%\inc\mozilla\imgicon +mkdir: %_DEST%\inc\mozilla\imglib2 +mkdir: %_DEST%\inc\mozilla\import +mkdir: %_DEST%\inc\mozilla\intl +mkdir: %_DEST%\inc\mozilla\intlcmpt +mkdir: %_DEST%\inc\mozilla\jar +mkdir: %_DEST%\inc\mozilla\java +mkdir: %_DEST%\inc\mozilla\jpeg +mkdir: %_DEST%\inc\mozilla\js +mkdir: %_DEST%\inc\mozilla\jsconsole +mkdir: %_DEST%\inc\mozilla\jsurl +mkdir: %_DEST%\inc\mozilla\layout +mkdir: %_DEST%\inc\mozilla\layout_xul +mkdir: %_DEST%\inc\mozilla\ldap +mkdir: %_DEST%\inc\mozilla\ldap\ldap +mkdir: %_DEST%\inc\mozilla\ldap-nspr +mkdir: %_DEST%\inc\mozilla\locale +mkdir: %_DEST%\inc\mozilla\lwbrk +mkdir: %_DEST%\inc\mozilla\mailnews +mkdir: %_DEST%\inc\mozilla\mime +mkdir: %_DEST%\inc\mozilla\mimeemitter +mkdir: %_DEST%\inc\mozilla\mimetype +mkdir: %_DEST%\inc\mozilla\mng +mkdir: %_DEST%\inc\mozilla\mork +mkdir: %_DEST%\inc\mozilla\mozbrwsr +mkdir: %_DEST%\inc\mozilla\mozldap +mkdir: %_DEST%\inc\mozilla\mozreg +mkdir: %_DEST%\inc\mozilla\mpfilelocprovider +mkdir: %_DEST%\inc\mozilla\msgbase +mkdir: %_DEST%\inc\mozilla\msgbaseutil +mkdir: %_DEST%\inc\mozilla\msgcompo +mkdir: %_DEST%\inc\mozilla\msgdb +mkdir: %_DEST%\inc\mozilla\msgimap +mkdir: %_DEST%\inc\mozilla\msglocal +mkdir: %_DEST%\inc\mozilla\msgnews +mkdir: %_DEST%\inc\mozilla\msgsearch +mkdir: %_DEST%\inc\mozilla\necko +mkdir: %_DEST%\inc\mozilla\necko2 +mkdir: %_DEST%\inc\mozilla\nkcache +mkdir: %_DEST%\inc\mozilla\nspr +mkdir: %_DEST%\inc\mozilla\nspr\obsolete +mkdir: %_DEST%\inc\mozilla\nspr\private +mkdir: %_DEST%\inc\mozilla\nsprefm +mkdir: %_DEST%\inc\mozilla\nss +mkdir: %_DEST%\inc\mozilla\oji +mkdir: %_DEST%\inc\mozilla\obsolete +mkdir: %_DEST%\inc\mozilla\plugin +mkdir: %_DEST%\inc\mozilla\png +mkdir: %_DEST%\inc\mozilla\pref +mkdir: %_DEST%\inc\mozilla\prefmigr +mkdir: %_DEST%\inc\mozilla\profile +mkdir: %_DEST%\inc\mozilla\rdf +mkdir: %_DEST%\inc\mozilla\rdfutil +mkdir: %_DEST%\inc\mozilla\regviewer +mkdir: %_DEST%\inc\mozilla\related +mkdir: %_DEST%\inc\mozilla\search +mkdir: %_DEST%\inc\mozilla\setuprsc +mkdir: %_DEST%\inc\mozilla\shistory +mkdir: %_DEST%\inc\mozilla\sidebar +mkdir: %_DEST%\inc\mozilla\signonviewer +mkdir: %_DEST%\inc\mozilla\string +mkdir: %_DEST%\inc\mozilla\timer +mkdir: %_DEST%\inc\mozilla\transformiix +mkdir: %_DEST%\inc\mozilla\txmgr +mkdir: %_DEST%\inc\mozilla\txtsvc +mkdir: %_DEST%\inc\mozilla\uconv +mkdir: %_DEST%\inc\mozilla\unicharutil +mkdir: %_DEST%\inc\mozilla\uninstall +mkdir: %_DEST%\inc\mozilla\uriloader +mkdir: %_DEST%\inc\mozilla\urlbarhistory +mkdir: %_DEST%\inc\mozilla\util +mkdir: %_DEST%\inc\mozilla\view +mkdir: %_DEST%\inc\mozilla\wallet +mkdir: %_DEST%\inc\mozilla\walleteditor +mkdir: %_DEST%\inc\mozilla\walletpreview +mkdir: %_DEST%\inc\mozilla\webBrowser_core +mkdir: %_DEST%\inc\mozilla\webshell +mkdir: %_DEST%\inc\mozilla\widget +mkdir: %_DEST%\inc\mozilla\windowwatcher +mkdir: %_DEST%\inc\mozilla\xml-rpc +mkdir: %_DEST%\inc\mozilla\xmlextras +mkdir: %_DEST%\inc\mozilla\xpcom +mkdir: %_DEST%\inc\mozilla\xpconnect +mkdir: %_DEST%\inc\mozilla\xpicleanup +mkdir: %_DEST%\inc\mozilla\xpinstall +mkdir: %_DEST%\inc\mozilla\xpnet +mkdir: %_DEST%\inc\mozilla\zlib +mkdir: %_DEST%\inc\mozilla\xpcom_obsolete -..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mozilla -..\%__SRC%\inc\absync\* %_DEST%\inc%_EXT%\mozilla\absync -..\%__SRC%\inc\accessibility\* %_DEST%\inc%_EXT%\mozilla\accessibility -..\%__SRC%\inc\AcctIdl\* %_DEST%\inc%_EXT%\mozilla\AcctIdl -..\%__SRC%\inc\addrbook\* %_DEST%\inc%_EXT%\mozilla\addrbook -..\%__SRC%\inc\appcomps\* %_DEST%\inc%_EXT%\mozilla\appcomps -..\%__SRC%\inc\appshell\* %_DEST%\inc%_EXT%\mozilla\appshell -..\%__SRC%\inc\appstartup\* %_DEST%\inc%_EXT%\mozilla\appstartup -..\%__SRC%\inc\bookmarks\* %_DEST%\inc%_EXT%\mozilla\bookmarks -..\%__SRC%\inc\caps\* %_DEST%\inc%_EXT%\mozilla\caps -..\%__SRC%\inc\chardet\* %_DEST%\inc%_EXT%\mozilla\chardet -..\%__SRC%\inc\chrome\* %_DEST%\inc%_EXT%\mozilla\chrome -..\%__SRC%\inc\content\* %_DEST%\inc%_EXT%\mozilla\content -..\%__SRC%\inc\content_xsl\* %_DEST%\inc%_EXT%\mozilla\content_xsl -..\%__SRC%\inc\content_xul\* %_DEST%\inc%_EXT%\mozilla\content_xul -..\%__SRC%\inc\cookie\* %_DEST%\inc%_EXT%\mozilla\cookie -..\%__SRC%\inc\docshell\* %_DEST%\inc%_EXT%\mozilla\docshell -..\%__SRC%\inc\dom\* %_DEST%\inc%_EXT%\mozilla\dom -..\%__SRC%\inc\editor\* %_DEST%\inc%_EXT%\mozilla\editor -..\%__SRC%\inc\embed_base\* %_DEST%\inc%_EXT%\mozilla\embed_base -..\%__SRC%\inc\expat\* %_DEST%\inc%_EXT%\mozilla\expat -..\%__SRC%\inc\exthandler\* %_DEST%\inc%_EXT%\mozilla\exthandler -..\%__SRC%\inc\find\* %_DEST%\inc%_EXT%\mozilla\find -..\%__SRC%\inc\gfx\* %_DEST%\inc%_EXT%\mozilla\gfx -..\%__SRC%\inc\gfx2\* %_DEST%\inc%_EXT%\mozilla\gfx2 -..\%__SRC%\inc\gfxwin\* %_DEST%\inc%_EXT%\mozilla\gfxwin -..\%__SRC%\inc\gkplugin\* %_DEST%\inc%_EXT%\mozilla\gkplugin -..\%__SRC%\inc\helperAppDlg\* %_DEST%\inc%_EXT%\mozilla\helperAppDlg -..\%__SRC%\inc\history\* %_DEST%\inc%_EXT%\mozilla\history -..\%__SRC%\inc\htmlparser\* %_DEST%\inc%_EXT%\mozilla\htmlparser -..\%__SRC%\inc\imgicon\* %_DEST%\inc%_EXT%\mozilla\imgicon -..\%__SRC%\inc\imglib2\* %_DEST%\inc%_EXT%\mozilla\imglib2 -..\%__SRC%\inc\import\* %_DEST%\inc%_EXT%\mozilla\import -..\%__SRC%\inc\intl\* %_DEST%\inc%_EXT%\mozilla\intl -..\%__SRC%\inc\intlcmpt\* %_DEST%\inc%_EXT%\mozilla\intlcmpt -..\%__SRC%\inc\jar\* %_DEST%\inc%_EXT%\mozilla\jar -..\%__SRC%\inc\java\* %_DEST%\inc%_EXT%\mozilla\java -..\%__SRC%\inc\jpeg\* %_DEST%\inc%_EXT%\mozilla\jpeg -..\%__SRC%\inc\js\* %_DEST%\inc%_EXT%\mozilla\js -..\%__SRC%\inc\jsconsole\* %_DEST%\inc%_EXT%\mozilla\jsconsole -..\%__SRC%\inc\jsurl\* %_DEST%\inc%_EXT%\mozilla\jsurl -..\%__SRC%\inc\layout\* %_DEST%\inc%_EXT%\mozilla\layout -..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul -..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap -..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap -..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc%_EXT%\mozilla\ldap-nspr -..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale -..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk -..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews -..\%__SRC%\inc\mime\* %_DEST%\inc%_EXT%\mozilla\mime -..\%__SRC%\inc\mimeemitter\* %_DEST%\inc%_EXT%\mozilla\mimeemitter -..\%__SRC%\inc\mimetype\* %_DEST%\inc%_EXT%\mozilla\mimetype -..\%__SRC%\inc\mng\* %_DEST%\inc%_EXT%\mozilla\mng -..\%__SRC%\inc\mork\* %_DEST%\inc%_EXT%\mozilla\mork -..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc%_EXT%\mozilla\mozbrwsr -..\%__SRC%\inc\mozldap\* %_DEST%\inc%_EXT%\mozilla\mozldap -..\%__SRC%\inc\mozreg\* %_DEST%\inc%_EXT%\mozilla\mozreg -..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc%_EXT%\mozilla\mpfilelocprovider -..\%__SRC%\inc\msgbase\* %_DEST%\inc%_EXT%\mozilla\msgbase -..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc%_EXT%\mozilla\msgbaseutil -..\%__SRC%\inc\msgcompo\* %_DEST%\inc%_EXT%\mozilla\msgcompo -..\%__SRC%\inc\msgdb\* %_DEST%\inc%_EXT%\mozilla\msgdb -..\%__SRC%\inc\msgimap\* %_DEST%\inc%_EXT%\mozilla\msgimap -..\%__SRC%\inc\msglocal\* %_DEST%\inc%_EXT%\mozilla\msglocal -..\%__SRC%\inc\msgnews\* %_DEST%\inc%_EXT%\mozilla\msgnews -..\%__SRC%\inc\msgsearch\* %_DEST%\inc%_EXT%\mozilla\msgsearch -..\%__SRC%\inc\necko\* %_DEST%\inc%_EXT%\mozilla\necko -..\%__SRC%\inc\necko2\* %_DEST%\inc%_EXT%\mozilla\necko2 -..\%__SRC%\inc\nkcache\* %_DEST%\inc%_EXT%\mozilla\nkcache -..\%__SRC%\inc\nspr\* %_DEST%\inc%_EXT%\mozilla\nspr -..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc%_EXT%\mozilla\nspr\obsolete -..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private -..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm -..\%__SRC%\inc\nss\* %_DEST%\inc%_EXT%\mozilla\nss -..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji -..\%__SRC%\inc\obsolete\* %_DEST%\inc%_EXT%\mozilla\obsolete -..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin -..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png -..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref -..\%__SRC%\inc\prefmigr\* %_DEST%\inc%_EXT%\mozilla\prefmigr -..\%__SRC%\inc\profile\* %_DEST%\inc%_EXT%\mozilla\profile -..\%__SRC%\inc\rdf\* %_DEST%\inc%_EXT%\mozilla\rdf -..\%__SRC%\inc\rdfutil\* %_DEST%\inc%_EXT%\mozilla\rdfutil -..\%__SRC%\inc\regviewer\* %_DEST%\inc%_EXT%\mozilla\regviewer -..\%__SRC%\inc\related\* %_DEST%\inc%_EXT%\mozilla\related -..\%__SRC%\inc\search\* %_DEST%\inc%_EXT%\mozilla\search -..\%__SRC%\inc\setuprsc\* %_DEST%\inc%_EXT%\mozilla\setuprsc -..\%__SRC%\inc\shistory\* %_DEST%\inc%_EXT%\mozilla\shistory -..\%__SRC%\inc\sidebar\* %_DEST%\inc%_EXT%\mozilla\sidebar -..\%__SRC%\inc\signonviewer\* %_DEST%\inc%_EXT%\mozilla\signonviewer -..\%__SRC%\inc\string\* %_DEST%\inc%_EXT%\mozilla\string -..\%__SRC%\inc\timer\* %_DEST%\inc%_EXT%\mozilla\timer -..\%__SRC%\inc\transformiix\* %_DEST%\inc%_EXT%\mozilla\transformiix -..\%__SRC%\inc\txmgr\* %_DEST%\inc%_EXT%\mozilla\txmgr -..\%__SRC%\inc\txtsvc\* %_DEST%\inc%_EXT%\mozilla\txtsvc -..\%__SRC%\inc\uconv\* %_DEST%\inc%_EXT%\mozilla\uconv -..\%__SRC%\inc\unicharutil\* %_DEST%\inc%_EXT%\mozilla\unicharutil -..\%__SRC%\inc\uninstall\* %_DEST%\inc%_EXT%\mozilla\uninstall -..\%__SRC%\inc\uriloader\* %_DEST%\inc%_EXT%\mozilla\uriloader -..\%__SRC%\inc\urlbarhistory\* %_DEST%\inc%_EXT%\mozilla\urlbarhistory -..\%__SRC%\inc\util\* %_DEST%\inc%_EXT%\mozilla\util -..\%__SRC%\inc\view\* %_DEST%\inc%_EXT%\mozilla\view -..\%__SRC%\inc\wallet\* %_DEST%\inc%_EXT%\mozilla\wallet -..\%__SRC%\inc\walleteditor\* %_DEST%\inc%_EXT%\mozilla\walleteditor -..\%__SRC%\inc\walletpreview\* %_DEST%\inc%_EXT%\mozilla\walletpreview -..\%__SRC%\inc\webBrowser_core\* %_DEST%\inc%_EXT%\mozilla\webBrowser_core -..\%__SRC%\inc\webshell\* %_DEST%\inc%_EXT%\mozilla\webshell -..\%__SRC%\inc\widget\* %_DEST%\inc%_EXT%\mozilla\widget -..\%__SRC%\inc\windowwatcher\* %_DEST%\inc%_EXT%\mozilla\windowwatcher -..\%__SRC%\inc\xml-rpc\* %_DEST%\inc%_EXT%\mozilla\xml-rpc -..\%__SRC%\inc\xmlextras\* %_DEST%\inc%_EXT%\mozilla\xmlextras -..\%__SRC%\inc\xpcom\* %_DEST%\inc%_EXT%\mozilla\xpcom -..\%__SRC%\inc\xpconnect\* %_DEST%\inc%_EXT%\mozilla\xpconnect -..\%__SRC%\inc\xpicleanup\* %_DEST%\inc%_EXT%\mozilla\xpicleanup -..\%__SRC%\inc\xpinstall\* %_DEST%\inc%_EXT%\mozilla\xpinstall -..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet -..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib -..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete +..\%__SRC%\inc\*.h %_DEST%\inc\mozilla +..\%__SRC%\inc\absync\* %_DEST%\inc\mozilla\absync +..\%__SRC%\inc\accessibility\* %_DEST%\inc\mozilla\accessibility +..\%__SRC%\inc\AcctIdl\* %_DEST%\inc\mozilla\AcctIdl +..\%__SRC%\inc\addrbook\* %_DEST%\inc\mozilla\addrbook +..\%__SRC%\inc\appcomps\* %_DEST%\inc\mozilla\appcomps +..\%__SRC%\inc\appshell\* %_DEST%\inc\mozilla\appshell +..\%__SRC%\inc\appstartup\* %_DEST%\inc\mozilla\appstartup +..\%__SRC%\inc\bookmarks\* %_DEST%\inc\mozilla\bookmarks +..\%__SRC%\inc\caps\* %_DEST%\inc\mozilla\caps +..\%__SRC%\inc\chardet\* %_DEST%\inc\mozilla\chardet +..\%__SRC%\inc\chrome\* %_DEST%\inc\mozilla\chrome +..\%__SRC%\inc\content\* %_DEST%\inc\mozilla\content +..\%__SRC%\inc\content_xsl\* %_DEST%\inc\mozilla\content_xsl +..\%__SRC%\inc\content_xul\* %_DEST%\inc\mozilla\content_xul +..\%__SRC%\inc\cookie\* %_DEST%\inc\mozilla\cookie +..\%__SRC%\inc\docshell\* %_DEST%\inc\mozilla\docshell +..\%__SRC%\inc\dom\* %_DEST%\inc\mozilla\dom +..\%__SRC%\inc\editor\* %_DEST%\inc\mozilla\editor +..\%__SRC%\inc\embed_base\* %_DEST%\inc\mozilla\embed_base +..\%__SRC%\inc\expat\* %_DEST%\inc\mozilla\expat +..\%__SRC%\inc\exthandler\* %_DEST%\inc\mozilla\exthandler +..\%__SRC%\inc\find\* %_DEST%\inc\mozilla\find +..\%__SRC%\inc\gfx\* %_DEST%\inc\mozilla\gfx +..\%__SRC%\inc\gfx2\* %_DEST%\inc\mozilla\gfx2 +..\%__SRC%\inc\gfxwin\* %_DEST%\inc\mozilla\gfxwin +..\%__SRC%\inc\gkplugin\* %_DEST%\inc\mozilla\gkplugin +..\%__SRC%\inc\helperAppDlg\* %_DEST%\inc\mozilla\helperAppDlg +..\%__SRC%\inc\history\* %_DEST%\inc\mozilla\history +..\%__SRC%\inc\htmlparser\* %_DEST%\inc\mozilla\htmlparser +..\%__SRC%\inc\imgicon\* %_DEST%\inc\mozilla\imgicon +..\%__SRC%\inc\imglib2\* %_DEST%\inc\mozilla\imglib2 +..\%__SRC%\inc\import\* %_DEST%\inc\mozilla\import +..\%__SRC%\inc\intl\* %_DEST%\inc\mozilla\intl +..\%__SRC%\inc\intlcmpt\* %_DEST%\inc\mozilla\intlcmpt +..\%__SRC%\inc\jar\* %_DEST%\inc\mozilla\jar +..\%__SRC%\inc\java\* %_DEST%\inc\mozilla\java +..\%__SRC%\inc\jpeg\* %_DEST%\inc\mozilla\jpeg +..\%__SRC%\inc\js\* %_DEST%\inc\mozilla\js +..\%__SRC%\inc\jsconsole\* %_DEST%\inc\mozilla\jsconsole +..\%__SRC%\inc\jsurl\* %_DEST%\inc\mozilla\jsurl +..\%__SRC%\inc\layout\* %_DEST%\inc\mozilla\layout +..\%__SRC%\inc\layout_xul\* %_DEST%\inc\mozilla\layout_xul +..\%__SRC%\inc\ldap\* %_DEST%\inc\mozilla\ldap +..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc\mozilla\ldap\ldap +..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc\mozilla\ldap-nspr +..\%__SRC%\inc\locale\* %_DEST%\inc\mozilla\locale +..\%__SRC%\inc\lwbrk\* %_DEST%\inc\mozilla\lwbrk +..\%__SRC%\inc\mailnews\* %_DEST%\inc\mozilla\mailnews +..\%__SRC%\inc\mime\* %_DEST%\inc\mozilla\mime +..\%__SRC%\inc\mimeemitter\* %_DEST%\inc\mozilla\mimeemitter +..\%__SRC%\inc\mimetype\* %_DEST%\inc\mozilla\mimetype +..\%__SRC%\inc\mng\* %_DEST%\inc\mozilla\mng +..\%__SRC%\inc\mork\* %_DEST%\inc\mozilla\mork +..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc\mozilla\mozbrwsr +..\%__SRC%\inc\mozldap\* %_DEST%\inc\mozilla\mozldap +..\%__SRC%\inc\mozreg\* %_DEST%\inc\mozilla\mozreg +..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc\mozilla\mpfilelocprovider +..\%__SRC%\inc\msgbase\* %_DEST%\inc\mozilla\msgbase +..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc\mozilla\msgbaseutil +..\%__SRC%\inc\msgcompo\* %_DEST%\inc\mozilla\msgcompo +..\%__SRC%\inc\msgdb\* %_DEST%\inc\mozilla\msgdb +..\%__SRC%\inc\msgimap\* %_DEST%\inc\mozilla\msgimap +..\%__SRC%\inc\msglocal\* %_DEST%\inc\mozilla\msglocal +..\%__SRC%\inc\msgnews\* %_DEST%\inc\mozilla\msgnews +..\%__SRC%\inc\msgsearch\* %_DEST%\inc\mozilla\msgsearch +..\%__SRC%\inc\necko\* %_DEST%\inc\mozilla\necko +..\%__SRC%\inc\necko2\* %_DEST%\inc\mozilla\necko2 +..\%__SRC%\inc\nkcache\* %_DEST%\inc\mozilla\nkcache +..\%__SRC%\inc\nspr\* %_DEST%\inc\mozilla\nspr +..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc\mozilla\nspr\obsolete +..\%__SRC%\inc\nspr\private\* %_DEST%\inc\mozilla\nspr\private +..\%__SRC%\inc\nsprefm\* %_DEST%\inc\mozilla\nsprefm +..\%__SRC%\inc\nss\* %_DEST%\inc\mozilla\nss +..\%__SRC%\inc\oji\* %_DEST%\inc\mozilla\oji +..\%__SRC%\inc\obsolete\* %_DEST%\inc\mozilla\obsolete +..\%__SRC%\inc\plugin\* %_DEST%\inc\mozilla\plugin +..\%__SRC%\inc\png\* %_DEST%\inc\mozilla\png +..\%__SRC%\inc\pref\* %_DEST%\inc\mozilla\pref +..\%__SRC%\inc\prefmigr\* %_DEST%\inc\mozilla\prefmigr +..\%__SRC%\inc\profile\* %_DEST%\inc\mozilla\profile +..\%__SRC%\inc\rdf\* %_DEST%\inc\mozilla\rdf +..\%__SRC%\inc\rdfutil\* %_DEST%\inc\mozilla\rdfutil +..\%__SRC%\inc\regviewer\* %_DEST%\inc\mozilla\regviewer +..\%__SRC%\inc\related\* %_DEST%\inc\mozilla\related +..\%__SRC%\inc\search\* %_DEST%\inc\mozilla\search +..\%__SRC%\inc\setuprsc\* %_DEST%\inc\mozilla\setuprsc +..\%__SRC%\inc\shistory\* %_DEST%\inc\mozilla\shistory +..\%__SRC%\inc\sidebar\* %_DEST%\inc\mozilla\sidebar +..\%__SRC%\inc\signonviewer\* %_DEST%\inc\mozilla\signonviewer +..\%__SRC%\inc\string\* %_DEST%\inc\mozilla\string +..\%__SRC%\inc\timer\* %_DEST%\inc\mozilla\timer +..\%__SRC%\inc\transformiix\* %_DEST%\inc\mozilla\transformiix +..\%__SRC%\inc\txmgr\* %_DEST%\inc\mozilla\txmgr +..\%__SRC%\inc\txtsvc\* %_DEST%\inc\mozilla\txtsvc +..\%__SRC%\inc\uconv\* %_DEST%\inc\mozilla\uconv +..\%__SRC%\inc\unicharutil\* %_DEST%\inc\mozilla\unicharutil +..\%__SRC%\inc\uninstall\* %_DEST%\inc\mozilla\uninstall +..\%__SRC%\inc\uriloader\* %_DEST%\inc\mozilla\uriloader +..\%__SRC%\inc\urlbarhistory\* %_DEST%\inc\mozilla\urlbarhistory +..\%__SRC%\inc\util\* %_DEST%\inc\mozilla\util +..\%__SRC%\inc\view\* %_DEST%\inc\mozilla\view +..\%__SRC%\inc\wallet\* %_DEST%\inc\mozilla\wallet +..\%__SRC%\inc\walleteditor\* %_DEST%\inc\mozilla\walleteditor +..\%__SRC%\inc\walletpreview\* %_DEST%\inc\mozilla\walletpreview +..\%__SRC%\inc\webBrowser_core\* %_DEST%\inc\mozilla\webBrowser_core +..\%__SRC%\inc\webshell\* %_DEST%\inc\mozilla\webshell +..\%__SRC%\inc\widget\* %_DEST%\inc\mozilla\widget +..\%__SRC%\inc\windowwatcher\* %_DEST%\inc\mozilla\windowwatcher +..\%__SRC%\inc\xml-rpc\* %_DEST%\inc\mozilla\xml-rpc +..\%__SRC%\inc\xmlextras\* %_DEST%\inc\mozilla\xmlextras +..\%__SRC%\inc\xpcom\* %_DEST%\inc\mozilla\xpcom +..\%__SRC%\inc\xpconnect\* %_DEST%\inc\mozilla\xpconnect +..\%__SRC%\inc\xpicleanup\* %_DEST%\inc\mozilla\xpicleanup +..\%__SRC%\inc\xpinstall\* %_DEST%\inc\mozilla\xpinstall +..\%__SRC%\inc\xpnet\* %_DEST%\inc\mozilla\xpnet +..\%__SRC%\inc\zlib\* %_DEST%\inc\mozilla\zlib +..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc\mozilla\xpcom_obsolete -..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\libldap50.* %_DEST%\lib +..\%__SRC%\lib\libmozjs.* %_DEST%\lib +..\%__SRC%\lib\libmozz.* %_DEST%\lib +..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib +..\%__SRC%\lib\libnssckbi.* %_DEST%\lib +..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib +..\%__SRC%\lib\libnssutil3.* %_DEST%\lib +..\%__SRC%\lib\libprldap50.* %_DEST%\lib +..\%__SRC%\lib\libxpcom.* %_DEST%\lib +..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib +..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib +..\%__SRC%\lib\*.a %_DEST%\lib +..\%__SRC%\lib\*.lib %_DEST%\lib -mkdir: %_DEST%\lib%_EXT%\sqlite -..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite +mkdir: %_DEST%\lib\sqlite +..\%__SRC%\lib\libsqlite3.* %_DEST%\lib\sqlite -..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT% +..\%__SRC%\bin\*.zip %_DEST%\bin diff --git a/neon/prj/d.lst b/neon/prj/d.lst index a6c269e96600..0914f57985cf 100644 --- a/neon/prj/d.lst +++ b/neon/prj/d.lst @@ -1,8 +1,8 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\neon -..\version.mk %_DEST%\inc%_EXT%\external\neon\version.mk -..\%__SRC%\inc\ne_*.h %_DEST%\inc%_EXT%\external\neon\ne_*.h -..\%__SRC%\lib\ineon.lib %_DEST%\lib%_EXT%\ineon.lib -..\%__SRC%\bin\neon*.dll %_DEST%\bin%_EXT%\neon*.dll -..\%__SRC%\lib\libneon*.so %_DEST%\lib%_EXT%\libneon*.so -..\%__SRC%\lib\libneon*.dylib %_DEST%\lib%_EXT%\libneon*.dylib \ No newline at end of file +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\neon +..\version.mk %_DEST%\inc\external\neon\version.mk +..\%__SRC%\inc\ne_*.h %_DEST%\inc\external\neon\ne_*.h +..\%__SRC%\lib\ineon.lib %_DEST%\lib\ineon.lib +..\%__SRC%\bin\neon*.dll %_DEST%\bin\neon*.dll +..\%__SRC%\lib\libneon*.so %_DEST%\lib\libneon*.so +..\%__SRC%\lib\libneon*.dylib %_DEST%\lib\libneon*.dylib \ No newline at end of file diff --git a/nss/prj/d.lst b/nss/prj/d.lst index f1090ca8d91e..e5695b9d2dc6 100644 --- a/nss/prj/d.lst +++ b/nss/prj/d.lst @@ -1,31 +1,31 @@ -mkdir: %_DEST%\inc%_EXT%\mozilla\nspr -mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete -mkdir: %_DEST%\inc%_EXT%\mozilla\nss -mkdir: %_DEST%\lib%_EXT%\sqlite +mkdir: %_DEST%\inc\mozilla\nspr +mkdir: %_DEST%\inc\mozilla\nspr\obsolete +mkdir: %_DEST%\inc\mozilla\nss +mkdir: %_DEST%\lib\sqlite -..\%__SRC%\inc\include\* %_DEST%\inc%_EXT%\mozilla\nspr -..\%__SRC%\inc\include\obsolete\protypes.h %_DEST%\inc%_EXT%\mozilla\nspr\obsolete\protypes.h -..\%__SRC%\inc\nss\*.h %_DEST%\inc%_EXT%\mozilla\nss +..\%__SRC%\inc\include\* %_DEST%\inc\mozilla\nspr +..\%__SRC%\inc\include\obsolete\protypes.h %_DEST%\inc\mozilla\nspr\obsolete\protypes.h +..\%__SRC%\inc\nss\*.h %_DEST%\inc\mozilla\nss -..\%__SRC%\lib\libfreebl3.* %_DEST%\lib%_EXT%\libfreebl.* -..\%__SRC%\lib\libfreebl_32fpu_3.* %_DEST%\lib%_EXT%\libfreebl_32fpu_3.* -..\%__SRC%\lib\libfreebl_32int64_3.* %_DEST%\lib%_EXT%\libfreebl_32int64_3.* -..\%__SRC%\lib\libfreebl_32int_3.* %_DEST%\lib%_EXT%\libfreebl_32int_3.* -..\%__SRC%\lib\libfreebl_64int_3.* %_DEST%\lib%_EXT%\libfreebl_64int_3.* -..\%__SRC%\lib\libfreebl_64fpu_3.* %_DEST%\lib%_EXT%\libfreebl_64fpu_3.* -..\%__SRC%\lib\libnspr4.* %_DEST%\lib%_EXT%\libnspr4.* -..\%__SRC%\lib\libnss3.* %_DEST%\lib%_EXT%\libnss3.* -..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%\libnssckbi.* -..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%\libnssdbm3.* -..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%\libnssutil3.* -..\%__SRC%\lib\libplc4.* %_DEST%\lib%_EXT%\libplc4.* -..\%__SRC%\lib\libplds4.* %_DEST%\lib%_EXT%\libplds4.* -..\%__SRC%\lib\libsmime3.* %_DEST%\lib%_EXT%\libsmime3.* -..\%__SRC%\lib\libsoftokn3.* %_DEST%\lib%_EXT%\libsoftokn3.* -..\%__SRC%\lib\libssl3.* %_DEST%\lib%_EXT%\libssl3.* +..\%__SRC%\lib\libfreebl3.* %_DEST%\lib\libfreebl.* +..\%__SRC%\lib\libfreebl_32fpu_3.* %_DEST%\lib\libfreebl_32fpu_3.* +..\%__SRC%\lib\libfreebl_32int64_3.* %_DEST%\lib\libfreebl_32int64_3.* +..\%__SRC%\lib\libfreebl_32int_3.* %_DEST%\lib\libfreebl_32int_3.* +..\%__SRC%\lib\libfreebl_64int_3.* %_DEST%\lib\libfreebl_64int_3.* +..\%__SRC%\lib\libfreebl_64fpu_3.* %_DEST%\lib\libfreebl_64fpu_3.* +..\%__SRC%\lib\libnspr4.* %_DEST%\lib\libnspr4.* +..\%__SRC%\lib\libnss3.* %_DEST%\lib\libnss3.* +..\%__SRC%\lib\libnssckbi.* %_DEST%\lib\libnssckbi.* +..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib\libnssdbm3.* +..\%__SRC%\lib\libnssutil3.* %_DEST%\lib\libnssutil3.* +..\%__SRC%\lib\libplc4.* %_DEST%\lib\libplc4.* +..\%__SRC%\lib\libplds4.* %_DEST%\lib\libplds4.* +..\%__SRC%\lib\libsmime3.* %_DEST%\lib\libsmime3.* +..\%__SRC%\lib\libsoftokn3.* %_DEST%\lib\libsoftokn3.* +..\%__SRC%\lib\libssl3.* %_DEST%\lib\libssl3.* -..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite\libsqlite3.* -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\libsqlite3.* %_DEST%\lib\sqlite\libsqlite3.* +..\%__SRC%\lib\*.lib %_DEST%\lib -..\%__SRC%\bin\* %_DEST%\bin%_EXT% +..\%__SRC%\bin\* %_DEST%\bin diff --git a/pango/prj/d.lst b/pango/prj/d.lst index c80568a0df01..2597aa37e623 100755 --- a/pango/prj/d.lst +++ b/pango/prj/d.lst @@ -1,44 +1,44 @@ -mkdir: %_DEST%\inc%_EXT%\external -mkdir: %_DEST%\inc%_EXT%\external\pango-1.0 -mkdir: %_DEST%\inc%_EXT%\external\pango-1.0\pango +mkdir: %_DEST%\inc\external +mkdir: %_DEST%\inc\external\pango-1.0 +mkdir: %_DEST%\inc\external\pango-1.0\pango -..\%__SRC%\inc\pango.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango.h -..\%__SRC%\inc\pangocairo.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pangocairo.h -..\%__SRC%\inc\pangoatsui.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pangoatsui.h -..\%__SRC%\inc\pango-attributes.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-attributes.h -..\%__SRC%\inc\pango-bidi-type.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-bidi-type.h -..\%__SRC%\inc\pango-break.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-break.h -..\%__SRC%\inc\pango-context.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-context.h -..\%__SRC%\inc\pango-coverage.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-coverage.h -..\%__SRC%\inc\pango-engine.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-engine.h -..\%__SRC%\inc\pango-enum-types.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-enum-types.h -..\%__SRC%\inc\pango-features.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-features.h -..\%__SRC%\inc\pango-font.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-font.h -..\%__SRC%\inc\pango-fontmap.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-fontmap.h -..\%__SRC%\inc\pango-fontset.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-fontset.h -..\%__SRC%\inc\pango-glyph.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-glyph.h -..\%__SRC%\inc\pango-glyph-item.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-glyph-item.h -..\%__SRC%\inc\pango-gravity.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-gravity.h -..\%__SRC%\inc\pango-item.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-item.h -..\%__SRC%\inc\pango-language.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-language.h -..\%__SRC%\inc\pango-layout.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-layout.h -..\%__SRC%\inc\pango-matrix.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-matrix.h -..\%__SRC%\inc\pango-modules.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-modules.h -..\%__SRC%\inc\pango-renderer.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-renderer.h -..\%__SRC%\inc\pango-script.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-script.h -..\%__SRC%\inc\pango-tabs.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-tabs.h -..\%__SRC%\inc\pango-types.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-types.h -..\%__SRC%\inc\pango-utils.h %_DEST%\inc%_EXT%\external\pango-1.0\pango\pango-utils.h +..\%__SRC%\inc\pango.h %_DEST%\inc\external\pango-1.0\pango\pango.h +..\%__SRC%\inc\pangocairo.h %_DEST%\inc\external\pango-1.0\pango\pangocairo.h +..\%__SRC%\inc\pangoatsui.h %_DEST%\inc\external\pango-1.0\pango\pangoatsui.h +..\%__SRC%\inc\pango-attributes.h %_DEST%\inc\external\pango-1.0\pango\pango-attributes.h +..\%__SRC%\inc\pango-bidi-type.h %_DEST%\inc\external\pango-1.0\pango\pango-bidi-type.h +..\%__SRC%\inc\pango-break.h %_DEST%\inc\external\pango-1.0\pango\pango-break.h +..\%__SRC%\inc\pango-context.h %_DEST%\inc\external\pango-1.0\pango\pango-context.h +..\%__SRC%\inc\pango-coverage.h %_DEST%\inc\external\pango-1.0\pango\pango-coverage.h +..\%__SRC%\inc\pango-engine.h %_DEST%\inc\external\pango-1.0\pango\pango-engine.h +..\%__SRC%\inc\pango-enum-types.h %_DEST%\inc\external\pango-1.0\pango\pango-enum-types.h +..\%__SRC%\inc\pango-features.h %_DEST%\inc\external\pango-1.0\pango\pango-features.h +..\%__SRC%\inc\pango-font.h %_DEST%\inc\external\pango-1.0\pango\pango-font.h +..\%__SRC%\inc\pango-fontmap.h %_DEST%\inc\external\pango-1.0\pango\pango-fontmap.h +..\%__SRC%\inc\pango-fontset.h %_DEST%\inc\external\pango-1.0\pango\pango-fontset.h +..\%__SRC%\inc\pango-glyph.h %_DEST%\inc\external\pango-1.0\pango\pango-glyph.h +..\%__SRC%\inc\pango-glyph-item.h %_DEST%\inc\external\pango-1.0\pango\pango-glyph-item.h +..\%__SRC%\inc\pango-gravity.h %_DEST%\inc\external\pango-1.0\pango\pango-gravity.h +..\%__SRC%\inc\pango-item.h %_DEST%\inc\external\pango-1.0\pango\pango-item.h +..\%__SRC%\inc\pango-language.h %_DEST%\inc\external\pango-1.0\pango\pango-language.h +..\%__SRC%\inc\pango-layout.h %_DEST%\inc\external\pango-1.0\pango\pango-layout.h +..\%__SRC%\inc\pango-matrix.h %_DEST%\inc\external\pango-1.0\pango\pango-matrix.h +..\%__SRC%\inc\pango-modules.h %_DEST%\inc\external\pango-1.0\pango\pango-modules.h +..\%__SRC%\inc\pango-renderer.h %_DEST%\inc\external\pango-1.0\pango\pango-renderer.h +..\%__SRC%\inc\pango-script.h %_DEST%\inc\external\pango-1.0\pango\pango-script.h +..\%__SRC%\inc\pango-tabs.h %_DEST%\inc\external\pango-1.0\pango\pango-tabs.h +..\%__SRC%\inc\pango-types.h %_DEST%\inc\external\pango-1.0\pango\pango-types.h +..\%__SRC%\inc\pango-utils.h %_DEST%\inc\external\pango-1.0\pango\pango-utils.h -..\%__SRC%\lib\libpango-1.0.0.dylib %_DEST%\lib%_EXT%\libpango-1.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libpango-1.0.0.dylib %_DEST%\lib%_EXT%\libpango-1.0.dylib -..\%__SRC%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib%_EXT%\libpangocairo-1.0.0.dylib -symlink: %_DEST%\lib%_EXT%\libpangocairo-1.0.0.dylib %_DEST%\lib%_EXT%\libpangocairo-1.0.dylib +..\%__SRC%\lib\libpango-1.0.0.dylib %_DEST%\lib\libpango-1.0.0.dylib +symlink: %_DEST%\lib\libpango-1.0.0.dylib %_DEST%\lib\libpango-1.0.dylib +..\%__SRC%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib\libpangocairo-1.0.0.dylib +symlink: %_DEST%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib\libpangocairo-1.0.dylib -..\%__SRC%\lib\pango-1.0.lib %_DEST%\lib%_EXT%\pango-1.0.lib -..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib%_EXT%\pangocairo-1.0.lib -..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib%_EXT%\pangowin32-1.0.lib +..\%__SRC%\lib\pango-1.0.lib %_DEST%\lib\pango-1.0.lib +..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib\pangocairo-1.0.lib +..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib\pangowin32-1.0.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% -..\%__SRC%\bin\pango-querymodules %_DEST%\bin%_EXT%\pango-querymodules -..\%__SRC%\bin\querymodules.exe %_DEST%\bin%_EXT%\pango-querymodules.exe +..\%__SRC%\bin\*.dll %_DEST%\bin +..\%__SRC%\bin\pango-querymodules %_DEST%\bin\pango-querymodules +..\%__SRC%\bin\querymodules.exe %_DEST%\bin\pango-querymodules.exe diff --git a/python/prj/d.lst b/python/prj/d.lst index 7df9cfe62af6..245ddb49a4d3 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -1,165 +1,165 @@ -mkdir: %_DEST%\lib%_EXT%\python -mkdir: %_DEST%\lib%_EXT%\python\lib-old -mkdir: %_DEST%\lib%_EXT%\python\lib-tk -mkdir: %_DEST%\lib%_EXT%\python\site-packages -mkdir: %_DEST%\lib%_EXT%\python\encodings -mkdir: %_DEST%\lib%_EXT%\python\email -mkdir: %_DEST%\lib%_EXT%\python\email\mime -mkdir: %_DEST%\lib%_EXT%\python\compiler -mkdir: %_DEST%\lib%_EXT%\python\hotshot -mkdir: %_DEST%\lib%_EXT%\python\distutils -mkdir: %_DEST%\lib%_EXT%\python\distutils\command -mkdir: %_DEST%\lib%_EXT%\python\xml -mkdir: %_DEST%\lib%_EXT%\python\xml\dom -mkdir: %_DEST%\lib%_EXT%\python\xml\parsers -mkdir: %_DEST%\lib%_EXT%\python\xml\sax -mkdir: %_DEST%\lib%_EXT%\python\xml\etree -mkdir: %_DEST%\lib%_EXT%\python\curses -mkdir: %_DEST%\lib%_EXT%\python\plat-linux2 -mkdir: %_DEST%\lib%_EXT%\python\plat-aix5 -mkdir: %_DEST%\lib%_EXT%\python\plat-aix6 -mkdir: %_DEST%\lib%_EXT%\python\plat-aix7 -mkdir: %_DEST%\lib%_EXT%\python\config -mkdir: %_DEST%\lib%_EXT%\python\lib-dynload -mkdir: %_DEST%\lib%_EXT%\python\bsddb -mkdir: %_DEST%\lib%_EXT%\python\logging -mkdir: %_DEST%\lib%_EXT%\python\idlelib -mkdir: %_DEST%\lib%_EXT%\python\idlelib\Icons -mkdir: %_DEST%\lib%_EXT%\python\wsgiref -mkdir: %_DEST%\lib%_EXT%\python\json -mkdir: %_DEST%\lib%_EXT%\python\lib2to3 -mkdir: %_DEST%\lib%_EXT%\python\lib2to3\fixes -mkdir: %_DEST%\lib%_EXT%\python\lib2to3\pgen2 -mkdir: %_DEST%\lib%_EXT%\python\sqlite3 -mkdir: %_DEST%\lib%_EXT%\python\ctypes -mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib +mkdir: %_DEST%\lib\python +mkdir: %_DEST%\lib\python\lib-old +mkdir: %_DEST%\lib\python\lib-tk +mkdir: %_DEST%\lib\python\site-packages +mkdir: %_DEST%\lib\python\encodings +mkdir: %_DEST%\lib\python\email +mkdir: %_DEST%\lib\python\email\mime +mkdir: %_DEST%\lib\python\compiler +mkdir: %_DEST%\lib\python\hotshot +mkdir: %_DEST%\lib\python\distutils +mkdir: %_DEST%\lib\python\distutils\command +mkdir: %_DEST%\lib\python\xml +mkdir: %_DEST%\lib\python\xml\dom +mkdir: %_DEST%\lib\python\xml\parsers +mkdir: %_DEST%\lib\python\xml\sax +mkdir: %_DEST%\lib\python\xml\etree +mkdir: %_DEST%\lib\python\curses +mkdir: %_DEST%\lib\python\plat-linux2 +mkdir: %_DEST%\lib\python\plat-aix5 +mkdir: %_DEST%\lib\python\plat-aix6 +mkdir: %_DEST%\lib\python\plat-aix7 +mkdir: %_DEST%\lib\python\config +mkdir: %_DEST%\lib\python\lib-dynload +mkdir: %_DEST%\lib\python\bsddb +mkdir: %_DEST%\lib\python\logging +mkdir: %_DEST%\lib\python\idlelib +mkdir: %_DEST%\lib\python\idlelib\Icons +mkdir: %_DEST%\lib\python\wsgiref +mkdir: %_DEST%\lib\python\json +mkdir: %_DEST%\lib\python\lib2to3 +mkdir: %_DEST%\lib\python\lib2to3\fixes +mkdir: %_DEST%\lib\python\lib2to3\pgen2 +mkdir: %_DEST%\lib\python\sqlite3 +mkdir: %_DEST%\lib\python\ctypes +mkdir: %_DEST%\lib\python\ctypes\macholib -..\%__SRC%\misc\build\Python-2.6.1\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix5\* %_DEST%\lib%_EXT%\python\plat-aix5\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix6\* %_DEST%\lib%_EXT%\python\plat-aix6\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix7\* %_DEST%\lib%_EXT%\python\plat-aix7\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.6.1\Lib\* %_DEST%\lib\python\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib\python\lib-old\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib\python\lib-tk\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib\python\site-packages\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib\python\encodings\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib\python\email\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib\python\email\mime\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\compiler\* %_DEST%\lib\python\compiler\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\hotshot\* %_DEST%\lib\python\hotshot\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\distutils\* %_DEST%\lib\python\distutils\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\distutils\command\* %_DEST%\lib\python\distutils\command\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\* %_DEST%\lib\python\xml\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\dom\* %_DEST%\lib\python\xml\dom\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\parsers\* %_DEST%\lib\python\xml\parsers\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\sax\* %_DEST%\lib\python\xml\sax\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\curses\* %_DEST%\lib\python\curses\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-linux2\* %_DEST%\lib\python\plat-linux2\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix5\* %_DEST%\lib\python\plat-aix5\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix6\* %_DEST%\lib\python\plat-aix6\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\plat-aix7\* %_DEST%\lib\python\plat-aix7\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\config\* %_DEST%\lib\python\config\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\bsddb\* %_DEST%\lib\python\bsddb\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\logging\* %_DEST%\lib\python\logging\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\idlelib\* %_DEST%\lib\python\idlelib\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\idlelib\Icons\* %_DEST%\lib\python\idlelib\Icons\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\wsgiref\* %_DEST%\lib\python\wsgiref\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\json\* %_DEST%\lib\python\json\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\* %_DEST%\lib\python\lib2to3\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\fixes\* %_DEST%\lib\python\lib2to3\fixes\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\lib2to3\pgen2\* %_DEST%\lib\python\lib2to3\pgen2\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\sqlite3\* %_DEST%\lib\python\sqlite3\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\* %_DEST%\lib\python\ctypes\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\macholib\* %_DEST%\lib\python\ctypes\macholib\* +..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\etree\* %_DEST%\lib\python\xml\etree -..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk +..\pyversion.mk %_DEST%\inc\pyversion.mk -..\%__SRC%\misc\build\Python-2.6.1\Include\* %_DEST%\inc%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.6.1\Include\* %_DEST%\inc\python\* #unix ONLY ! -..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python -..\%__SRC%\misc\build\Python-2.6.1\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h -..\%__SRC%\misc\build\python-inst\lib\python2.6\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\* -..\%__SRC%\misc\build\python-inst\bin\python2.6 %_DEST%\bin%_EXT%\python -..\%__SRC%\misc\build\python-inst\lib\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so.1.0 -symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so +..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin\python +..\%__SRC%\misc\build\Python-2.6.1\pyconfig.h %_DEST%\inc\python\pyconfig.h +..\%__SRC%\misc\build\python-inst\lib\python2.6\lib-dynload\* %_DEST%\lib\python\lib-dynload\* +..\%__SRC%\misc\build\python-inst\bin\python2.6 %_DEST%\bin\python +..\%__SRC%\misc\build\python-inst\lib\libpython2.6.so.1.0 %_DEST%\lib\libpython2.6.so.1.0 +symlink: %_DEST%\lib\libpython2.6.so.1.0 %_DEST%\lib\libpython2.6.so # MacOS X -..\%__SRC%\misc\build\python-inst\lib\libpython2.6.dylib %_DEST%\lib%_EXT%\libpython2.6.dylib +..\%__SRC%\misc\build\python-inst\lib\libpython2.6.dylib %_DEST%\lib\libpython2.6.dylib #MingW ONLY ! -..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\libpython2.6.dll %_DEST%\bin%_EXT%\libpython2.6.dll +..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin\python.exe +..\%__SRC%\misc\build\Python-2.6.1\libpython2.6.dll %_DEST%\bin\libpython2.6.dll # WINDOWS ONLY ! -..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.dll %_DEST%\bin%_EXT%\python26.dll -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.lib %_DEST%\lib%_EXT%\python26.lib -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python26.dll %_DEST%\bin%_EXT%\python26.dll -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python26.lib %_DEST%\lib%_EXT%\python26.lib -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.dll %_DEST%\bin%_EXT%\python26.dll -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.lib %_DEST%\lib%_EXT%\python26.lib -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.dll %_DEST%\bin%_EXT%\python26.dll -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.lib %_DEST%\lib%_EXT%\python26.lib -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.dll %_DEST%\bin%_EXT%\python26.dll -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.lib %_DEST%\lib%_EXT%\python26.lib -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc\python\pyconfig.h +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python.exe %_DEST%\bin\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.dll %_DEST%\bin\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.lib %_DEST%\lib\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_socket.pyd %_DEST%\lib\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ssl.pyd %_DEST%\lib\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\select.pyd %_DEST%\lib\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\unicodedata.pyd %_DEST%\lib\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\winsound.pyd %_DEST%\lib\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\pyexpat.pyd %_DEST%\lib\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_testcapi.pyd %_DEST%\lib\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_multiprocessing.pyd %_DEST%\lib\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python.exe %_DEST%\bin\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python26.dll %_DEST%\bin\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\python26.lib %_DEST%\lib\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_socket.pyd %_DEST%\lib\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_ssl.pyd %_DEST%\lib\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\select.pyd %_DEST%\lib\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\unicodedata.pyd %_DEST%\lib\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\winsound.pyd %_DEST%\lib\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\pyexpat.pyd %_DEST%\lib\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_testcapi.pyd %_DEST%\lib\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_multiprocessing.pyd %_DEST%\lib\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_msi.pyd %_DEST%\lib\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_elementtree.pyd %_DEST%\lib\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS10.0\_ctypes.pyd %_DEST%\lib\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python.exe %_DEST%\bin\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.dll %_DEST%\bin\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.lib %_DEST%\lib\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_socket.pyd %_DEST%\lib\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ssl.pyd %_DEST%\lib\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\select.pyd %_DEST%\lib\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\unicodedata.pyd %_DEST%\lib\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\winsound.pyd %_DEST%\lib\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\pyexpat.pyd %_DEST%\lib\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_testcapi.pyd %_DEST%\lib\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_multiprocessing.pyd %_DEST%\lib\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_msi.pyd %_DEST%\lib\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_elementtree.pyd %_DEST%\lib\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ctypes.pyd %_DEST%\lib\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python.exe %_DEST%\bin\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.dll %_DEST%\bin\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.lib %_DEST%\lib\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_socket.pyd %_DEST%\lib\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ssl.pyd %_DEST%\lib\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\select.pyd %_DEST%\lib\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\unicodedata.pyd %_DEST%\lib\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\winsound.pyd %_DEST%\lib\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\pyexpat.pyd %_DEST%\lib\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_testcapi.pyd %_DEST%\lib\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_multiprocessing.pyd %_DEST%\lib\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_msi.pyd %_DEST%\lib\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_elementtree.pyd %_DEST%\lib\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ctypes.pyd %_DEST%\lib\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python.exe %_DEST%\bin\python.exe +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.dll %_DEST%\bin\python26.dll +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.lib %_DEST%\lib\python26.lib +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_socket.pyd %_DEST%\lib\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ssl.pyd %_DEST%\lib\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\select.pyd %_DEST%\lib\python\select.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\unicodedata.pyd %_DEST%\lib\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\winsound.pyd %_DEST%\lib\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\pyexpat.pyd %_DEST%\lib\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_testcapi.pyd %_DEST%\lib\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_multiprocessing.pyd %_DEST%\lib\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_msi.pyd %_DEST%\lib\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_elementtree.pyd %_DEST%\lib\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ctypes.pyd %_DEST%\lib\python\_ctypes.pyd #linklib: libpython.so.*.*.* diff --git a/saxon/prj/d.lst b/saxon/prj/d.lst index fabc35e4fb33..0793dadfcfb1 100644 --- a/saxon/prj/d.lst +++ b/saxon/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\class\saxon9.jar %_DEST%\bin%_EXT%\saxon9.jar +..\%__SRC%\class\saxon9.jar %_DEST%\bin\saxon9.jar diff --git a/stax/prj/d.lst b/stax/prj/d.lst index 7cfc3dd4af58..a4fd204791f8 100644 --- a/stax/prj/d.lst +++ b/stax/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\class\jsr*.jar %_DEST%\bin%_EXT% +..\%__SRC%\class\jsr*.jar %_DEST%\bin diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst index b6433510d6c8..dc223ae4dd56 100644 --- a/zlib/prj/d.lst +++ b/zlib/prj/d.lst @@ -1,13 +1,13 @@ -mkdir: %_DEST%\inc%_EXT%\external\zlib -mkdir: %_DEST%\lib%_EXT%\x64 +mkdir: %_DEST%\inc\external\zlib +mkdir: %_DEST%\lib\x64 -..\%__SRC%\inc\patched\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h -..\%__SRC%\inc\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h -..\%__SRC%\inc\ioapi.h %_DEST%\inc%_EXT%\external\zlib\ioapi.h -..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zlib\zconf.h +..\%__SRC%\inc\patched\zlib.h %_DEST%\inc\external\zlib\zlib.h +..\%__SRC%\inc\unzip.h %_DEST%\inc\external\zlib\unzip.h +..\%__SRC%\inc\ioapi.h %_DEST%\inc\external\zlib\ioapi.h +..\%__SRC%\inc\zconf.h %_DEST%\inc\external\zlib\zconf.h -..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a -..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib -..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin -..\%__SRC%\slb\x64\zlib.lib %_DEST%\lib%_EXT%\x64\zlib.lib -..\%__SRC%\slb\x64\zlib.lin %_DEST%\lib%_EXT%\x64\zlib.lin +..\%__SRC%\lib\libzlib.a %_DEST%\lib\libzlib.a +..\%__SRC%\slb\zlib.lib %_DEST%\lib\zlib.lib +..\%__SRC%\slb\zlib.lin %_DEST%\lib\zlib.lin +..\%__SRC%\slb\x64\zlib.lib %_DEST%\lib\x64\zlib.lib +..\%__SRC%\slb\x64\zlib.lin %_DEST%\lib\x64\zlib.lin -- cgit From 9002e8749382bff83e644d432fb9908664edfeb2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:53:27 +0300 Subject: Use unique Pango DLL names to avoid risk clashing with "official" DLLs --- pango/makefile.mk | 6 +++--- pango/pango-1.28.3-win32.patch | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pango/makefile.mk b/pango/makefile.mk index d202de296654..a5c285438cfa 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -122,9 +122,9 @@ OUT2LIB+=pango/pango-1.0.lib OUT2LIB+=pango/pangocairo-1.0.lib OUT2LIB+=pango/pangowin32-1.0.lib -OUT2BIN+=pango/libpango-1.0-0.dll -OUT2BIN+=pango/libpangocairo-1.0-0.dll -OUT2BIN+=pango/libpangowin32-1.0-0.dll +OUT2BIN+=pango/pangolo.dll +OUT2BIN+=pango/pangocairolo.dll +OUT2BIN+=pango/pangowin32lo.dll OUT2BIN+=pango/querymodules.exe OUT2INC+=pango/pango.h diff --git a/pango/pango-1.28.3-win32.patch b/pango/pango-1.28.3-win32.patch index 0aa1155c3a2f..f232d5bf0d21 100644 --- a/pango/pango-1.28.3-win32.patch +++ b/pango/pango-1.28.3-win32.patch @@ -64,6 +64,15 @@ EXES = querymodules testfonts #? test1 test2 test3 test4 test5 +@@ -30,7 +30,7 @@ + nmake -nologo -f makefile.msc $(THIS)-$(PANGO_VER)s.lib PACKAGE=$(THIS) OBJS_$(THIS)=1 + + sub-one-dll: +- nmake -nologo -f makefile.msc lib$(THIS)-$(PANGO_VER)-0.dll PACKAGE=$(THIS) OBJS_$(THIS)=1 ++ nmake -nologo -f makefile.msc $(THIS)lo.dll PACKAGE=$(THIS) OBJS_$(THIS)=1 + + sub-one-exe: + nmake -nologo -f makefile.msc $(THIS).exe PACKAGE=$(THIS) OBJS_$(THIS)=1 @@ -40,28 +50,28 @@ !ELSE @@ -185,7 +194,15 @@ --fhead "#include " \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ -@@ -275,15 +277,6 @@ +@@ -275,22 +277,13 @@ + $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PRJ_TOP)\config.h + lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) + +-lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h ++$(PACKAGE)lo.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) \ + user32.lib gdi32.lib advapi32.lib $(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PKG_DEF) + $(PACKAGE).exe : $(PKG_LINK) $(OBJECTS) $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(OBJECTS) $(PKG_LINK) gdi32.lib user32.lib -- cgit From 70464030f66ea1b7dc0d89ce5da07b1e0a56609d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 14:05:13 +0300 Subject: Make the GLib DLL names even more unique --- glib/glib-2.28.1-win32.patch | 20 ++++++++++---------- glib/makefile.mk | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch index a6fc48f8a652..c33955e96041 100644 --- a/glib/glib-2.28.1-win32.patch +++ b/glib/glib-2.28.1-win32.patch @@ -328,7 +328,7 @@ gioenumtypes.h \ gioenumtypes.c \ - libgio-$(PKG_VER)-0.dll -+ gio-$(PKG_VER).dll ++ giolo.dll $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 @@ -346,7 +346,7 @@ -libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib $(PACKAGE).def $(RESOURCE) - $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \ -+gio-$(PKG_VER).dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) ++giolo.dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(RESOURCE) \ ..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \ - win32\giowin32.lib \ @@ -399,7 +399,7 @@ gnulib\gnulib.lib \ pcre\pcre.lib \ - libglib-2.0-0.dll \ -+ glib-2.0.dll \ ++ gliblo.dll \ - glib-2.28s.lib \ - gspawn-win32-helper.exe \ - gspawn-win32-helper-console.exe \ @@ -508,7 +508,7 @@ lib /out:glib-2.28s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib -libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res -+glib-2.0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res ++gliblo.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \ gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \ $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def @@ -578,7 +578,7 @@ all : \ gmoduleconf.h \ - libgmodule-2.0-0.dll -+ gmodule-2.0.dll ++ gmodulelo.dll gmodule_OBJECTS = \ gmodule.obj @@ -608,7 +608,7 @@ + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gmodule.res gmodule.rc -libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res -+gmodule-2.0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res ++gmodulelo.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \ ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def @@ -637,7 +637,7 @@ gmarshal.strings \ - gobject-query.exe \ - libgobject-2.0-0.dll \ -+ gobject-2.0.dll \ ++ gobjectlo.dll \ gobject-2.28s.lib \ - testgobject.exe @@ -666,7 +666,7 @@ + cp xgen-gmh gmarshal.h -libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res -+gobject-2.0.dll : $(gobject_OBJECTS) gobject.def gobject.res ++gobjectlo.dll : $(gobject_OBJECTS) gobject.def gobject.res $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \ - ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@ + ..\glib\glib-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || rm $@ @@ -684,7 +684,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" all : \ - libgthread-2.0-0.dll -+ gthread-2.0.dll ++ gthreadlo.dll gthread_OBJECTS = \ gthread-impl.obj @@ -696,7 +696,7 @@ + rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gthread.res gthread.rc -libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res -+gthread-2.0.dll : $(gthread_OBJECTS) gthread.def gthread.res ++gthreadlo.dll : $(gthread_OBJECTS) gthread.def gthread.res $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \ ..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def --- misc/glib-2.28.1/makefile.msc 2009-04-01 01:04:20.000000000 +0200 diff --git a/glib/makefile.mk b/glib/makefile.mk index d228187c30f2..18e180c401d9 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -123,11 +123,11 @@ ADDITIONAL_FILES= config.h \ BUILD_ACTION=nmake -f makefile.msc -OUT2BIN+=gio$/gio-2.0.dll -OUT2BIN+=glib$/glib-2.0.dll -OUT2BIN+=gmodule$/gmodule-2.0.dll -OUT2BIN+=gobject$/gobject-2.0.dll -OUT2BIN+=gthread$/gthread-2.0.dll +OUT2BIN+=gio$/giolo.dll +OUT2BIN+=glib$/gliblo.dll +OUT2BIN+=gmodule$/gmodulelo.dll +OUT2BIN+=gobject$/gobjectlo.dll +OUT2BIN+=gthread$/gthreadlo.dll OUT2BIN+=gobject$/glib-mkenums OUT2BIN+=gobject$/glib-genmarshal.exe -- cgit From eef313e6a5a5fa9c4ea6ed88e3247ca04280dcdc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 16:49:42 +0300 Subject: Propagate dmake verbosity and parallelism to gnumake --- librsvg/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index af082c3eb5c9..9ddc809b9bb9 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -77,7 +77,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ - $(GNUMAKE) + $(GNUMAKE) $(!eq,$(VERBOSE),$(NULL) V=1) -j$(MAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER -- cgit From 4560a620db00d31872fdb772ce04bb00bc1c7839 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Fri, 3 Jun 2011 18:51:55 +0200 Subject: configure exists for a reason. Don't redefine the stuff in random makefiles AKA: fix compiling libcroco against SDK-libxml (Mac) --- libcroco/makefile.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 814f80404ad4..4888bfa405bc 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,20 +51,14 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" -.IF "$(SYSTEM_LIBXML)"=="YES" -LIBXML2_INCLUDE=-I/usr/include/libxml2 -.ELSE -LIBXML2_INCLUDE= -.ENDIF CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ ./configure \ --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 $(LIBXML2_INCLUDE)" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ - LIBXML2_CFLAGS=" " \ - LIBXML2_LIBS="-lxml2" + LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)" CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) -- cgit From af375a927a05aa8faf2507e63f9d483d7eb0943d Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sat, 4 Jun 2011 17:25:47 +0200 Subject: conditionalize libxml dependency --- librsvg/prj/build.lst | 2 +- libxml2/makefile.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/librsvg/prj/build.lst b/librsvg/prj/build.lst index d667da5c7b0b..05eaffd0085b 100644 --- a/librsvg/prj/build.lst +++ b/librsvg/prj/build.lst @@ -1,3 +1,3 @@ -rg librsvg : libxml2 pango libcroco libgsf cairo gdk-pixbuf glib gettext soltools NULL +rg librsvg : LIBXML2:libxml2 pango libcroco libgsf cairo gdk-pixbuf glib gettext soltools NULL rg librsvg usr1 - all rg_mkout NULL rg librsvg nmake - all rg_librsvg NULL diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 78511bfbf82b..ca0bee5a372f 100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_libxml2 .IF "$(SYSTEM_LIBXML)" == "YES" all: - @echo "An already available installation of libxml should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of libxml should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- -- cgit From a7dcaae8264ee0cfdf9e4bcce06c042b2f65e602 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 4 Jun 2011 19:04:35 +0300 Subject: Fix libpng build for iOS Ugh, the patch for libpng is silly, but I didn't bother now fixing the silliness, just added the case for iOS, too. --- libpng/libpng-1.5.1.patch | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.1.patch index b64d92430f55..b69735efeff8 100644 --- a/libpng/libpng-1.5.1.patch +++ b/libpng/libpng-1.5.1.patch @@ -233,16 +233,20 @@ +#endif /* PNGLCONF_H */ --- misc/libpng-1.5.1/pngstruct.h 2011-02-03 05:58:17.000000000 +0100 +++ misc/build/libpng-1.5.1/pngstruct.h 2011-03-24 21:47:23.380397048 +0100 -@@ -24,7 +24,11 @@ +@@ -24,7 +24,15 @@ * in this structure and is required for decompressing the LZ compressed * data in PNG files. */ -+#if defined MACOSX ++/* WTF, surely this should depend explicitly on whether using the system or ++ * internal zlib, not on OS... But yeah, so maybe MacOSX (and iOS) are the only OSes for which ++ * we use a system zlib but internal libpng, at least by default. ++ */ ++#if defined MACOSX || defined IOS #include "zlib.h" +#else +#include +#endif - + struct png_struct_def { --- misc/libpng-1.5.1/pngtest.c 2011-02-03 05:58:17.000000000 +0100 @@ -251,7 +255,7 @@ * of files at once by typing "pngtest -m file1.png file2.png ..." */ -+#if defined MACOSX ++#if defined MACOSX || defined IOS #include "zlib.h" +#else +#include @@ -267,7 +271,7 @@ #endif -#include "zlib.h" /* For crc32 */ -+#if defined MACOSX ++#if defined MACOSX || defined IOS +#include "zlib.h" +#else +#include -- cgit From fe8fb7e51913099555dec6aa73650d60dbfda570 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sat, 4 Jun 2011 18:20:31 +0200 Subject: data/mappings/ucm*.mk & data/translit/trn*.mk don't exist in current icu anymore --- icu/makefile.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index 6395e1f7bbe6..fe9f43c904f4 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -79,9 +79,6 @@ icu_CFLAGS+=-O $(ARCH_FLAGS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) -# remove conversion and transliteration data to reduce binary size. -CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ; - # until someone introduces SOLARIS 64-bit builds .IF "$(OS)"=="SOLARIS" DISABLE_64BIT=--enable-64bit-libs=no @@ -167,7 +164,6 @@ OUT2BIN= \ .IF "$(GUI)"=="WNT" CONFIGURE_DIR=source .IF "$(COM)"=="GCC" -CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ; .IF "$(MINGW_SHARED_GCCLIB)"=="YES" icu_LDFLAGS+=-shared-libgcc .ENDIF -- cgit From f0ffdd64179e6808bc455891f198691e21055104 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sat, 4 Jun 2011 18:51:16 +0200 Subject: add --disable-dependency-tracking, --disable-acl, verbosity switches --- gettext/makefile.mk | 69 +++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/gettext/makefile.mk b/gettext/makefile.mk index 3b52dea41569..cf13c736aed2 100644 --- a/gettext/makefile.mk +++ b/gettext/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_gettext .IF "$(SYSTEM_GETTEXT)" == "YES" all: - @echo "An already available installation of gettext should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of gettext should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -53,43 +53,44 @@ PATCH_FILES= .IF "$(OS)"=="MACOSX" CONFIGURE_DIR= -CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-curses --without-emacs --without-git --disable-java +CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) +CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) EXTRPATH=LOADER -OUT2LIB+=gettext-tools$/intl$/.libs$/libintl.*.dylib -OUT2LIB+=gettext-runtime$/libasprintf$/.libs$/libasprintf.*.dylib -OUT2LIB+=gettext-tools$/gnulib-lib$/.libs$/libgettextlib-*.dylib -OUT2LIB+=gettext-tools$/src$/.libs$/libgettextsrc-*.dylib -OUT2LIB+=gettext-tools$/libgettextpo$/.libs$/libgettextpo.*.dylib - -OUT2INC+=gettext-tools$/intl$/libintl.h -OUT2INC+=gettext-runtime$/libasprintf$/autosprintf.h -OUT2INC+=gettext-tools$/libgettextpo$/gettext-po.h - -OUT2BIN+=gettext-tools$/src$/.libs$/msgattrib -OUT2BIN+=gettext-tools$/src$/.libs$/msgcat -OUT2BIN+=gettext-tools$/src$/.libs$/msgcmp -OUT2BIN+=gettext-tools$/src$/.libs$/msgcomm -OUT2BIN+=gettext-tools$/src$/.libs$/msgconv -OUT2BIN+=gettext-tools$/src$/.libs$/msgen -OUT2BIN+=gettext-tools$/src$/.libs$/msgexec -OUT2BIN+=gettext-tools$/src$/.libs$/msgfilter -OUT2BIN+=gettext-tools$/src$/.libs$/msgfmt -OUT2BIN+=gettext-tools$/src$/.libs$/msggrep -OUT2BIN+=gettext-tools$/src$/.libs$/msginit -OUT2BIN+=gettext-tools$/src$/.libs$/msgmerge -OUT2BIN+=gettext-tools$/src$/.libs$/msgunfmt -OUT2BIN+=gettext-tools$/src$/.libs$/msguniq -OUT2BIN+=gettext-tools$/src$/.libs$/urlget -OUT2BIN+=gettext-tools$/src$/.libs$/xgettext +OUT2LIB+=gettext-tools/intl/.libs/libintl.*.dylib +OUT2LIB+=gettext-runtime/libasprintf/.libs/libasprintf.*.dylib +OUT2LIB+=gettext-tools/gnulib-lib/.libs/libgettextlib-*.dylib +OUT2LIB+=gettext-tools/src/.libs/libgettextsrc-*.dylib +OUT2LIB+=gettext-tools/libgettextpo/.libs/libgettextpo.*.dylib + +OUT2INC+=gettext-tools/intl/libintl.h +OUT2INC+=gettext-runtime/libasprintf/autosprintf.h +OUT2INC+=gettext-tools/libgettextpo/gettext-po.h + +OUT2BIN+=gettext-tools/src/.libs/msgattrib +OUT2BIN+=gettext-tools/src/.libs/msgcat +OUT2BIN+=gettext-tools/src/.libs/msgcmp +OUT2BIN+=gettext-tools/src/.libs/msgcomm +OUT2BIN+=gettext-tools/src/.libs/msgconv +OUT2BIN+=gettext-tools/src/.libs/msgen +OUT2BIN+=gettext-tools/src/.libs/msgexec +OUT2BIN+=gettext-tools/src/.libs/msgfilter +OUT2BIN+=gettext-tools/src/.libs/msgfmt +OUT2BIN+=gettext-tools/src/.libs/msggrep +OUT2BIN+=gettext-tools/src/.libs/msginit +OUT2BIN+=gettext-tools/src/.libs/msgmerge +OUT2BIN+=gettext-tools/src/.libs/msgunfmt +OUT2BIN+=gettext-tools/src/.libs/msguniq +OUT2BIN+=gettext-tools/src/.libs/urlget +OUT2BIN+=gettext-tools/src/.libs/xgettext .ELIF "$(OS)"=="IOS" -BUILD_DIR=gettext-runtime$/intl +BUILD_DIR=gettext-runtime/intl BUILD_ACTION=dmake .IF "$(VERBOSE)"!="" BUILD_ACTION+=VERBOSE=t @@ -100,11 +101,11 @@ ADDITIONAL_FILES=\ gettext-runtime/intl/libgnuintl.h \ gettext-runtime/intl/libintl.h \ gettext-runtime/config.h -OUT2INC+=gettext-runtime$/intl$/libintl.h +OUT2INC+=gettext-runtime/intl/libintl.h .ELIF "$(OS)"=="WNT" -BUILD_DIR=gettext-runtime$/intl +BUILD_DIR=gettext-runtime/intl BUILD_ACTION=dmake PATCH_FILES=gettext-0.18.1.1.patch ADDITIONAL_FILES=\ @@ -112,7 +113,7 @@ ADDITIONAL_FILES=\ gettext-runtime/intl/libgnuintl.h \ gettext-runtime/intl/libintl.h \ gettext-runtime/config.h -OUT2INC+=gettext-runtime$/intl$/libintl.h +OUT2INC+=gettext-runtime/intl/libintl.h .ELSE .ENDIF -- cgit From 6654a13382259f6908b12786fd909fe514059ff4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 5 Jun 2011 01:21:28 +0300 Subject: No ICU_NATIVE_BUILD_ROOT used any more --- icu/makefile.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/icu/makefile.mk b/icu/makefile.mk index fe9f43c904f4..7cc1487aca0c 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -111,7 +111,8 @@ STATIC_OR_SHARED=--disable-static --enable-shared .ENDIF .IF "$(CROSS_COMPILING)"!="" -BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(ICU_NATIVE_BUILD_ROOT) +# We require that the cross-build-toolset target from the top Makefile(.in) has bee built +BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source .ENDIF CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -- cgit From 718381b51c459b55ce25326215fe0edce5572e88 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 00:30:56 +0300 Subject: Fix cairo build when cross-compiling to ppc MacOSX --- cairo/cairo/makefile.mk | 3 +++ cairo/pixman/makefile.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 0d3cd3344332..abe850db851e 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -109,6 +109,9 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF cairo_CPPFLAGS+=$(EXTRA_CDEFS) cairo_LDFLAGS+=$(EXTRA_LINKFLAGS) BUILD_ACTION=$(GNUMAKE) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 83ea75922178..b344520f66af 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -85,6 +85,9 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)" .ENDIF # "$(EXTRA_CDEFS)"!="" .ENDIF # "$(SYSBASE)"!="" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From a3c369662401501a5ebad8fe30f7e23cbce9949d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 01:07:50 +0300 Subject: Fix cross-compilation to ppc MacOSX Yeah, just build all the unneeded stuff (the executables like the msgfmt command and their support libraries) in this case too, for now. (We obviously won't be able to run ppc exectuables when cross-compiling from Intel Mac.) --- gettext/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gettext/makefile.mk b/gettext/makefile.mk index cf13c736aed2..5b82a3c5fb56 100644 --- a/gettext/makefile.mk +++ b/gettext/makefile.mk @@ -57,6 +57,10 @@ CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) $(eq,$(VERB CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From 8cae99e1be367fc801acaaadfe4879ff1ebb4aa4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 02:03:02 +0300 Subject: Pre-cache necessary stuff also when cross-compiling for MacOSX --- glib/makefile.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/glib/makefile.mk b/glib/makefile.mk index 18e180c401d9..280b1a2a0b4b 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -64,6 +64,15 @@ FRAMEWORK=-framework CoreFoundation CONFIGURE_FLAGS=--disable-static .ENDIF +.IF "$(OS)"=="MACOSX" && "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+= \ + glib_cv_stack_grows=no \ + glib_cv_uscore=yes \ + ac_cv_func_posix_getpwuid_r=yes \ + ac_cv_func_posix_getgrgid_r=yes \ + ac_cv_func__NSGetEnviron=yes +.ENDIF + CONFIGURE_FLAGS+=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CONFIGURE_FLAGS+=--disable-fam CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX" -- cgit From 78f9b77628e5288e47ad5de4722c4a69c6295406 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 09:07:30 +0300 Subject: Always compare CROSS_COMPILING explicitly to "YES" --- berkeleydb/makefile.mk | 2 +- cairo/cairo/makefile.mk | 4 ++-- cairo/pixman/makefile.mk | 4 ++-- curl/makefile.mk | 2 +- expat/makefile.mk | 2 +- gettext/makefile.mk | 2 +- glib/makefile.mk | 2 +- hunspell/makefile.mk | 2 +- icu/makefile.mk | 2 +- libxml2/makefile.mk | 2 +- libxslt/makefile.mk | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) mode change 100755 => 100644 libxml2/makefile.mk diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index f755075e9f16..20c53409c7ae 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -103,7 +103,7 @@ CONFIGURE_FLAGS+= --enable-shared .IF "$(OS)"=="MACOSX" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index abe850db851e..754ceba71f13 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -109,7 +109,7 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF cairo_CPPFLAGS+=$(EXTRA_CDEFS) @@ -154,7 +154,7 @@ CONFIGURE_FLAGS=--disable-shared CONFIGURE_FLAGS=--disable-static --enable-xlib .ENDIF CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index b344520f66af..0a1d443942c3 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -85,7 +85,7 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)" CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)" .ENDIF # "$(EXTRA_CDEFS)"!="" .ENDIF # "$(SYSBASE)"!="" -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) @@ -129,7 +129,7 @@ CONFIGURE_FLAGS=--disable-shared CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)" -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=$(GNUMAKE) diff --git a/curl/makefile.mk b/curl/makefile.mk index c3a36b201fd8..dc9d74d42e41 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -86,7 +86,7 @@ CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/expat/makefile.mk b/expat/makefile.mk index efcd82270ff4..857468e4b4c7 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -55,7 +55,7 @@ CONFIGURE_ACTION= CONFIGURE_ACTION=.$/configure .ENDIF -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/gettext/makefile.mk b/gettext/makefile.mk index 5b82a3c5fb56..b6443f5fafb5 100644 --- a/gettext/makefile.mk +++ b/gettext/makefile.mk @@ -57,7 +57,7 @@ CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) $(eq,$(VERB CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/glib/makefile.mk b/glib/makefile.mk index 280b1a2a0b4b..c1bb0692a16a 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -79,7 +79,7 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX" CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) $(FRAMEWORK)" -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index d1498cdb8483..5a6ea0cccafb 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -66,7 +66,7 @@ CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/icu/makefile.mk b/icu/makefile.mk index 7cc1487aca0c..fca782f61a7c 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -110,7 +110,7 @@ STATIC_OR_SHARED=--enable-static --disable-shared STATIC_OR_SHARED=--disable-static --enable-shared .ENDIF -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" # We require that the cross-build-toolset target from the top Makefile(.in) has bee built BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source .ENDIF diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk old mode 100755 new mode 100644 index ca0bee5a372f..5091360b94f3 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -110,7 +110,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .IF "$(debug)"!="" CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug .ENDIF -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF .ENDIF diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index f9ca45113634..7167adf3af46 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -123,7 +123,7 @@ CONFIGURE_FLAGS=--disable-shared CONFIGURE_FLAGS=--disable-static .ENDIF CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes -.IF "$(CROSS_COMPILING)"!="" +.IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) -- cgit From 251b4d282b26d65ff17fd404727e9359f495b227 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 6 Jun 2011 18:10:24 +0200 Subject: don't limit the _POSIX_SEMAPHORES+0 to FreeBSD (Mac needs it as well), rediff please guys'n'gals: Use dmake create_patch when updating/creating new patches. And when replacing patches instead of adding ones, use solenv/bin/patch_sanitizer.pl --- python/Python-2.6.1.patch | 254 +++++++++++++++++++++------------------------- 1 file changed, 114 insertions(+), 140 deletions(-) diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index 0e045c484eef..ac70bab33f70 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -1,5 +1,5 @@ ---- misc/build/Python-2.6.1/Include/pyport.h Wed Jun 11 09:41:16 2008 -+++ misc/build/Python-2.6.1/Include/pyport.h Fri Apr 17 09:02:52 2009 +--- misc/Python-2.6.1/Include/pyport.h 2008-06-11 09:41:16.000000000 +0200 ++++ misc/build/Python-2.6.1/Include/pyport.h 2011-06-06 17:31:17.000000000 +0200 @@ -449,11 +449,6 @@ in platform-specific #ifdefs. **************************************************************************/ @@ -12,8 +12,8 @@ #ifdef __BEOS__ /* Unchecked */ /* It's in the libs, but not the headers... - [cjh] */ ---- misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200 -+++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2009-03-09 22:48:14.546329900 +0100 +--- misc/Python-2.6.1/PCbuild/pcbuild.sln 2008-06-27 04:30:34.000000000 +0200 ++++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln 2011-06-06 17:31:17.000000000 +0200 @@ -15,16 +15,6 @@ {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} EndProjectSection @@ -31,7 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}" -@@ -38,12 +38,6 @@ +@@ -38,12 +28,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -44,7 +44,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -69,34 +69,18 @@ +@@ -69,12 +53,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -57,12 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" ProjectSection(ProjectDependencies) = postProject {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} - {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" - ProjectSection(ProjectDependencies) = postProject +@@ -87,16 +65,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -79,7 +74,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -114,19 +114,6 @@ +@@ -112,19 +80,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -99,7 +94,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -162,20 +162,20 @@ +@@ -162,20 +117,20 @@ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 @@ -128,7 +123,7 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 -@@ -226,20 +226,20 @@ +@@ -226,20 +181,20 @@ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32 {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32 @@ -157,7 +152,7 @@ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 -@@ -448,7 +448,7 @@ +@@ -481,7 +436,7 @@ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64 {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32 @@ -166,8 +161,8 @@ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64 {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32 ---- misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj -+++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj +--- misc/Python-2.6.1/PCbuild/make_versioninfo.vcproj 2008-06-12 23:58:20.000000000 +0200 ++++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj 2011-06-06 17:31:17.000000000 +0200 @@ -124,6 +124,8 @@ InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" @@ -177,7 +172,7 @@ /> + + + + + + + + + +--- misc/Python-2.6.1/PCbuild/make_buildinfo.vcproj 2007-11-30 20:18:08.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcproj 2011-06-06 17:31:17.000000000 +0200 @@ -119,6 +119,9 @@ /> @@ -237,8 +279,8 @@ - Value="$(HOST_PYTHON)" - /> ---- misc/build/Python-2.6.1/PCbuild/debug.vsprops -+++ misc/build/Python-2.6.1/PCbuild/debug.vsprops +--- misc/Python-2.6.1/PCbuild/debug.vsprops 2008-04-03 20:27:06.000000000 +0200 ++++ misc/build/Python-2.6.1/PCbuild/debug.vsprops 2011-06-06 17:31:17.000000000 +0200 @@ -10,6 +10,6 @@ /> ---- misc/build/Python-2.6.1/PCbuild/kill_python.vcproj -+++ misc/build/Python-2.6.1/PCbuild/kill_python.vcproj +--- misc/Python-2.6.1/PCbuild/kill_python.vcproj 2008-06-14 00:38:33.000000000 +0200 ++++ misc/build/Python-2.6.1/PCbuild/kill_python.vcproj 2011-06-06 17:31:17.000000000 +0200 @@ -54,7 +54,7 @@ /> - - - - - - - -@@ -310,7 +310,7 @@ - /> - - - ---- misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops -+++ misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops -@@ -15,13 +15,13 @@ +--- misc/Python-2.6.1/PCbuild/pyd_d.vsprops 2008-11-06 18:29:54.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops 2011-06-06 17:31:17.000000000 +0200 +@@ -11,13 +11,13 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="false" PreprocessorDefinitions="Py_BUILD_CORE_MODULE" @@ -350,8 +336,8 @@ + Value="$(SolutionDir)python.exe" /> ---- misc/build/Python-2.6.1/PCbuild/python.vcproj -+++ misc/build/Python-2.6.1/PCbuild/python.vcproj +--- misc/Python-2.6.1/PCbuild/python.vcproj 2008-06-12 23:58:20.000000000 +0200 ++++ misc/build/Python-2.6.1/PCbuild/python.vcproj 2011-06-06 17:31:17.000000000 +0200 @@ -191,7 +191,7 @@ EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="" @@ -391,8 +377,8 @@ BaseAddress="0x1d000000" /> = 1400 && defined(__STDC_SECURE_LIB__) /* Set CRT argument error handler */ prevCrtHandler = _set_invalid_parameter_handler(InvalidParameterHandler); @@ -463,15 +449,15 @@ #endif } -@@ -2170,6 +2170,5 @@ +@@ -2170,6 +2168,5 @@ #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) /* reset CRT error handling */ _set_invalid_parameter_handler(prevCrtHandler); - _CrtSetReportMode(_CRT_ASSERT, prevCrtReportMode); #endif } ---- misc/build/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000 -+++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000 +--- misc/Python-2.6.1/Lib/test/test_threading.py 2008-09-30 22:41:13.000000000 +0200 ++++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2011-06-06 17:31:17.000000000 +0200 @@ -382,7 +382,7 @@ return # Skip platforms with known problems forking from a worker thread. @@ -481,10 +467,9 @@ print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread' ' due to known OS bugs on'), sys.platform return - ---- misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure.orig 2008-05-24 00:06:50.000000000 +0900 -+++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure 2008-10-09 20:24:02.000000000 +0900 -@@ -4725,6 +4725,6 @@ +--- misc/Python-2.6.1/Modules/_ctypes/libffi/configure 2008-05-23 17:06:50.000000000 +0200 ++++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure 2011-06-06 17:31:17.000000000 +0200 +@@ -4725,7 +4725,7 @@ rm -rf conftest* ;; @@ -492,10 +477,10 @@ +amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. - ---- misc/build/Python-2.6.1/Python/thread_pthread.h.orig 2006-06-13 16:04:24.000000000 +0100 -+++ misc/build/Python-2.6.1/Python/thread_pthread.h 2009-03-12 10:55:49.000000000 +0000 -@@ -26,13 +26,18 @@ + echo 'int i;' > conftest.$ac_ext +--- misc/Python-2.6.1/Python/thread_pthread.h 2006-06-13 17:04:24.000000000 +0200 ++++ misc/build/Python-2.6.1/Python/thread_pthread.h 2011-06-06 17:33:34.000000000 +0200 +@@ -26,6 +26,10 @@ #endif #endif @@ -506,16 +491,7 @@ /* The POSIX spec says that implementations supporting the sem_* family of functions must indicate this by defining _POSIX_SEMAPHORES. */ - #ifdef _POSIX_SEMAPHORES - /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so - we need to add 0 to make it work there as well. */ --#if (_POSIX_SEMAPHORES+0) == -1 -+#if defined(__FreeBSD__) && __FreeBSD_version < 701104 && \ -+ (_POSIX_SEMAPHORES+0) == -1 - #define HAVE_BROKEN_POSIX_SEMAPHORES - #else - #include -@@ -44,7 +49,6 @@ +@@ -44,7 +48,6 @@ in default setting. So the process scope is preferred to get enough number of threads to work. */ #ifdef __FreeBSD__ @@ -523,7 +499,7 @@ #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101 #undef PTHREAD_SYSTEM_SCHED_SUPPORTED #endif -@@ -149,6 +153,9 @@ +@@ -149,6 +152,9 @@ { pthread_t th; int status; @@ -533,7 +509,7 @@ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) pthread_attr_t attrs; #endif -@@ -177,7 +184,10 @@ +@@ -177,7 +183,10 @@ #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM); #endif @@ -545,7 +521,7 @@ status = pthread_create(&th, #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) &attrs, -@@ -188,6 +198,9 @@ +@@ -188,6 +197,9 @@ (void *)arg ); @@ -555,8 +531,17 @@ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) pthread_attr_destroy(&attrs); #endif ---- misc/build/Python-2.6.1/configure 2008-11-17 02:57:10.000000000 +0900 -+++ misc/build/Python-2.6.1/configure 2009-03-23 21:18:42.000000000 +0900 +--- misc/Python-2.6.1/configure 2008-11-16 18:57:10.000000000 +0100 ++++ misc/build/Python-2.6.1/configure 2011-06-06 17:31:17.000000000 +0200 +@@ -4102,7 +4102,7 @@ + ;; + SunOS*) + LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)' ++ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; @@ -4110,11 +4110,6 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' @@ -569,19 +554,8 @@ INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) ---- misc/build/Python-2.6.1/configure Sun Nov 16 18:57:10 2008 -+++ misc/build/Python-2.6.1/configure Thu Apr 16 15:16:03 2009 -@@ -4102,7 +4102,7 @@ - ;; - SunOS*) - LDLIBRARY='libpython$(VERSION).so' -- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)' -+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; ---- misc/build/Python-2.6.1/PC/pyconfig.h -+++ misc/build/Python-2.6.1/PC/pyconfig.h +--- misc/Python-2.6.1/PC/pyconfig.h 2008-06-13 02:42:22.000000000 +0200 ++++ misc/build/Python-2.6.1/PC/pyconfig.h 2011-06-06 17:31:17.000000000 +0200 @@ -322,11 +322,7 @@ /* So MSVC users need not specify the .lib file in their Makefile (other compilers are generally -- cgit From e9d4bad4408320425dd0916065f4a484a9393af1 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 6 Jun 2011 18:21:14 +0200 Subject: allow building internal Python on Mac (needs to be built as framework) fixes #i111496# (meta), #i111498# & #i111500# (along with the similar commits to the other repos) --- python/Python-2.6.1-arch_i386.patch | 11 +++++++ python/Python-2.6.1-arch_ppc.patch | 11 +++++++ python/Python-2.6.1-py8067.patch | 12 +++++++ python/makefile.mk | 63 +++++++++++++++++++++++++++++++++---- python/prj/d.lst | 16 +++++++--- python/pyversion.mk | 8 +++-- 6 files changed, 108 insertions(+), 13 deletions(-) create mode 100644 python/Python-2.6.1-arch_i386.patch create mode 100644 python/Python-2.6.1-arch_ppc.patch create mode 100644 python/Python-2.6.1-py8067.patch diff --git a/python/Python-2.6.1-arch_i386.patch b/python/Python-2.6.1-arch_i386.patch new file mode 100644 index 000000000000..6dca2c327abb --- /dev/null +++ b/python/Python-2.6.1-arch_i386.patch @@ -0,0 +1,11 @@ +--- misc/Python-2.6.1/configure 2010-05-06 20:24:36.000000000 +0200 ++++ misc/build/Python-2.6.1/configure 2010-05-06 20:25:17.000000000 +0200 +@@ -4653,7 +4653,7 @@ + if test "${enable_universalsdk}"; then + UNIVERSAL_ARCH_FLAGS="" + if test "$UNIVERSAL_ARCHS" = "32-bit" ; then +- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" ++ UNIVERSAL_ARCH_FLAGS="-arch i386" + ARCH_RUN_32BIT="" + + elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then diff --git a/python/Python-2.6.1-arch_ppc.patch b/python/Python-2.6.1-arch_ppc.patch new file mode 100644 index 000000000000..d4073ac9de94 --- /dev/null +++ b/python/Python-2.6.1-arch_ppc.patch @@ -0,0 +1,11 @@ +--- misc/Python-2.6.1/configure 2010-05-06 20:24:36.000000000 +0200 ++++ misc/build/Python-2.6.1/configure 2010-05-06 20:25:17.000000000 +0200 +@@ -4653,7 +4653,7 @@ + if test "${enable_universalsdk}"; then + UNIVERSAL_ARCH_FLAGS="" + if test "$UNIVERSAL_ARCHS" = "32-bit" ; then +- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" ++ UNIVERSAL_ARCH_FLAGS="-arch ppc" + ARCH_RUN_32BIT="" + + elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then diff --git a/python/Python-2.6.1-py8067.patch b/python/Python-2.6.1-py8067.patch new file mode 100644 index 000000000000..7a88a9348058 --- /dev/null +++ b/python/Python-2.6.1-py8067.patch @@ -0,0 +1,12 @@ +http://bugs.python.org/issue8067 - needed for building on Mac OSX >= 10.6 +--- misc/Python-2.6.1/configure 2010-05-06 20:59:52.000000000 +0200 ++++ misc/build/Python-2.6.1/configure 2010-05-06 20:59:46.000000000 +0200 +@@ -2120,6 +2120,8 @@ + # has no effect, don't bother defining them + Darwin/[6789].*) + define_xopen_source=no;; ++ Darwin/1[0-9].*) ++ define_xopen_source=no;; + # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but + # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined + # or has another value. By not (re)defining it, the defaults come in place. diff --git a/python/makefile.mk b/python/makefile.mk index f51e7e88398f..b43147dd3943 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -40,8 +40,8 @@ TARGET=so_python .IF "$(SYSTEM_PYTHON)" == "YES" all: - @echo "An already available installation of python should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of python should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -81,14 +81,27 @@ python_LDFLAGS+=$(ARCH_FLAGS) python_CFLAGS=-g0 .ENDIF -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" +CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" + .IF "$(OS)$(CPU)" == "SOLARISI" CONFIGURE_ACTION += --disable-ipv6 .ENDIF + +.IF "$(OS)" == "MACOSX" +PATCH_FILES+=Python-2.6.1-py8067.patch +# don't build dual-arch version as OOo itself is not universal binary either +PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch + +MACDEVSDK*=/Developer/SDKs/MacOSX10.4u.sdk +CONFIGURE_ACTION+=--enable-universalsdk=$(MACDEVSDK) --with-universal-archs=32-bit --enable-framework=/python-inst --with-framework-name=OOoPython +ALLTAR: $(MISC)/OOoPython.framework.zip + +.ENDIF + .IF "$(OS)"=="AIX" CONFIGURE_ACTION += --disable-ipv6 --with-threads .ENDIF -BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include +BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install DESTDIR=$(MYCWD) && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include .ELSE # ---------------------------------- # WINDOWS @@ -182,9 +195,47 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h ALLTAR : $(PYVERSIONFILE) .ENDIF # "$(L10N_framework)"=="" +# rule to allow relocating the whole framework, removing reference to buildinstallation directory +$(PACKAGE_DIR)/fixscripts: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + @echo remove build installdir from scripts + $(COMMAND_ECHO)for file in \ + $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/2to3 \ + $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/idle$(PYMAJOR).$(PYMINOR) \ + $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/pydoc$(PYMAJOR).$(PYMINOR) \ + $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/python$(PYMAJOR).$(PYMINOR)-config \ + $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/smtpd$(PYMAJOR).$(PYMINOR).py ; do \ + {{ rm "$$file" && awk '\ + BEGIN {{print "\ +#!/bin/bash\n\ +origpath=$$(pwd)\n\ +bindir=$$(cd $$(dirname \"$$0\") ; pwd)\n\ +cd \"$$origpath\"\n\ +\"$$bindir/../Resources/Python.app/Contents/MacOS/OOoPython\" - $$@ < "$$file" ; }} < "$$file" ; chmod +x "$$file" ; done + @touch $@ + +$(PACKAGE_DIR)/fixinstallnames: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + @echo remove build installdir from OOoPython + $(COMMAND_ECHO)install_name_tool -change \ + /python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython \ + @executable_path/../../../../OOoPython \ + $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/Resources/Python.app/Contents/MacOS/OOoPython + @touch $@ + +$(MISC)/OOoPython.framework.zip: $(PACKAGE_DIR)/fixinstallnames $(PACKAGE_DIR)/fixscripts + @-rm -f $@ + @echo creating $@ + $(COMMAND_ECHO)cd $(MISC)/build/python-inst && find OOoPython.framework \ + -not -type l -not -name Info.plist.in \ + -not -name pythonw$(PYMAJOR).$(PYMINOR) \ + -not -name python$(PYMAJOR).$(PYMINOR) -print0 | \ + xargs -0 zip $(ZIP_VERBOSITY) ../../$(@:f) $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) - -rm -f $@ - cat $? > $@ + @-rm -f $@ + @echo process $@ + $(COMMAND_ECHO)sed 's#%%replaceme%%#$(MYCWD)/python-inst#g' < pyversion.mk > $@ .ENDIF # DISABLE_PYTHON != TRUE diff --git a/python/prj/d.lst b/python/prj/d.lst index 245ddb49a4d3..749515037664 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -1,3 +1,14 @@ +# MACOSX - start +mkdir: %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6 + +..\%__SRC%\misc\build\python-inst\OOoPython.framework\OOoPython %_DEST%\lib\OOoPython.framework\OOoPython +..\%__SRC%\misc\build\python-inst\OOoPython.framework\Versions\2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\* +..\%__SRC%\misc\build\python-inst\OOoPython.framework\Versions\2.6\include\python2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6\* +..\%__SRC%\misc\OOoPython.framework.zip %_DEST%\bin\OOoPython.framework.zip +# MACOSX - end + +..\%__SRC%\misc\pyversion.mk %_DEST%\inc\pyversion.mk + mkdir: %_DEST%\lib\python mkdir: %_DEST%\lib\python\lib-old mkdir: %_DEST%\lib\python\lib-tk @@ -69,8 +80,6 @@ mkdir: %_DEST%\lib\python\ctypes\macholib ..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\macholib\* %_DEST%\lib\python\ctypes\macholib\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\etree\* %_DEST%\lib\python\xml\etree -..\pyversion.mk %_DEST%\inc\pyversion.mk - ..\%__SRC%\misc\build\Python-2.6.1\Include\* %_DEST%\inc\python\* #unix ONLY ! @@ -81,9 +90,6 @@ mkdir: %_DEST%\lib\python\ctypes\macholib ..\%__SRC%\misc\build\python-inst\lib\libpython2.6.so.1.0 %_DEST%\lib\libpython2.6.so.1.0 symlink: %_DEST%\lib\libpython2.6.so.1.0 %_DEST%\lib\libpython2.6.so -# MacOS X -..\%__SRC%\misc\build\python-inst\lib\libpython2.6.dylib %_DEST%\lib\libpython2.6.dylib - #MingW ONLY ! ..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin\python.exe ..\%__SRC%\misc\build\Python-2.6.1\libpython2.6.dll %_DEST%\bin\libpython2.6.dll diff --git a/python/pyversion.mk b/python/pyversion.mk index 71b5acffd278..baba53838d3f 100644 --- a/python/pyversion.mk +++ b/python/pyversion.mk @@ -7,11 +7,15 @@ PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) .IF "$(GUI)" == "UNX" .IF "$(OS)" == "MACOSX" -PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib +PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).a +PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython +CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR) +# needed to fix install_name in pyuno +PYTHON_MAKEINSTALLDIR=%%replaceme%% .ELSE PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0 -.ENDIF PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR) +.ENDIF .ELSE .IF "$(COM)" == "GCC" PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll -- cgit From 2e9d324a6d4f0963ce8f7c18ca1f7f36179ff7ea Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 10:50:30 +0300 Subject: Pass --build and --host options when cross-compiling --- libgsf/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index 7e4613fde6c2..eadbe1013a6a 100755 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -86,6 +86,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From b5b085394038b8bd8d322dc693cb8576b5da87cf Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 10:50:49 +0300 Subject: chmod -x --- libgsf/makefile.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libgsf/makefile.mk diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk old mode 100755 new mode 100644 -- cgit From e634a528fa93533eab3681af579b5cb98d5f5e7a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 6 Jun 2011 16:40:31 +0300 Subject: Cross-compilation support for MacOSX --- gdk-pixbuf/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 1e89debb1612..201495d3cc6e 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -64,6 +64,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \ --disable-glibtest --without-libtiff --without-libjasper +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no +.ENDIF + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From 168c537165e75ee1e3d12935371e65f6f2d92bf6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 7 Jun 2011 00:05:37 +0300 Subject: Add cross-compilation support --- pango/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pango/makefile.mk b/pango/makefile.mk index a5c285438cfa..44fd08009c2f 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -68,6 +68,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" CONFIGURE_ACTION+="--without-x" +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + .IF "$(VERBOSE)"!="" VFLAG=V=1 .ENDIF -- cgit From ea445e1b3be2a2063cee3284a63678dd1a872921 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 7 Jun 2011 00:05:47 +0300 Subject: Add cross-compilation support --- librsvg/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 9ddc809b9bb9..664baf6e730c 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -76,6 +76,10 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) $(!eq,$(VERBOSE),$(NULL) V=1) -j$(MAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From c4b0c753716fd7c61507a48f00a548e12bda059e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 7 Jun 2011 00:05:57 +0300 Subject: Add cross-compilation support --- libcroco/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 4888bfa405bc..9e26dded174f 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -62,6 +62,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -- cgit -- cgit From 971fbd84812400341e9858959cd812f85fd49e4c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 9 Jun 2011 18:31:01 +0300 Subject: Cross-compilation support for Android --- libxml2/libxml2-configure.patch | 25 +++++++++++++++++++++++++ libxml2/makefile.mk | 2 +- libxml2/prj/d.lst | 3 ++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch index 4158c38ef47f..8694b6a4d328 100644 --- a/libxml2/libxml2-configure.patch +++ b/libxml2/libxml2-configure.patch @@ -1,3 +1,28 @@ +--- misc/libxml2-2.7.6/config.sub ++++ misc/build/libxml2-2.7.6/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +--- misc/libxml2-2.7.6/Makefile.in ++++ misc/build/libxml2-2.7.6/Makefile.in +@@ -41,9 +41,9 @@ + testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ + testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ + testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ +- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ ++ testapi$(EXEEXT) testModule$(EXEEXT) \ + runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \ +- runxmlconf$(EXEEXT) testrecurse$(EXEEXT) ++ runxmlconf$(EXEEXT) + bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ --- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 +++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 @@ -6271,8 +6271,8 @@ diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 5091360b94f3..0eb08019f1b6 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -123,7 +123,7 @@ EXTRPATH=URELIB OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint OUT2BIN+=xml2-config -.ELIF "$(OS)"=="IOS" +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" OUT2LIB+=.libs$/libxml2.a OUT2BIN+=xml2-config .ELIF "$(OS)"=="WNT" diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst index 9b5d736dbe99..e28c52e22415 100644 --- a/libxml2/prj/d.lst +++ b/libxml2/prj/d.lst @@ -3,7 +3,8 @@ mkdir: %_DEST%\inc\external\libxml ..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2 symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so ..\%__SRC%\lib\*.lib %_DEST%\lib -..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.a +..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a +..\%__SRC%\lib\libxml2.a %_DEST%\lib\libxml2.a ..\%__SRC%\bin\*.dll %_DEST%\bin ..\%__SRC%\bin\xmllint* %_DEST%\bin ..\%__SRC%\bin\xml2-config* %_DEST%\bin -- cgit From 46c6d9533b36c587b657f1e0e6e34c59b8ef74a1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 9 Jun 2011 18:38:45 +0300 Subject: Cross-compilation support for Android --- libxslt/libxslt-configure.patch | 11 +++++++++++ libxslt/makefile.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch index bfa0b512824e..3ec9de54ab47 100644 --- a/libxslt/libxslt-configure.patch +++ b/libxslt/libxslt-configure.patch @@ -1,3 +1,14 @@ +--- misc/libxslt-1.1.26/config.sub ++++ misc/build/libxslt-1.1.26/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007 +++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008 @@ -6195,9 +6195,9 @@ diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 7167adf3af46..dff40683bbda 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -138,7 +138,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib OUT2BIN+=xsltproc$/.libs$/xsltproc OUT2BIN+=xslt-config -.ELIF "$(OS)"=="IOS" +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" OUT2LIB+=libxslt$/.libs$/libxslt.a OUT2LIB+=libexslt$/.libs$/libexslt.a OUT2BIN+=xslt-config -- cgit From 496bba4a6898e0fda7a3ce0a74ed1dd254277992 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 9 Jun 2011 19:29:05 +0300 Subject: Cross-compilation support for Android --- curl/curl-7.19.7.patch | 22 ++++++++++++++++++++++ curl/makefile.mk | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch index 0e39cb700a35..ca25c230762b 100644 --- a/curl/curl-7.19.7.patch +++ b/curl/curl-7.19.7.patch @@ -1,3 +1,14 @@ +--- misc/curl-7.19.7/config.sub ++++ misc/build/curl-7.19.7/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/curl-7.19.7/configure 2009-11-04 13:26:02.000000000 +0100 +++ misc/build/curl-7.19.7/configure 2009-11-18 14:17:25.453125000 +0100 @@ -2735,8 +2735,8 @@ @@ -42,6 +53,17 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +--- misc/curl-7.19.7/include/curl/curl.h ++++ misc/build/curl-7.19.7/include/curl/curl.h +@@ -74,7 +74,7 @@ + require it! */ + #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ + defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ +- defined(ANDROID) ++ defined(__ANDROID__) + #include + #endif + --- misc/curl-7.19.7/lib/setup.h 2009-10-28 21:21:58.000000000 +0100 +++ misc/build/curl-7.19.7/lib/setup.h 2009-11-18 13:30:42.375000000 +0100 @@ -193,6 +193,7 @@ diff --git a/curl/makefile.mk b/curl/makefile.mk index dc9d74d42e41..dfc5720e882a 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -94,7 +94,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -.IF "$(OS)"=="IOS" +.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a .ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 -- cgit From d6964127f5e2c1a2ce6c29b5396bf4063120410c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 9 Jun 2011 19:40:37 +0300 Subject: Cross-compilation support for Android --- berkeleydb/db-4.7.25.patch | 11 +++++++++++ berkeleydb/makefile.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 8cf412d23e25..6077e6669c77 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -398,6 +398,17 @@ $(RM) -f $(libdb) $(LN) -s .libs/$(libdb_version) $(libdb) +--- misc/db-4.7.25.NC/dist/config.sub ++++ misc/build/db-4.7.25.NC/dist/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200 @@ -3757,8 +3757,10 @@ diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 20c53409c7ae..376b1d93dfe9 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -116,7 +116,7 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) -.IF "$(OS)"=="IOS" +.IF "$(OS)"=="IOS" || "$(OS)" == "ANDROID" OUT2LIB=$(BUILD_DIR)$/libdb*.a .ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) -- cgit From db280c82e6c2bd809aae83527b6293851f3aedb7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 9 Jun 2011 21:51:30 +0300 Subject: First attempt at Android support --- expat/expat-2.0.1.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch index bea3d01e0c4f..6c09d34f4676 100644 --- a/expat/expat-2.0.1.patch +++ b/expat/expat-2.0.1.patch @@ -1,3 +1,14 @@ +--- misc/expat-2.0.1/conftools/config.sub ++++ misc/build/expat-2.0.1/conftools/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008 +++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008 @@ -1 +1,89 @@ -- cgit From 3fafb2f3ead5fb533730ce5607e4421cfd85e28a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 10 Jun 2011 00:05:57 +0300 Subject: Use system zlib on Android, too --- libpng/libpng-1.5.1.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.1.patch index b69735efeff8..ebae94ac000a 100644 --- a/libpng/libpng-1.5.1.patch +++ b/libpng/libpng-1.5.1.patch @@ -238,10 +238,10 @@ * data in PNG files. */ +/* WTF, surely this should depend explicitly on whether using the system or -+ * internal zlib, not on OS... But yeah, so maybe MacOSX (and iOS) are the only OSes for which ++ * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which + * we use a system zlib but internal libpng, at least by default. + */ -+#if defined MACOSX || defined IOS ++#if defined MACOSX || defined IOS || defined ANDROID #include "zlib.h" +#else +#include @@ -255,7 +255,7 @@ * of files at once by typing "pngtest -m file1.png file2.png ..." */ -+#if defined MACOSX || defined IOS ++#if defined MACOSX || defined IOS || defined ANDROID #include "zlib.h" +#else +#include @@ -271,7 +271,7 @@ #endif -#include "zlib.h" /* For crc32 */ -+#if defined MACOSX || defined IOS ++#if defined MACOSX || defined IOS || defined ANDROID +#include "zlib.h" +#else +#include -- cgit From 95b0fe9f51462b2ee158bf50b83ccc849422f690 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 10 Jun 2011 00:07:14 +0300 Subject: Fix configury for Android, but won't build --- cairo/cairo-1.8.0.patch | 25 +++++++++++++++++++++++++ cairo/cairo/makefile.mk | 20 ++++++++++++++++++-- cairo/pixman-0.12.0.patch | 11 +++++++++++ cairo/pixman/makefile.mk | 2 +- 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch index d18396c0ac03..f2ce5b67bfd4 100644 --- a/cairo/cairo-1.8.0.patch +++ b/cairo/cairo-1.8.0.patch @@ -55,6 +55,17 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cai -CAIRO_HAS_SVG_SURFACE=1 +CAIRO_HAS_SVG_SURFACE=0 CAIRO_HAS_TEST_SURFACES=0 +--- misc/build/cairo-1.8.0.org/build/config.sub ++++ misc/build/cairo-1.8.0/build/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure --- misc/build/cairo-1.8.0.org/configure 2008-09-26 01:57:30.000000000 +0300 +++ misc/build/cairo-1.8.0/configure 2008-11-04 22:21:26.000000000 +0200 @@ -258,3 +269,17 @@ diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8. #include #define DEBUG_PS 0 +--- misc/build/cairo-1.8.0.org/src/cairo-output-stream.c ++++ misc/build/cairo-1.8.0/src/cairo-output-stream.c +@@ -281,7 +281,11 @@ + d = 0.0; + + locale_data = localeconv (); ++#ifdef __ANDROID__ ++ decimal_point = "."; ++#else + decimal_point = locale_data->decimal_point; ++#endif + decimal_point_len = strlen (decimal_point); + + assert (decimal_point_len != 0); diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 754ceba71f13..4059504e35bc 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -147,16 +147,32 @@ cairo_CFLAGS+=-march=i486 .ENDIF CONFIGURE_DIR= + +.IF "$(OS)"=="ANDROID" +# No pkg-config in the Android NDK +CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure +.ELSE CONFIGURE_ACTION=.$/configure +.ENDIF + .IF "$(OS)"=="IOS" CONFIGURE_FLAGS=--disable-shared .ELSE CONFIGURE_FLAGS=--disable-static --enable-xlib .ENDIF -CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) + +.IF "$(OS)"=="ANDROID" +CONFIGURE_FLAGS+=--disable-ft +.ELSE +CONFIGURE_FLAGS+=--enable-ft +.ENDIF + +CONFIGURE_FLAGS+=--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) + .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF + BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -212,7 +228,7 @@ OUT2BIN+=src$/.libs$/*.dll OUT2LIB+=src$/release$/*.lib OUT2BIN+=src$/release$/*.dll .ENDIF -.ELIF "$(OS)"=="IOS" +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" OUT2LIB+=src$/.libs$/libcairo-1.a .ELSE OUT2LIB+=src$/.libs$/libcairo.so* diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch index c3d21459828d..8694a8778ec1 100644 --- a/cairo/pixman-0.12.0.patch +++ b/cairo/pixman-0.12.0.patch @@ -1,3 +1,14 @@ +--- misc/build/pixman-0.12.0/config.sub ++++ misc/build/pixman-0.12.0/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/build/pixman-0.12.0/configure.orig 2008-09-17 20:14:40.000000000 +0300 +++ misc/build/pixman-0.12.0/configure 2008-11-08 21:17:00.000000000 +0200 @@ -19740,6 +19740,13 @@ diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 0a1d443942c3..d2124079c5d2 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -152,7 +152,7 @@ OUT2LIB+=pixman$/.libs$/*.a .ELSE OUT2LIB+=pixman$/release$/*.lib .ENDIF -.ELIF "$(OS)"=="IOS" +.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" OUT2LIB+=pixman$/.libs$/libpixman-1.a .ELSE OUT2LIB+=pixman$/.libs$/libpixman-1.so* -- cgit From cff5a8d0ee52252f9f5d42857c9985eb827f45dc Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Fri, 10 Jun 2011 16:50:35 +0200 Subject: get rid of some noise in the buildlog due to missing msgfmt o test.mo ./de.po; \ ../.././install-sh -c -d de/LC_MESSAGES; \ cp -f test.mo de/LC_MESSAGES /bin/sh: line 1: o: command not found cp: test.mo: No such file or directory make[5]: [test.mo] Error 1 (ignored) --- glib/glib-2.28.1.noise.patch | 12 ++++++++++++ glib/makefile.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 glib/glib-2.28.1.noise.patch diff --git a/glib/glib-2.28.1.noise.patch b/glib/glib-2.28.1.noise.patch new file mode 100644 index 000000000000..f42b08a97a64 --- /dev/null +++ b/glib/glib-2.28.1.noise.patch @@ -0,0 +1,12 @@ +--- misc/glib-2.28.1/gio/tests/Makefile.in 2011-02-18 16:22:00.000000000 +0100 ++++ misc/build/glib-2.28.1/gio/tests/Makefile.in 2011-06-10 16:37:05.000000000 +0200 +@@ -1020,7 +1020,9 @@ + proxy_LDADD = $(progs_ldadd) \ + $(top_builddir)/gthread/libgthread-2.0.la + ++ifneq ($(MSGFMT),) + MISC_STUFF = test.mo ++endif + DISTCLEANFILES = \ + applications/mimeinfo.cache \ + org.gtk.test.enums.xml \ diff --git a/glib/makefile.mk b/glib/makefile.mk index c1bb0692a16a..1b31d395eab6 100644 --- a/glib/makefile.mk +++ b/glib/makefile.mk @@ -49,7 +49,7 @@ TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e .IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS" -PATCH_FILES=glib-2.28.1.patch +PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch .IF "$(OS)"=="IOS" CONFIGURE_FLAGS= \ -- cgit From adb552574038ca62db0f3d1ccf0e80d75cb09f5e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 11 Jun 2011 17:44:45 +0300 Subject: Initial attempt at Android cross-compilation support Recognize the arm-linux-androideabi "triplet". (Actually I doubt that is a well-formed triplet at all, what are the Google people smoking?) Allow longer lines in pkgdata.cpp as the compiler command line gets quite long for cross-compilation to Android. Add the proper assembly source file format for Android to pkg_genc.c and use that. Probably a good idea to use --disable-dyload on Android (and iOS). Tweak gcc flags used for Android a bit to work around some Android C header weirdness related to strictness and 64-bit types. --- icu/icu4c-build.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++ icu/makefile.mk | 12 +++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index e5e4bd9b10a0..3a09610682ee 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -1,3 +1,88 @@ +--- misc/icu/source/config.sub ++++ misc/build/icu/source/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +--- misc/icu/source/configure ++++ misc/build/icu/source/configure +@@ -5438,7 +5438,7 @@ + else + icu_cv_host_frag=mh-linux-va + fi ;; +-*-*-linux*|*-pc-gnu) icu_cv_host_frag=mh-linux ;; ++*-*-linux*|*-pc-gnu|*-*-androideabi*) icu_cv_host_frag=mh-linux ;; + *-*-cygwin|*-*-mingw32) + if test "$GCC" = yes; then + cat >conftest.$ac_ext <<_ACEOF +@@ -7429,6 +7429,9 @@ + # Check to see if genccode can generate simple assembly. + GENCCODE_ASSEMBLY= + case "${host}" in ++*-linux-androideabi) ++ GENCCODE_ASSEMBLY="-a gcc-android" ++ ;; + *-linux*|i*86-*-*bsd*|i*86-pc-gnu) + if test "$GCC" = yes; then + # We're using gcc, and the simple -a gcc command line works for genccode +@@ -11115,6 +1115,10 @@ + # wchar_t can be used + CHECK_UTF16_STRING_RESULT="available" + ;; ++*-*-androideabi*) ++ # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t ++ CHECK_UTF16_STRING_RESULT="nope" ++ ;; + *) + ;; + esac +--- misc/icu/source/tools/toolutil/pkg_genc.c ++++ misc/build/icu/source/tools/toolutil/pkg_genc.c +@@ -145,6 +145,28 @@ + + ".long ","",HEX_0X + }, ++ {"gcc-android", ++ "\t.arch armv5te\n" ++ "\t.fpu softvfp\n" ++ "\t.eabi_attribute 20, 1\n" ++ "\t.eabi_attribute 21, 1\n" ++ "\t.eabi_attribute 23, 3\n" ++ "\t.eabi_attribute 24, 1\n" ++ "\t.eabi_attribute 25, 1\n" ++ "\t.eabi_attribute 26, 2\n" ++ "\t.eabi_attribute 30, 6\n" ++ "\t.eabi_attribute 18, 4\n" ++ "\t.file \"%s.s\"\n" ++ "\t.global %s\n" ++ "\t.section .rodata\n" ++ "\t.align 2\n" ++ "\t.type %s, %%object\n" ++ "%s:\n", ++ ++ "\t.word ", ++ "\t.section .note.GNU-stack,\"\",%%progbits\n", ++ HEX_0X ++ }, + {"sun", + "\t.section \".rodata\"\n" + "\t.align 8\n" +--- misc/icu/source/tools/pkgdata/pkgdata.cpp ++++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp +@@ -97,7 +97,7 @@ + #endif + + #define LARGE_BUFFER_MAX_SIZE 2048 +-#define SMALL_BUFFER_MAX_SIZE 512 ++#define SMALL_BUFFER_MAX_SIZE 2048 + + static void loadLists(UPKGOptions *o, UErrorCode *status); + --- misc/icu/source/common/putil.c 2010-09-29 20:37:22.000000000 +0200 +++ misc/build/icu/source/common/putil.c 2011-03-15 10:58:44.054592942 +0100 @@ -52,7 +52,7 @@ diff --git a/icu/makefile.mk b/icu/makefile.mk index fca782f61a7c..42ca8386b9aa 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -98,6 +98,16 @@ LDFLAGSADD += -Wl,--hash-style=both icu_CFLAGS+=-DUCONFIG_NO_FILE_IO .ENDIF +.IF "$(OS)"=="ANDROID" +# Problems with uint64_t on Android unless disabling strictness +DISABLE_STRICT=--disable-strict +.ENDIF + +.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +# Problems with uint64_t on Android unless disabling strictness +DISABLE_DYLOAD=--disable-dyload +.ENDIF + .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF @@ -116,7 +126,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu .ENDIF CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT)' +./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) ' CONFIGURE_FLAGS= -- cgit From f892f979ce17c70ccff5c802db17f24129628504 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sat, 11 Jun 2011 20:19:03 +0200 Subject: add dylib to the list of native python modules for Mac (for pyuno.dylib) --- python/Python-2.6.1-dylib_dynload.patch | 14 ++++++++++++++ python/makefile.mk | 5 ++--- python/pyversion.mk | 2 -- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 python/Python-2.6.1-dylib_dynload.patch diff --git a/python/Python-2.6.1-dylib_dynload.patch b/python/Python-2.6.1-dylib_dynload.patch new file mode 100644 index 000000000000..3e44502e389c --- /dev/null +++ b/python/Python-2.6.1-dylib_dynload.patch @@ -0,0 +1,14 @@ +add dylib to the extensions, to be able to load pyuno.dylib via "import pyuno" +--- misc/Python-2.6.1/Python/dynload_shlib.c 2006-01-04 02:30:17.000000000 +0100 ++++ misc/build/Python-2.6.1/Python/dynload_shlib.c 2011-06-11 19:42:09.000000000 +0200 +@@ -46,6 +46,10 @@ + {"module.exe", "rb", C_EXTENSION}, + {"MODULE.EXE", "rb", C_EXTENSION}, + #else ++#ifdef __APPLE__ ++ {".dylib", "rb", C_EXTENSION}, ++ {"module.dylib", "rb", C_EXTENSION}, ++#endif + {".so", "rb", C_EXTENSION}, + {"module.so", "rb", C_EXTENSION}, + #endif diff --git a/python/makefile.mk b/python/makefile.mk index b43147dd3943..d91660a3d350 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -88,7 +88,7 @@ CONFIGURE_ACTION += --disable-ipv6 .ENDIF .IF "$(OS)" == "MACOSX" -PATCH_FILES+=Python-2.6.1-py8067.patch +PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch # don't build dual-arch version as OOo itself is not universal binary either PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch @@ -235,7 +235,6 @@ $(MISC)/OOoPython.framework.zip: $(PACKAGE_DIR)/fixinstallnames $(PACKAGE_DIR)/f $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) @-rm -f $@ - @echo process $@ - $(COMMAND_ECHO)sed 's#%%replaceme%%#$(MYCWD)/python-inst#g' < pyversion.mk > $@ + $(COMMAND_ECHO)$(COPY) pyversion.mk $@ .ENDIF # DISABLE_PYTHON != TRUE diff --git a/python/pyversion.mk b/python/pyversion.mk index baba53838d3f..97c904f2ab79 100644 --- a/python/pyversion.mk +++ b/python/pyversion.mk @@ -10,8 +10,6 @@ PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).a PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR) -# needed to fix install_name in pyuno -PYTHON_MAKEINSTALLDIR=%%replaceme%% .ELSE PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR) -- cgit From 1db5eb0c1c2162daf80e64637f7f3154f734e05c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 11 Jun 2011 21:23:00 +0300 Subject: Add Android patch --- hunspell/hunspell-android.patch | 33 +++++++++++++++++++++++++++++++++ hunspell/makefile.mk | 3 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 hunspell/hunspell-android.patch diff --git a/hunspell/hunspell-android.patch b/hunspell/hunspell-android.patch new file mode 100644 index 000000000000..6713e40a3542 --- /dev/null +++ b/hunspell/hunspell-android.patch @@ -0,0 +1,33 @@ +--- misc/hunspell-1.3.1/config.sub ++++ misc/build/hunspell-1.3.1/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ +--- misc/hunspell-1.3.1/src/tools/munch.c ++++ misc/build/hunspell-1.3.1/src/tools/munch.c +@@ -8,7 +8,7 @@ + #include + #include + #include +-#ifdef __linux__ ++#if defined(__linux__) && !defined(__ANDROID__) + #include + #include + #include +--- misc/hunspell-1.3.1/src/tools/unmunch.c ++++ misc/build/hunspell-1.3.1/src/tools/unmunch.c +@@ -8,7 +8,7 @@ + #include + #include + #include +-#ifdef __linux__ ++#if defined(__linux__) && !defined(__ANDROID__) + #include + #include + #include diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 5a6ea0cccafb..a682ba05e4fc 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -43,7 +43,8 @@ ADDITIONAL_FILES+=config.h PATCH_FILES=\ hunspell-static.patch \ hunspell-wntconfig.patch \ - hunspell-solaris.patch + hunspell-solaris.patch \ + hunspell-android.patch .IF "$(GUI)"=="UNX" -- cgit From 25dff099078d6923172100372268035488d6c08e Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sun, 12 Jun 2011 21:00:47 +0200 Subject: tell the linker how to resolve @loader_path on Mac also cleanup useless double checking for MACOSX and remove unneeded AUGMENT_LIBRARY_PATH --- libcroco/makefile.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 9e26dded174f..4789c0795897 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -51,17 +51,14 @@ PATCH_FILES= CONFIGURE_DIR= .IF "$(OS)"=="MACOSX" -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - ./configure \ - --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ +CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ + CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ - LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ + LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \ GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)" -CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF -- cgit From 4d00f7934609b42338a0ca9630bd562cd129e8d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 13 Jun 2011 01:04:28 +0300 Subject: Use dummy xml2-config script for iOS --- libxslt/dummy/bin/xml2-config | 17 +++++++++++++++++ libxslt/makefile.mk | 10 +++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 libxslt/dummy/bin/xml2-config diff --git a/libxslt/dummy/bin/xml2-config b/libxslt/dummy/bin/xml2-config new file mode 100755 index 000000000000..4ee8dd0206c5 --- /dev/null +++ b/libxslt/dummy/bin/xml2-config @@ -0,0 +1,17 @@ +#!/bin/sh + +# Use flags found out by configure when we *don't* want +# to use the "system" xml2-config in $PATH + +case $1 in +--cflags) + echo $LIBXML_CFLAGS + ;; +--libs) + echo $LIBXML_LIBS + ;; +--version) + # Assume it's close enough to the system version... + xml2-config --version + ;; +esac diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index dff40683bbda..576dedefa2b3 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -115,17 +115,25 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l .IF "$(COMNAME)"=="sunpro5" CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure + .IF "$(OS)"=="IOS" -CONFIGURE_FLAGS=--disable-shared +# --with-libxml-prefix actually gives the prefix where bin/xml2-config is looked for, +# and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that +# the configure script found out. +CONFIGURE_FLAGS=--disable-shared --with-libxml-prefix=$(SRC_ROOT)/$(PRJNAME)/dummy .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF + CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes + .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF + BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -- cgit From baa4d72f225911e38b6e68c8fa7968c27c582769 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 14 Jun 2011 02:20:17 +0200 Subject: silence warnings from configure, get rid of $/ escapes --- libgsf/libgsf-1.14.19.patch | 11 ++++++++++- libgsf/makefile.mk | 16 ++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch index 12d20c660129..e8acba50c4c0 100644 --- a/libgsf/libgsf-1.14.19.patch +++ b/libgsf/libgsf-1.14.19.patch @@ -5,7 +5,7 @@ - -+if 0; then ++if false; then case "$am__api_version" in 1.01234) as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 @@ -27,3 +27,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 $as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +@@ -12846,7 +12846,7 @@ + fi + + fi +-if test -n "$PKG_CONFIG"; then ++if test "$PKG_CONFIG" != "no" ; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 + $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index eadbe1013a6a..6a481a2debc8 100644 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -57,17 +57,17 @@ BUILD_DIR=gsf BUILD_ACTION=dmake ADDITIONAL_FILES=\ - gsf$/makefile.mk \ - gsf$/gsf-config.h + gsf/makefile.mk \ + gsf/gsf-config.h .ELSE PATCH_FILES=libgsf-1.14.19.patch CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - .$/configure \ - --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + ./configure \ + --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ --without-python \ --without-bonobo \ @@ -76,11 +76,11 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ --with-gdk_pixbuf \ --without-gnome-vfs \ --disable-nls \ - LIBGSF_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \ + LIBGSF_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ LIBGSF_LIBS="-lxml2 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ - LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \ + LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ LIBGSF_GIO_LIBS="-lgio-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \ - GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \ + GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \ GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0" -- cgit From 3c1e5d564cfd06105ed9d119dd2a5509e6c316d2 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 14 Jun 2011 03:21:00 +0200 Subject: silence pango, get rid of $/ escapes, pass verbosity switches --- pango/makefile.mk | 16 ++++++++-------- pango/pango-1.28.3.patch | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/pango/makefile.mk b/pango/makefile.mk index 44fd08009c2f..66bf866dd124 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_pango .IF "$(SYSTEM_PANGO)" == "YES" all: - @echo "An already available installation of pango should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of pango should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -56,15 +56,15 @@ PATCH_FILES=pango-1.28.3.patch CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)" CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - .$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ - CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + ./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) --disable-dependency-tracking --disable-doc-cross-references \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ + CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="$(CONFIGURE_LDFLAGS)" \ - CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \ + CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)/cairo" \ CAIRO_LIBS="-lcairo" \ - GLIB_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \ + GLIB_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \ GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl" -CONFIGURE_FLAGS=--with-included-modules=yes +CONFIGURE_FLAGS=--with-included-modules=yes $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" CONFIGURE_ACTION+="--without-x" diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch index 7da953f28311..45ce441dfcbd 100644 --- a/pango/pango-1.28.3.patch +++ b/pango/pango-1.28.3.patch @@ -1,6 +1,15 @@ --- misc/pango-1.28.3/configure 2010-09-29 13:02:33.000000000 +0200 +++ misc/build/pango-1.28.3/configure 2011-03-01 17:56:26.000000000 +0100 -@@ -18596,16 +18596,16 @@ +@@ -17980,8 +17980,6 @@ + + + if test x$no_x = xyes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X development libraries not found" >&5 +-$as_echo "$as_me: WARNING: X development libraries not found" >&2;} + have_x=false + else + X_LIBS="$X_LIBS -lX11" +@@ -18596,16 +18594,16 @@ fi if $have_atsui; then @@ -26,12 +35,31 @@ fi if $have_cairo_atsui; then -@@ -18859,7 +18859,7 @@ +@@ -18858,20 +18856,20 @@ + fi # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled. - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - ++#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +GLIB_MKENUMS=glib-mkenums # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any + # necesary defines for thread-safety. +-GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0` ++#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0` + + # See if it's safe to turn G_DISABLE_DEPRECATED on. +-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` +-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"` +-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then ++#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` ++#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"` ++#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then + GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS" +-fi ++#fi + + # + # Checks for LibThai -- cgit From 4ef9af9e9507ef68882277f3abb0128e90178ddc Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 14 Jun 2011 15:04:04 +0200 Subject: remove noise from configure on Mac, use --disable-dependency-tracking --- librsvg/librsvg-2.32.1.patch | 19 ++++++++++++++++++- librsvg/makefile.mk | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch index 0b7534d8119e..2d9fc0fc216a 100644 --- a/librsvg/librsvg-2.32.1.patch +++ b/librsvg/librsvg-2.32.1.patch @@ -40,4 +40,21 @@ LIBCROCOPKG="" test_croco=true - +@@ -13376,13 +13380,13 @@ + + + +-GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0) ++#GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0) + +-GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) ++#GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) + +-GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) ++#GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0) + +-CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo) ++#CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo) + + + diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 664baf6e730c..63f45e3e6f3d 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -62,7 +62,7 @@ CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ - --disable-pixbuf-loader \ + --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \ LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \ GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \ @@ -71,7 +71,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ GTHREAD_LIBS=-lgthread-2.0 \ LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \ LIBCROCO_LIBS=-lcroco-0.6 \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \ LDFLAGS="$(CONFIGURE_LDFLAGS)" CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)" -- cgit From 1d84afcf346e374980259718e26f48622b76aa5d Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 14 Jun 2011 15:44:11 +0200 Subject: remove noise from configure on Mac, use --disable-dependency-tracking --- gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 59 +++++++++++++++++++++++++++++++++++--- gdk-pixbuf/makefile.mk | 38 ++++++++++++------------ 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch index 726ca895643f..fccd992da74f 100644 --- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch +++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch @@ -1,5 +1,5 @@ --- misc/gdk-pixbuf-2.23.0/configure 2010-12-23 15:18:11.000000000 +0100 -+++ misc/build/gdk-pixbuf-2.23.0/configure 2011-02-28 18:49:26.000000000 +0100 ++++ misc/build/gdk-pixbuf-2.23.0/configure 2011-06-14 15:20:05.000000000 +0200 @@ -16839,7 +16839,7 @@ @@ -9,7 +9,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then -@@ -17158,7 +17158,11 @@ +@@ -17158,14 +17158,18 @@ rm -f conf.glibtest @@ -21,7 +21,58 @@ +fi # See if it's safe to turn G_DISABLE_DEPRECATED on. - GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` +-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` +-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"` +-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then ++#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` ++#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"` ++#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then + CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" +-fi ++#fi + + CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" + +@@ -17801,7 +17805,7 @@ + for l in libpng libpng14 libpng12 libpng13 libpng10 ; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $l" >&5 + $as_echo_n "checking for $l... " >&6; } +- if $PKG_CONFIG --exists $l ; then ++ if false ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + PNG='png' +@@ -18206,8 +18210,8 @@ + $as_echo_n "checking if gio can sniff png... " >&6; } + gtk_save_LIBS="$LIBS" + gtk_save_CFLAGS="$CFLAGS" +- LIBS="`$PKG_CONFIG --libs gio-2.0`" +- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" ++ #LIBS="`$PKG_CONFIG --libs gio-2.0`" ++ #CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +@@ -18622,8 +18626,8 @@ + GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" + GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" + GDK_PIXBUF_EXTRA_CFLAGS= +-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" ++GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS" ++GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS" + + + +@@ -18640,7 +18644,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS= + GDK_PIXBUF_XLIB_EXTRA_LIBS= + +-if $PKG_CONFIG --exists x11; then ++if false; then + if true; then + USE_X11_TRUE= + USE_X11_FALSE='#' --- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c +++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c @@ -23,7 +23,9 @@ @@ -34,7 +85,7 @@ #include "gdk-pixbuf-transform.h" #include "gdk-pixbuf-private.h" -@@ -336,15 +336,19 @@ +@@ -336,15 +338,19 @@ const gchar * gdk_pixbuf_gettext (const gchar *msgid) { diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 201495d3cc6e..aa58133f49f5 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -52,13 +52,13 @@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043 PATCH_FILES=gdk-pixbuf-2.23.0.patch CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ + BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ BASE_DEPENDENCIES_LIBS=" " \ - .$/configure \ - CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \ + ./configure --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ + CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/libpng -I$(SOLARINCDIR)/external/jpeg" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \ LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ - --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ + --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ --disable-nls \ --disable-modules \ --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \ @@ -95,21 +95,21 @@ CONFIGURE_ACTION= BUILD_DIR=./gdk-pixbuf BUILD_ACTION=nmake -f makefile.msc -OUT2LIB+=gdk-pixbuf$/gdk_pixbuf-2.0.lib - -OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll - -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-core.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-io.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-simple-anim.h -OUT2INC+=gdk-pixbuf$/gdk-pixdata.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-enum-types.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-loader.h -OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h +OUT2LIB+=gdk-pixbuf/gdk_pixbuf-2.0.lib + +OUT2BIN+=gdk-pixbuf/libgdk_pixbuf-2.0-0.dll + +OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h +OUT2INC+=gdk-pixbuf/gdk-pixdata.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h +OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h .ELSE -- cgit