build CHANGE update package scripts

Author: michalvasko

CMakeLists.txt

@@ -81,19 +81,25 @@ if ($ENV{TRAVIS_BRANCH} STREQUAL "master")
     set(BRANCH "master")
     set(BUILD_TYPE "Package")
     set(CONFLICT_PACKAGE_NAME "libnetconf2-experimental")
-    set(COMPAT_PACKAGES "")
+    set(PACKAGE_PART_NAME "")
 else ()
     set(PACKAGE_NAME "libnetconf2-experimental")
     set(BRANCH "devel")
     set(BUILD_TYPE "debug")
     set(CONFLICT_PACKAGE_NAME "libnetconf2")
-    set(COMPAT_PACKAGES "-experimental")
+    set(PACKAGE_PART_NAME "-experimental")
 endif()
 # change version in config files
 configure_file(${PROJECT_SOURCE_DIR}/packages/libnetconf2.spec.in ${PROJECT_BINARY_DIR}/build-packages/libnetconf2.spec)
 configure_file(${PROJECT_SOURCE_DIR}/packages/libnetconf2.dsc.in ${PROJECT_BINARY_DIR}/build-packages/libnetconf2.dsc)
 configure_file(${PROJECT_SOURCE_DIR}/packages/debian.control.in ${PROJECT_BINARY_DIR}/build-packages/debian.control @ONLY)
 configure_file(${PROJECT_SOURCE_DIR}/packages/debian.rules.in ${PROJECT_BINARY_DIR}/build-packages/debian.rules)
+configure_file(${PROJECT_SOURCE_DIR}/packages/debian.libnetconf2-dev.install
+               ${PROJECT_BINARY_DIR}/build-packages/debian.libnetconf2${PACKAGE_PART_NAME}-dev.install COPYONLY)
+configure_file(${PROJECT_SOURCE_DIR}/packages/debian.libnetconf2.install
+               ${PROJECT_BINARY_DIR}/build-packages/debian.libnetconf2${PACKAGE_PART_NAME}.install COPYONLY)
+configure_file(${PROJECT_SOURCE_DIR}/packages/debian.python3-netconf2.install
+               ${PROJECT_BINARY_DIR}/build-packages/debian.python3-netconf2${PACKAGE_PART_NAME}.install COPYONLY)
 
 if (NOT DEB_BUILDER)
     message(WARNING "Missing tools (devscripts, debhelper package) for building deb package.\nYou won't be able to generate deb package from source code.\nCompiling libnetconf2 should still works fine.")

packages/create-package.sh

@@ -10,7 +10,7 @@ fi
 
 # fill username and password for opensuse build and downlaod last package information
 echo -e "[general]\napiurl = https://api.opensuse.org\n\n[https://api.opensuse.org]\nuser = ${osb_user}\npass = ${osb_pass}" >~/.oscrc
-cd ./build_all
+cd ./build
 if [ $TRAVIS_BRANCH == "devel" ]; then
 	package="home:liberouter/libnetconf2-experimental"
 	name="libnetconf2-experimental"
@@ -26,21 +26,26 @@ cd $package
 # check versions
 VERSION=$(cat libnetconf2.spec | grep "Version: " | awk '{print $NF}')
 OLDVERSION=$(cat ../libnetconf2.spec | grep "Version: " | awk '{print $NF}')
-if [ "$VERSION" == "$OLDVERSION" ]; then
+if [ -z "$FORCEVERSION" -a "$VERSION" == "$OLDVERSION" ]; then
     exit 0
 fi
 
 # create new changelog and paste old changelog
-logtime=$(git log -i --grep="VERSION .* $OLDVERSION" | grep "Date: " | sed 's/Date:[ ]*//')
-echo -e "$name ($VERSION) stable; urgency=low\n" >debian.changelog
-git log --since="$logtime" --pretty=format:"  * %s (%aN)%n" | grep "BUGFIX\|CHANGE\|FEATURE" >>debian.changelog
-git log -1  --pretty=format:"%n -- %aN <%aE>  %aD%n" >>debian.changelog
-echo -e "\n" >>debian.changelog
-cat ../debian.changelog >>debian.changelog
-git log -1 --date=format:'%a %b %d %Y' --pretty=format:"* %ad  %aN <%aE>" | tr -d "\n" >>libnetconf2.spec
-echo " $VERSION" >>libnetconf2.spec
-git log --since="$logtime" --pretty=format:"- %s (%aN)"  | grep "BUGFIX\|CHANGE\|FEATURE" >>libnetconf2.spec
-echo -e "\n" >>libnetconf2.spec
+if [ "$VERSION" != "$OLDVERSION" ]; then
+    logtime=$(git log -i --grep="VERSION .* $OLDVERSION" | grep "Date: " | sed 's/Date:[ ]*//')
+    echo -e "$name ($VERSION) stable; urgency=low\n" >debian.changelog
+    git log --since="$logtime" --pretty=format:"  * %s (%aN)%n" | grep "BUGFIX\|CHANGE\|FEATURE" >>debian.changelog
+    git log -1  --pretty=format:"%n -- %aN <%aE>  %aD%n" >>debian.changelog
+    echo -e "\n" >>debian.changelog
+    cat ../debian.changelog >>debian.changelog
+fi
+
+if [ "$VERSION" != "$OLDVERSION" ]; then
+    git log -1 --date=format:'%a %b %d %Y' --pretty=format:"* %ad  %aN <%aE>" | tr -d "\n" >>libnetconf2.spec
+    echo " $VERSION" >>libnetconf2.spec
+    git log --since="$logtime" --pretty=format:"- %s (%aN)"  | grep "BUGFIX\|CHANGE\|FEATURE" >>libnetconf2.spec
+    echo -e "\n" >>libnetconf2.spec
+fi
 cat ../libnetconf2.spec | sed -e '1,/%changelog/d' >>libnetconf2.spec
 
 # download source and update to opensuse build

packages/debian.control.in

@@ -6,14 +6,14 @@ Build-Depends: debhelper (>= 9), gcc
 Homepage: https://github.com/CESNET/libnetconf2
 
 Package: @PACKAGE_NAME@
-Depends: libyang@COMPAT_PACKAGES@, libssh-4 (>= 0.7.1), ${shlibs:Depends}
+Depends: libyang@PACKAGE_PART_NAME@, libssh-4 (>= 0.7.1), ${shlibs:Depends}
 Conflicts: @CONFLICT_PACKAGE_NAME@
 Section: libs
 Architecture: any
 Description: Libnetconf2 is a NETCONF library in C intended for building NETCONF clients and servers.
 
 Package: @PACKAGE_NAME@-dev
-Depends: libyang@COMPAT_PACKAGES@-dev
+Depends: libyang@PACKAGE_PART_NAME@-dev
 Section: libdevel
 Architecture: any
 Description: Headers for libnetconf2 library.
@@ -24,14 +24,14 @@ Section: debug
 Architecture: any
 Description: Debug symbols for libnetconf2 library.
 
-Package: python3-netconf2@COMPAT_PACKAGES@
+Package: python3-netconf2@PACKAGE_PART_NAME@
 Depends: @PACKAGE_NAME@ (= @LIBNETCONF2_VERSION@)
 Section: libs
 Architecture: any
 Description: Bindings of libyang library to python3 language.
 
-Package: python3-netconf2@COMPAT_PACKAGES@-dbg
-Depends: python3-netconf2@COMPAT_PACKAGES@ (= @LIBNETCONF2_VERSION@)
+Package: python3-netconf2@PACKAGE_PART_NAME@-dbg
+Depends: python3-netconf2@PACKAGE_PART_NAME@ (= @LIBNETCONF2_VERSION@)
 Section: debug
 Architecture: any
 Description: Debug symbols of python3 bidings of libnetconf2 library.

…ian.libnetconf2-experimental-dev.install packages/debian.libnetconf2-dev.installpackages/debian.libnetconf2-experimental-dev.install renamed to packages/debian.libnetconf2-dev.install packages/debian.libnetconf2-experimental-dev.install renamed to packages/debian.libnetconf2-dev.install

@@ -8,10 +8,10 @@ export DH_VERBOSE=1
 
 override_dh_strip:
 	dh_strip -p@PACKAGE_NAME@ --dbg-package=@PACKAGE_NAME@-dbg
-	dh_strip -ppython3-netconf2@COMPAT_PACKAGES@ --dbg-package=python3-netconf2@COMPAT_PACKAGES@-dbg
+	dh_strip -ppython3-netconf2@PACKAGE_PART_NAME@ --dbg-package=python3-netconf2@PACKAGE_PART_NAME@-dbg
 
 override_dh_auto_configure:
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DENABLE_PYTHON=ON -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" .
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_PYTHON=ON -DCMAKE_BUILD_TYPE="@BUILD_TYPE@" .
 
 override_dh_auto_test:
 	ctest --output-on-failure

…/debian.libnetconf2-experimental.install packages/debian.libnetconf2.installpackages/debian.libnetconf2-experimental.install renamed to packages/debian.libnetconf2.install packages/debian.libnetconf2-experimental.install renamed to packages/debian.libnetconf2.install

@@ -1,10 +1,10 @@
 Format: 3.0 (quilt)
 Source: @PACKAGE_NAME@
-Binary: @PACKAGE_NAME@, @PACKAGE_NAME@-dbg, @PACKAGE_NAME@-dev, python3-netconf2@COMPAT_PACKAGES@, python3-netconf2@COMPAT_PACKAGES@-dbg
+Binary: @PACKAGE_NAME@, @PACKAGE_NAME@-dbg, @PACKAGE_NAME@-dev, python3-netconf2@PACKAGE_PART_NAME@, python3-netconf2@PACKAGE_PART_NAME@-dbg
 Maintainer: CESNET <rkrejci@cesnet.cz>
 Version: @LIBNETCONF2_VERSION@
 Architecture: any
 Standards-Version: 3.8.2
 Homepage: https://github.com/CESNET/libnetconf2
 Vcs-Git: https://github.com/CESNET/libnetconf2
-Build-Depends: debhelper (>= 9), make, gcc, cmake, pkg-config, libcmocka-dev, libyang@COMPAT_PACKAGES@-dev, libssh-dev (>= 0.7.1), openssl, python3-dev (>= 3.4)
+Build-Depends: debhelper (>= 9), make, gcc, cmake, pkg-config, libcmocka-dev, libyang@PACKAGE_PART_NAME@-dev, libssh-dev (>= 0.7.1), openssl, python3-dev (>= 3.4)

…an.python3-netconf2-experimental.install packages/debian.python3-netconf2.installpackages/debian.python3-netconf2-experimental.install renamed to packages/debian.python3-netconf2.install packages/debian.python3-netconf2-experimental.install renamed to packages/debian.python3-netconf2.install

@@ -7,11 +7,10 @@ Source: %{url}/archive/@BRANCH@.tar.gz
 License: BSD-3-Clause
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 
-Requires:  libyang@COMPAT_PACKAGES@
-BuildRequires:  libyang@COMPAT_PACKAGES@-devel
+Requires:  libyang@PACKAGE_PART_NAME@
+BuildRequires:  libyang@PACKAGE_PART_NAME@-devel
 BuildRequires:  libssh-devel >= 0.7.1
 BuildRequires:  openssl-devel
-BuildRequires:  valgrind
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 BuildRequires:  gcc
@@ -22,7 +21,7 @@ BuildRequires:  timezone
 %if 0%{?suse_version} + 0%{?fedora} > 0
 BuildRequires:  python3-devel
 %else
-BuildRequires:  python34-devel
+BuildRequires:  python36-devel
 %endif
 Conflicts: @CONFLICT_PACKAGE_NAME@
 
@@ -31,14 +30,14 @@ Summary:    Headers of libnetconf2 library
 Requires:   %{name} = %{version}-%{release}
 Requires:   libssh-devel
 
-%package -n python3-netconf2@COMPAT_PACKAGES@
+%package -n python3-netconf2@PACKAGE_PART_NAME@
 Summary:    Bindings to python3
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
 Headers of libnetconf2 library.
 
-%description -n python3-netconf2@COMPAT_PACKAGES@
+%description -n python3-netconf2@PACKAGE_PART_NAME@
 Bindings of libnetconf2 library to python3 language.
 
 %description
@@ -48,7 +47,7 @@ Libnetconf2 is a NETCONF library in C intended for building NETCONF clients and
 %setup -n libnetconf2-@BRANCH@
 
 %build
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -DENABLE_PYTHON=ON -DENABLE_VALGRIND_TESTS:BOOL=FALSE .
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE="@BUILD_TYPE@" -DENABLE_PYTHON=ON -DENABLE_VALGRIND_TESTS=OFF .
 make
 
 %check
@@ -76,7 +75,7 @@ make DESTDIR=%{buildroot} install
 %{_includedir}/nc_server.h
 %dir %{_includedir}/libnetconf2/
 
-%files -n python3-netconf2@COMPAT_PACKAGES@
+%files -n python3-netconf2@PACKAGE_PART_NAME@
 %defattr(-,root,root)
 /usr/lib*/python*/*-packages/*
 

packages/debian.rules.in

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+GIT_PATH=`git rev-parse --show-cdup`
+if [ "$GIT_PATH" != "" ]; then
+    echo "Must be run from repository root"
+    exit
+fi
+
+if [ $# -ne 2 ]; then
+    echo "Usage $0 <osb-user> <osb-pass>"
+    exit
+fi
+
+# for correct git log command output used in changelog
+LC_TIME=en_US.UTF-8
+# upload package even if the version is not newer
+FORCEVERSION=1
+# needed so that the package is even created
+TRAVIS_EVENT_TYPE=cron
+# what package to upload (devel = libnetconf2-experimental, master = libnetconf2)
+TRAVIS_BRANCH=`git branch --show-current`
+
+# OSB login
+osb_user=$1
+osb_pass=$2
+
+# create and upload the package
+. ./packages/create-package.sh