Skip to content

Commit

Permalink
Fix some release issues !build !macos
Browse files Browse the repository at this point in the history
  • Loading branch information
rsubtil committed Sep 1, 2023
1 parent acd9aae commit 6b3d244
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 35 deletions.
2 changes: 1 addition & 1 deletion cmake/FreecivInstall.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ if(FREECIV_ENABLE_CLIENT AND FREECIV_DOWNLOAD_FONTS)
else()
install(
DIRECTORY ${CMAKE_BINARY_DIR}/src/Libertinus
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/freeciv21/fonts
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lunar_gambit/fonts
COMPONENT lunar_gambit
FILES_MATCHING PATTERN *.otf PATTERN *.txt
)
Expand Down
33 changes: 23 additions & 10 deletions demo_run.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
#!/bin/sh

logdir=$1
if [ -z "$logdir" ]; then
echo "Usage: $0 <logdir>"
match=alpha

# Test if savefiles and logs directory exists
if [ ! -d "savefiles" ]; then
echo "Savefiles directory not found"
exit 1
fi
if [ ! -d "logs" ]; then
echo "Logs directory not found"
exit 1
fi

if [ -z "$1" ]; then
if [ "$(ls -A savefiles)" ]; then
echo "Savefiles directory not empty! Specify last save_file"
exit 1
fi
echo "No scenario file specified, using scenario.sav"
scenario=scenario.sav
else
scenario=$1
fi

logfile=$logdir/$(date +%d_%m___%H_%M_%S).log
echo "Storing logfile at $logfile"

# Run the demo
echo "Server running... (type q and enter to quit, or end from game)"
./build/freeciv21-server -f demoScenario.sav --saves ../spaceRaceScenario/backups > $logfile 2>&1
# We are in the right place
lunar_gambit-server -f "$scenario" --saves savefiles --log ../logs/$(date +%d_%m___%H_%M_%S).log --read setup_commands

echo "Server closed. Logfile at $logfile"
# Send an email everytime this script leaves, to warn us
echo "Lunar Gambit server stopped"
46 changes: 23 additions & 23 deletions dist/net.longturn.freeciv21.client.desktop.in
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[Desktop Entry]
Name=Freeciv21
Name[af]=Freeciv21
Name[ca]=Freeciv21
Name[cs]=Freeciv21
Name[de]=Freeciv21
Name[dk]=Freeciv21
Name[es]=Freeciv21
Name[eu]=Freeciv21
Name[fi]=Freeciv21
Name[fr]=Freeciv21
Name[gl]=Freeciv21
Name[he]=Freeciv21
Name[hu]=Freeciv21
Name[it]=Freeciv21
Name[lt]=Freeciv21
Name[pt]=Freeciv21
Name[ru]=Freeciv21
Name[sk]=Freeciv21
Name[sr]=Freeciv21
Name[sr@latin]=Freeciv21
Name[tr]=Freeciv21
Name[vi]=Freeciv21
Name=LunarGambit
Name[af]=LunarGambit
Name[ca]=LunarGambit
Name[cs]=LunarGambit
Name[de]=LunarGambit
Name[dk]=LunarGambit
Name[es]=LunarGambit
Name[eu]=LunarGambit
Name[fi]=LunarGambit
Name[fr]=LunarGambit
Name[gl]=LunarGambit
Name[he]=LunarGambit
Name[hu]=LunarGambit
Name[it]=LunarGambit
Name[lt]=LunarGambit
Name[pt]=LunarGambit
Name[ru]=LunarGambit
Name[sk]=LunarGambit
Name[sr]=LunarGambit
Name[sr@latin]=LunarGambit
Name[tr]=LunarGambit
Name[vi]=LunarGambit
GenericName=Strategy Game
GenericName[af]=Strategie-spel
GenericName[ca]=Joc d'estrategia
Expand Down Expand Up @@ -53,7 +53,7 @@ Comment[pt]=Jogo de estratégia por turnos inspirado na História da civilizaç
Comment[ru]=Пошаговая стратегическая игра, вдохновлённая историей человеческой цивилизации
Comment[sv]=Turordningsbaserat strategispel inspirerat av den mänskliga historien
Exec=@CMAKE_INSTALL_FULL_BINDIR@/lunar_gambit-client %u
Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/civicon.png
Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/lunar_gambit/misc/civicon.png
StartupNotify=true
MimeType=x-scheme-handler/fc21;
X-KDE-Protocols=fc21;
Expand Down
2 changes: 1 addition & 1 deletion dist/net.longturn.freeciv21.ruledit.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GenericName[ru]=Стратегическая игра
Comment=Edit Lunar Gambit game rules
Comment[ru]=Меняйте любые правила Lunar Gambit и создавайте новые
Exec=@CMAKE_INSTALL_FULL_BINDIR@/lunar_gambit-ruledit
Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/freeciv21/misc/civicon.png
Icon=@CMAKE_INSTALL_FULL_DATAROOTDIR@/lunar_gambit/misc/civicon.png
StartupNotify=true
Terminal=false
Type=Application
Expand Down

0 comments on commit 6b3d244

Please sign in to comment.