From: g0dil Date: Mon, 31 Aug 2009 10:56:00 +0000 (+0000) Subject: Fix debian build X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=62bcd1c4c495d8c6b8727dee0e609bbb0c9231f5 Fix debian build git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1355 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/README b/README index 974c9c8..41ed246 100644 --- a/README +++ b/README @@ -18,4 +18,5 @@ The main goals of this library are (in no particular order): - extensible design - concise interface + -- Stefan Bund Tue, 28 Aug 2007 10:02:23 +0200 diff --git a/SConstruct b/SConstruct index 64376fa..2192601 100644 --- a/SConstruct +++ b/SConstruct @@ -3,6 +3,7 @@ import sys, glob, os.path, fnmatch import SENFSCons, senfutil +# Fix for SCons 0.97 compatibility try: BoolVariable except NameError: @@ -15,6 +16,7 @@ env = Environment() # Load all the local SCons tools env.Tool('Doxygen') +env.Tool('Doxygen') env.Tool('Dia2Png') env.Tool('PkgDraw') env.Tool('InstallSubdir') @@ -48,7 +50,7 @@ env.Replace( env.Append( ENV = { 'PATH' : os.environ.get('PATH') }, - CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', '.sconsign' ], + CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ], CPPPATH = [ '#' ], LOCALLIBDIR = '#', @@ -61,10 +63,10 @@ env.Append( LIBINSTALLDIR = '$PREFIX${syslayout and "/lib" or ""}', BININSTALLDIR = '$PREFIX${syslayout and "/bin" or ""}', INCLUDEINSTALLDIR = '$PREFIX${syslayout and "/include" or ""}', - OBJINSTALLDIR = '${syslayout and "$LIBINSTALLDIR/senf" or "$PREFIX"}', - DOCINSTALLDIR = '$PREFIX/manual', - SCONSINSTALLDIR = '${syslayout and "$LIBINSTALLDIR/senf" or "$PREFIX"}/site_scons', - CONFINSTALLDIR = '$OBJINSTALLDIR', + CONFINSTALLDIR = '${syslayout and "$LIBINSTALLDIR/senf" or "$PREFIX"}', + OBJINSTALLDIR = '$CONFINSTALLDIR', + DOCINSTALLDIR = '$PREFIX${syslayout and "/share/doc/senf" or "/manual"}', + SCONSINSTALLDIR = '$CONFINSTALLDIR/site_scons', CPP_INCLUDE_EXTENSIONS = [ '.h', '.hh', '.ih', '.mpp', '.cci', '.ct', '.cti' ], CPP_EXCLUDE_EXTENSIONS = [ '.test.hh' ], @@ -183,6 +185,7 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """ env.Clean('all', '.prepare-stamp') env.Clean('all', libsenf) env.Clean('all', env.Dir('linklint')) # env.Dir to disambiguate from linklint PhonyTarget +env.Clean('all', env.Dir('dist')) if env.GetOption('clean'): env.Clean('all', [ os.path.join(path,f) diff --git a/debian/.gitignore b/debian/.gitignore index 5bd5ee6..305e9a3 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -3,3 +3,4 @@ /*.debhelper.log /libsenf*/ /tmp/ +/*.substvars diff --git a/debian/README.Debian b/debian/README.Debian index 437aa3d..bcf6310 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -2,14 +2,17 @@ Th SENF debian distribution consists of the following packages: libsenf non-debug static library /usr/lib/libsenf.a - /usr/lib/senf-packets/ + /usr/lib/senf/*.o libsenf-dbg debug static library /usr/lib/libsenf_g.a - /usr/lib/debug/senf-packets/ + /usr/lib/senf/*_g.o libsenf-dev include files /usr/include/senf + /usr/lib/senf/site_scons + /usr/bin - libsenf-doc documentation /usr/share/doc/libsenf-doc/ + libsenf-doc documentation /usr/share/doc/libsenf-doc/html + /usr/share/doc/libsenf-doc/examples So to develop using SENF, you will need 'libsenf-dev' and one of @@ -17,14 +20,14 @@ So to develop using SENF, you will need 'libsenf-dev' and one of both, 'libsenf' and 'libsenf-dbg'. To compile an application against the debug library, just link against -the libsenf_g.a library. +the libsenf_g.a library AND ENSURE the preprocessor symbol +'SENF_DEBUG' is defined. To compile an application against the non-debug library, link against -libsenf.a AND ENSURE, THE PREPROCESSOR SYMBOL 'SENF_NO_DEBUG' IS -DEFINED in your build, best by adding '-DSENF_NO_DEBUG' to CPPFLAGS. +libsenf.a. Lets repeat that: - VERY IMPORTANT: When building against libsenf.a, you MUST define - SENF_NO_DEBUG. Don't say, you haven't been warned ... + VERY IMPORTANT: When building against libsenf_g.a, you MUST define + SENF_DEBUG. Don't say, you haven't been warned ... diff --git a/debian/SConscript b/debian/SConscript index ef2cc74..aea26db 100644 --- a/debian/SConscript +++ b/debian/SConscript @@ -87,7 +87,8 @@ env.Append( ENV = { env.Replace( LOCAL_CONFIG_FILES = [ '/Doxyfile.local', '/SConscript.local', '/senf/local_config.hh' ], - DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '/_templates' ], + DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '.git', '.gitignore', '/_templates', + '/TODO', '.project', '.cproject', '.dir.el', '/project.el' ], DPKG_IGNORED_FILES_OPTS = dpkgIgnoredFilesOpts, BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot $DPKG_IGNORED_FILES_OPTS", ) @@ -111,4 +112,5 @@ env.PhonyTarget('debbin', [], [ "fakeroot ./debian/rules debclean" ]) -env.Clean(env.Alias('all'), 'changelog') +if not os.environ.get('debian_build'): + env.Clean(env.Alias('all'), '#/debian/changelog') diff --git a/debian/control b/debian/control index fdeeaa4..571b522 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 5), scons (>= 0.97), g++, binutils-dev, libboost-date-time-dev | libboost-date-time1.35-dev, libboost-regex-dev | libboost-regex1.35-dev, libboost-filesystem-dev | libboost-filesystem1.35-dev, - libboost-serialization-dev | libboost-serialization1.35-dev, libboost-iostreams-dev | libboost-iostreams1.35-dev, libboost-signals-dev | libboost-signals1.35-dev, doxygen (>= 1.5.5), libreadline-dev, dia, tidy, xsltproc, graphviz, @@ -43,7 +42,6 @@ Depends: binutils-dev, libboost-dev | libboost-1.35-dev, libboost-regex-dev | libboost-regex1.35-dev, libboost-date-time-dev | libboost-date-time1.35-dev, libboost-thread-dev | libboost-thread1.35-dev, - libboost-serialization-dev | libboost-serialization1.35-dev, libboost-filesystem-dev | libboost-filesystem1.35-dev, libboost-signals-dev | libboost-signals1.35-dev, libsenf (=${source:Version}) | libsenf-dbg (=${source:Version}) @@ -67,3 +65,15 @@ Description: SENF Extensible Network Framework, documentation and examples application layer. However, the framework includes many general purpose utilities and will be expedient to use well beyond its primary objective. + +Package: libsenf-tools +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends} +Description: SENF Extensible Network Framework, utilities + The SENF Simple and Extensible Network Framework aims to be a + complete set of libraries to facilitate the development of network + applications focusing on network protocols on the layers below the + application layer. However, the framework includes many general + purpose utilities and will be expedient to use well beyond its primary + objective. diff --git a/debian/libsenf-dbg.install b/debian/libsenf-dbg.install index f3193ca..59f19c1 100644 --- a/debian/libsenf-dbg.install +++ b/debian/libsenf-dbg.install @@ -1,4 +1,5 @@ debian/tmp/usr/lib/libsenf_g.a -debian/tmp/usr/lib/senf/debug/*_g.o usr/lib/senf +debian/tmp/usr/lib/senf/senf_g.conf +debian/tmp/usr/lib/senf/debug/* usr/lib/senf README usr/share/doc/libsenf-dbg debian/README.Debian usr/share/doc/libsenf-dbg diff --git a/debian/libsenf-dev.install b/debian/libsenf-dev.install index d27ef05..e509ef2 100644 --- a/debian/libsenf-dev.install +++ b/debian/libsenf-dev.install @@ -1,3 +1,4 @@ -debian/tmp/usr/include/senf usr/include +debian/tmp/usr/include/senf +debian/tmp/usr/lib/senf/site_scons README usr/share/doc/libsenf-dev debian/README.Debian usr/share/doc/libsenf-dev diff --git a/debian/libsenf-doc.install b/debian/libsenf-doc.install index d87d3c5..ab4d785 100644 --- a/debian/libsenf-doc.install +++ b/debian/libsenf-doc.install @@ -1,4 +1,3 @@ debian/tmp/usr/share/doc/libsenf-doc -debian/index.html usr/share/doc/libsenf-doc README usr/share/doc/libsenf-doc debian/README.Debian usr/share/doc/libsenf-doc diff --git a/debian/libsenf-tools.install b/debian/libsenf-tools.install new file mode 100644 index 0000000..ee70803 --- /dev/null +++ b/debian/libsenf-tools.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin +README usr/share/doc/libsenf-dev +debian/README.Debian usr/share/doc/libsenf-dev diff --git a/debian/libsenf.install b/debian/libsenf.install index 2adc8ef..217e8ae 100644 --- a/debian/libsenf.install +++ b/debian/libsenf.install @@ -1,4 +1,5 @@ debian/tmp/usr/lib/libsenf.a -debian/tmp/usr/lib/senf/final/*.o usr/lib/senf +debian/tmp/usr/lib/senf/senf.conf +debian/tmp/usr/lib/senf/final/* usr/lib/senf README usr/share/doc/libsenf debian/README.Debian usr/share/doc/libsenf diff --git a/debian/rules b/debian/rules index 3df60cc..631b0b4 100755 --- a/debian/rules +++ b/debian/rules @@ -95,7 +95,7 @@ install-indep: build-indep dh_installdirs -i # Add here commands to install the indep part of the package into # debian/-doc. - dh_install -X.svn -i + dh_install -X.svn -X.git -i install-arch: build-arch dh_testdir @@ -104,7 +104,7 @@ install-arch: build-arch dh_installdirs -s # Add here commands to install the arch part of the package into # debian/tmp. - dh_install -X.svn -s + dh_install -X.svn -X.git -s # Must not depend on anything. This is to be called by # binary-arch/binary-indep