1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Commit Graph

25 Commits

Author SHA1 Message Date
Andrew Tridgell
4f48a28c3c build: fixed 'make dist' without configuring
this finds git inside samba_version.py

thanks to Simo for noticing this problem

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Feb 23 07:55:28 CET 2011 on sn-devel-104
2011-02-23 07:55:28 +01:00
Jelmer Vernooij
fd880fda0d s4-version: Fix version finding for bzr branches.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Feb 20 17:35:45 CET 2011 on sn-devel-104
2011-02-20 17:35:45 +01:00
Jelmer Vernooij
4078b649f1 Show text output messages when interfacing with bzr. 2011-01-24 17:14:50 -08:00
Jelmer Vernooij
8b34a2dff6 wafsamba: Fix handling of nick name in VERSION. 2010-12-24 01:15:05 +01:00
Andrew Tridgell
d5bf525591 s4-waf: get the version number right on private libraries
use the first digit of the version number for the library version

Pair-Programmed-With: Jelmer Vernooij <jelmer@samba.org>
2010-12-08 05:26:06 +01:00
Jelmer Vernooij
8dcd4cca4e wafsamba: Override GIT_DIR without using putenv.
putenv has sideffects on later code. This overrides GIT_DIR for just this call.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Fri Dec  3 04:24:53 CET 2010 on sn-devel-104
2010-12-03 04:24:53 +01:00
Stefan Metzmacher
beb01815f0 buildtools: fix --git-local-changes option
If we set the GIT_DIR envvar we also need to set GIT_WORK_TREE,
otherwise we can't expect valid output from 'git diff HEAD'.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Dec  2 09:09:21 CET 2010 on sn-devel-104
2010-12-02 09:09:21 +01:00
Andrew Tridgell
fe5c48cbed waf: added --git-local-changes configure option
if you use --git-local-changes then the version number that waf
extracts from git will have a '+' on the end if you have local
changes, as determined by running 'git diff'.

This used to be the default, but unfortunately it is far too slow on
some systems. On a NFS build system I was using the first line of
configure took about 2 minutes.

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Nov 16 01:51:54 UTC 2010 on sn-devel-104
2010-11-16 01:51:54 +00:00
Andrew Tridgell
88d694ac8e waf: fixed configure again on RHEL5
the fancier cmd_output() broke git versioning

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Nov 15 11:33:41 UTC 2010 on sn-devel-104
2010-11-15 11:33:41 +00:00
Jelmer Vernooij
e4eba98f83 waf/samba_version: Simplify git show command.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Fri Nov 12 18:38:21 UTC 2010 on sn-devel-104
2010-11-12 18:38:21 +00:00
Jelmer Vernooij
8d07e6d986 samba_version: Make COMMIT_IS_CLEAN an int rather than a string. 2010-11-12 17:42:14 +00:00
Jelmer Vernooij
7d961ddc44 samba_version: Simplify dirty tree detection. 2010-11-12 17:42:14 +00:00
Jelmer Vernooij
c338dede1b waf/samba_version: Support integer defines. 2010-11-12 17:42:14 +00:00
Jelmer Vernooij
7b964c7269 samba_version: When working from git checkout, display git revision SHA1 rather
than Bazaar revision ids.
2010-11-12 17:42:13 +00:00
Jelmer Vernooij
a0c2040ab6 samba_version: Support retrieving snapshot identity from bzr. 2010-11-12 17:42:13 +00:00
Jelmer Vernooij
45af495695 samba_version: Cope with building snapshots in directories without git checkout.
Error out when run in a git checkout in which git fails.
2010-11-12 17:42:13 +00:00
Jelmer Vernooij
d9a0a18dda Put git tree finding into a separate function. 2010-11-12 17:42:13 +00:00
Jelmer Vernooij
80e2adc9c3 sambaversion.py: Some cleanups, make less git-specific. 2010-11-12 17:42:13 +00:00
Andrew Tridgell
c24240bcd2 waf: fixed some python3.x portability issues
these have crept into the tree over time. Maybe we should add testing
of a range of python versions to autobuild?
2010-10-06 11:13:05 +00:00
Jelmer Vernooij
ead126caac Merge branch 'v4-0-stable' into newmaster 2010-09-20 15:24:44 -07:00
Jelmer Vernooij
e4d7bc24d1 wafsamba: Fix parsing of IS_GIT_VERSION. 2010-09-20 13:08:29 -07:00
Stefan Metzmacher
92eccf89a1 waf: add a '+' to the git hash if the working tree isn't clean
metze
2010-09-19 07:40:39 +02:00
Stefan Metzmacher
a66db2cb78 waf: fix typos in GIT_COMMIT_* strings
metze
2010-09-19 07:40:14 +02:00
Andrew Tridgell
30dc87dab9 build: only use git when found by configure
this rebuilds version.h whenever the git version changes, so we always
get the right version with samba -V. That adds about 15s to the build
time on each git commit, which shouldn't be too onerous
2010-06-29 14:28:08 +10:00
Andrew Bartlett
892a4b24e7 waf Read VERSION file inside WAF to set package version
This replaces the call to mkversion.sh in both the Samba3 and Samba4
WAF builds.

Andrew Bartlett
2010-05-28 15:20:03 +10:00