diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/VERSION | 38 | ||||
| -rwxr-xr-x | source3/autogen.sh | 16 | ||||
| -rwxr-xr-x | source3/script/mkversion.sh | 30 |
3 files changed, 23 insertions, 61 deletions
diff --git a/source3/VERSION b/source3/VERSION index 991b12dcbb..63953826cf 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -54,46 +54,16 @@ SAMBA_VERSION_PRE_RELEASE=3 SAMBA_VERSION_RC_RELEASE= ######################################################## -# For 'beta' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>beta<BETA_RELEASE> # -# # -# e.g. SAMBA_VERSION_BETA_RELEASE=3 # -# -> "3.0.0beta3" # -######################################################## -SAMBA_VERSION_BETA_RELEASE= - -######################################################## -# For 'alpha' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>alpha<ALPHA_RELEASE> # -# # -# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # -# -> "4.0.0alpha1" # -######################################################## -SAMBA_VERSION_ALPHA_RELEASE= - -######################################################## -# For 'test' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>test<TEST_RELEASE> # -# # -# e.g. SAMBA_VERSION_TEST_RELEASE=1 # -# -> "4.0.0test1" # -######################################################## -SAMBA_VERSION_TEST_RELEASE= - -######################################################## -# To mark CVS snapshots this should be set to 'yes' # +# To mark SVN snapshots this should be set to 'yes' # # in the development BRANCH, and set to 'no' only in # # the SAMBA_X_X_RELEASE BRANCH # # # # <MAJOR>.<MINOR>.<RELEASE>[...]cvs # # # -# e.g. SAMBA_VERSION_IS_CVS_SNAPSHOT=yes # -# -> "CVS 3.0.0rc2" # +# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # +# -> "3.0.0-SVN-build-199" # ######################################################## -SAMBA_VERSION_IS_CVS_SNAPSHOT=yes +SAMBA_VERSION_IS_SVN_SNAPSHOT=yes ######################################################## # This can be set by vendors if they want... # diff --git a/source3/autogen.sh b/source3/autogen.sh index 6042b82cdc..922cad8e61 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -1,11 +1,11 @@ #!/bin/sh -# Run this script to build samba from CVS. +# Run this script to build samba from SVN. ## insert all possible names (only works with ## autoconf 2.x -TESTAUTOHEADER="autoheader autoheader-2.53" -TESTAUTOCONF="autoconf autoconf-2.53" +TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50" +TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50" AUTOHEADERFOUND="0" AUTOCONFFOUND="0" @@ -43,11 +43,14 @@ done ## do we have it? ## if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then - echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2 + echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2 exit 1 fi +echo "$0: running script/mkversion.sh" +./script/mkversion.sh || exit 1 +rm -rf autom4te*.cache echo "$0: running $AUTOHEADER" $AUTOHEADER || exit 1 @@ -55,10 +58,7 @@ $AUTOHEADER || exit 1 echo "$0: running $AUTOCONF" $AUTOCONF || exit 1 -echo "$0: running script/mkversion.sh" -./script/mkversion.sh || exit 1 - -rm -rf autom4te.cache autom4te-2.53.cache +rm -rf autom4te*.cache echo "Now run ./configure and then make." exit 0 diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index ca39297940..f3d385e27e 100755 --- a/source3/script/mkversion.sh +++ b/source3/script/mkversion.sh @@ -24,13 +24,7 @@ SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` -SAMBA_VERSION_BETA_RELEASE=`sed -n 's/^SAMBA_VERSION_BETA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` - -SAMBA_VERSION_ALPHA_RELEASE=`sed -n 's/^SAMBA_VERSION_ALPHA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` - -SAMBA_VERSION_TEST_RELEASE=`sed -n 's/^SAMBA_VERSION_TEST_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` - -SAMBA_VERSION_IS_CVS_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_CVS_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE` +SAMBA_VERSION_IS_SVN_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_SVN_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE` SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE` @@ -53,21 +47,19 @@ elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then elif test -n "${SAMBA_VERSION_RC_RELEASE}";then SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}rc${SAMBA_VERSION_RC_RELEASE}" echo "#define SAMBA_VERSION_RC_RELEASE ${SAMBA_VERSION_RC_RELEASE}" >> $OUTPUT_FILE -elif test -n "${SAMBA_VERSION_BETA_RELEASE}";then - SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}beta${SAMBA_VERSION_BETA_RELEASE}" - echo "#define SAMBA_VERSION_BETA_RELEASE ${SAMBA_VERSION_BETA_RELEASE}" >> $OUTPUT_FILE -elif test -n "${SAMBA_VERSION_ALPHA_RELEASE}";then - SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}alpha${SAMBA_VERSION_ALPHA_RELEASE}" - echo "#define SAMBA_VERSION_ALPHA_RELEASE ${SAMBA_VERSION_ALPHA_RELEASE}" >> $OUTPUT_FILE -elif test -n "${SAMBA_VERSION_TEST_RELEASE}";then - SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}test${SAMBA_VERSION_TEST_RELEASE}" - echo "#define SAMBA_VERSION_TEST_RELEASE ${SAMBA_VERSION_TEST_RELEASE}" >> $OUTPUT_FILE fi -if test x"${SAMBA_VERSION_IS_CVS_SNAPSHOT}" = x"yes";then - SAMBA_VERSION_STRING="CVS ${SAMBA_VERSION_STRING}" - echo "#define SAMBA_VERSION_IS_CVS_SNAPSHOT 1" >> $OUTPUT_FILE +if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then + TMP_SVN_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'` + TMP_SVN_REVISION_STR="" + if test -n "${TMP_SVN_REVISION}";then + TMP_SVN_REVISION_STR="-${TMP_SVN_REVISION}" + else + TMP_SVN_REVISION=0 + fi + SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-SVN-build${TMP_SVN_REVISION_STR}" + echo "#define SAMBA_VERSION_SVN_REVISION ${TMP_SVN_REVISION}" >> $OUTPUT_FILE fi if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then |