sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code
26,074 Commits 60 Branches 1,146 Tags
Commit Graph

16 Commits

Author SHA1 Message Date
Stefan Metzmacher
edfcfefa37 prepare the mkversion.sh infrastructure for git branches in the build-farm 
metze
(This used to be commit 1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef)
 2007-10-11 12:27:38 +02:00
Stefan Metzmacher
4802b2d6ca r25418: fix generation of git revision calculation 
metze
(This used to be commit 43df4928ecd61ae071109abb1c72dfd1b78a5a5e)
 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 e4df2e1c2d302613b1e7f44f13db9435bdafb30f)
 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 0e9aeec37008e5b882ce91c44ee201ef779ecabe)
 2007-10-10 12:23:44 -05:00
Kai Blin
97746f8db0 r23606: Merge Samba4 mkversion.sh to Samba3. 
(This used to be commit 6566e24c13aaf974b756c230d4890357e7adf73d)
 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 dec7e31f298c565b49b7bd650e164274d0f61778)
 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 485f0370942880a71095da5096e414b28193b150)
 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 d40f06018b9197c35a10cc9ab284dd596244f47b)
 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 26bf1d223efd011ca7c4d5c7d5de23d0f9ad0823)
 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 110c0f6f36b8a5e7b0e1bf4477605ed81aca5580)
 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 6b84f30e3d746a13613d94071501430fef8ee2ca)
 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 7cc35ba06644669e64460b03c141a23ad7a516d7)
 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 25cbca89baa89327384e80ad5f71577c3db6d6a2)
 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 2326c9e0a239de6997a40d8d28c39b9aea965feb)
 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 4d9d8e83aa367fe17a74b81d4417cc2cfbdf200e)
 2007-10-10 10:51:14 -05:00
Gerald Carter
8bfe26b62d metze's autogenerate patch for version.h 
(This used to be commit ae452e51b02672a56adf18aa7a7e365eeaba9272)
 2003-08-20 17:13:38 +00:00