Merge branch 'master' into JoelGardes-patch-1

Author: ChristopheMaldivi

.ci.sh

@@ -6,22 +6,9 @@ export LANG=C.UTF-8
 TAG=`git describe`
 echo git tag is: $TAG
 
-(cd simdoc && ./prep-simdoc.sh) && \
-(cd simdoc/simdoc-server && ./mvnw clean install) && \
-(cd simdoc/apps && ./refIntegrationTest.sh) && \
-cp simdoc/simdoc-server/target/simdoc-server-1.0.0-SNAPSHOT.jar simdoc-server-$TAG.jar && \
-cp simdoc/apps/line-detection/target/line*.jar line-detection-$TAG.jar && \
-cp simdoc/apps/prep-data/target/prep*.jar prep-data-$TAG.jar && \
-cp simdoc/apps/ncd/target/ncd*.jar ncd-$TAG.jar && \
-cp simdoc/apps/ncd-remote/target/ncd*.jar ncd-remote-$TAG.jar && \
-cp simdoc/apps/prep-clustering/target/prep*.jar prep-clustering-$TAG.jar && \
-cp simdoc/apps/similarity-clustering/target/sim*.jar similarity-clustering-$TAG.jar && \
-cp simdoc/apps/graph/target/graph*.jar graph-$TAG.jar && \
-cp simdoc/apps/base64/target/base64*.jar base64-$TAG.jar && \
-cp simdoc/simdoc-server/target/simdoc-server*.jar simdoc-server-$TAG.jar && \
-cp simdoc-server-$TAG.jar simdoc/simdoc-server && \
-echo Create tarball && \
-tar cvjf documentare-simdoc-$TAG.tar.bz2 *.jar && \
+make build-tests integration-test deb && \
+echo Create tar && \
+tar cvf documentare-simdoc-$TAG.tar *.jar usr ../simdoc*.deb && \
 echo && \
 echo OK && exit 0
 

.dh_build.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+debuild -uc -us -b <<<"y"

.dh_make.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+export DEBEMAIL=christophe.maldivi@orange.com
+export DEBFULLNAME="Christophe Maldivi"
+
+VERSION=`git describe`
+PACKAGENAME=simdoc-server
+
+dh_make -p ${PACKAGENAME}_${VERSION} -c gpl2 --native -s
+

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.gitlab.com/orange-opensource/documentare-simdoc-ci-docker:master
+image: registry.gitlab.com/orange-opensource/documentare/documentare-simdoc-ci-docker:master
 
 cache:
  paths:
@@ -17,8 +17,7 @@ default-job:
  - ./.ci.sh
  artifacts:
  paths:
- - ./CHANGELOG.html
- - ./*.jar
+ - ./usr
  expire_in: 5 mins
  except:
  - tags
@@ -29,8 +28,7 @@ release-job:
  - ./.ci.sh
  artifacts:
  paths:
- - ./CHANGELOG.html
- - ./*.jar
+ - ./usr
  only:
  - tags
 
@@ -44,7 +42,7 @@ deploy-job:
 # - env | grep ^CI_
 # - docker info
  - ls
- - cp simdoc-server*.jar simdoc/simdoc-server
+ - cp ./usr/share/java/simdoc-server.jar simdoc/simdoc-server
  - ls simdoc/simdoc-server
  - docker login $CI_REGISTRY --username gitlab-ci-token --password $CI_BUILD_TOKEN
 

.travis.yml

@@ -1,28 +1,34 @@
 language: java
 
 dist: trusty
-sudo: false
+sudo: required
 
 jdk:
 - oraclejdk8
 
 addons:
  apt:
  packages:
+ - maven
  - libgts-0.7-5
+ - devscripts
+ - fakeroot
+ - debhelper
+ - libopencv-core2.4
+ - libopencv2.4-java
+
 
 install: true
 
 before_script:
-- tar xvjf 3rdparty/graphviz-2.38-ubuntu-trusty.tar.bz2 && mv opt/local /opt/
-- /opt/local/bin/sfdp -V
-- /opt/local/bin/gvmap --help
+- wget https://gitlab.com/Orange-OpenSource/documentare/documentare-graphviz/-/jobs/21454333/artifacts/raw/graphviz_2.38.0-18_amd64.deb
+- sudo dpkg --force-all -i graphviz_2.38.0-18_amd64.deb
 
 script:
 - ./.ci.sh
 
 before_deploy:
-- export TARBALL=$(ls *.tar.bz2)
+- export TARBALL=$(ls *.tar)
 - echo Will deploy ${TARBALL}
 
 deploy:
@@ -46,4 +52,5 @@ notifications:
  recipients:
  - christophe.maldivi@orange.com
  - joel.gardes@orange.com
+ - denis.boisset@orange.com
 

Makefile

@@ -0,0 +1,45 @@
+VERSION=`git describe`
+
+# Quick build without tests
+build-notest:
+(cd simdoc/core/java/ && mvn -Dmaven.repo.local=${HOME}/.m2/repository install -DskipTests=true)
+(cd simdoc/apps && mvn -Dmaven.repo.local=${HOME}/.m2/repository install -DskipTests=true)
+(cd simdoc/simdoc-server/ && mvn -Dmaven.repo.local=${HOME}/.m2/repository install -DskipTests=true)
+
+build-tests:
+(cd simdoc/core/java/ && mvn -Dmaven.repo.local=${HOME}/.m2/repository install)
+(cd simdoc/apps && mvn -Dmaven.repo.local=${HOME}/.m2/repository install)
+(cd simdoc/simdoc-server/ && mvn -Dmaven.repo.local=${HOME}/.m2/repository install)
+
+# Used to build debian package
+# here we consider that artifacts are already built (to speed up continuous integration)
+# so we do nothing here
+build: 
+
+integration-test:
+(cd simdoc/apps/ && ./refIntegrationTest.sh)
+
+# Build debian package
+deb:
+dch -v ${VERSION} "git update, version ${VERSION}"
+bash .dh_build.sh
+
+# Debian package install
+install:
+rm -rf usr && mkdir -p usr/share/java
+cp simdoc/simdoc-server/target/simdoc-server-*.jar usr/share/java/simdoc-server.jar
+rm -rf etc && mkdir -p etc/init.d && cp debian/server-init-d etc/init.d/simdoc-server
+mkdir etc/rc2.d && (cd etc/rc2.d && ln -s ../init.d/simdoc-server S08simdoc-server)
+
+# We only include server in deb package, here we copy jars to have it in the tarball
+cp simdoc/apps/line-detection/target/line*.jar line-detection.jar
+cp simdoc/apps/prep-data/target/prep*.jar prep-data.jar
+cp simdoc/apps/ncd/target/ncd*.jar ncd.jar
+cp simdoc/apps/ncd-remote/target/ncd*.jar ncd-remote.jar
+cp simdoc/apps/clustering-remote/target/clustering-remote*.jar clustering-remote.jar
+cp simdoc/apps/prep-clustering/target/prep*.jar prep-clustering.jar
+cp simdoc/apps/similarity-clustering/target/sim*.jar similarity-clustering.jar
+cp simdoc/apps/graph/target/graph*.jar graph.jar
+
+clean:
+debclean

README.md

@@ -8,15 +8,15 @@ Library and tools for similarity measurement, classification and clustering of d
 
 Prerequisites:
  - java 8
- - you need to install graphviz (see .travis.yml to see how we install it)
+ - you need to install a rebuilt version of graphviz, provided here: https://gitlab.com/Orange-OpenSource/documentare/documentare-graphviz
  - you need to install convert (imagemagick)
 
-To build the core library: ```cd simdoc/core/java/libs && ./mvnw clean install```
+More information about graphviz are provided under `doc/graphviz/README.md`
 
-To build tools (***LineDetection***,***NCD***, etc): ```cd simdoc/apps/pc/ && ./compileAll.sh```
+To build the core library: ```cd simdoc/core/java && ./mvnw clean install```
+
+To build tools (***LineDetection***,***NCD***, etc): ```cd simdoc/apps/ && ./mvnw clean install```
 
-NB: gradle daemon is great to speed up builds, but it has a nasty effect: sometimes it will not see that the core library has changed after a rebuild. So if you update the core library, do a ```gradle --stop``` to be sure that the new core library version will be used for the next gradle build.
- 
 ## Introduction
 
 This software bundle is aimed for computer-aided transcription of digitised document produced with scanners or digital cameras. But other uses are allowed for NCD and SimClustering. Following tools are implemented:

debian/README

@@ -0,0 +1,6 @@
+The Debian Package simdoc-server
+----------------------------
+
+Comments regarding the Package
+
+ -- Christophe Maldivi <christophe.maldivi@orange.com> Fri, 30 Jun 2017 22:14:08 +0200

debian/README.Debian

@@ -0,0 +1,6 @@
+simdoc-server for Debian
+-----------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Christophe Maldivi <christophe.maldivi@orange.com> Fri, 30 Jun 2017 22:14:08 +0200

debian/README.source

@@ -0,0 +1,10 @@
+simdoc-server for Debian
+-----------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+ -- Christophe Maldivi <christophe.maldivi@orange.com> Fri, 30 Jun 2017 22:14:08 +0200
+