Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update CMakeLists.txt

Update CMakeLists.txt

Update .gitlab-ci.yml

Update .gitlab-ci.yml

Update CI

Update CI

Update

Update CI

Update CI

Update CI

Update CI

Update CI

Update CI

Update CI

Update CI

.gitlab-ci.yml

@@ -8,28 +8,28 @@ build_deb:
   stage: build
   only:
     - master
-  before_script:
+  script:
+    - mkdir build
     - apt-get update -qq
     - apt-get install -y -qq 
         sqlite3 wget locales locales-all libboost-all-dev libicu-dev
     - wget https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v2.8.0.tar.gz
     - tar -xvf v2.8.0.tar.gz
     - cd AMQP-CPP-2.8.0
-    - make -j4 && make install && ldconfig
-  script:
-    - mkdir build
-    - build
-    - cmake ..
-    - make -j4
-    - make install
-    - ldconfig
+    - make -j4 && make install && ldconfig && cd ..
+    - cd build && cmake .. && cmake --build .
+    - cpack
   artifacts:
     paths:
-      - build/
+      - build
       
 push_deb:
+  stage: deploy
   only:
     - master
   script:
-    - ls build
+    - FILE=$(ls build/wsnlp*.deb)
+    - curl --fail -i -X POST -F "file=@./${FILE}" -u "${APT_USERNAME}:${APT_PASSWORD}" https://apt.clarin-pl.eu/
+  dependencies:
+    - build_deb
 

CMakeLists.txt

@@ -2,29 +2,26 @@ cmake_minimum_required(VERSION 3.5.1)
 
 cmake_policy(SET CMP0048 NEW)
 project(wsnlp VERSION 1.0.0)
-
-set(CMAKE_CXX_STANDARD 11)
-
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
+SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
+SET(CMAKE_BUILD_TYPE Release)
 
 find_package(ICU 55 REQUIRED)
-set(LIBS ${LIBS} ${ICU_LIBRARIES})
+SET(LIBS ${LIBS} ${ICU_LIBRARIES})
 
 find_package(Boost COMPONENTS program_options system thread filesystem chrono atomic date_time)
 link_directories(${Boost_LIBRARY_DIRS})
-set(LIBS ${LIBS} ${Boost_LIBRARIES})
+SET(LIBS ${LIBS} ${Boost_LIBRARIES})
 
 find_package(amqpcpp 3.0 REQUIRED)
-set(LIBS ${LIBS} amqpcpp)
+SET(LIBS ${LIBS} amqpcpp)
+get_filename_component(AMQP_DIR ${AMQP_LIBRARY} REALPATH)
 
 find_package(Threads)
-set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
+SET(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
-set(CMAKE_BUILD_TYPE Release)
-# SET(COMPILE_FLAGS "-O3")
-# SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}")
-
-add_library(wsnlp src/nlpworker.cpp src/asiohandler.cpp src/easylogging++.h)
+add_library(wsnlp SHARED src/nlpworker.cpp src/asiohandler.cpp)
+target_link_libraries(wsnlp amqpcpp)
 set_target_properties(wsnlp PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties(wsnlp PROPERTIES PUBLIC_HEADER src/nlpworker.h)
 
@@ -35,7 +32,17 @@ install(TARGETS wsnlp
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-install(FILES src/easylogging++.h DESTINATION include)
-
+message(${CMAKE_INSTALL_LIBDIR})
+message(${CMAKE_INSTALL_INCLUDEDIR})
 
+install(FILES src/easylogging++.h DESTINATION include)
+install(FILES ${AMQP_INCLUDE_DIR}/amqpcpp.h DESTINATION include)
+install(DIRECTORY "${AMQP_INCLUDE_DIR}/amqpcpp/" DESTINATION include/amqpcpp)
+install(FILES ${AMQP_DIR} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../bin)
+
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-all-dev")
+SET(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+SET(CPACK_GENERATOR "DEB")
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "g419")
+INCLUDE(CPack)