Commit Graph

49 Commits

Author SHA1 Message Date
lmat
04a4849967 Removing unneeded build flag from docker 2017-11-28 16:09:23 -05:00
John Ralls
115c0bf4a4 Merge Aaron Law's branch 'buildfix' to unstable. 2017-10-27 10:13:06 -07:00
lmat
7a0d5a5735 Updating home directory to fix CI error messages 2017-10-27 11:57:06 -04:00
Geert Janssens
67ae241075 Use alternative revision retrieval if git describe is failing
This happens primarily on Travis. It looks like the shallow clone it makes is missing
tags. So if git describe fails, fall back to only the short commit hash (as we used to do
previously everywhere).
2017-10-26 22:48:50 +02:00
Geert Janssens
998f1185c1 Improve about dialog layout and contents
The main changes are
- group version and build information together
- increase size of application icon and name
- A more complete copyright notice (including 'Copyright' and 'GnuCash')

The default gtk provided about dialog widget won't allow for much more customization than that...

Note the build info has been condensed and is now based on 'git describe' which
returns a very concise, yet complete description of a commit starting from
the last tag that precedes it. This info will also be used anywhere else the build info
was displayed from now on, simplifying translations as well.
2017-10-26 22:48:50 +02:00
Geert Janssens
29b862adc2 Use different format specifier to make older git versions happy 2017-10-05 17:02:32 +02:00
Geert Janssens
e56cb37813 Additional changes to use commit date rather than build date
This effectively replaces the use of GNUCASH_BUILD_DATE with GNUCASH_SCM_REV_DATE.
The latter is extracted from the current commit if building from some kind of vcs
(currently only works correctly for svn and git). The info extracted while building
from vcs is then also added to the dist tarball so it's available when building
from tarball as well (via the file libgnucash/core-utils/gnc-vcs-info.h).

The same date is also used to set the date in gnucash' man page document.
A practical detail: I have changed the substitution variables in the man page template
from @- -@ to ${} so we could leverage CONFIGURE_FILE in cmake. The necessary
related adjustments have also been made to Makefile.am's substitution rules.
2017-10-05 15:51:55 +02:00
Bernhard M. Wiedemann
f9b2d8ce57 Allow to export the last commit's date
for use in release tarballs
to give users a hint on how old their software is.
2017-10-01 22:31:58 +02:00
Geert Janssens
42aa734475 Travis fixes
- Remove trailing semicolons. They're not needed in shell scripts
- Don't create default XDG_DATA_HOME (<HOME>/.local/share) the code
  should work equally well if that directory doesn't exist and so
  not creating it tests another part of the code
2017-09-16 22:29:29 +02:00
Geert Janssens
61a90d99fb Disable creating a user_data_dir in the test environment
The code should be able to cope with this
2017-09-16 19:18:01 +02:00
lmat
0cdd776941 Adding python tests to cmake
And removing some debugging comments
2017-09-12 14:20:18 +02:00
lmat
121dd8cf90 Configure travis to use docker for CI
Currently, there is an ubuntu 14.04 and archlinux build and they both
use cmake with ninja, cmake with make, and autotools to build. It should
be straightforward to add another configuration.

Travis checks out the correct branch of the source code for us, and we
expose that source code to the docker container using a docker run
"volume".
2017-09-09 09:56:34 -04:00
Geert Janssens
c0f3147a3e Merge branch 'maint'
Resolved conflicts:
	.travis.yml
2017-09-02 16:18:23 +02:00
Geert Janssens
1e7c721e8d Have Travis print out build logs in case of test failures
To get the after_failure line work, I had to move the inline
build script to a separate script (util/travis-script.sh)

The second script (util/travis-after-failure.sh) will output
LastTest.log for cmake based builds and all files named
test*.log for an autotools based build.

Note: this commit also comes with a delibarate test failure
to illustrate the Travis behaviour. It will be removed in the
next commit.
2017-09-02 16:02:08 +02:00
Geert Janssens
16b98cc5a4 Tweak cmake/autotools so they produce the same output for POTFILES.in 2017-08-03 18:19:06 +02:00
Rob Gowin
6b14dc5b59 Implement 'dist', 'distcheck' and 'uninstall' targets for CMake 2017-07-03 16:15:17 -07:00
John Ralls
5839235861 Add small utility to print message catalog statistics.
Use perldoc on it for details.
2016-01-19 16:24:20 -08:00
John Ralls
85141691bd Bug 755781 - Files with copyright but no grant of license. Non-free?
Add the GPL Blurb to all source files lacking it via a perl utility,
util/fix-license.pl.
2015-09-29 12:08:48 -07:00
Frank H. Ellenberger
a59b01b939 Build system: rename gnc-scm-info to gnc-vcs-info
Follow up of my previous patch to distinguish version control from
scheme
2015-03-31 02:07:39 +02:00
Frank H. Ellenberger
cc2e87baa0 Build system: Rename BUILDING_FROM_SCM to BUILDING_FROM_VCS
This should avoid confunsion as in other variable SCM means scheme.
2015-03-31 02:07:38 +02:00
Geert Janssens
cebcc5afcc Fix bzr/svk copy/paste typo 2015-03-30 17:30:12 +02:00
Geert Janssens
90d66f99c9 Check proper env variable in gnc-scm-info 2015-03-30 17:30:12 +02:00
John Ralls
b3781c16d0 Bug 731889 - guile 2 exports different autoconf macros than what is expected
Replace the autogen-sh time configuration which doesn't really work
correctly by making a local interpreter which links whichever library
pkg-config finds.

Also makes Guile-2.0 the default by looking for it first.
2015-01-31 14:31:19 +01:00
Geert Janssens
5fe14092eb Add script to generate a list of changes in html format between two revisions based on git log
This is the equivalent of svnlog2ul.sh which does the same from svn log

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22983 57a11ea4-9604-0410-9ed3-97b8803252fd
2013-05-17 10:10:50 +00:00
John Ralls
2d15a1bc73 Allow svnlog2ul.sh to run on the current working copy
And from the root directory instead of having to cd to util/svnlog2ul


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22948 57a11ea4-9604-0410-9ed3-97b8803252fd
2013-05-04 22:28:35 +00:00
Geert Janssens
67b2a56855 Change of mind. Use scm instead of vcs.
scm is the modern term. vcs is rather used to refer to archaic systems
such as cvs and older. I wish I remembered this before my previous
commit. Oh well...

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22476 57a11ea4-9604-0410-9ed3-97b8803252fd
2012-11-01 10:35:34 +00:00
Geert Janssens
27c76eccd5 Minor changes to indicate svn is not the only/primary vcs used.
The code actually has provisions for svn, svk, git and bzr. Only svn and
git are actively used by the core developers though.

This involves changing
- filenames that contained svn while meant for multiple vcs's
- variable and macro names that are relevant for multiple vcs's
- the various locations where the vcs revision info is displayed
  to the user, to mention the actual vcs used instead of standard "svn"

While at the last item, I also changed the text printed when gnucash is
called with the --version parameter, to reuse the translatable string
that is also used for the about dialog. This saves us one string to
translate.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22475 57a11ea4-9604-0410-9ed3-97b8803252fd
2012-10-31 21:38:49 +00:00
Geert Janssens
fa7bd291c7 Further tweaks to enable git on the windows build
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22167 57a11ea4-9604-0410-9ed3-97b8803252fd
2012-04-28 16:18:29 +00:00
John Ralls
db9ca59763 Force /bin/echo in git section
Apple's version of bash version 3, when called as /bin/sh, uses an internal echo command which doesn't handle the "-n" argument and contaminates the git version string. /bin/echo correctly handles the -n argument.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20654 57a11ea4-9604-0410-9ed3-97b8803252fd
2011-05-17 18:24:10 +00:00
Christian Stimming
bd17b5fa41 Add missing svn:executable property
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20162 57a11ea4-9604-0410-9ed3-97b8803252fd
2011-01-24 14:04:37 +00:00
Geert Janssens
cdaf152cd7 Use last changed revision number instead of last-commited-somewhere-in-repo
svnversion without options returns the most recent revision in the repo
at the time of the last svn update/checkout even if that revision
didn't hold any changes in the current path. Not very useful as a
reference. Better is to ask for the last changed revision with -c.
BUT: -c option for some reason always considers svn working copy
as having mixed sources. We're only interested in the last part so
we strip the beginning revision if it's there.
As a result if your WC really has mixed sources, that will not be
visible in the version number...

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20140 57a11ea4-9604-0410-9ed3-97b8803252fd
2011-01-21 22:10:40 +00:00
Micha Lenk
6e71c239d9 Add facility to force BUILDING_FROM_SVN=no from outside the Gnucash build system
Needed by packagers that maintain the packaging code in svn, svk or git too


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19990 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-12-29 13:54:58 +00:00
Geert Janssens
9b4682cb04 Insert missing "format:" - otherwise it didn't build for me.
Additional simplifying git expressions.
Patch by Frank H. Ellenberger

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19011 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-04-10 12:22:56 +00:00
Geert Janssens
8b3528f47d Bug #611645 gnc-svnversion returns "too long" a string for git users, patch by Jeff Kletsky
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18880 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-03-09 18:28:04 +00:00
Geert Janssens
ed33fc5226 Tweak to gnc-svnversion's bzr section, patch by Jesse Weinstein
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18809 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-03-04 09:53:57 +00:00
Geert Janssens
0e00cfd225 Add bzr support to gnc-svnversion. Patch by Jesse Weinstein
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18692 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-02-20 00:17:41 +00:00
Geert Janssens
53749867fe Move count.* to util
Also I made a first attempt at improving the line count.
The old script missed a number of files in the directories
it counted.

The script is still not in line with the current code base
though. A number of directories are still not counted (like
gnome, engine, ledger, ...)

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18628 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-02-08 20:53:35 +00:00
Geert Janssens
9e1e1bea8a Moved svnlog2ul from contrib to util
It makes more sense in util as it is by and for the devs, not
contributed by an external user for external use.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18627 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-02-08 17:59:15 +00:00
Geert Janssens
0c34b87720 Fix script to check for > 2.8 entries to remove
The minimal Gtk+ requirement has been set to 2.8 recently. This script still removed glade
parameters that are valid in 2.8. This patch fixes that.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18617 57a11ea4-9604-0410-9ed3-97b8803252fd
2010-02-06 20:22:21 +00:00
Andreas Köhler
4619a7b38c Revert r17966 and use Glade-2 again.
At the moment all major distributions feature Glade-3 which tends to
save a lot of lines less compared to Glade-2 because it does not define
properties whose values equal the default ones specified by Gtk+.
Unfortunately though, only very recent versions of Glade, v3.5.3+,
address the following two issues:

(1) GtkTable attachments are written in different order each times,
rendering diffs unusable.
(2) Currently we depend on the ability to use a name multiple times in a
single glade file and only newer versions allow to have uniqueness be
applied to each top-level widget.

Sorry for the confusion.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17967 57a11ea4-9604-0410-9ed3-97b8803252fd
2009-03-02 21:15:41 +00:00
Andreas Köhler
47ede669f2 Re-save glade files from Glade 3, remove util/glade-fixup.
Glade 3 does not save properties with default values anymore.  This
reduces patch sizes when Glade-3/Gtk+ is used with varying versions and
also avoids warnings about properties unknown to older Gtk+ versions.

The version Glade 3 used is 3.4.5.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17966 57a11ea4-9604-0410-9ed3-97b8803252fd
2009-03-01 19:13:14 +00:00
Christian Stimming
efc19c85eb Add shell script to easily back-port commits in git-svn from trunk to other branches.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17856 57a11ea4-9604-0410-9ed3-97b8803252fd
2009-01-31 10:24:34 +00:00
Andreas Köhler
7a3dc4ac7c SVK detection on Windows is not trivial :-)
Patch from Daniel Harding.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17120 57a11ea4-9604-0410-9ed3-97b8803252fd
2008-04-21 20:59:50 +00:00
Derek Atkins
c052ac4078 limit SVK version information to 5 revisions/copies.
Otherwise the svk version info just continues to grow ad nausium


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16362 57a11ea4-9604-0410-9ed3-97b8803252fd
2007-07-26 19:15:54 +00:00
Andreas Köhler
0a179cf181 Update comment in glade-fixup to Gtk+ v2.6.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16065 57a11ea4-9604-0410-9ed3-97b8803252fd
2007-05-08 20:45:13 +00:00
David Hampton
440e1e7323 Update for the new base level of gtk2.6.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15432 57a11ea4-9604-0410-9ed3-97b8803252fd
2007-01-27 04:31:29 +00:00
Andreas Köhler
348c8cce3e Make GnuCash compile from a git repository.
Patch gnc-svnversion to check for .git, but in the top-level source
directory instead of src/gnome-utils. Use the output of "git-rev-parse
HEAD" as version string.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15292 57a11ea4-9604-0410-9ed3-97b8803252fd
2007-01-01 16:47:32 +00:00
Derek Atkins
68400b50f6 Handle the case of a user who has svk but hasn't configured it. (#347403)
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14489 57a11ea4-9604-0410-9ed3-97b8803252fd
2006-07-12 19:50:44 +00:00
Derek Atkins
d86d61e227 Allow building from either SVN or SVK
- create gnc-svnversion script that builds the revision number
  from either SVN or SVK.  The script should fail gracefully if
  you don't have SVK installed
- convert the configure script to use the new gnc-svnversion script
- convert the splash-screen Makefile to use the gnc-svnversions script

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14427 57a11ea4-9604-0410-9ed3-97b8803252fd
2006-06-24 18:34:35 +00:00