restructure example projects

Author: lganzzzo

CMakeLists.txt

@@ -2,38 +2,49 @@ cmake_minimum_required(VERSION 3.1)
 
 set(project_name hls-example) ## rename your project here
 
-project(${project_name}-loader)
+project(${project_name})
 
-include(ExternalProject)
+set(CMAKE_CXX_STANDARD 11)
 
-#############################################################################
-## load all dependencies
+add_library(${project_name}-lib
+        src/AppComponent.hpp
+        src/Utils.cpp
+        src/Utils.hpp
+        src/controller/MediaController.hpp
+        src/hls/Playlist.cpp
+        src/hls/Playlist.hpp
+)
 
-ExternalProject_Add(oatpp
-        GIT_REPOSITORY "https://github.com/oatpp/oatpp.git"
-        GIT_TAG origin/master
-        CMAKE_ARGS -DOATPP_BUILD_TESTS=OFF
+target_include_directories(${project_name}-lib
+        PUBLIC src
 )
 
-ExternalProject_Add(main
-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/main
-        INSTALL_COMMAND cmake -E echo "SKIP INSTALL"
-        DEPENDS oatpp
+## link libs
+
+find_package(oatpp 0.19.4 REQUIRED)
+
+target_link_libraries(${project_name}-lib
+        PUBLIC oatpp::oatpp
+        PUBLIC oatpp::oatpp-test
 )
 
-#############################################################################
-## make run command
+add_definitions(
+        -DEXAMPLE_MEDIA_FOLDER="${CMAKE_CURRENT_LIST_DIR}/video"
+)
 
-ExternalProject_Get_Property(main BINARY_DIR)
+## add executables
 
-add_custom_target(run
-        COMMAND ${BINARY_DIR}/${project_name}-exe
-        DEPENDS main
-        WORKING_DIRECTORY ${BINARY_DIR}
+add_executable(${project_name}-exe
+        src/App.cpp
 )
+target_link_libraries(${project_name}-exe ${project_name}-lib)
+add_dependencies(${project_name}-exe ${project_name}-lib)
 
-#############################################################################
-## make test command
+add_executable(${project_name}-test
+        test/tests.cpp
+)
+target_link_libraries(${project_name}-test ${project_name}-lib)
+add_dependencies(${project_name}-test ${project_name}-lib)
 
 enable_testing()
-add_test(all-tests ${BINARY_DIR}/${project_name}-test)
+add_test(project-tests ${project_name}-test)

Dockerfile

@@ -2,11 +2,15 @@ FROM lganzzzo/alpine-cmake:latest
 
 ADD . /service
 
+WORKDIR /service/utility
+
+RUN ./install-oatpp-modules.sh
+
 WORKDIR /service/build
 
 RUN cmake ..
 RUN make
 
 EXPOSE 8000 8000
 
-ENTRYPOINT ["make", "run"]
+ENTRYPOINT ["./hls-example-exe"]

README.md

@@ -26,16 +26,14 @@ Server is built using oat++ Async-Api and has following endpoints:
 
 ```
 
-|- CMakeLists.txt              // project loader script. load and build dependencies 
-|- main/                       // main project directory
-|    |
-|    |- CMakeLists.txt         // projects CMakeLists.txt
-|    |- src/                   // source folder
-|    |- test/                  // test folder
+|- CMakeLists.txt                       // projects CMakeLists.txt
+|- src/                                 // source folder
+|- test/                                // test folder
+|- utility/install-oatpp-modules.sh     // utility script to install required oatpp-modules.
 |
-|- video/                      // media files and playlists here
-     |- generate_pls.sh        // example how to use ```ffmpeg``` to generate initial playlist and video chunks
-     |- playlist_live.m3u8     // playlist used to generate infinite playlist for http-live-streaming
+|- video/                               // media files and playlists here
+     |- generate_pls.sh                 // example how to use ```ffmpeg``` to generate initial playlist and video chunks
+     |- playlist_live.m3u8              // playlist used to generate infinite playlist for http-live-streaming
 
 ```
 ```
@@ -56,11 +54,16 @@ Server is built using oat++ Async-Api and has following endpoints:
 
 #### Using CMake
 
+**Requires**
+
+- `oatpp` module installed. You may run `utility/install-oatpp-modules.sh` 
+script to install required oatpp modules.
+
 ```
 $ mkdir build && cd build
 $ cmake ..
-$ make run        ## Download, build, and install all dependencies. Run project
-
+$ make 
+$ ./hls-example-exe             # - run application.
 ```
 
 #### In Docker

azure-pipelines.yml

@@ -14,6 +14,10 @@ jobs:
     workspace:
       clean: all
     steps:
+      - script: |
+          sudo ./install-oatpp-modules.sh
+        displayName: 'install oatpp modules'
+        workingDirectory: utility
       - script: |
           mkdir build
       - script: |
@@ -24,4 +28,4 @@ jobs:
       - script: |
           make test ARGS="-V"
         displayName: 'Test'
-        workingDirectory: build
+        workingDirectory: build

main/CMakeLists.txt

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+rm -rf tmp
+
+mkdir tmp
+cd tmp
+
+##########################################################
+## install oatpp
+
+MODULE_NAME="oatpp"
+
+git clone --depth=1 https://github.com/oatpp/$MODULE_NAME
+
+cd $MODULE_NAME
+mkdir build
+cd build
+
+cmake ..
+make install
+
+cd ../../
+
+##########################################################
+
+cd ../
+
+rm -rf tmp