Commit Graph

116 Commits

Author SHA1 Message Date
9e822d9ae4 Merge branch 'master' into msvc-support-master 2011-09-27 14:35:26 +08:00
7fb8fc65a3 mingw-fetch-dependencies: Mirror the changes made to the Cogl version
Cogl has a similar script which has had the following additional
changes:

* Don't pass -c to wget

* Explicitly download and run config.guess

This patch just syncs up with those.

https://bugzilla.gnome.org/show_bug.cgi?id=659625
2011-09-21 13:47:28 +01:00
7d8c48268e mingw32: Update the build script to compile 1.8.0
* Updated dependencies, glib 2.28 and cogl 1.8.0
* Mesa has removed mesa_wgl.h from its headers
* added -I$ROOT_DIR/include to the CFLAGS to include the headers from
  our prefix (say <GL/gl.h>) before the system ones

https://bugzilla.gnome.org/show_bug.cgi?id=659625
2011-09-21 13:46:55 +01:00
9f12ec534e msvc-support: Recover wrecked branch
Recover the branch! :|
2011-09-16 17:25:47 +08:00
8f8663c875 moduleset: Fix up the location of the moduleset file
We moved to git.gnome.org, and the moduleset moved with us.
2011-09-12 16:38:49 +01:00
c5cf8c53cd mingw-fetch-dependencies: Build ATK from source
There is no prebuilt package for ATK 2.1.5 which Clutter now depends
on so let's build it from source instead. The ATK packages don't have
a .gz version so this patch also changes it to download the .bz2
version of json-glib to avoid having to accept both formats.
2011-09-06 09:41:06 +01:00
9d46c47997 build: Fix up the release rules
Highlight actions and errors, and update the release message.
2011-09-06 08:32:07 +01:00
2fc8fa82f0 build: Fix up the tarball target used when releasing 2011-07-04 22:13:23 +01:00
86d96dbcc1 build: Put back ChangeLog.pre-git-import to unbreak distcheck 2011-06-13 23:15:17 +01:00
e8bd46b82b build: Fix up ChangeLog build generation
Since the pre-git-import ChangeLog has been moved, we need to put it
back in the list temporarily when generating the rest.
2011-06-13 17:41:52 +01:00
fbdc967575 release rules: Add note for snapshots 2011-06-13 16:32:24 +01:00
5012087588 clutter.modules: Update the moduleset
Reflect the changes in the repository location for a bunch of modules,
and add the Cogl dependency to Clutter.
2011-06-10 09:39:09 +01:00
161e64aae7 build: Fix typo in the docs URI variable name 2011-04-07 15:09:15 +01:00
280165333d build: Cosmetic fixes for release targets
• Use $(SED) and $(GREP) consistently
• Do not point to the template README.in
• Eliminate the '===' separator in the NEWS extractor
• List all download URIs for the tarballs
2011-04-05 11:24:03 +01:00
144aa4d9ba build: Fix remote docs URI in the release-message 2011-04-04 23:16:46 +01:00
b8047b5471 build: Generate the release announcement
Update the release-message target to generate the full release
announcement out of the standard blurb and the NEWS file. We use
a pretty evil sed incantation, courtesy of Neil Roberts.
2011-04-04 22:34:10 +01:00
6aa0919ba6 build: Fix typo in Makefile.am.release 2011-04-04 15:11:20 +01:00
564765c45c build: Update the release rules 2011-04-01 16:31:49 +01:00
620727689f moduleset: Some modules have been moved to gnome.org
So we need to update the moduleset.
2011-03-28 18:36:33 +01:00
f23a7583e1 mingw-fetch-dependencies.sh: Add a wrapper for pkg-config
On a Fedora system (and maybe others) there is a wrapper script called
i686-pc-mingw32-pkg-config. This script unsets the PKG_CONFIG_PATH
variable and then sets the PKG_CONFIG_LIBDIR variable so that it won't
pick up the native system .pc files. This breaks cross compiling in
mingw-fetch-dependencies.sh because it ends up removing its attempts
to set a local search path.

To fix this, the mingw-fetch-dependencies script now generates its own
wrapper script which instead sets PKG_CONFIG_LIBDIR to the local
clutter-cross prefix and then runs the original pkg-config program
from the search path. This should have the same benefit of preventing
it from finding native system .pc files on systems that don't provide
a cross pkg-config. The cross compiling for json-glib and the
recommend args to pass to configure when building clutter are updated
to set the PKG_CONFIG varible to point to this wrapper script.
2011-03-16 13:06:52 +00:00
4dc8ccf9ea win32: remove env.sh generated by mingw-fetch-dependencies.sh
Since there is very little now left in the env.sh file generated by
mingw-fetch-dependencies.sh it can be removed. What remained (The
CFLAGS="-mms-bitfields" and PKG_CONFIG_PATH=$ROOT_DIR/lib/pkgconfig) can
simply be passed explicitly when calling ./configure.
2011-03-16 11:23:38 +00:00
5faf7666ec win32: remove deprecated -mno-cygwin options from env.sh
This removes the use of -mno-cygwin from our generated env.sh for cross
compiling with mingw.

I don't know that anyone is building clutter under cygwin, and our
BuildingClutterOnWindows wiki page only describes building with msys not
cygwin so I think its fair to assume that this build configuration is
untested and thus not supported by us currently. Since the -mno-cygwin
option is deprecated it could well be that there is a better
cross-compilation solution available for cygwin these days if you want
to build programs that don't depend on cygwin libraries.
2011-03-16 11:23:38 +00:00
861bda91d5 win32: Strip unneeded flags from env.sh
This remove CXXFLAGS since we don't have any c++ code in Clutter and
also removes the redundant -L$ROOT_DIR/lib from LDFLAGS and
-I$ROOT_DIR/include from CPPFLAGS and CFLAGS. (These should get added by
pkg-config)
2011-03-16 11:23:38 +00:00
6340f3a24b win32: Add blurb at end of mingw helper script
This adds some blurb at the end the mingw-fetch-dependencies.sh script
that gives an example of how to go on and build clutter after fetching
all dependencies.
2011-03-16 11:23:38 +00:00
130135a09f win32: support building json-glib in mingw script
Since Tor does not currently provide win32 binaries for json-glib we
need to cross compile it before we can build clutter. This extends
mingw-fetch-dependencies.sh so it can fetch, unpack and cross-compile
json-glib into the same prefix as the binary dependencies.
2011-03-16 11:23:38 +00:00
820765eea0 win32: don't set CC,CPP,AR,NM,LD etc in mingw env.sh
It shouldn't be necessary to explicitly override CC,CPP,AR,NM,LD etc in
the env.sh helper script that mingw-fetch-dependencies.sh generates.
Clutter's ./configure script should figure all of those out for us.
2011-03-16 11:23:37 +00:00
ed025f1c85 win32: remove automatic build option from mingw script
This removes the "Do you want to checkout and build Clutter?" option
from the mingw-cross-compile.sh script and renames the script
mingw-fetch-dependencies.sh

As it stands the mingw-cross-compile.sh script isn't enough to fetch all
the dependencies for building clutter, since Tor doesn't provide binaries
for json-glib so the option to checkout and build clutter can't work.

Also it doesn't seem ideal to clone a fresh clutter repo instead of
being able to compile the source of the current repo.
2011-03-16 11:22:47 +00:00
f4ca82fc6d build: Remove MAINTAINERCLEANFILES from ChangeLog rules 2011-02-23 00:07:12 +00:00
f5c240a50b build: Use all-am, not all as the gitignore target 2011-02-21 12:46:34 +00:00
ced045148f clutter.modules: Fix Wayland's location
The Git repository URL for Wayland has been moved into the main fd.o
structure.
2011-02-10 10:35:35 +00:00
cab4a5b484 build: Remove stringify.sh from Makefile.am 2010-12-17 14:41:42 +00:00
7dc4b3c894 Remove the GLES2 wrapper
The GLES2 wrapper is no longer needed because the shader generation is
done within the GLSL fragend and vertend and any functions that are
different for GLES2 are now guarded by #ifdefs.
2010-12-13 17:29:14 +00:00
8c7298b0c1 build: Check NEWS file during release, not distcheck
The check-news option in configure.ac conflicts with the idea of using a
buildbot to do a distcheck.

Since we're doing some validation on the state of the build during the
release-check phase we should add the NEWS file check there.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2468
2010-12-09 13:49:01 +00:00
e0ce4cee8c win32: export TARGET and ROOT_DIR in env.sh
So children of the shell sourcing it can use them (eg. buildbot slaves)
2010-12-02 16:54:43 +00:00
c1878316e0 win32: Detect the mingw32 cross compiler on Fedora
Fedora mingw32 cross compiler is prefix with i686-pc-mingw32-.
2010-12-02 16:54:41 +00:00
e73d5b30bb win32: Update glib and cairo version in mingw-cross-compile.sh
Clutter has moved on and now depends on glib 2.26 and cairo 1.10
(for cairo-gobject).
2010-12-02 16:54:38 +00:00
b5a9de1a23 moduleset: Add gstreamer and gst-plugins-good 2010-11-30 10:35:17 +00:00
1d153fa860 moduleset: Disable stand-alone Cally 2010-11-30 10:34:59 +00:00
085962a361 moduleset: Switch gtk2 to the 2.24 branch 2010-11-30 10:34:38 +00:00
ad0e7a9e15 moduleset: Add Atk as a Clutter dependency 2010-10-15 15:24:58 +01:00
3cb0436c42 clutter.modules: Update Cairo and Pixman 2010-10-05 14:30:33 +01:00
cd7df1b421 build: Fix the release-message target
Generate the SHA256 checksum file during release-upload and then copy it
to the build directory.
2010-10-04 15:47:53 +01:00
ba09e9c6df build: Generate a stub announcement email when releasing 2010-10-03 17:21:10 +01:00
96db215ed3 build: Automate the release process 2010-10-03 14:54:36 +01:00
7aaef8abee modules: Use the stable branch of json-glib 2010-09-29 16:46:36 +01:00
e36cc40a49 Merge branch 'wip/non-recursive'
* wip/non-recursive:
  build: Start moving to a non-recursive layout
2010-09-29 15:55:58 +01:00
0f22e922e3 modules: Fix up mesa module 2010-09-29 15:44:51 +01:00
e072d797b1 modules: Add mesa and wayland to the moduleset 2010-09-29 15:28:26 +01:00
8dd8fbdbdf build: Start moving to a non-recursive layout
*** WARNING: THIS COMMIT CHANGES THE BUILD ***

Do not recurse into the backend directories to build private, internal
libraries.

We only recurse from clutter/ into the cogl sub-directory; from there,
we don't recurse any further. All the backend-specific code in Cogl and
Clutter is compiled conditionally depending on the macros defined by the
configure script.

We still recurse from the top-level directory into doc, clutter and
tests, because gtk-doc and tests do not deal nicely with non-recursive
layouts.

This change makes Clutter compile slightly faster, and cleans up the
build system, especially when dealing with introspection data.

Ideally, we also want to make Cogl part of the top-level build, so that
we can finally drop the sed trick to change the shared library from the
GIR before compiling it.

Currently disabled:

  ‣ OSX backend
  ‣ Fruity backend

Currently enabled but untested:

  ‣ EGL backend
  ‣ Windows backend
2010-09-29 14:40:15 +01:00
5335689340 Update the uncrustify configuration 2010-09-23 13:36:41 +01:00