cleanup of debian/control and zoltan and libgpng cmake configuration updated

.gitlab-ci.yml

@@ -19,7 +19,7 @@ build:9-debug-gcc:
     name: "$CI_BUILD_NAME"
     expire_in: 6 hrs
   only:
-  - develop
+  - master
 
 build:9-release-gcc:
   stage: build
@@ -31,7 +31,7 @@ build:9-release-gcc:
     name: "$CI_BUILD_NAME"
     expire_in: 6 hrs
   only:
-  - develop
+  - master
 
 build:9-parallel-debug-gcc:
   stage: build
@@ -43,7 +43,7 @@ build:9-parallel-debug-gcc:
     name: "$CI_BUILD_NAME"
     expire_in: 6 hrs
   only:
-  - develop
+  - master
 
 build:9-parallel-release-gcc:
   stage: build
@@ -55,7 +55,7 @@ build:9-parallel-release-gcc:
     name: "$CI_BUILD_NAME"
     expire_in: 6 hrs
   only:
-  - develop
+  - master
 
 
 # compile the demos
@@ -66,7 +66,7 @@ demo:9-debug-gcc:
   dependencies:
   - build:9-debug-gcc
   only:
-  - develop
+  - master
 
 demo:9-release-gcc:
   stage: demo
@@ -75,7 +75,7 @@ demo:9-release-gcc:
   dependencies:
   - build:9-release-gcc
   only:
-  - develop
+  - master
 
 demo:9-parallel-debug-gcc:
   stage: demo
@@ -84,7 +84,7 @@ demo:9-parallel-debug-gcc:
   dependencies:
   - build:9-parallel-debug-gcc
   only:
-  - develop
+  - master
 
 demo:9-parallel-release-gcc:
   stage: demo
@@ -93,7 +93,7 @@ demo:9-parallel-release-gcc:
   dependencies:
   - build:9-parallel-release-gcc
   only:
-  - develop
+  - master
 
 
 # compiel and run the tests
@@ -104,7 +104,7 @@ test:9-debug-gcc:
   dependencies:
   - build:9-debug-gcc
   only:
-  - develop
+  - master
 
 test:9-release-gcc:
   stage: test
@@ -113,7 +113,7 @@ test:9-release-gcc:
   dependencies:
   - build:9-release-gcc
   only:
-  - develop
+  - master
 
 test:9-parallel-debug-gcc:
   stage: test
@@ -122,7 +122,7 @@ test:9-parallel-debug-gcc:
   dependencies:
   - build:9-parallel-debug-gcc
   only:
-  - develop
+  - master
 
 test:9-parallel-release-gcc:
   stage: test
@@ -131,47 +131,20 @@ test:9-parallel-release-gcc:
   dependencies:
   - build:9-parallel-release-gcc
   only:
-  - develop
-
-
-# compiel and run the tests
-package:9-debug-gcc:
-  stage: package
-  script:
-  - cmake -DCONFIG=Debug -DCOMPONENT=SEQUENTIAL -P tools/packaging/debian/create_package.cmake
-  artifacts:
-    paths:
-    - debian_package/amdis-dbg/amdis*.deb
-  only:
   - master
 
-package:9-release-gcc:
-  stage: package
-  script:
-  - cmake -DCONFIG=Release -DCOMPONENT=SEQUENTIAL -P tools/packaging/debian/create_package.cmake
-  artifacts:
-    paths:
-    - debian_package/amdis/amdis*.deb
-  only:
-  - master
 
-package:9-parallel-debug-gcc:
+# compiel and run the tests
+package:xenial:
   stage: package
   script:
-  - cmake -DCONFIG=Debug -DCOMPONENT=PARALLEL -P tools/packaging/debian/create_package.cmake
-  artifacts:
-    paths:
-    - debian_package/amdis-dbg/amdis-par-dbg*.deb
+  - cmake -DDISTRIBUTION=xenial -P tools/packaging/debian/create_package.cmake
   only:
   - master
 
-package:9-parallel-release-gcc:
+package:yakkety:
   stage: package
   script:
-  - cmake -DCONFIG=Release -DCOMPONENT=PARALLEL -P tools/packaging/debian/create_package.cmake
-  artifacts:
-    paths:
-    - debian_package/amdis-dbg/amdis-par*.deb
+  - cmake -DDISTRIBUTION=yakkety -P tools/packaging/debian/create_package.cmake
   only:
   - master
-

AMDiS/cmake/CMakeLists.txt

@@ -243,6 +243,7 @@ endforeach ()
 
 file(GLOB CMAKE_MACROS "${BASE_DIR}/cmake/enable_*.cmake")
 install(FILES ${CMAKE_MACROS} DESTINATION share/amdis/)
+install(FILES ${BASE_DIR}/cmake3/ZoltanConfig.cmake DESTINATION share/amdis/)
 
 install(DIRECTORY ${BASE_DIR}/lib/mtl4/ DESTINATION include/amdis/mtl4/
   FILES_MATCHING PATTERN "*.hpp"

AMDiS/cmake/ZoltanConfig.cmake

+macro(parse_zoltan_makefile _FILE_ _LIBS_)
+
+  file(STRINGS ${_FILE_} ZOLTAN_MAKEFILE_LINE REGEX "ZOLTAN_EXTRA_LIBS")
+  get_filename_component(ZOLTAN_MAKEFILE_DIR "${ZOLTAN_MAKEFILE}" PATH CACHE)
+
+  string(STRIP "${ZOLTAN_MAKEFILE_LINE}" LINE)
+  if ("${LINE}" MATCHES "^ZOLTAN_EXTRA_LIBS[ ]*=[ ]*([a-zA-Z0-9_/. -]+)$")
+    string(REGEX REPLACE " " ";" ZOLTAN_EXTRA_LIBS_LIST "${CMAKE_MATCH_1}")
+
+    set(ZOLTAN_LIB_DIRS "")
+    foreach(LIBS ${ZOLTAN_EXTRA_LIBS_LIST})
+      string(STRIP "${LIBS}" LIBS)
+      string(SUBSTRING "${LIBS}" 0 2 LIB_PREFIX)
+      string(SUBSTRING "${LIBS}" 2 -1 LIB_NAME)
+      if ("${LIB_PREFIX}" STREQUAL "-L")
+        list(APPEND ZOLTAN_LIB_DIRS ${LIB_NAME})
+      elseif ("${LIB_PREFIX}" STREQUAL "-l")
+        find_library(_ZOLTAN_EXTERN_LIB ${LIB_NAME} HINTS ${ZOLTAN_LIB_DIRS})
+        if (NOT _ZOLTAN_EXTERN_LIB)
+          message(FATAL_ERROR "Could not find library \"${LIB_NAME}\" in directories ${ZOLTAN_LIB_DIRS}!")
+        else ()
+          list(APPEND ${_LIBS_} ${_ZOLTAN_EXTERN_LIB})
+        endif ()
+        unset(_ZOLTAN_EXTERN_LIB CACHE)
+      else ()
+        message(WARNING "Unknown link parameter \"${LIBS}\"")
+      endif ()
+    endforeach (LIBS)
+  endif()
+endmacro(parse_zoltan_makefile)

AMDiS/cmake/enable_png.cmake

@@ -9,12 +9,21 @@ macro(enable_png _FLAGS_ _INC_DIRS_ _LIBS_)
       HINTS ENV CPATH /usr/include
       DOC "headerfile png.h for PNG-READER")
 
-    if (_PNG_H)
-      get_filename_component(PNG_PATH ${_PNG_H} PATH)
-      list(APPEND ${_INC_DIRS_} ${PNG_PATH})
-    else()
+    if (NOT _PNG_H)
       message(FATAL_ERROR "Could not find the PNG header png.h.")
-    endif()
+    else ()
+      file(STRINGS ${_PNG_H} PNG_VERSION_LINE REGEX "#define PNG_LIBPNG_VER_STRING")
+      string(REGEX MATCH "\"([0-9]+[.][0-9]+([.][0-9]+)?)\"" PNG_VERSION_LINE ${PNG_VERSION_LINE})
+      set(PNG_VERSION ${CMAKE_MATCH_1})
+
+      message(STATUS "Libpng version: ${PNG_VERSION}")
+      if (NOT PNG_VERSION VERSION_LESS "1.6" OR NOT PNG_VERSION VERSION_GREATER "1.2")
+        message(FATAL_ERROR "Incompatible libpng version. Requires 1.2.x")
+      endif ()
+    endif ()
+
+    get_filename_component(PNG_PATH ${_PNG_H} PATH)
+    list(APPEND ${_INC_DIRS_} ${PNG_PATH})
 
     if (LINK_EXECUTABLE)
       find_library(_PNG_LIB png

AMDiS/cmake/enable_zoltan.cmake

+include(ZoltanConfig)
 macro(enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_)
     if (${ARGC} GREATER 3)
       set(LINK_EXECUTABLE ON)
@@ -5,22 +6,55 @@ macro(enable_zoltan _FLAGS_ _INC_DIRS_ _LIBS_)
       set(LINK_EXECUTABLE OFF)
     endif ()
 
-    find_file(ZOLTAN_HEADER_FILE "zoltan_cpp.h" HINTS ${ZOLTAN_DIR}/include ${PETSC_INCLUDE_DIRS})
-    if (ZOLTAN_HEADER_FILE)
-      get_filename_component(ZOLTAN_HEADER_DIR "${ZOLTAN_HEADER_FILE}" PATH CACHE)
-      list(APPEND ${_INC_DIRS_} ${ZOLTAN_HEADER_DIR})
-    else()
-      message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!")
-    endif(ZOLTAN_HEADER_FILE)
+    find_package(Zoltan QUIET)
+    if (Zoltan_FOUND)
+      find_file(ZOLTAN_HEADER_FILE "zoltan.h" PATHS ${Zoltan_INCLUDE_DIRS})
+      list(APPEND ${_INC_DIRS_} ${Zoltan_INCLUDE_DIRS})
+
+      if (LINK_EXECUTABLE)
+        foreach (LIB_NAME ${Zoltan_LIBRARIES})
+          find_library(_ZOLTAN_LIB ${LIB_NAME} HINTS ${Zoltan_LIBRARY_DIRS})
+          if (NOT _ZOLTAN_LIB)
+            message(FATAL_ERROR "Could not find library \"${LIB_NAME}\" in directories ${Zoltan_LIBRARY_DIRS}!")
+          else ()
+            list(APPEND ${_LIBS_} ${_ZOLTAN_LIB})
+          endif ()
+          unset(_ZOLTAN_LIB CACHE)
+        endforeach(LIB_NAME)
+      endif (LINK_EXECUTABLE)
+    else (Zoltan_FOUND)
+      find_file(ZOLTAN_HEADER_FILE "zoltan.h" HINTS ${ZOLTAN_DIR}/include ${PETSC_INCLUDE_DIRS})
+      if (ZOLTAN_HEADER_FILE)
+        get_filename_component(ZOLTAN_HEADER_DIR "${ZOLTAN_HEADER_FILE}" PATH CACHE)
+        list(APPEND ${_INC_DIRS_} ${ZOLTAN_HEADER_DIR})
+      else()
+        message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!")
+      endif(ZOLTAN_HEADER_FILE)
+
+      if (LINK_EXECUTABLE)
+        find_library(ZOLTAN_LIB zoltan
+          HINTS ENV LIBRARY_PATH DOC "Full path to the zoltan library")
+        if (NOT ZOLTAN_LIB)
+          message(FATAL_ERROR "Could not find zoltan library!")
+        endif (NOT ZOLTAN_LIB)
+        list(APPEND ${_LIBS_} ${ZOLTAN_LIB})
 
-    if (LINK_EXECUTABLE)
-      find_library(ZOLTAN_LIB zoltan
-        HINTS ENV LIBRARY_PATH DOC "Full path to the zoltan library")
-      if (NOT ZOLTAN_LIB)
-        message(FATAL_ERROR "Could not find zoltan library!")
-      endif (NOT ZOLTAN_LIB)
-      list(APPEND ${_LIBS_} ${ZOLTAN_LIB})
-    endif (LINK_EXECUTABLE)
+        find_file(ZOLTAN_CONFIG_FILE "Makefile.export.zoltan" HINTS ${ZOLTAN_HEADER_DIR})
+        if (ZOLTAN_CONFIG_FILE)
+          parse_zoltan_makefile(${ZOLTAN_CONFIG_FILE} ${_TARGET_} ${_SCOPE_})
+        else ()
+          message(WARNING "Zoltan configuration file Makefile.export.zoltan not found!")
+        endif ()
+      endif (LINK_EXECUTABLE)
+    endif (Zoltan_FOUND)
 
+
+    if (ZOLTAN_HEADER_FILE)
+      file(STRINGS ${ZOLTAN_HEADER_FILE} ZOLTAN_VERSION_LINE REGEX "#define ZOLTAN_VERSION_NUMBER")
+      string(REGEX MATCH "([0-9]+[.][0-9]+)" ZOLTAN_VERSION_REGEX ${ZOLTAN_VERSION_LINE})
+      set(ZOLTAN_VERSION ${CMAKE_MATCH_1})
+      unset(ZOLTAN_HEADER_FILE CACHE)
+      message(STATUS "Zoltan version: ${ZOLTAN_VERSION}")
+    endif (ZOLTAN_HEADER_FILE)
     list(APPEND ${_FLAGS_} "-DHAVE_ZOLTAN=1")
 endmacro(enable_zoltan)

AMDiS/cmake3/AMDIS.cmake.in

@@ -181,6 +181,9 @@ endif (AMDIS_HAS_PARALLEL_DOMAIN)
 # Zoltan library
 # --------------
 if (AMDIS_NEED_ZOLTAN)
+  if (NOT DEFINED ZOLTAN_DIR)
+    set(ZOLTAN_DIR "@ZOLTAN_DIR@")
+  endif ()
   target_enable_zoltan(amdis_base INTERFACE ON)
 endif ()
 

AMDiS/cmake3/CMakeLists.txt

@@ -210,6 +210,7 @@ endforeach ()
 
 file(GLOB CMAKE_MACROS "${BASE_DIR}/cmake3/target_enable_*.cmake")
 install(FILES ${CMAKE_MACROS} DESTINATION share/amdis/)
+install(FILES ${BASE_DIR}/cmake3/ZoltanConfig.cmake DESTINATION share/amdis/)
 
 install(DIRECTORY ${BASE_DIR}/lib/mtl4/ DESTINATION include/amdis/mtl4/
   FILES_MATCHING PATTERN "*.hpp"

AMDiS/cmake3/ZoltanConfig.cmake

+macro(parse_zoltan_makefile _FILE_ _TARGET_ _SCOPE_)
+
+  file(STRINGS ${_FILE_} ZOLTAN_MAKEFILE_LINE REGEX "ZOLTAN_EXTRA_LIBS")
+  get_filename_component(ZOLTAN_MAKEFILE_DIR "${ZOLTAN_MAKEFILE}" PATH CACHE)
+
+  string(STRIP "${ZOLTAN_MAKEFILE_LINE}" LINE)
+  if ("${LINE}" MATCHES "^ZOLTAN_EXTRA_LIBS[ ]*=[ ]*([a-zA-Z0-9_/. -]+)$")
+    string(REGEX REPLACE " " ";" ZOLTAN_EXTRA_LIBS_LIST "${CMAKE_MATCH_1}")
+
+    set(ZOLTAN_LIB_DIRS "")
+    foreach(LIBS ${ZOLTAN_EXTRA_LIBS_LIST})
+      string(STRIP "${LIBS}" LIBS)
+      string(SUBSTRING "${LIBS}" 0 2 LIB_PREFIX)
+      string(SUBSTRING "${LIBS}" 2 -1 LIB_NAME)
+      if ("${LIB_PREFIX}" STREQUAL "-L")
+        list(APPEND ZOLTAN_LIB_DIRS ${LIB_NAME})
+      elseif ("${LIB_PREFIX}" STREQUAL "-l")
+        find_library(_ZOLTAN_EXTERN_LIB ${LIB_NAME} HINTS ${ZOLTAN_LIB_DIRS})
+        if (NOT _ZOLTAN_EXTERN_LIB)
+          message(FATAL_ERROR "Could not find library \"${LIB_NAME}\" in directories ${ZOLTAN_LIB_DIRS}!")
+        else ()
+          target_link_libraries(${_TARGET_} ${_SCOPE_} ${_ZOLTAN_EXTERN_LIB})
+        endif ()
+        unset(_ZOLTAN_EXTERN_LIB CACHE)
+      else ()
+        message(WARNING "Unknown link parameter \"${LIBS}\"")
+      endif ()
+    endforeach (LIBS)
+  endif()
+endmacro(parse_zoltan_makefile)

AMDiS/cmake3/target_enable_png.cmake

@@ -9,12 +9,21 @@ macro(target_enable_png _TARGET_ _SCOPE_)
       HINTS ENV CPATH /usr/include
       DOC "headerfile png.h for PNG-READER")
 
-    if (_PNG_H)
-      get_filename_component(PNG_PATH ${_PNG_H} PATH)
-      target_include_directories(${_TARGET_} ${_SCOPE_} ${PNG_PATH})
-    else()
+    if (NOT _PNG_H)
       message(FATAL_ERROR "Could not find the PNG header png.h.")
-    endif()
+    else ()
+      file(STRINGS ${_PNG_H} PNG_VERSION_LINE REGEX "#define PNG_LIBPNG_VER_STRING")
+      string(REGEX MATCH "\"([0-9]+[.][0-9]+([.][0-9]+)?)\"" PNG_VERSION_LINE ${PNG_VERSION_LINE})
+      set(PNG_VERSION ${CMAKE_MATCH_1})
+
+      message(STATUS "Libpng version: ${PNG_VERSION}")
+      if (NOT PNG_VERSION VERSION_LESS "1.6" OR NOT PNG_VERSION VERSION_GREATER "1.2")
+        message(FATAL_ERROR "Incompatible libpng version. Requires 1.2.x")
+      endif ()
+    endif ()
+
+    get_filename_component(PNG_PATH ${_PNG_H} PATH)
+    target_include_directories(${_TARGET_} ${_SCOPE_} ${PNG_PATH})
 
     if (LINK_EXECUTABLE)
       find_library(_PNG_LIB png

AMDiS/cmake3/target_enable_zoltan.cmake

+include(ZoltanConfig)
 macro(target_enable_zoltan _TARGET_ _SCOPE_)
     if (${ARGC} GREATER 2)
       set(LINK_EXECUTABLE ON)
@@ -5,22 +6,55 @@ macro(target_enable_zoltan _TARGET_ _SCOPE_)
       set(LINK_EXECUTABLE OFF)
     endif ()
 
-    find_file(ZOLTAN_HEADER_FILE "zoltan_cpp.h" HINTS ${ZOLTAN_DIR}/include ${PETSC_INCLUDE_DIRS})
-    if (ZOLTAN_HEADER_FILE)
-      get_filename_component(ZOLTAN_HEADER_DIR "${ZOLTAN_HEADER_FILE}" PATH CACHE)
-      target_include_directories(${_TARGET_} ${_SCOPE_} ${ZOLTAN_HEADER_DIR})
-    else()
-      message(FATAL_ERROR "Could not find Zoltan include file 'zoltan_cpp.h'!")
-    endif(ZOLTAN_HEADER_FILE)
+    find_package(Zoltan QUIET)
+    if (Zoltan_FOUND)
+      find_file(ZOLTAN_HEADER_FILE "zoltan.h" PATHS ${Zoltan_INCLUDE_DIRS})
+      target_include_directories(${_TARGET_} ${_SCOPE_} ${Zoltan_INCLUDE_DIRS})
+
+      if (LINK_EXECUTABLE)
+        foreach (LIB_NAME ${Zoltan_LIBRARIES})
+          find_library(_ZOLTAN_LIB ${LIB_NAME} HINTS ${Zoltan_LIBRARY_DIRS})
+          if (NOT _ZOLTAN_LIB)
+            message(FATAL_ERROR "Could not find library \"${LIB_NAME}\" in directories ${Zoltan_LIBRARY_DIRS}!")
+          else ()
+            target_link_libraries(${_TARGET_} ${_SCOPE_} ${_ZOLTAN_LIB})
+          endif ()
+          unset(_ZOLTAN_LIB CACHE)
+        endforeach(LIB_NAME)
+      endif (LINK_EXECUTABLE)
+    else (Zoltan_FOUND)
+      find_file(ZOLTAN_HEADER_FILE "zoltan.h" HINTS ${ZOLTAN_DIR}/include ${PETSC_INCLUDE_DIRS})
+      if (ZOLTAN_HEADER_FILE)
+        get_filename_component(Zoltan_INCLUDE_DIR "${ZOLTAN_HEADER_FILE}" PATH CACHE)
+        target_include_directories(${_TARGET_} ${_SCOPE_} ${Zoltan_INCLUDE_DIR})
+      else()
+        message(FATAL_ERROR "Could not find Zoltan include file 'zoltan.h'!")
+      endif(ZOLTAN_HEADER_FILE)
+
+      if (LINK_EXECUTABLE)
+        find_library(ZOLTAN_LIB zoltan
+          HINTS ${Zoltan_INCLUDE_DIR}/../lib DOC "Full path to the zoltan library")
+        if (NOT ZOLTAN_LIB)
+          message(FATAL_ERROR "Could not find zoltan library!")
+        endif (NOT ZOLTAN_LIB)
+        target_link_libraries(${_TARGET_} ${_SCOPE_} ${ZOLTAN_LIB})
 
-    if (LINK_EXECUTABLE)
-      find_library(ZOLTAN_LIB zoltan
-        HINTS ENV LIBRARY_PATH DOC "Full path to the zoltan library")
-      if (NOT ZOLTAN_LIB)
-        message(FATAL_ERROR "Could not find zoltan library!")
-      endif (NOT ZOLTAN_LIB)
-      target_link_libraries(${_TARGET_} ${_SCOPE_} ${ZOLTAN_LIB})
-    endif (LINK_EXECUTABLE)
+        find_file(ZOLTAN_CONFIG_FILE "Makefile.export.zoltan" HINTS ${Zoltan_INCLUDE_DIR})
+        if (ZOLTAN_CONFIG_FILE)
+          parse_zoltan_makefile(${ZOLTAN_CONFIG_FILE} ${_TARGET_} ${_SCOPE_})
+        else ()
+          message(WARNING "Zoltan configuration file Makefile.export.zoltan not found!")
+        endif ()
+      endif (LINK_EXECUTABLE)
 
-    target_compile_definitions(${_TARGET_} ${_SCOPE_} HAVE_ZOLTAN=1)
+      target_compile_definitions(${_TARGET_} ${_SCOPE_} HAVE_ZOLTAN=1)
+    endif (Zoltan_FOUND)
+
+    if (ZOLTAN_HEADER_FILE)
+      file(STRINGS ${ZOLTAN_HEADER_FILE} ZOLTAN_VERSION_LINE REGEX "#define ZOLTAN_VERSION_NUMBER")
+      string(REGEX MATCH "([0-9]+[.][0-9]+)" ZOLTAN_VERSION_REGEX ${ZOLTAN_VERSION_LINE})
+      set(ZOLTAN_VERSION ${CMAKE_MATCH_1})
+      unset(ZOLTAN_HEADER_FILE CACHE)
+      message(STATUS "Zoltan version: ${ZOLTAN_VERSION}")
+    endif (ZOLTAN_HEADER_FILE)
 endmacro(target_enable_zoltan)

CHANGELOG

-amdis (@PACKAGE_VERSION@-1) @PACKAGE_DISTRIBUTION@; urgency=medium
+amdis (@PACKAGE_VERSION_FULL@) @PACKAGE_DISTRIBUTION@; urgency=medium
 
   * CMake configuration redesigned
   * ARH3 reader corrected to parse .parh files correctly

tools/build_amdis.sh

@@ -5,6 +5,7 @@ ROOT=${PWD}
 STAGE="build"
 CONFIG="Release"
 COMPONENT="SEQUENTIAL"
+ENABLE_PNG="0"
 
 # parse command line
 if [ $# -gt 0 ]; then
@@ -19,6 +20,9 @@ if [ $# -gt 0 ]; then
     --parallel)
         COMPONENT="PARALLEL" # [SEQUENTIAL|PARALLEL]
         shift ;;
+    --png)
+        ENABLE_PNG="1"
+        shift ;;
     --)
         shift
         break ;;
@@ -40,12 +44,15 @@ fi
 
 if [ "${COMPONENT}" == "SEQUENTIAL" ]; then
   POSTFIX="${POSTFIX}_seq"
-  FLAGS="-DENABLE_UMFPACK:BOOL=ON"
+  FLAGS="-DENABLE_UMFPACK:BOOL=ON -DENABLE_HYPRE:BOOL=ON"
 else
   POSTFIX="${POSTFIX}_par"
-  FLAGS="-DENABLE_UMFPACK:BOOL=OFF -DENABLE_PARALLEL_DOMAIN:BOOL=ON"
+  FLAGS="-DENABLE_UMFPACK:BOOL=OFF -DENABLE_PARALLEL_DOMAIN:BOOL=ON -DENABLE_ZOLTAN:BOOL=ON"
 fi
 
+if [ "${ENABLE_PNG}" == "1" ]; then
+  FLAGS="${FLAGS} -DENABLE_PNG:BOOL=ON"
+fi
 
 if [[ "${STAGE}" == "build" || "${STAGE}" == "all" ]]; then
   # at first build AMDiS

tools/packaging/debian/control.in

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), libboost-date-time-dev (>= 1.48),
  libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
  libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
  zlib1g-dev (>= 1.2), libsuitesparse-dev (>= 4.2.1), cmake (>= 2.8.10),
- petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), pkg-config (>= 0.26)
+ petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), pkg-config (>= 0.26), libmetis-dev (>= 5.0)
 
 Package: libamdis-dev
 Architecture: any
@@ -17,8 +17,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-date-time-dev (>= 1.48),
  libboost-filesystem-dev (>= 1.48), libboost-iostreams-dev (>= 1.48),
  libboost-program-options-dev (>= 1.48), libboost-system-dev (>= 1.48),
  zlib1g-dev (>= 1.2), cmake (>= 2.8.10), pkg-config (>= 0.26)
-Recommends: libamdis (= @PACKAGE_VERSION@), libamdis-par (= @PACKAGE_VERSION@)
-Suggests: libamdis-debug (= @PACKAGE_VERSION@), libamdis-par-debug (= @PACKAGE_VERSION@)
+Recommends: libamdis (= ${source:Version}), libamdis-par (= ${source:Version})
+Suggests: libamdis-debug (= ${source:Version}), libamdis-par-debug (= ${source:Version})
 Description: @PACKAGE_DESCRIPTION_SUMMARY@
  @PACKAGE_DESCRIPTION@
  .
@@ -26,7 +26,7 @@ Description: @PACKAGE_DESCRIPTION_SUMMARY@
 
 Package: libamdis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= @PACKAGE_VERSION@),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= ${source:Version}),
  libsuitesparse-dev (>= 4.2.1)
 Description: @PACKAGE_DESCRIPTION_SUMMARY@
  @PACKAGE_DESCRIPTION@
@@ -35,25 +35,25 @@ Description: @PACKAGE_DESCRIPTION_SUMMARY@
 
 Package: libamdis-par
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= @PACKAGE_VERSION@),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-dev (= ${source:Version}),
  petsc-dev (>= 3.3), libparmetis-dev (>= 3.0), libmetis-dev (>= 5.0)
-Description: @PACKAGE_DESCRIPTION_SUMMARY@
+Description: @PACKAGE_DESCRIPTION_SUMMARY@ (parallel Release-mode)
  @PACKAGE_DESCRIPTION@
  .
  This is the parallel version in Release mode of AMDiS.
 
 Package: libamdis-debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis (= @PACKAGE_VERSION@)
-Description: @PACKAGE_DESCRIPTION_SUMMARY@
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis (= ${source:Version})
+Description: @PACKAGE_DESCRIPTION_SUMMARY@ (Debug-mode)
  @PACKAGE_DESCRIPTION@
  .
  This is the sequential version in Debug mode of AMDiS.
 
 Package: libamdis-par-debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-par (= @PACKAGE_VERSION@)
-Description: @PACKAGE_DESCRIPTION_SUMMARY@
+Depends: ${shlibs:Depends}, ${misc:Depends}, libamdis-par (= ${source:Version})
+Description: @PACKAGE_DESCRIPTION_SUMMARY@ (parallel Debug-mode)
  @PACKAGE_DESCRIPTION@
  .
  This is the parallel version in Debug mode of AMDiS.

tools/packaging/debian/create_package.cmake

 set(PACKAGE_SOURCE_NAME   "amdis")
 set(PACKAGE_NAME          "libamdis")
 set(PACKAGE_SECTION       "libdevel")
-set(PACKAGE_DISTRIBUTION  "xenial")
+if (DEFINED DISTRIBUTION)
+  set(PACKAGE_DISTRIBUTION  "${DISTRIBUTION}")
+  set(IS_RELEASE ON)
+else ()
+  set(PACKAGE_DISTRIBUTION  "xenial")
+  set(IS_RELEASE OFF)
+endif ()
 set(PACKAGE_VERSION_MAJOR "1")
 set(PACKAGE_VERSION_MINOR "1")
 set(PACKAGE_VERSION_PATCH "0")
 set(PACKAGE_RELEASE_CANDIDATE "1")
-set(IS_RELEASE OFF)
 
 # construct a package-version string
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
@@ -19,7 +24,8 @@ if (NOT IS_RELEASE)
   set(PACKAGE_VERSION "${PACKAGE_VERSION}~rc${PACKAGE_RELEASE_CANDIDATE}")
 endif ()
 
-set(PACKAGE_VERSION "${PACKAGE_VERSION}~${PACKAGE_DISTRIBUTION}")
+set(PACKAGE_VERSION "${PACKAGE_VERSION}~ppa1~${PACKAGE_DISTRIBUTION}")
+set(PACKAGE_VERSION_FULL "${PACKAGE_VERSION}-1")
 
 set(PACKAGE_CONTACT "Simon Praetorius <simon.praetorius@tu-dresden.de>")
 set(PACKAGE_SOURCE  "<https://gitlab.math.tu-dresden.de/iwr/amdis.git>")
@@ -46,7 +52,7 @@ set(PACKAGE_PREFIX ${PACKAGE_SOURCE_NAME}-${PACKAGE_VERSION})
 set(TGZ_FILENAME ${OUT_DIR}/${PACKAGE_FILENAME}.orig.tar.gz)
 
 # create source tar.gz archive using git archive
-execute_process(COMMAND git archive --format=tar.gz --prefix ${PACKAGE_PREFIX}/ -o ${TGZ_FILENAME} master)
+execute_process(COMMAND git archive --format=tar.gz --prefix ${PACKAGE_PREFIX}/ -o ${TGZ_FILENAME} HEAD)
 
 # extract package generated above
 execute_process(COMMAND tar -xzf ${TGZ_FILENAME} -C ${OUT_DIR})

tools/packaging/debian/rules.in

@@ -35,7 +35,6 @@ override_dh_auto_build:
 	dh_auto_build --builddirectory=build_libamdis_par --package=libamdis-par --max-parallel=2
 	dh_auto_build --builddirectory=build_libamdis_debug --package=libamdis-debug --max-parallel=2
 	dh_auto_build --builddirectory=build_libamdis_par_debug --package=libamdis-par-debug --max-parallel=2
-	doxygen AMDiS/doc/Doxyfile
 
 override_dh_auto_install:
 	dh_auto_install --builddirectory=build_libamdis --package=libamdis