1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-18 19:17:08 +03:00

17 Commits

Author SHA1 Message Date
Michael Adam
7a23dab1ea mkversion: be more portable, use 'print "%s"' instead of 'echo -n'
Michael
2008-04-01 16:16:55 +02:00
Stefan Metzmacher
1bf4c7fb20 prepare the mkversion.sh infrastructure for git branches in the build-farm
metze
2007-10-11 12:27:38 +02:00
Stefan Metzmacher
43df4928ec r25418: fix generation of git revision calculation
metze
2007-10-10 12:31:04 -05:00
Stefan Metzmacher
e4df2e1c2d 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
2007-10-10 12:23:45 -05:00
Volker Lendecke
0e9aeec370 r23670: Fix mkversion.sh for the git case: Only use the first line where
"commit" occurs
2007-10-10 12:23:44 -05:00
Kai Blin
6566e24c13 r23606: Merge Samba4 mkversion.sh to Samba3. 2007-10-10 12:23:35 -05:00
Michael Adam
dec7e31f29 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
2007-10-10 12:19:32 -05:00
Gerald Carter
485f037094 r13229: * fix bad comparison caught by the AIX compiler in wbinfo code
* update output from mkversion.sh to include the SAMBA_VENDOR_PATCH
2007-10-10 11:06:19 -05:00
Gerald Carter
d40f06018b r13093: adding vendor patch level string as announced on samba-technical ml 2007-10-10 11:06:13 -05:00
Lars Müller
26bf1d223e 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 11:00:24 -05:00
Stefan Metzmacher
110c0f6f36 r6925: merge rev 6920 from 4_0:
display the SVN revision in svk build of tree's directly mirrored from samba.org

metze
2007-10-10 10:56:57 -05:00
Stefan Metzmacher
6b84f30e3d r6354: merge from 4_0 rev 6353:
we need the english output from the svn commands

metze
2007-10-10 10:56:38 -05:00
Stefan Metzmacher
7cc35ba066 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
2007-10-10 10:51:47 -05:00
Stefan Metzmacher
25cbca89ba 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
2007-10-10 10:51:22 -05:00
Stefan Metzmacher
2326c9e0a2 r215: merge over svk fixes from 4_0
metze
2007-10-10 10:51:14 -05:00
Stefan Metzmacher
4d9d8e83aa r208: merge the version schema changes from 4_0
metze
2007-10-10 10:51:14 -05:00
Gerald Carter
ae452e51b0 metze's autogenerate patch for version.h -