From f15ffed95f0ef247ee9f1d30ffb18cffd270f766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20G=C3=BCndling?= <felix.guendling@gmail.com>
Date: Fri, 5 Apr 2024 12:07:53 +0200
Subject: [PATCH] improve release (add profile, client, etc.)

---
 .github/workflows/ci.yml | 7 +++++++
 src/import.cc            | 2 +-
 src/server.cc            | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c045bc3..d673037 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,8 +106,13 @@ jobs:
         if: matrix.config.mode == 'Release'
         run: |
           mkdir dist
+          mv client dist
+          mv profile dist
           mv .\build\tiles-import.exe dist
           mv .\build\tiles-server.exe dist
+          cd dist
+          7z a motis-windows.zip *
+          mv tiles-windows.zip ..
 
       - name: Upload Distribution
         if: matrix.config.mode == 'Release'
@@ -289,6 +294,8 @@ jobs:
         if: matrix.config.artifact
         run: |
           mkdir tiles
+          mv client tiles/client
+          mv profile tiles/profile
           mv build/tiles-import tiles/tiles-import
           mv build/tiles-server tiles/tiles-server
           tar cjf tiles-${{ matrix.config.artifact }}.tar.bz2 tiles
diff --git a/src/import.cc b/src/import.cc
index 36dc280..957bdd6 100644
--- a/src/import.cc
+++ b/src/import.cc
@@ -37,7 +37,7 @@ struct import_settings : public conf::configuration {
 
   std::string db_fname_{"tiles.mdb"};
   std::string osm_fname_{"planet-latest.osm.pbf"};
-  std::string osm_profile_{"../profile/profile.lua"};
+  std::string osm_profile_{"tiles/profile/profile.lua"};
   std::string coastlines_fname_{"land-polygons-complete-4326.zip"};
   std::string tmp_dname_{"."};
   std::vector<std::string> tasks_{{"all"}};
diff --git a/src/server.cc b/src/server.cc
index 864c9d6..e914e11 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -150,13 +150,13 @@ void serve_forever(std::string const& address, uint16_t port, callback_t&& cb) {
 struct server_settings : public conf::configuration {
   server_settings() : configuration("tiles-server options", "") {
     param(db_fname_, "db_fname", "/path/to/tiles.mdb");
-    param(res_dname_, "res_dname", "/path/to/res");
+    param(res_dname_, "res_dname", "tiles/client");
     param(port_, "port", "the http port of the server");
   }
 
   std::string db_fname_{"tiles.mdb"};
   std::string res_dname_;
-  uint16_t port_{8888};
+  uint16_t port_{8080};
 };
 
 int run_tiles_server(int argc, char const** argv) {