Commit Graph

429 Commits

Author SHA1 Message Date
Massimo Valentini ddf09b3a36 Fixes two minor issues when builddir != srcdir 2011-05-26 20:17:21 +02:00
Michael Natterer 43c593bb3c app: remove obsolete linking workarounds, they break the build on OSX 2010-12-09 15:29:57 +01:00
Alexia Death 27c77e6a5e Merge branch 'master' into soc-2010-cage-2 2010-11-04 00:41:45 +02:00
Mukund Sivaraman 5dfb2782dd Use libapp_generated_sources in Makefile.am 2010-09-29 00:39:23 +05:30
Nils Philippsen 6b1aabfa71 add git-version.h to BUILT_SOURCES
This is so that it gets built before automake descends into subdirs.
2010-09-28 18:19:34 +02:00
Nils Philippsen 37d9876742 app: define GIMP_GIT_LAST_COMMIT_{TIMESTAMP,YEAR} macros 2010-09-28 14:25:43 +02:00
Alexia Death 74e5864fa6 Merge branch 'master' into soc-2010-cage-2 2010-09-26 23:08:15 +03:00
Martin Nordholts 1801fc70ab app: Use `git describe` for verbose version
Use `git describe` for verbose version, it provides more info than
just the commit ID, and it feels sane to use an existing command for
this. Note that the commit ID is prefixed with 'g'.
2010-09-02 21:28:42 +02:00
Alexia Death d98bd748e7 Merge branch 'master' into soc-2010-cage-2 2010-09-01 11:21:58 +03:00
Michael Schumacher 90655d8744 Use $(GIMP_APP_VERSION) in resource object file name 2010-08-27 23:13:34 +02:00
Michael Schumacher 9781cf1523 Bug 574018 - Add a manifest to executables
This step moves the %.rc.o pattern rule to a small include file in the
build/windows/ directory. Michael Natterer suggested this approach in
order to minimize the changes done to each executable's Makefile.am.
2010-08-27 21:31:38 +02:00
Michael Schumacher 82dca2ecf4 Bug 574018 - Add a manifest to executables
Eventually all executables will have the manifest and version resources
linked. In this initial step, the current resources are moved from the
app/ directory to a global build/windows directory.
2010-08-26 22:10:07 +02:00
Alexia Death aee148a486 Merge branch 'master' into soc-2010-cage-2 2010-08-26 21:50:55 +03:00
Michael Muré 98b198785a gimpoperationcage: the gegl op now do a transformation, with cage vertices hardcoded 2010-08-08 13:21:41 +02:00
Mukund Sivaraman 25be82a04b Substitute target header filename like the rest of the code 2010-08-02 02:40:08 +05:30
Mukund Sivaraman 10d11abcd5 Fix typo 2010-08-02 02:29:34 +05:30
Nils Philippsen 222ffd2360 app: generate git-version.h regardless of branch
Previously, git-version.h always recorded the latest commit on the
master branch. This change should record the current commit (which is
what gets built) regardless of the branch.

I've checked that it does "the right thing" regarding multi-parent
merges by checking out such a merge commit, generating git-version.h and
comparing it to the commit sha1 in the log.
2010-07-09 16:43:56 +02:00
Martin Nordholts 01113ffeee app: Handle merge commits for git-version.h
Use

  git show-ref --hash refs/heads/master

instead of

  git log HEAD^..HEAD --pretty=format:%H

so we can handle multi-parent (merge) commits.
2010-07-06 16:02:53 +02:00
Michael Natterer b2b1cb135b app: move the instance debug facility to the new file app/gimp-debug.c
Build it unconditionally but enable it via GIMP_DEBUG=instances
2010-06-24 19:11:56 +02:00
Martin Nordholts ff1da59f33 Bug 574018 - Add a manifest to executables
Patch from Jernej Simončič.
2010-06-22 19:35:16 +02:00
Martin Nordholts 8b344fa6ad app: Test for existance of git-version.h.tmp before comparing
Test for existance of git-version.h.tmp before comparing. Otherwise
cmp will complain when building tarballs.
2010-06-21 21:19:15 +02:00
Martin Nordholts df731fecda Make 'make distcheck' pass
Add missing CLEANFILES, make distcheck passes now.
2010-06-20 20:30:24 +02:00
Martin Nordholts d1202096e6 app: Include git commit hash in verbose version output
Note:
* Passes make distcheck
* The git commit hash is shipped with tarballs
* Build handles if git-version.h is removed from a tarball
2010-06-19 23:55:35 +02:00
Martin Nordholts ed2d178da3 app: Get rid of config -> display module dependency
In order to make a clear separation between the core modules and the
UI modules, move the necessary enums from display-enums.h and
widgets-enums.h to config-enums.h and the files
gimpdisplayoptions.[ch] from the display to the config module. This
removes the config -> display dependency.

This change has three main benefits
 * It lets us remove includes of display files from the config module
 * We don't have to link gimp-console and test-config with a subset of
   object files from the display module
 * It is reflected in devel-docs/gimp-module-dependencies.svg that the
   application is made up of core modules and UI modules and that no
   core module depends on any UI module
2010-02-01 21:56:48 +01:00
Michael Schumacher e0ab94d8aa Fixed typo "depenendencies" 2009-10-14 21:42:14 +02:00
Michael Schumacher ac7eee3659 Bug 554748 - Version information for gimp.exe
Add a VERSIONINFO resource to gimp.rc.in, use windres to create object files
for gimp and gimp-console with file-specific information.
Finally, add gimp.rc to .gitignore.

This resource file can potentially be used for all other exectuables and
shared objects, but some adjustments can become necessary.
2009-10-14 21:30:59 +02:00
Michael Schumacher 53984a8486 Bug 554748 - Version information for gimp.exe : generate gimp.rc
In preparation for adding VERSIONINFO resource data to the gimp executable,
the RC file has to be generated from a corresponding gimp.rc.in file.
2009-10-13 00:18:52 +02:00
Michael Natterer 8734c71150 Build "tests" after "." 2009-09-15 21:05:08 +02:00
Martin Nordholts 3e6f6088ee app: Create libapp.a for convenient test case linking
Create libapp.a for convenient test case linking and link the existing
tests against that.
2009-09-07 23:05:11 +02:00
Michael Natterer c552d2f065 (SUBDIRS): gegl and text live on top of core, xcf on top of plug-ins 2009-09-07 11:06:12 +02:00
Martin Nordholts 6fd1e5d50b app: Compile vectors and paint after core
Compile vectors and paint after core since they need the
core-generated core/gimpmarshal.h
2009-09-05 19:11:39 +02:00
Martin Nordholts 071153124a app: Reverse order of SUBDIRS
The SUBDIRS var should be sorted on build-order, not link-order.
2009-09-05 16:08:23 +02:00
Martin Nordholts 14aa5314af app: Add GIMP core unit testing framework and a simple first test
Enable us to have regression testing by introducing a core testing
framework that uses the GLib JUnit-like test library.

Do this by adding a new subdir app/tests that will contain all our
tests (it contains one trivial test already). Also add app/tests.[ch]
with a new function gimp_init_for_testing() so that test cases can
easily setup the core object system.
2009-09-05 16:02:32 +02:00
Martin Nordholts 871e41c062 app: Clean up subsystem linking dependencies
Clean up subsystem linking dependencies by
* Rearranging LDADD entries to better match architectural layers
* Being clear about why we need to pass -u in LDFLAGS some times
* Adding FIXMEs when we have broken dependencies
* Introducing a helper variable so we can share LDADD between
  gimp-console and gimp
2009-09-05 14:33:48 +02:00
Michael Natterer 5a1cf727bf Bug 562427 – Compilation with --as-needed
2008-11-27  Michael Natterer  <mitch@gimp.org>

	Bug 562427 – Compilation with --as-needed

	* app/Makefile.am (gimp_console_2_7_LDADD): add $(GLIB_LIBS) so
	libgthread gets pulled in explicitely.


svn path=/trunk/; revision=27732
2008-11-27 19:21:03 +00:00
Sven Neumann 3c15e5ed19 removed checks for PangoFT2.
2008-10-31  Sven Neumann  <sven@gimp.org>

	* INSTALL: 
	* configure.in: removed checks for PangoFT2.

	* app/config/Makefile.am
	* app/text/Makefile.am
	* app/Makefile.am: removed use of PANGOFT2_CFLAGS and 
PANGOFT2_LIBS.


svn path=/trunk/; revision=27490
2008-10-31 07:53:40 +00:00
Michael Natterer ee414d9e6f Merge on-canvas GSoC project:
2008-10-26  Michael Natterer  <mitch@gimp.org>

	Merge on-canvas GSoC project:

	* configure.in: check for pangocairo.

	* app/Makefile.am
	* app/text/Makefile.am: add its CFLAGS and LIBS.

	* app/text/gimptext-bitmap.[ch]
	* app/text/gimptext-private.h
	* app/text/gimptext-vectors.[ch]
	* app/text/gimptextlayer.c
	* app/text/gimptextlayout-render.c
	* app/text/gimptextlayout.c: port to pangocairo.

	* menus/Makefile.am
	* menus/text-tool-menu.xml
	* app/menus/menus.c
	* app/actions/Makefile.am
	* app/actions/actions.c
	* app/actions/text-tool-actions.[ch]
	* app/actions/text-tool-commands.[ch]: add a context menu for the
	text tool similar to GtkEntry's context menu.

	* app/tools/gimprectangletool.[ch]: add "narrow-mode" property.

	* app/tools/gimptextoptions.[ch]
	* app/widgets/gimptexteditor.[ch]: take a text buffer for the
	standalone text editor window instead of creating one internally.

	* app/tools/gimptexttool.[ch]: all the new wonderful on-canvas
	text editing logic. Wheee!


svn path=/trunk/; revision=27419
2008-10-26 17:39:55 +00:00
Sven Neumann e25c82e21a Applied patch from Alexia Death as attached to bug #471344:
2008-10-18  Sven Neumann  <sven@gimp.org>

	Applied patch from Alexia Death as attached to bug #471344:
	
	* app/core/Makefile.am
	* app/core/gimpcoords-interpolate.[ch]: new files with
	interpolation code taken from ...

	* app/vectors/gimpbezierstroke.c: ... here.

	* app/Makefile.am (AM_LDFLAGS): make it link.


svn path=/trunk/; revision=27314
2008-10-18 18:46:15 +00:00
Sven Neumann f6e08757a1 app/Makefile.am new files with code split out of main.c.
2008-10-13  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am
	* app/signals.[ch]: new files with code split out of main.c.

	* app/main.c: changed accordingly.


svn path=/trunk/; revision=27270
2008-10-13 19:32:33 +00:00
Michael Natterer 381d521499 app/Makefile.am change 2.6 to 2.7 here too.
2008-10-09  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* tools/Makefile.am: change 2.6 to 2.7 here too.


svn path=/trunk/; revision=27188
2008-10-09 08:28:39 +00:00
Sven Neumann 6a6d2f789b bumped version to 2.6.0.
2008-09-29  Sven Neumann  <sven@gimp.org>

        * configure.in: bumped version to 2.6.0.

        * app/Makefile.am
        * tools/Makefile.am: changed accordingly.

        * docs/gimprc.5.in
        * etc/gimprc: regenerated.


svn path=/trunk/; revision=27081
2008-09-29 20:33:13 +00:00
Michael Natterer 72c4ef1a83 app/Makefile.am remove references to $(REGEXREPL).
2008-09-09  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* plug-ins/script-fu/Makefile.am: remove references to $(REGEXREPL).


svn path=/trunk/; revision=26907
2008-09-09 12:21:43 +00:00
Tor Lillqvist 8af046ad76 Define WIN32_LARGE_ADDRESS_AWARE as -Wl,--large-address-aware on 32-bit
2008-08-07  Tor Lillqvist  <tml@novell.com>

	* configure.in: Define WIN32_LARGE_ADDRESS_AWARE as
	-Wl,--large-address-aware on 32-bit Windows, empty
	otherwise. AC_SUBST() it.

	* app/Makefile.am (win32_ldflags): Use WIN32_LARGE_ADDRESS_AWARE
	instead of hardcoding the switch, as it isn't valid, and would be
	pointless, when building a 64-bit GIMP.


svn path=/trunk/; revision=26411
2008-08-07 00:36:47 +00:00
Tor Lillqvist 3c9234d5ba Use -Wl,--large-address-aware on Windows so that we can use more that 2 GB
2008-07-17  Tor Lillqvist  <tml@novell.com>

	* app/Makefile.am (win32_ldflags): Use -Wl,--large-address-aware
	on Windows so that we can use more that 2 GB user data space (if
	available; i.e. if running on a 64-bit OS, or a 32-bit OS booted
	with /3GB). See discussion in bug #522073.


svn path=/trunk/; revision=26220
2008-07-17 11:34:19 +00:00
Sven Neumann 30cc37c5fe app/Makefile.am new files containing functionality to check for an already
2008-07-11  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am 
	* app/unique.[ch]: new files containing functionality to check 
for
	an already running instance of GIMP of notifying it about files 
to
	open. Code split out of main.c.

	* app/main.c: changed accordingly.


svn path=/trunk/; revision=26117
2008-07-11 09:08:07 +00:00
Michael Natterer a921d65df6 app/core/Makefile.am app/core/core-types.h new GimpViewable subclass which
2008-05-20  Michael Natterer  <mitch@gimp.org>

	* app/core/Makefile.am
	* app/core/core-types.h
	* app/core/gimpimagemapconfig.[ch]: new GimpViewable subclass
	which has a "time" property. Sets the object's name to a date
	string if a time != 0 gets set. Has a compare function which first
	sorts the objects with a timestamp in MRU order and then the
	objects without timestamp by name.

	* app/gegl/gimpbrightnesscontrastconfig.[ch]
	* app/gegl/gimpcolorbalanceconfig.[ch]
	* app/gegl/gimpcolorizeconfig.[ch]
	* app/gegl/gimpcurvesconfig.[ch]
	* app/gegl/gimphuesaturationconfig.[ch]
	* app/gegl/gimplevelsconfig.[ch]
	* app/gegl/gimpposterizeconfig.[ch]
	* app/gegl/gimpthresholdconfig.[ch]: derive from GimpImageMapConfig.

	* app/tools/gimpimagemaptool.c: sort the settings container with
	above compare function.

	* app/tools/gimpimagemaptool-settings.c: add utility functions
	for loading and saving the settings container. In the settings
	combo, add a separator between MRU items and favorites.

	* app/Makefile.am: make the thing link.


svn path=/trunk/; revision=25724
2008-05-20 21:41:47 +00:00
Michael Natterer ebe4406610 formatting.
2008-05-16  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am: formatting.


svn path=/trunk/; revision=25676
2008-05-16 17:35:19 +00:00
Sven Neumann 6e6a0355aa app/core/Makefile.am
2008-05-11  Sven Neumann  <sven@gimp.org>

	* app/core/Makefile.am
	* app/core/gimpcurve.[ch]:
	* app/core/gimpcurve-map.[ch]: split curve map functions into
	seperate files.

	* app/gegl/gimpoperationcurves.c
	* app/tools/gimpcurvestool.c
	* app/widgets/gimpcurveview.c: changed accordingly.

	* app/Makefile.am (AM_LDFLAGS): make it link.


svn path=/trunk/; revision=25642
2008-05-11 14:56:57 +00:00
Simon Budig 5426c0c10e removed Libart usage, replaced with Cairo. Dashed strokes do not yet work
2008-05-09  Simon Budig  <simon@gimp.org>

	* app/core/gimpscanconvert.[ch]: removed Libart usage,
	  replaced with Cairo. Dashed strokes do not yet work again, will
	  happen tomorrow. Also the blending modes need a second look at.

	  Also removed deprecated API which made it unnecessarily complicated.

	* app/tools/gimpiscissorstool.c: use the current API.

	* app/core/Makefile.am
	* app/Makefile.am
	* configure.in: removed libart dependency, added cairo dependency
	  where necessary.


svn path=/trunk/; revision=25591
2008-05-08 23:35:53 +00:00
Sven Neumann 682c55451c don't assume that global AM_LDFLAGS and per-target LD_FLAGS would sum up
2008-02-26  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am (gimp_2_5_LDFLAGS): don't assume that global
	AM_LDFLAGS and per-target LD_FLAGS would sum up and explicitly 
add
	AM_LDFLAGS to gimp_2_5_LDFLAGS.


svn path=/trunk/; revision=24987
2008-02-26 21:20:48 +00:00