diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2015-02-05 20:53:33 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2015-02-05 20:53:33 +0000 |
| commit | f7cba3a80d9ebefc57776fffd17a4ae68f72e494 (patch) | |
| tree | dc1c5074828f0c5fafe2fb8f5599339dfdc5bc97 /scripts/build | |
| parent | 44a728f815af203cd7a91db83b06325818433463 (diff) | |
Notes
Diffstat (limited to 'scripts/build')
| -rw-r--r-- | scripts/build/Makefile.in | 3 | ||||
| -rwxr-xr-x | scripts/build/UpdatePoint | 18 | ||||
| -rwxr-xr-x | scripts/build/VersionName | 15 |
3 files changed, 27 insertions, 9 deletions
diff --git a/scripts/build/Makefile.in b/scripts/build/Makefile.in index e1d8811614508..13e9011bd0542 100644 --- a/scripts/build/Makefile.in +++ b/scripts/build/Makefile.in @@ -111,6 +111,7 @@ CHUTEST = @CHUTEST@ CONFIG_SHELL = @CONFIG_SHELL@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@ CPPFLAGS_NTP = @CPPFLAGS_NTP@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -145,7 +146,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ +LDADD_LIBEVENT = @LDADD_LIBEVENT@ LDADD_LIBNTP = @LDADD_LIBNTP@ +LDADD_LIBUTIL = @LDADD_LIBUTIL@ LDADD_NLIST = @LDADD_NLIST@ LDADD_NTP = @LDADD_NTP@ LDFLAGS = @LDFLAGS@ diff --git a/scripts/build/UpdatePoint b/scripts/build/UpdatePoint index e3c5957dc6bc2..61c034983b6c1 100755 --- a/scripts/build/UpdatePoint +++ b/scripts/build/UpdatePoint @@ -217,20 +217,26 @@ case "$repo" in ;; esac -case "$bp::$point" in - 0::*) +case "$repo::$bp::$point" in + *::0::*) newpoint=$point ;; - 1::[1-9]*) + dev::1::0) + newpoint=`expr $point + 1` + ;; + *::1::[1-9]*) newpoint=`expr $point + 1` ;; - 1::) + dev::1::) + newpoint=0 + ;; + stable::1::) newpoint=1 ;; - 1::[Nn][Ee][Ww]) + *::1::[Nn][Ee][Ww]) newpoint= ;; - *) echo "Unexpected value for 'point' <$point>!" + *) echo "Unexpected value for 'point' <$point>! (repo::bp::point is $repo::$bp::$point)" exit 1 ;; esac diff --git a/scripts/build/VersionName b/scripts/build/VersionName index 71e31a948ff0b..84b5972261ac4 100755 --- a/scripts/build/VersionName +++ b/scripts/build/VersionName @@ -19,8 +19,17 @@ esac . "$packageinfo" NAME="$version" -case $point in - [1-9]*) +case "$repotype::$point" in + dev::) + case "${proto}.${major}" in + 4.[012]) + NAME="${NAME}p${point}" + ;; + *) NAME="${NAME}" + ;; + esac + ;; + stable::[1-9]* | dev::[0-9]*) case "${proto}.${major}" in 4.[012]) NAME="${NAME}p${point}" @@ -31,7 +40,7 @@ case $point in ;; NEW) ;; '') ;; - *) echo "Unexpected value for 'point' <$point>!" + *) echo "Unexpected value for 'point' <$point>! (repotype is <$repotype>)" exit 1 ;; esac |