[Pkg-voip-commits] r2449 - in wengophone/branches: . cmake/debian
cmake/debian/patches
Marco Nenciarini
mnencia at costa.debian.org
Thu Sep 28 13:06:18 UTC 2006
Author: mnencia
Date: 2006-09-28 13:06:07 +0000 (Thu, 28 Sep 2006)
New Revision: 2449
Added:
wengophone/branches/cmake/
wengophone/branches/cmake/debian/cmake.mk
Removed:
wengophone/branches/upstream/
Modified:
wengophone/branches/cmake/debian/changelog
wengophone/branches/cmake/debian/control
wengophone/branches/cmake/debian/get-orig-source.sh
wengophone/branches/cmake/debian/patches/series
wengophone/branches/cmake/debian/rules
Log:
* Created cmake branch
* Added debian/cmake.mk stolen from strigi package.
* Cleaned debian/rules from scons, now all work is done
by debian/cmake.mk
* All patches are temporary disabled because almost
all are related to scons.
* Modified debian/get-orig-source.sh:
+ checkout the cmake build system instead
of the scons one.
+ increased verbosity of source clean process.
* Checked Build-Depends:
+cmake
+libavformat-dev
-libdc1394-dev
-libglade2-dev
-libglib2.0-dev
-libraw1394-dev
-libxv-dev
-pkg-config
+portaudio19-dev
-scons
Copied: wengophone/branches/cmake (from rev 2446, wengophone/trunk)
Modified: wengophone/branches/cmake/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-09-27 23:14:48 UTC (rev 2446)
+++ wengophone/branches/cmake/debian/changelog 2006-09-28 13:06:07 UTC (rev 2449)
@@ -1,3 +1,30 @@
+wengophone (2.0.0~rc3-svn7809-1) experimental; urgency=low
+
+ * New upstream snapshot.
+ * Switch to CMake build system.
+ * Added debian/cmake.mk stolen from strigi package.
+ * Cleaned debian/rules from scons, now all work is done
+ by debian/cmake.mk
+ * All patches are temporary disabled because almost
+ all are related to scons.
+ * Modified debian/get-orig-source.sh:
+ + checkout the cmake build system instead
+ of the scons one.
+ + increased verbosity of source clean process.
+ * Checked Build-Depends:
+ +cmake
+ +libavformat-dev
+ -libdc1394-dev
+ -libglade2-dev
+ -libglib2.0-dev
+ -libraw1394-dev
+ -libxv-dev
+ -pkg-config
+ +portaudio19-dev
+ -scons
+
+ -- Marco Nenciarini <mnencia at debian.org> Thu, 28 Sep 2006 15:01:39 +0200
+
wengophone (2.0.0~rc3-svn7552-2) experimental; urgency=low
* Added patch to install missing libsfp-plugin.so
Added: wengophone/branches/cmake/debian/cmake.mk
===================================================================
--- wengophone/branches/cmake/debian/cmake.mk (rev 0)
+++ wengophone/branches/cmake/debian/cmake.mk 2006-09-28 13:06:07 UTC (rev 2449)
@@ -0,0 +1,76 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright (C) 2006 Peter Rockai <me at mornfall.net>
+# Copyright (C) 2006 Fathi Boudra <fboudra at free.fr>
+# Description: A class for cmake packages
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_cmake
+_cdbs_class_cmake := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
+DEB_CMAKE_PREFIX =/usr
+
+# Overriden from makefile-vars.mk
+# We pass CFLAGS and friends to ./configure, so no need to pass them to make
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR)
+
+include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# well, -O0
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+# semi-debug
+else
+# final
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+# debug
+endif
+
+#DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt
+$(DEB_BUILDDIR)/CMakeCache.txt:
+ cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \
+ -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \
+ $(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+ -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON
+ mkdir -p $(DEB_DESTDIR)
+
+cleanbuilddir::
+ -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+endif
+
Modified: wengophone/branches/cmake/debian/control
===================================================================
--- wengophone/trunk/debian/control 2006-09-27 23:14:48 UTC (rev 2446)
+++ wengophone/branches/cmake/debian/control 2006-09-28 13:06:07 UTC (rev 2449)
@@ -2,7 +2,13 @@
Section: net
Priority: optional
Maintainer: Marco Nenciarini <mnencia at debian.org>
-Build-Depends: cdbs (>= 0.4.27-1), bzip2, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), scons, pkg-config, libqt4-dev, libboost-serialization-dev (>= 1.33.1-5), libboost-thread-dev (>= 1.33.1-5), libboost-test-dev (>= 1.33.1-5), libboost-regex-dev (>= 1.33.1-5), libboost-signals-dev (>= 1.33.1-5), libboost-program-options-dev (>= 1.33.1-5), libglib2.0-dev, libasound2-dev, libssl-dev, libavcodec-dev (>= 0.cvs20060329-4), libxv-dev, libspeex-dev, uuid-dev, libgnutls-dev, libglade2-dev, libgtk2.0-dev, libraw1394-dev, libdc1394-dev
+Build-Depends: cdbs (>= 0.4.27-1), bzip2, debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25),
+ cmake, libqt4-dev, libgtk2.0-dev, libavcodec-dev (>= 0.cvs20060823-3.1),
+ libavformat-dev (>= 0.cvs20060823-3.1), portaudio19-dev, libgnutls-dev,
+ libboost-serialization-dev (>= 1.33.1-5), libboost-thread-dev (>= 1.33.1-5),
+ libboost-test-dev (>= 1.33.1-5), libboost-regex-dev (>= 1.33.1-5),
+ libboost-signals-dev (>= 1.33.1-5), libboost-program-options-dev (>= 1.33.1-5),
+ uuid-dev, libasound2-dev, libspeex-dev, libssl-dev
Standards-Version: 3.7.2
Package: wengophone
Modified: wengophone/branches/cmake/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh 2006-09-27 23:14:48 UTC (rev 2446)
+++ wengophone/branches/cmake/debian/get-orig-source.sh 2006-09-28 13:06:07 UTC (rev 2449)
@@ -32,12 +32,12 @@
fi
if [ -e "$finaldir/$desttar.gz" ]; then
- echo "Uptodate archive found ($desttar), nothing to do."
+ echo "Uptodate archive found ($finaldir/$desttar.gz), nothing to do."
exit 0
fi
workdir="$(mktemp -d)"
-trap "rm -fr $workdir" EXIT
+trap "rm -fr $workdir; echo Aborted." EXIT
cd $workdir
@@ -47,28 +47,33 @@
else
echo -n "Downloading sources... "
mkdir -p $destdir
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/wengoscons $destdir/wengoscons
+ svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/crashreport $destdir/crashreport
svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/wengophone $destdir/wengophone
svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/libs $destdir/libs
svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/wifo $destdir/wifo
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/SConscript $destdir/SConscript
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/SConstruct $destdir/SConstruct
- svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/SOptions $destdir/SOptions
+ # new CMake build system
+ svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/cmake $destdir/cmake
+ svn export -q -r $svn_rev --password guest --username guest --non-interactive $svn_url/CMakeLists.txt $destdir/CMakeLists.txt
echo "done."
fi
# Remove binaries
-echo -n "Cleaning tree to remove anything not needed for non-Windows builds..."
-rm -rf $destdir/wengoscons/doc/html
-rm -rf $destdir/wengophone/together
-find $destdir -iname \*.dll | xargs rm -f
-find $destdir -iname \*.jpg | xargs rm -f
-find $destdir -iname \*.lib | xargs rm -f
-find $destdir -iname \*.pdf -a -iname \*.html | xargs rm -f
-echo "done"
+echo "Cleaning tree to remove anything not needed for non-Windows builds..."
+rm -vrf $destdir/wengophone/together
+find $destdir -iname scons\* | xargs rm -vf
+find $destdir -iname config.guess -o -iname config.sub | xargs rm -vf
+find $destdir -iname \*.dll | xargs rm -vf
+find $destdir -iname \*.lib | xargs rm -vf
+find $destdir -iname \*.pdf | xargs rm -vf
+find $destdir -iname \*.jpg | xargs rm -vf
+find $destdir -iname \*.html | xargs rm -vf
+echo "Cleaning done"
# Remove ffmpeg and openssl
rm -rf $destdir/libs/3rdparty
+rm -rf $destdir/libs/ffmpeg
+rm -rf $destdir/libs/openssl/inc32
+rm -rf $destdir/libs/openssl/out32
# Make the sources archive
echo -n "Writing archive... "
@@ -76,5 +81,11 @@
gzip --best $desttar
echo "done"
+mv -f $desttar.gz "$finaldir"
echo "Archive is in $finaldir/$desttar.gz"
-mv -f $desttar.gz "$finaldir"
+
+rm -fr "$workdir"
+
+trap "" EXIT
+
+exit 0
Modified: wengophone/branches/cmake/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2006-09-27 23:14:48 UTC (rev 2446)
+++ wengophone/branches/cmake/debian/patches/series 2006-09-28 13:06:07 UTC (rev 2449)
@@ -1,12 +1 @@
-001_wengoscons-boost.patch
-002_wengoscons-doxygen-pic.patch
-003_wengoscons-qtplugindir.patch
-004_external-ffmpeg.patch
-005_external-speex.patch
-006_wengoscons-install.patch
-007_wengophone-resourcedir.patch
-008_wengoscons-qt-debug.patch
-009_wengoscons-qt-resources.patch
-010_wengophone-phapi.patch
-011_install-sfp-plugin-so.patch
-200_add_rpath.patch
+
Modified: wengophone/branches/cmake/debian/rules
===================================================================
--- wengophone/trunk/debian/rules 2006-09-27 23:14:48 UTC (rev 2446)
+++ wengophone/branches/cmake/debian/rules 2006-09-28 13:06:07 UTC (rev 2449)
@@ -1,35 +1,11 @@
#!/usr/bin/make -f
+include debian/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
-SCONS_MODE := release-symbols
-SCONS_CALL := \
- QTDIR=/usr \
- QTLIBDIR=/usr/lib \
- QTINCLUDEDIR=/usr/include/qt4 \
- QTPLUGINDIR=/usr/lib/qt4/plugins \
- scons nobuildid=1 \
- prefix="/usr" \
- mode=$(SCONS_MODE) \
- destdir="$(CURDIR)/debian/wengophone/" \
- libdir="$(CURDIR)/debian/wengophone/usr/lib/wengophone" \
-
-build/wengophone::
- $(SCONS_CALL) qtwengophone qtwengophone-translations
-
-install/wengophone::
- $(SCONS_CALL) qtwengophone-install
-
-clean::
- rm -fr $(CURDIR)/$(SCONS_MODE) $(CURDIR)/debug $(CURDIR)/.scon*
- rm -f $(CURDIR)/config.log
- find $(CURDIR) -name \*.ui | sed -e "s/\([^/]*\).ui$$/ui_\1.h/" | xargs --no-run-if-empty rm -f
- find $(CURDIR) -name \*.qrc | sed -e "s/$$/.cpp/" | xargs --no-run-if-empty rm -f
- find $(CURDIR) -name \*.pyc -print0 | xargs -0 --no-run-if-empty rm -f
-
DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/-svn.*$$//' -e 's/.dfsg$$//')
SVNVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
More information about the Pkg-voip-commits
mailing list