sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-29 04:23:51 +03:00
Code Activity
14,984 Commits 64 Branches 1,177 Tags
26108eb66b4b5d4b339dfc845e8a018190068e81
Commit Graph

26 Commits

Author SHA1 Message Date
Stefan Metzmacher
464668b07a prepare the mkversion.sh infrastructure for git branches in the build-farm 
metze
(cherry-picked from 1bf4c7fb20)
 2008-01-10 19:34:24 +01:00
Stefan Metzmacher
7f70d5e7b9 r25419: fix generation of git revision calculation 
metze
 2007-10-10 15:07:29 -05:00
Andrew Bartlett
5f9ca54b5c 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
 2007-10-10 15:03:16 -05:00
Andrew Bartlett
6245da195b r24819: We are preparing for alpha1, so update the mkversion script to cope with that. 
Andrew Bartlett
 2007-10-10 15:03:16 -05:00
Stefan Metzmacher
7bb81c1fc3 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
 2007-10-10 14:59:01 -05:00
Stefan Metzmacher
446312df74 r23681: merge 23670 from SAMBA_3_0: 
metze
 2007-10-10 14:59:00 -05:00
Kai Blin
03be540ee3 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
 2007-10-10 14:53:28 -05:00
Stefan Metzmacher
12c8067337 r19229: let mkversion.sh handle bzr trees 
metze
 2007-10-10 14:20:55 -05:00
Stefan Metzmacher
0e10282f89 r16560: print out the correct value 
metze
 2007-10-10 14:09:34 -05:00
Stefan Metzmacher
a54f9a4fa8 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
 2007-10-10 14:07:01 -05:00
Andrew Tridgell
962afd362c 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
 2007-10-10 14:05:45 -05:00
Stefan Metzmacher
82cd1de3fb r15513: only run 'svn info' and 'svk info' once 
metze
 2007-10-10 14:05:44 -05:00
Andrew Bartlett
31c97b4e67 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
 2007-10-10 14:05:44 -05:00
Jelmer Vernooij
ba62880f5b 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/
 2007-10-10 13:52:05 -05:00
Stefan Metzmacher
7cb4e1bd04 r13112: merge over some stuff from samba3 
metze
 2007-10-10 13:51:26 -05:00
Stefan Metzmacher
780870293b r13079: add SAMBA_VERSION_RELEASE_NICKNAME 
if it's set in source/VERSION

smbd --version will print
4.0.0tp1 (Nickname)

metze
 2007-10-10 13:51:23 -05:00
Jelmer Vernooij
2636e6c948 r13077: Allow the mkversion script to be used for technology preview releases 2007-10-10 13:51:22 -05:00
Lars Müller
8e2be770ae 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
 2007-10-10 13:31:10 -05:00
Stefan Metzmacher
7feddfb5d2 r6920: display the SVN revision in svk build of tree's directly mirrored from samba.org 
metze
 2007-10-10 13:16:56 -05:00
Stefan Metzmacher
ccedfc9fe7 r6353: we need the english output from the svn commands 
metze
 2007-10-10 13:11:34 -05:00
Stefan Metzmacher
081f7970dd r822: use 'Last Change Rev:' instead of 'Revision:' from the svn info output 
for setting the SVN_REVISION in version.h

metze
 2007-10-10 12:53:52 -05:00
Stefan Metzmacher
6658e75358 r412: as we decide to not do 3.0.2a releases anymore, 
remove the generation stuff from VERSION and mkversion.sh

metze
 2007-10-10 12:51:37 -05:00
Stefan Metzmacher
995f54b208 r212: fix the svk stuff 
metze
 2007-10-10 12:51:17 -05:00
Stefan Metzmacher
a99e31d10f 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
 2007-10-10 12:51:17 -05:00
Stefan Metzmacher
a7f552f96b 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
 2007-10-10 12:51:16 -05:00
Stefan Metzmacher
24dc237e10 merge the version.h autogeneration stuff from 3.0 
metze
 -