[med-svn] [Git][med-team/iitii][master] 3 commits: libmmap_allocator is packaged

Sun Jun 7 09:51:50 BST 2020


Andreas Tille pushed to branch master at Debian Med / iitii


Commits:
9f9efcd0 by Andreas Tille at 2020-06-06T22:53:37+02:00
libmmap_allocator is packaged

- - - - -
c17daf50 by Andreas Tille at 2020-06-07T09:42:11+02:00
Install binary

- - - - -
0904379b by Andreas Tille at 2020-06-07T10:51:26+02:00
Add manpage, dynamic linking

- - - - -


10 changed files:

- debian/changelog
- debian/control
- + debian/createmanpages
- + debian/iitii.1
- + debian/install
- + debian/manpages
- + debian/patches/dynamic_linking.patch
- debian/patches/series
- debian/patches/use_debian_packaged_libs.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,5 @@
 iitii (0.0+git20191030.85209e0-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #<bug>)
-  TODO: https://github.com/ekg/mmap_allocator
 
  -- Andreas Tille <tille at debian.org>  Fri, 05 Jun 2020 17:53:54 +0200


=====================================
debian/control
=====================================
@@ -6,7 +6,8 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
                libips4o-dev,
-               libargs-dev
+               libargs-dev,
+               libmmap-allocator-dev (>= 0.4.0+git20200122.adbfbe1)
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/iitii
 Vcs-Git: https://salsa.debian.org/med-team/iitii.git


=====================================
debian/createmanpages
=====================================
@@ -0,0 +1,28 @@
+#!/bin/sh
+MANDIR=debian
+mkdir -p $MANDIR
+
+VERSION=`dpkg-parsechangelog | awk '/^Version:/ {print $2}' | sed -e 's/^[0-9]*://' -e 's/-.*//' -e 's/[+~]dfsg$//'`
+NAME=`grep "^Description:" debian/control | sed 's/^Description: *//' | head -n1`
+PROGNAME=`grep "^Package:" debian/control | sed 's/^Package: *//' | head -n1`
+
+AUTHOR=".SH AUTHOR\n \
+This manpage was written by $DEBFULLNAME for the Debian distribution and\n \
+can be used for any other usage of the program.\
+"
+
+# If program name is different from package name or title should be
+# different from package short description change this here
+progname=${PROGNAME}
+help2man --no-info --no-discard-stderr --help-option=" " \
+         --name="memmapped interpolated implicit interval tree" \
+            --version-string="$VERSION" ${progname} > $MANDIR/${progname}.1
+echo $AUTHOR >> $MANDIR/${progname}.1
+
+echo "$MANDIR/*.1" > debian/manpages
+
+cat <<EOT
+Please enhance the help2man output.
+The following web page might be helpful in doing so:
+    http://liw.fi/manpages/
+EOT


=====================================
debian/iitii.1
=====================================
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.15.
+.TH IITII "1" "June 2020" "iitii 0.0+git20191030.85209e0" "User Commands"
+.SH NAME
+iitii \- memmapped interpolated implicit interval tree
+.SH SYNOPSIS
+.B iitii
+{OPTIONS}
+.SH DESCRIPTION
+memmapped interpolated implicit interval tree
+.IP
+.SH OPTIONS:
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help summary
+.TP
+\fB\-T[FILE]\fR, \fB\-\-test\-file\fR=\fI\,[FILE]\/\fR
+test mmmultimap with random data in this
+file
+.TP
+\fB\-s[N]\fR, \fB\-\-test\-size\fR=\fI\,[N]\/\fR
+test this many pairs
+.TP
+\fB\-M[N]\fR, \fB\-\-max\-value\fR=\fI\,[N]\/\fR
+generate test data in the range
+[1,max_value]
+.TP
+\fB\-m[N]\fR, \fB\-\-range\-mean\fR=\fI\,[N]\/\fR
+the mean length for intervals (under
+gaussian distribution)
+.TP
+\fB\-D[N]\fR, \fB\-\-range\-stdev\fR=\fI\,[N]\/\fR
+the standard deviation for intervals
+(under gaussian distribution)
+.TP
+\fB\-t[N]\fR, \fB\-\-threads\fR=\fI\,[N]\/\fR
+number of threads to use
+.TP
+\fB\-d[N]\fR, \fB\-\-domains\fR=\fI\,[N]\/\fR
+number of domains for interpolation
+.SH AUTHOR
+ This manpage was written by Andreas Tille for the Debian distribution and
+ can be used for any other usage of the program.


=====================================
debian/install
=====================================
@@ -0,0 +1 @@
+bin	usr


=====================================
debian/manpages
=====================================
@@ -0,0 +1 @@
+debian/*.1


=====================================
debian/patches/dynamic_linking.patch
=====================================
@@ -0,0 +1,13 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 05 Jun 2020 17:53:54 +0200
+Description: No static linking
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,5 +115,5 @@ target_link_libraries(iitii
+   
+ if (APPLE)
+ elseif (TRUE)
+-  set(CMAKE_EXE_LINKER_FLAGS "-static")
++  # set(CMAKE_EXE_LINKER_FLAGS "-static")
+ endif()


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 use_debian_packaged_libs.patch
+dynamic_linking.patch


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -12,11 +12,29 @@ Description: Use Debian packaged libraries
  # In-place Parallel Super Scalar Samplesort (IPS⁴o), header only
  ExternalProject_Add(ips4o
    GIT_REPOSITORY "https://github.com/vgteam/ips4o.git"
-@@ -85,6 +86,7 @@ ExternalProject_Add(tayweeargs
-   INSTALL_COMMAND "")
- ExternalProject_Get_property(tayweeargs SOURCE_DIR)
- set(tayweeargs_INCLUDE "${SOURCE_DIR}")
+@@ -96,6 +97,7 @@ ExternalProject_Add(mmap_allocator
+   CONFIGURE_COMMAND "")
+ ExternalProject_Get_property(mmap_allocator SOURCE_DIR)
+ set(mmap_allocator_INCLUDE "${SOURCE_DIR}")
 +endif()
  
- ExternalProject_Add(mmap_allocator
-   GIT_REPOSITORY "https://github.com/ekg/mmap_allocator.git"
+ set(CMAKE_BUILD_TYPE Debug)
+ 
+@@ -103,15 +105,12 @@ set(CMAKE_BUILD_TYPE Debug)
+ add_executable(iitii
+   ${CMAKE_SOURCE_DIR}/src/main.cpp
+   )
+-add_dependencies(iitii ips4o tayweeargs mmap_allocator)
+ target_include_directories(iitii PUBLIC
+   "${CMAKE_SOURCE_DIR}/src"
+-  "${ips4o_INCLUDE}"
+-  "${mmap_allocator_INCLUDE}"
+-  "${tayweeargs_INCLUDE}")
++  )
+ 
+ target_link_libraries(iitii
+-  "${mmap_allocator_INCLUDE}/libmmap_allocator.a"
++  "-lmmap_allocator"
+   "-latomic")
+   
+ if (APPLE)


=====================================
debian/rules
=====================================
@@ -4,15 +4,6 @@
 export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-#                    specified by <https://reproducible-builds.org/specs/source-date-epoch/>
 
 # for hardening you might like to uncomment this:
 # export DEB_BUILD_MAINT_OPTIONS=hardening=+all



View it on GitLab: https://salsa.debian.org/med-team/iitii/-/compare/7f838f2ca2986e0f69b6bae4a50edf7008130215...0904379bf810ce6d73235414494c3fbf705de929

-- 
View it on GitLab: https://salsa.debian.org/med-team/iitii/-/compare/7f838f2ca2986e0f69b6bae4a50edf7008130215...0904379bf810ce6d73235414494c3fbf705de929
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200607/90e70244/attachment-0001.html>
