| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Without this change, out-of-tree distcheck doesn't get very far.
Similarly, allow *.vcxproj, *.props to be in either the builddir or
the srcdir.
Finally, since I'm touching these lines anyway, eliminate some
useless uses of cat: "cat x | sed 's/foo/bar/' > y" is
equivalent to "sed 's/foo/bar/' < x > y".
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=748176
Reviewed-by: Chun-wei Fan <fanchunwei@src.gnome.org>
|
|
|
|
| |
We can use $< for generating the MSVC 2012/2013 Solution files, so use it.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apaprently there are many incompatible realpath(1) implementations out
there, so things like --relative-to can't be assured to work everywhere,
such as on Ubuntu.
Instead, simply use the subst feature of automake to fulfil the same
purpose, which is like what the rest of this file does, and follows the
pattern of the introspection makefile, which this is modelled on.
Also update the simple tutorial and clean up a bit, changing $(empty) to
<nothing> as Behdad pointed out.
This is also checked with 'make -j8 distcheck'.
https://bugzilla.gnome.org/show_bug.cgi?id=735039
|
|
|
|
|
|
|
| |
This reverts commit aa7a9e08d33ac01aa43460a064e086b099f71642.
Sorry, I accidently committed this in master, when I am supposed to commit
in my own local branch.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apaprently there are many incompatible realpath(1) implementations out
there, so things like --relative-to can't be assured to work everywhere,
such as on Ubuntu.
Instead, simply use the subst feature of automake to fulfil the same
purpose, which is like what the rest of this file does, and follows the
pattern of the introspection makefile, which this is modelled on.
This is also checked with 'make -j8 distcheck'
https://bugzilla.gnome.org/show_bug.cgi?id=735039
|
|
|
|
|
|
|
| |
Since we are no longer using the interim Makefile-msvcproj.am way to
generate the complete MSVC build files, change all PangoApiVersion to
ApiVersion, to be consistent with the other MSVC build files in the GTK+/
Clutter stack.
|
|
|
|
|
|
| |
Create the directory where the headers should be copied. I did not notice
this as there was always
$(GlibEtcInstallRoot)\vs$(VSVER)\$(PLAT)\include\pango-1.0\pango. Oops.
|
|
|
|
|
| |
...as this is interim that is to be superceded by Makefile.msvcproj, which
is meant to be usable across different projects.
|
|
|
|
|
| |
The command macro for copying config.h.win32 to config.h was wrong due to
a leftover when copying the rule. Fix that, oops.
|
|
|
|
|
|
|
|
|
| |
This restores the EXTRA_DIST for the project file related items, as the
underlying mechanism in the previous commit (i.e. Makefile-newvs.am) has
been cleaned up and fixed to allow 'make -jN distcheck' to complete
successfully.
https://bugzilla.gnome.org/show_bug.cgi?id=735039
|
|
|
|
|
|
|
| |
This allows this common autotools file to be cleaned up quite a bit, and
has the benefit of having 'make -jN distcheck' complete successfully.
https://bugzilla.gnome.org/show_bug.cgi?id=735039
|
|
|
|
|
|
|
|
|
|
| |
... in a way that 'make distcheck' (with or without -jN) completes
successfully. This uses the common autotools module that was added in
a previous commit so that we just need to define the items needed and call
the things in there during 'make dist' (or 'make distcheck'), which would
have things in a more tidy manner for this.
https://bugzilla.gnome.org/show_bug.cgi?id=735039
|
|
|
|
|
|
|
|
|
|
| |
This adds a common autotools module that can be used by various projects to
generate the Visual Studio projects as needed, and if necessary, generate
the headers listings to "install" for that project, based on items passed
in to this. This is modelled on the Makefile.introspection autotools file
that is used by many GNOME projects to generate the introspection files.
https://bugzilla.gnome.org/show_bug.cgi?id=735039
|
|
|
|
|
|
| |
Use a custom build rule for the copying of config.h.win32 to config.h, and
reflect on the changes on the module source files for the Arabic and Indic
line breaks.
|
|
|
|
| |
Win32 maintainer, please...
|
|
|
|
| |
What is this...
|
|
|
|
|
|
| |
Rename the install projects to pango-install, so that they can be easier
integrated into grand solution files that are used to build items, such as
the entire GTK+ or Clutter stack.
|
|
|
|
|
| |
To make it easier for people to develop and debug Pango on Windows,
especially as the builds already generate the .pdb's.
|
|
|
|
|
|
|
| |
Make the .pdb filenames like the ones generated by the MSVC 2008 builds,
that follows the names of the DLLs. Also, use the /d2Zi+ flag so that more
useful information is logged into the .pdb files, in particular the release
builds.
|
|
|
|
|
|
|
| |
This adds the /MP option to the compiler, which can cut down on the
build time of release builds by quite a bit, by using multi-processor
or multi-core capabilities. This will, however, emit a brief warning
with debug builds, but the code will otherwise build normally.
|
|
|
|
|
|
| |
Make sure we only try to create the directory for pango.aliases if that
file didn't exist. This cleans things up a little, and avoids weird
MSBuild batch errors.
|
|
|
|
|
|
| |
Be a bit more carful when copying and updating the property sheets, so that
we don't accidently change fields with '10' in them that are actually not
indicating the Visual Studio version.
|
|
|
|
|
|
|
|
|
|
|
| |
As the Visual Studio 2012/2013 are only slightly different from the Visual
Studio 2010 projects, we can provide support for them by using scripts to
copy the Visual Studio 2010 projects, and update the specific parts as
necessary. Thus, there would be little maintenance overhead for these as
only the 2010 projects need to be kept up-to-date as a result.
This might change when we do get the stack working with WinRT/Metro, but
that's going to be another totally different issue.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently, due to the way that Visual Studio 2010+ projects are handled,
the "install" project does not re-build upon changes to the sources, as it
does not believe that its dependencies have changed, although the changed
sources are automatically recompiled. This means that if a part or more
of the solution does not build, or if the sources need some other fixes
or enhancements, the up-to-date build is not copied automatically, which
can be misleading.
Improve on the situation by forcing the "install" project to trigger its
rebuild, so that the updated binaries can be copied. This does trigger an
MSBuild warning, but having that warning is way better than not having an
up-to-date build, especially during testing and development.
|
|
|
|
|
| |
We need to create $(prefix)\etc\pango before trying to create a default
pango.aliases file, otherwise it wouldn't work.
|
|
|
|
|
|
|
|
|
|
| |
GObject-Introspection was recently changed to support acquiring the name of
the DLL from a library (.lib, etc) that was passed into g-ir-scanner on
Windows, like the *nix builds, instead of directly passing in the name of
the DLL.
This updates the introspection build process, so that introspection files
for Pango can continue to be properly built.
|
|
|
|
|
|
| |
Delete libpangocairo.vs10.sourcefiles and
libpangocairo.vs10.sourcefiles.filters once we are done with them, so to
fix make distcheck
|
|
|
|
|
|
|
|
|
|
| |
Link and run the dumper program firstly against the build of ATK from
the same tarball, then linking to the other dependent libraries which
this build of ATK was built against before finally trying to link and
run against other existing builds.
This is especially important for unstable releases, as APIs are often
added and dependent upon during development cycles.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The current approach of building the introspection files for Pango works,
but is often cumbersome as one needs to set many environmental variables
before launching a solution file, which runs a Windows batch script to
generate the .gir/.typelib files. It was also possible to hand-run the
batch script from the Visual Studio command prompt, but even more
environmental variables need to be set.
This changes the approach to build the introspection files using an NMake
Makefile (but elimating from the Visual Studio Project Files the part to
build the introspection files) to:
-Make it clearer to the person building the introspection files what
environmental variables are needed, specifically for PKG_CONFIG_PATH and
MINGWDIR and CFG (formerly CONF). Setting stuff like VSVER, PLAT and
BASEDIR is no longer required, which was a bit clunky.
-Allows some more easier flexibility on the build of the intropsection
files.
|
|
|
|
|
|
| |
We don't have the *_FC configs in the Pango and PangoWin32 projects
anymore, so get rid of all remaining traces of them in these projects, like
the MSVC 2010 ones.
|
| |
|
|
|
|
| |
Split up the property sheets so that their maintenance can be simplified
|
|
|
|
| |
...so that the maintenance of these files would be easier
|
|
|
|
|
|
| |
As there is no longer a pango_fc.sln solution file, tell the people to use
the *_fc configs if building PangoFT2 and PangoCairo with FreeType/
FontConfig support with the Visual Studio Projects is desired.
|
|
|
|
|
| |
Turn on Whole Program Optimization/Link Time Code Generation for release
builds to improve optimization a bit
|
|
|
|
|
|
|
| |
Combine the non-PangoFT2 and PangoFT2 builds into one single solution file
and remove configs in the Pango and PangoWin32 projects that aren't really
necessary. Also use Link Time Code Generation for release builds to
improve optimization a bit.
|
|
|
|
|
| |
Missed out the $(Platform) part when building the FontConfig flavor, so
make it up.
|
|
|
|
|
| |
Make the DLL installation more flexible, as one might still prefer to use
the autotools style DLL naming for the Visual Studio builds.
|
|
|
|
|
|
| |
We don't really need the NoFCDef here, as this DLL has nothing to do with
FreeType, like the main Pango DLL. FreeType matters when we build
PangoCairo (and the cxx-test.c and pango-view) though.
|
|
|
|
| |
We don't really need to NoFCDef here, so remove that.
|
|
|
|
| |
Remove lines that were left out in the last commit
|
|
|
|
|
|
|
| |
Use a single solution file for the non-PangoFT2 and PangoFT2 builds, and
use a single PangoCairo project for these builds too. Also get rid of
configurations that we don't really need in the Pango and PangoWin32
projects.
|
|
|
|
|
| |
This makes it easier to upgrade to Visual Studio 2012/2013 formats, like
the other *.vcxproj files in Pango.
|
|
|
|
|
| |
We need to link to the Debug CRT for debug configs, not the release CRTs,
as linking to different CRTs will cause trouble during debugging.
|
|
|
|
| |
Add commands to be used for building introspection files.
|
|
|
|
|
|
|
| |
Integrate the utility project files to build the introspection files.
This is not built by default, so one may choose to build the introspection
files if he/she chooses
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add Windows .bat and Python utility script to call g-ir-scanner to build
the introspection files for Pango/MSVC builds. This will read from
pango/Makefile.am to determine the source and header files to process using
Python REGEX capabilities, so the autotools files won't have to be updated
except to distribute the necessary files under build/win32.
Also add utility Visual Studio 2008/2010 projects to call the Windows .bat
to create the introspection files.
https://bugzilla.gnome.org/show_bug.cgi?id=692255
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds a PlatformToolset tag in the project configs so that we can
provide support for Visual Studio 2012 with relative ease as the format
of the VS 2012 projects are only slightly different from their VS 2010
counterparts. We can then use a script like the one used in GLib[1] to
copy the VS2010 projects and replace the necessary tags to create the
VS2012 projects.
This also cleans up the projects and property sheets, as there were
some unwanted/unneeded entries in them.
[1]: http://git.gnome.org/browse/glib/commit/?id=76cecf061b377d30e5422cdddb1fb9d19c52421d
|
|
|
|
|
| |
Cosmetic changes, so that the .sln files will have the same headers across
the board
|