Merge pull request #3 from vesavlad/build-fixes

Update build dependencies and some libs in order to make build easy on newer ubuntu

Author: vesavlad

.pkg

@@ -11,4 +11,10 @@
 [spdlog]
     url=git@github.com:gabime/spdlog.git
     branch=master
-    commit=de0dbfa3596a18cd70a4619b6a9766847a941276
+    commit=ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36
+
+[zlib]
+    url=git@github.com:motis-project/zlib.git
+    branch=master
+    commit=d1c943390ba4f97aa2f50bedc629b6d29027fa0e
+

CHANGELOG.md

@@ -17,7 +17,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [2.1.0] - 17-02-2023
+### Changed
+- Bumped spdlog version
+- Bumped buildcache
+- Bumped catch2 testing framework used for gtfs lib tests
+- fixed building on newer ubuntu compilers
+
+## [2.0.1] - 05-03-2022
+### Fixes
+- Fixed wrong generation of interpolated times.
+
+## [2.0.0] - 24-01-2021
 ### Added
 - changelog support
 - use new dependency management system named [pkg](https://github.com/motis-project/pkg)

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu AS builder
+FROM ubuntu:jammy AS builder
 
 WORKDIR /app
 
@@ -18,10 +18,10 @@ RUN mkdir build && \
 	pwd && \
 	make install
 
-FROM ubuntu
+FROM ubuntu:jammy
 
 RUN apt-get update && \
-	apt-get install -y libgomp1 && \
+	apt-get install -y libgomp1 libbz2-dev && \
 	rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local/etc/pfaedle /usr/local/etc/pfaedle

cmake/buildcache.cmake

@@ -23,7 +23,7 @@ else()
       message(FATAL "Error: NO_BUILDCACHE was not set but buildcache was not in path and system OS detection failed")
     endif()
 
-    set(buildcache-url "https://github.com/mbitsnbites/buildcache/releases/download/v0.22.3/${buildcache-archive}")
+    set(buildcache-url "https://github.com/mbitsnbites/buildcache/releases/download/v0.28.2/${buildcache-archive}")
     message(STATUS "Downloading buildcache binary from ${buildcache-url}")
     file(DOWNLOAD "${buildcache-url}" ${CMAKE_CURRENT_BINARY_DIR}/${buildcache-archive})
     execute_process(

src/apps/pfaedle/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_library(pfaedle-main-lib app.cpp)
 target_link_libraries(pfaedle-main-lib
         PUBLIC logging
-        PUBLIC stei-gtfs
+        PUBLIC gtfs
         PUBLIC pfaedle-lib
         PRIVATE pfaedle-generated
         PRIVATE pfaedle-util

src/libs/gtfs/CMakeLists.txt

@@ -1,8 +1,11 @@
-file(GLOB_RECURSE stei-gtfs-src *.cpp)
-add_library(stei-gtfs ${stei-gtfs-src})
-target_include_directories(stei-gtfs PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
-set_target_properties(stei-gtfs PROPERTIES
+file(GLOB_RECURSE gtfs-src  ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
+add_library(gtfs STATIC ${gtfs-src})
+
+target_include_directories(gtfs PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+
+set_target_properties(gtfs PROPERTIES
         CXX_STANDARD 17
         CXX_EXTENSIONS OFF)
 

src/libs/gtfs/include/gtfs/stop.h

@@ -2,7 +2,7 @@
 #include <gtfs/record.h>
 #include <gtfs/types.h>
 #include <gtfs/enums/stop_location_type.h>
-
+#include <optional>
 #include <functional>
 #include <vector>
 

src/libs/gtfs/include/gtfs/stop_time.h

@@ -5,6 +5,7 @@
 #include <gtfs/time.h>
 #include <gtfs/types.h>
 
+#include <optional>
 #include <functional>
 
 namespace pfaedle::gtfs

src/libs/gtfs/src/gtfs/access/feed_reader.cpp

@@ -10,7 +10,7 @@ namespace pfaedle::gtfs::access
 class preparation_handler
 {
 public:
-    preparation_handler(feed& f):
+    explicit preparation_handler(feed& f):
         feed_(f)
     {
     }

src/libs/gtfs/tests/CMakeLists.txt

@@ -2,15 +2,15 @@ set(test_folder_path ${CMAKE_CURRENT_SOURCE_DIR})
 
 message(STATUS "CMAKE_CURRENT_BINARY_DIR=" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
-add_executable(stei-gtfs-tests
+add_executable(gtfs-tests
         main.cpp
         time_tests.cpp
         date_tests.cpp
         feed_reading.cpp
         csv_parsing_tests.cpp
         catch_amalgamated.cpp)
 
-target_link_libraries(stei-gtfs-tests PUBLIC stei-gtfs)
-target_include_directories(stei-gtfs-tests PRIVATE "${CMAKE_CURRENT_LIST_DIR}/../src/gtfs/access/")
-target_compile_features(stei-gtfs-tests PRIVATE cxx_std_17)
-add_test("stei-gtfs-tests" stei-gtfs-tests)
+target_link_libraries(gtfs-tests PUBLIC gtfs)
+target_include_directories(gtfs-tests PRIVATE "${CMAKE_CURRENT_LIST_DIR}/../src/gtfs/access/")
+target_compile_features(gtfs-tests PRIVATE cxx_std_17)
+add_test("gtfs-tests" gtfs-tests)