Skip to content

Commit

Permalink
improve release (add profile, client, etc.)
Browse files Browse the repository at this point in the history
  • Loading branch information
felixguendling committed Apr 5, 2024
1 parent 331faa0 commit f15ffed
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/import.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"}};
Expand Down
4 changes: 2 additions & 2 deletions src/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f15ffed

Please sign in to comment.