sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code
60,934 Commits 60 Branches 1,144 Tags 452 MiB
0e77bea165
Commit Graph

27 Commits

Author SHA1 Message Date
Stefan Metzmacher
06d38e58e8 mkversion.sh: printf %s is more portable than echo -e 
metze
(This used to be commit 274ae4b06a)
 2008-06-27 09:22:21 +02:00
Stefan Metzmacher
ef4e560174 prepare the mkversion.sh infrastructure for git branches in the build-farm 
metze
(cherry-picked from 1bf4c7fb20)
(This used to be commit 464668b07a)
 2008-01-10 19:34:24 +01:00
Stefan Metzmacher
34da75652d r25419: fix generation of git revision calculation 
metze
(This used to be commit 7f70d5e7b9)
 2007-10-10 15:07:29 -05:00
Andrew Bartlett
6f9ea168a6 r24822: Merge from SAMBA_4_0_RELEASE: 
Update the mkrelease.sh script and mkversion.sh to make releasing correct
Samba4 tarballs harder to screw up.

Andrew Bartlett
(This used to be commit 5f9ca54b5c)
 2007-10-10 15:03:16 -05:00
Andrew Bartlett
b7eae78794 r24819: We are preparing for alpha1, so update the mkversion script to cope with that. 
Andrew Bartlett
(This used to be commit 6245da195b)
 2007-10-10 15:03:16 -05:00
Stefan Metzmacher
ee1ca9a410 r23684: 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 7bb81c1fc3)
 2007-10-10 14:59:01 -05:00
Stefan Metzmacher
91e68b1d90 r23681: merge 23670 from SAMBA_3_0: 
metze
(This used to be commit 446312df74)
 2007-10-10 14:59:00 -05:00
Kai Blin
a1d45c6280 r23605: Update mkversion.sh to support git and git-svn checkouts. 
Jerry, did I get you right that you'll merge this to 3_0 yourself?

Kai
(This used to be commit 03be540ee3)
 2007-10-10 14:53:28 -05:00
Stefan Metzmacher
66f264bd7a r19229: let mkversion.sh handle bzr trees 
metze
(This used to be commit 12c8067337)
 2007-10-10 14:20:55 -05:00
Stefan Metzmacher
c71aac4403 r16560: print out the correct value 
metze
(This used to be commit 0e10282f89)
 2007-10-10 14:09:34 -05:00
Stefan Metzmacher
ee9108e11b r15619: use source/version.h again 
I have removed the old files from the unpacked area,
so we should not get any problems on the build farm

metze
(This used to be commit a54f9a4fa8)
 2007-10-10 14:07:01 -05:00
Andrew Tridgell
7947d4c425 r15517: fixed the segv in provision. The problem was that SAMBA_VERSION_STRING 
was defined recursively as the mkversion.sh script was putting the new
version in the wrong spot
(This used to be commit 962afd362c)
 2007-10-10 14:05:45 -05:00
Stefan Metzmacher
713f241edc r15513: only run 'svn info' and 'svk info' once 
metze
(This used to be commit 82cd1de3fb)
 2007-10-10 14:05:44 -05:00
Andrew Bartlett
721270ebad r15510: As discussed on samba-technical, move the VERSION system back to a 
#define based system only.  This avoids allocation in the fault code.

Andrew Bartlett
(This used to be commit 31c97b4e67)
 2007-10-10 14:05:44 -05:00
Jelmer Vernooij
dfc517b053 r13658: More moving around of files: 
- Collect the generic utility functions into a lib/util/ (a la GLib is
		for the GNOME folks)
 - Remove even more files from include/
(This used to be commit ba62880f5b)
 2007-10-10 13:52:05 -05:00
Stefan Metzmacher
ca649f797c r13112: merge over some stuff from samba3 
metze
(This used to be commit 7cb4e1bd04)
 2007-10-10 13:51:26 -05:00
Stefan Metzmacher
36b1a0f82d r13079: add SAMBA_VERSION_RELEASE_NICKNAME 
if it's set in source/VERSION

smbd --version will print
4.0.0tp1 (Nickname)

metze
(This used to be commit 780870293b)
 2007-10-10 13:51:23 -05:00
Jelmer Vernooij
541d84f934 r13077: Allow the mkversion script to be used for technology preview releases 
(This used to be commit 2636e6c948)
 2007-10-10 13:51:22 -05:00
Lars Müller
df9b8edff5 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 8e2be770ae)
 2007-10-10 13:31:10 -05:00
Stefan Metzmacher
928d749143 r6920: display the SVN revision in svk build of tree's directly mirrored from samba.org 
metze
(This used to be commit 7feddfb5d2)
 2007-10-10 13:16:56 -05:00
Stefan Metzmacher
b089a28cb7 r6353: we need the english output from the svn commands 
metze
(This used to be commit ccedfc9fe7)
 2007-10-10 13:11:34 -05:00
Stefan Metzmacher
4e9d01c2a7 r822: 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 081f7970dd)
 2007-10-10 12:53:52 -05:00
Stefan Metzmacher
405e08683d r412: 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 6658e75358)
 2007-10-10 12:51:37 -05:00
Stefan Metzmacher
5201ae9b31 r212: fix the svk stuff 
metze
(This used to be commit 995f54b208)
 2007-10-10 12:51:17 -05:00
Stefan Metzmacher
bfbe809a6f r211: svk has different revision numbers, 
so use "3.9.0-SVK-build-276-metze@dragon"
as version when the working copy is checked out with svk

metze
(This used to be commit a99e31d10f)
 2007-10-10 12:51:17 -05:00
Stefan Metzmacher
dda81bdb92 r205: update to the new version schema 
in a svn or svk working copy (checked out tree)
we now have "3.9.0-SVN-build-205" versions
for the SAMBA_4_0 branch

when I put out the 3.9.0 release
it will change to 3.9.1-SVN-build-XXX

I will merge this to SAMBA_3_0 and trunk soon

metze
(This used to be commit a7f552f96b)
 2007-10-10 12:51:16 -05:00
Stefan Metzmacher
e06687eb17 merge the version.h autogeneration stuff from 3.0 
metze
(This used to be commit 24dc237e10)
 2004-01-28 12:47:52 +00:00