sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code
69,801 Commits 60 Branches 1,144 Tags 452 MiB
901f34840b
Commit Graph

21 Commits

Author SHA1 Message Date
Jelmer Vernooij
ed22f13e7e s3: Rename GIT_COMMIT_{TIME,DATE} to COMMIT_{TIME,DATE}. 
This avoids some special casing in the waf code.
 2010-11-12 17:42:14 +00:00
Michael Adam
d813a90d18 version: fix handling of SAMBA_VERSION_VENDOR_PATCH. 
We need a string version of this, or else version.c does not compile.

Michael
 2009-03-19 23:57:34 +01:00
Jelmer Vernooij
41ebc6fe73 Reorder defines for version for consistency with Samba 4. 
(This used to be commit fe36d83508)
 2008-09-12 12:38:54 +02:00
Andreas Schneider
2a8ebdca53 Simplify samba_version_string. 
This adds a new macro for a vender version function which will be returned
by the samba_version_string() function if defined.

Signed-off-by: Andreas Schneider <anschneider@suse.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit 8b9301fbc7)
 2008-07-17 14:16:19 +02:00
Michael Adam
36ade6136d mkversion: be more portable, use 'print "%s"' instead of 'echo -n' 
Michael
(This used to be commit 7a23dab1ea)
 2008-04-01 16:16:55 +02:00
Stefan Metzmacher
edfcfefa37 prepare the mkversion.sh infrastructure for git branches in the build-farm 
metze
(This used to be commit 1bf4c7fb20)
 2007-10-11 12:27:38 +02:00
Stefan Metzmacher
4802b2d6ca r25418: fix generation of git revision calculation 
metze
(This used to be commit 43df4928ec)
 2007-10-10 12:31:04 -05:00
Stefan Metzmacher
1d5646f9ff r23685: merge from SAMBA_4_0: 
Only use the bzr and git information when there's
a .bzr or .git in the top branch directory

I use bzr for my home directory and
bzr version-info in ~/devel/samba/4.0/samba4-git
gives the info about the ~/.bzr branch

metze
(This used to be commit e4df2e1c2d)
 2007-10-10 12:23:45 -05:00
Volker Lendecke
0a754ca75c r23670: Fix mkversion.sh for the git case: Only use the first line where 
"commit" occurs
(This used to be commit 0e9aeec370)
 2007-10-10 12:23:44 -05:00
Kai Blin
97746f8db0 r23606: Merge Samba4 mkversion.sh to Samba3. 
(This used to be commit 6566e24c13)
 2007-10-10 12:23:35 -05:00
Michael Adam
90ad4eae89 r22401: Add bzr revision+nick support to mkversion.sh. 
The plan is to actually synchronize with SAMBA_4_0's mkversion.sh,
which is more elaborate. But there are a few differences in
behaviour I still have to check. So I am cheching this here in for
a start...

Michael
(This used to be commit dec7e31f29)
 2007-10-10 12:19:32 -05:00
Gerald Carter
7de55b30b7 r13229: * fix bad comparison caught by the AIX compiler in wbinfo code 
* update output from mkversion.sh to include the SAMBA_VENDOR_PATCH
(This used to be commit 485f037094)
 2007-10-10 11:06:19 -05:00
Gerald Carter
19907887fc r13093: adding vendor patch level string as announced on samba-technical ml 
(This used to be commit d40f06018b)
 2007-10-10 11:06:13 -05:00
Lars Müller
910f3dd348 r9038: Revert svn rev 414. Discussed with Jerry and Metze. 
We need the option to add an 'a' if we're already in pre or rc state
with the next release.

Bugzilla Bug 2618
(This used to be commit 26bf1d223e)
 2007-10-10 11:00:24 -05:00
Stefan Metzmacher
0895eae509 r6925: merge rev 6920 from 4_0: 
display the SVN revision in svk build of tree's directly mirrored from samba.org

metze
(This used to be commit 110c0f6f36)
 2007-10-10 10:56:57 -05:00
Stefan Metzmacher
6cc85bbe72 r6354: merge from 4_0 rev 6353: 
we need the english output from the svn commands

metze
(This used to be commit 6b84f30e3d)
 2007-10-10 10:56:38 -05:00
Stefan Metzmacher
b4594cec6e r824: merge from: SAMBA_4_0: 
use 'Last Change Rev:' instead of 'Revision:' from the svn info output
for setting the SVN_REVISION in version.h

metze
(This used to be commit 7cc35ba066)
 2007-10-10 10:51:47 -05:00
Stefan Metzmacher
65d9febf9a r413: merge from 4_0: 
as we decide to not do 3.0.2a releases anymore,
remove the generation stuff from VERSION and mkversion.sh

metze
(This used to be commit 25cbca89ba)
 2007-10-10 10:51:22 -05:00
Stefan Metzmacher
1cd9d74016 r215: merge over svk fixes from 4_0 
metze
(This used to be commit 2326c9e0a2)
 2007-10-10 10:51:14 -05:00
Stefan Metzmacher
f8c418a0af r208: merge the version schema changes from 4_0 
metze
(This used to be commit 4d9d8e83aa)
 2007-10-10 10:51:14 -05:00
Gerald Carter
8bfe26b62d metze's autogenerate patch for version.h 
(This used to be commit ae452e51b0)
 2003-08-20 17:13:38 +00:00