diff options
Diffstat (limited to 'scripts/build')
-rw-r--r-- | scripts/build/Makefile.in | 14 | ||||
-rwxr-xr-x | scripts/build/UpdatePoint | 18 | ||||
-rwxr-xr-x | scripts/build/VersionName | 15 |
3 files changed, 36 insertions, 11 deletions
diff --git a/scripts/build/Makefile.in b/scripts/build/Makefile.in index 212d26b..2f6b026 100644 --- a/scripts/build/Makefile.in +++ b/scripts/build/Makefile.in @@ -40,8 +40,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \ - $(top_srcdir)/sntp/libevent/m4/openldap-thread-check.m4 \ - $(top_srcdir)/sntp/libevent/m4/openldap.m4 \ + $(top_srcdir)/sntp/m4/ax_c99_struct_init.m4 \ $(top_srcdir)/sntp/m4/define_dir.m4 \ $(top_srcdir)/sntp/m4/hms_search_lib.m4 \ $(top_srcdir)/sntp/m4/libtool.m4 \ @@ -52,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ + $(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \ $(top_srcdir)/sntp/m4/ntp_debug.m4 \ $(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \ $(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \ @@ -69,6 +69,8 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ $(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \ $(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \ + $(top_srcdir)/sntp/m4/openldap-thread-check.m4 \ + $(top_srcdir)/sntp/m4/openldap.m4 \ $(top_srcdir)/sntp/m4/os_cflags.m4 \ $(top_srcdir)/sntp/m4/snprintf.m4 \ $(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac @@ -110,6 +112,7 @@ CHUTEST = @CHUTEST@ CONFIG_SHELL = @CONFIG_SHELL@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@ CPPFLAGS_NTP = @CPPFLAGS_NTP@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -144,7 +147,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@ @@ -283,6 +288,11 @@ TIMETRIM_DL = @TIMETRIM_DL@ TIMETRIM_DS = @TIMETRIM_DS@ TIMETRIM_MS = @TIMETRIM_MS@ TIMETRIM_NI = @TIMETRIM_NI@ +UPDATE_LEAP_DB = @UPDATE_LEAP_DB@ +UPDATE_LEAP_DL = @UPDATE_LEAP_DL@ +UPDATE_LEAP_DS = @UPDATE_LEAP_DS@ +UPDATE_LEAP_MS = @UPDATE_LEAP_MS@ +UPDATE_LEAP_NI = @UPDATE_LEAP_NI@ VERSION = @VERSION@ VER_SUFFIX = @VER_SUFFIX@ YACC = @YACC@ diff --git a/scripts/build/UpdatePoint b/scripts/build/UpdatePoint index e3c5957..61c0349 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 71e31a9..84b5972 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 |