Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-08 Thread laforge 
laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15110 )

Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..

osmo-release.sh: Verify consistency of dependency versions in configure.ac and 
debian/control

Sample output for current osmo-msc master:
Releasing 1.3.1.191-7ea0d -> 1.4.0...
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control !
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: exiting due to previous errors
make: *** [osmo-release.mk:9: release] Error 1

Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
---
M osmo-release.sh
1 file changed, 42 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/osmo-release.sh b/osmo-release.sh
index e9602aa..38f238d 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -21,6 +21,46 @@
echo "$major"
 }

+# Make sure that depedency requirement versions match in configure.ac vs 
debian/control.
+#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs 
"libosmocore-dev (>= 1.0.0),"
+check_configureac_debctrl_deps_match() {
+   configureac_list=$(grep -e "PKG_CHECK_MODULES" 
"${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed 
"s/>=/ /g")
+   echo "$configureac_list" | \
+   { return_error=0
+   while read -r dep ver; do
+
+   debctrl_match="$(grep -e "${dep}-dev" 
${GIT_TOPDIR}/debian/control | grep ">=")"
+   debctrl_match_count="$(echo "$debctrl_match" | grep -c ">=")"
+   if [ "z$debctrl_match_count" != "z0" ]; then
+   #echo "Dependency <$dep, $ver> from configure.ac 
matched in debian/control! ($debctrl_match_count)"
+   if [ "z$debctrl_match_count" != "z1" ]; then
+   echo "WARN: configure.ac <$dep, $ver> matches 
debian/control $debctrl_match_count times, manual check required!"
+   else # 1 match:
+   parsed_match=$(echo "$debctrl_match" | tr -d 
"(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g")
+   debctrl_dep=$(echo "$parsed_match" | cut -d " " 
-f 1 | sed "s/-dev//g")
+   debctrl_ver=$(echo "$parsed_match" | cut -d " " 
-f 2)
+   if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" 
!= "z$debctrl_ver" ]; then
+   echo "ERROR: configure.ac <$dep, $ver> 
does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
+   return_error=1
+   #else
+   #   echo "OK: configure.ac <$dep, $ver> 
matches debian/control <$debctrl_dep, $debctrl_ver>"
+   fi
+   fi
+   fi
+   done
+   if [ $return_error -ne 0 ]; then
+   exit 1
+   fi
+   }
+
+   # catch and forward exit from pipe subshell "while read":
+   if [ $? -ne 0 ]; then
+   echo "ERROR: exiting due to previous errors"
+   exit 1
+   fi
+   echo "OK: dependency specific versions in configure.ac and 
debian/control match"
+}
+
 BUMPVER=`command -v bumpversion`
 GIT_TOPDIR="$(git rev-parse --show-toplevel)"
 NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | 
awk -F '=' '{ print $2 }'`
@@ -40,6 +80,8 @@

 echo "Releasing $VERSION -> $NEW_VER..."

+check_configureac_debctrl_deps_match
+
 if [ "z$LIBVERS" != "z" ]; then
if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; 
then
echo "ERROR: Before releasing, please modify some of the 
libversions: $LIBVERS"

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-08 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15110 )

Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 08 Aug 2019 11:29:48 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-08 Thread pespin 
Hello fixeria, laforge, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libosmocore/+/15110

to look at the new patch set (#2).

Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..

osmo-release.sh: Verify consistency of dependency versions in configure.ac and 
debian/control

Sample output for current osmo-msc master:
Releasing 1.3.1.191-7ea0d -> 1.4.0...
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control !
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: exiting due to previous errors
make: *** [osmo-release.mk:9: release] Error 1

Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
---
M osmo-release.sh
1 file changed, 42 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/15110/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: newpatchset

Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-08 Thread pespin 
pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15110 )

Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..


Patch Set 1: Code-Review-1

(1 comment)

https://gerrit.osmocom.org/#/c/15110/1/osmo-release.sh
File osmo-release.sh:

https://gerrit.osmocom.org/#/c/15110/1/osmo-release.sh@27
PS1, Line 27:   return_error=0
I think this return_error should go inside the {}



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 08 Aug 2019 09:53:17 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-08 Thread fixeria 
fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15110 )

Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 08 Aug 2019 06:21:40 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-07 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15110 )

Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Thu, 08 Aug 2019 05:11:01 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...

2019-08-07 Thread pespin 
pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmocore/+/15110


Change subject: osmo-release.sh: Verify consistency of dependency versions in 
configure.ac and debian/control
..

osmo-release.sh: Verify consistency of dependency versions in configure.ac and 
debian/control

Sample output for current osmo-msc master:
Releasing 1.3.1.191-7ea0d -> 1.4.0...
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: configure.ac  does NOT match debian/control !
ERROR: configure.ac  does NOT match debian/control 
!
ERROR: exiting due to previous errors
make: *** [osmo-release.mk:9: release] Error 1

Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
---
M osmo-release.sh
1 file changed, 42 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/15110/1

diff --git a/osmo-release.sh b/osmo-release.sh
index e9602aa..eab5040 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -21,6 +21,46 @@
echo "$major"
 }

+# Make sure that depedency requirement versions match in configure.ac vs 
debian/control.
+#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs 
"libosmocore-dev (>= 1.0.0),"
+check_configureac_debctrl_deps_match() {
+   return_error=0
+   configureac_list=$(grep -e "PKG_CHECK_MODULES" 
"${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed 
"s/>=/ /g")
+   echo "$configureac_list" | \
+   { while read -r dep ver; do
+
+   debctrl_match="$(grep -e "${dep}-dev" 
${GIT_TOPDIR}/debian/control | grep ">=")"
+   debctrl_match_count="$(echo "$debctrl_match" | grep -c ">=")"
+   if [ "z$debctrl_match_count" != "z0" ]; then
+   #echo "Dependency <$dep, $ver> from configure.ac 
matched in debian/control! ($debctrl_match_count)"
+   if [ "z$debctrl_match_count" != "z1" ]; then
+   echo "WARN: configure.ac <$dep, $ver> matches 
debian/control $debctrl_match_count times, manual check required!"
+   else # 1 match:
+   parsed_match=$(echo "$debctrl_match" | tr -d 
"(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g")
+   debctrl_dep=$(echo "$parsed_match" | cut -d " " 
-f 1 | sed "s/-dev//g")
+   debctrl_ver=$(echo "$parsed_match" | cut -d " " 
-f 2)
+   if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" 
!= "z$debctrl_ver" ]; then
+   echo "ERROR: configure.ac <$dep, $ver> 
does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
+   return_error=1
+   #else
+   #   echo "OK: configure.ac <$dep, $ver> 
matches debian/control <$debctrl_dep, $debctrl_ver>"
+   fi
+   fi
+   fi
+   done
+   if [ $return_error -ne 0 ]; then
+   exit 1
+   fi
+   }
+
+   # catch and forward exit from pipe subshell "while read":
+   if [ $? -ne 0 ]; then
+   echo "ERROR: exiting due to previous errors"
+   exit 1
+   fi
+   echo "OK: dependency specific versions in configure.ac and 
debian/control match"
+}
+
 BUMPVER=`command -v bumpversion`
 GIT_TOPDIR="$(git rev-parse --show-toplevel)"
 NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | 
awk -F '=' '{ print $2 }'`
@@ -40,6 +80,8 @@

 echo "Releasing $VERSION -> $NEW_VER..."

+check_configureac_debctrl_deps_match
+
 if [ "z$LIBVERS" != "z" ]; then
if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; 
then
echo "ERROR: Before releasing, please modify some of the 
libversions: $LIBVERS"

--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange