tested on fedora, centos, opensuse and ubuntu
This commit is contained in:
18
ChangeLog
18
ChangeLog
@@ -1,3 +1,21 @@
|
|||||||
|
2016-12-07 15:59
|
||||||
|
|
||||||
|
* [r450] bootstrap.sh, build-in-docker.sh, configure.ac,
|
||||||
|
mrw-c++.spec.in, resolve-rpmbuilddeps.sh:
|
||||||
|
build improved for fedora, centos, opensuse
|
||||||
|
|
||||||
|
2016-12-07 12:35
|
||||||
|
|
||||||
|
* [r449] bootstrap.sh, build-in-docker.sh, resolve-rpmbuilddeps.sh:
|
||||||
|
improved build, so that build in docker does not depend on the
|
||||||
|
hosting system
|
||||||
|
|
||||||
|
2016-12-07 10:27
|
||||||
|
|
||||||
|
* [r448] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
||||||
|
build-in-docker.sh, mrw-c++.spec.in, resolve-rpmbuilddeps.sh:
|
||||||
|
successfully built rpm on fedora 25
|
||||||
|
|
||||||
2016-10-17 14:06
|
2016-10-17 14:06
|
||||||
|
|
||||||
* [r447] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
* [r447] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
|
||||||
|
@@ -1463,7 +1463,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
|
|||||||
|
|
||||||
-- @PACKAGER@ @BUILD_DATE@
|
-- @PACKAGER@ @BUILD_DATE@
|
||||||
EOF
|
EOF
|
||||||
BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
|
BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
|
||||||
to debian/control.in <<EOF
|
to debian/control.in <<EOF
|
||||||
Source: @PACKAGE_NAME@
|
Source: @PACKAGE_NAME@
|
||||||
Priority: extra
|
Priority: extra
|
||||||
@@ -1554,7 +1554,7 @@ $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
|
|||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
||||||
BuildRequires: which, svn2cl, pkgconfig, redhat-lsb$(
|
BuildRequires: which, svn2cl, pkgconfig, redhat-lsb$(
|
||||||
if testtag AX_USE_LIBTOOL; then
|
if testtag AX_USE_LIBTOOL; then
|
||||||
echo -n ", libtool-ltdl";
|
echo -n ", libtool-ltdl-devel";
|
||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||||
|
@@ -255,6 +255,11 @@ enabled=1
|
|||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum))
|
||||||
|
docker exec ${DOCKER_ID} ${INSTALL_TOOL} install -y rpm-build automake libtool subversion gcc-c++ pkgconfig
|
||||||
|
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -c
|
||||||
|
TGZFILE=$(grep PACKAGE_STRING= configure | sed "s, ,-,g;s,PACKAGE_STRING=',,g;s,',.tar.gz,g")
|
||||||
|
touch $TGZFILE
|
||||||
docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
|
docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
2
debian/control.in
vendored
2
debian/control.in
vendored
@@ -1,7 +1,7 @@
|
|||||||
Source: @PACKAGE_NAME@
|
Source: @PACKAGE_NAME@
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Maintainer: @AUTHOR@
|
Maintainer: @AUTHOR@
|
||||||
Build-Depends: debhelper, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, default-jre-headless|default-jre, libcppunit-dev, libz-dev, binutils-dev, liblog4cxx-dev|liblog4cxx10-dev, libboost-thread-dev, pandoc @DEB_DEPEND_IFEXISTS@
|
Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, default-jre-headless|default-jre, libcppunit-dev, libz-dev, binutils-dev, liblog4cxx-dev|liblog4cxx10-dev, libboost-thread-dev, pandoc @DEB_DEPEND_IFEXISTS@
|
||||||
|
|
||||||
Package: @PACKAGE_NAME@
|
Package: @PACKAGE_NAME@
|
||||||
Section: libs
|
Section: libs
|
||||||
|
@@ -11,7 +11,7 @@ BuildRequires: graphviz
|
|||||||
%endif
|
%endif
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
|
||||||
BuildRequires: which, pkgconfig, cppunit-devel, redhat-lsb, libtool-ltdl
|
BuildRequires: which, pkgconfig, cppunit-devel, redhat-lsb, libtool-ltdl-devel
|
||||||
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
|
||||||
BuildRequires: mscgen
|
BuildRequires: mscgen
|
||||||
%endif
|
%endif
|
||||||
|
@@ -15,15 +15,11 @@ SCHROOTNAME="$1"
|
|||||||
PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
|
PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
|
||||||
|
|
||||||
if test -n "${SCHROOTNAME}"; then
|
if test -n "${SCHROOTNAME}"; then
|
||||||
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} install -y rpm-build automake libtool subversion gcc-c++ pkgconfig
|
|
||||||
schroot -c ${SCHROOTNAME} -u root -- ./bootstrap.sh -c
|
|
||||||
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||||
if test -n "${FILES}"; then
|
if test -n "${FILES}"; then
|
||||||
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} install -y ${FILES}
|
schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} install -y ${FILES}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
${INSTALL_TOOL} install -y rpm-build automake libtool subversion gcc-c++ pkgconfig
|
|
||||||
./bootstrap.sh -c
|
|
||||||
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
|
||||||
if test -n "${FILES}"; then
|
if test -n "${FILES}"; then
|
||||||
${INSTALL_TOOL} install -y ${FILES}
|
${INSTALL_TOOL} install -y ${FILES}
|
||||||
|
Reference in New Issue
Block a user