linux deployment

platform/platform_linux.cpp

@@ -4,6 +4,11 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include "../std/fstream.hpp"
+
+
+#include <sys/stat.h>
+#include <sys/types.h>
 
 
 /// @return directory where binary resides, including slash at the end
@@ -25,10 +30,52 @@ Platform::Platform()
   string path;
   CHECK(GetBinaryFolder(path), ("Can't retrieve path to executable"));
 
-  // @TODO implement correct resources and writable directories for public releases
-  m_resourcesDir = path + "../../data/";
-  m_writableDir = m_resourcesDir;
-  m_settingsDir = m_writableDir;
+  string home;
+  home = ::getenv("HOME");
+
+  m_settingsDir = home + "/.config/MapsWithMe/";
+
+  if (!IsFileExistsByFullPath(m_settingsDir + SETTINGS_FILE_NAME))
+  {
+    mkdir((home + "/.config/").c_str(), 0755);
+    mkdir(m_settingsDir.c_str(), 0755);
+  }
+
+  m_writableDir = home + "/.local/share/MapsWithMe/";
+  mkdir((home + "/.local/").c_str(), 0755);
+  mkdir((home + "/.local/share/").c_str(), 0755);
+  mkdir(m_writableDir.c_str(), 0755);
+
+  char * resDir = ::getenv("MWM_RESOURCES_DIR");
+  if (resDir)
+    m_resourcesDir = resDir;
+  else
+  {
+    // installed version
+    if (IsFileExistsByFullPath("/usr/share/MapsWithMe/eula.html"))
+      m_resourcesDir = "/usr/share/MapsWithMe";
+    // developer builds with symlink
+    if (IsFileExistsByFullPath(path + "../../data/eula.html")){
+      m_resourcesDir = path + "../../data";
+      m_writableDir = m_resourcesDir;
+    }
+    // developer builds without symlink
+    if (IsFileExistsByFullPath(path + "../../../omim/data/eula.html"))
+    {
+      m_resourcesDir = path + "../../../omim/data";
+      m_writableDir = m_resourcesDir;
+    }
+    // portable installations
+    else if (IsFileExistsByFullPath(path + "/eula.html"))
+    {
+      m_resourcesDir = path;
+      m_writableDir = m_resourcesDir;
+      m_settingsDir = m_resourcesDir;
+    }
+  }
+  m_resourcesDir += '/';
+  m_settingsDir += '/';
+
   char * tmpDir = ::getenv("TMPDIR");
   if (tmpDir)
     m_tmpDir = tmpDir;
@@ -40,6 +87,7 @@ Platform::Platform()
   LOG(LDEBUG, ("Writable directory:", m_writableDir));
   LOG(LDEBUG, ("Tmp directory:", m_tmpDir));
   LOG(LDEBUG, ("Settings directory:", m_settingsDir));
+  LOG(LDEBUG,  ("Client ID:", UniqueClientId()));
 }
 
 int Platform::CpuCores() const
@@ -51,8 +99,16 @@ int Platform::CpuCores() const
 }
 
 string Platform::UniqueClientId() const
-{
-  return "@TODO";
+{  
+  string machinefile = "/var/lib/dbus/machine-id";
+  if (IsFileExistsByFullPath("/etc/machine-id"))
+    machinefile = "/etc/machine-id";
+
+  std::ifstream ifs(machinefile.c_str());
+  string content( (std::istreambuf_iterator<char>(ifs) ),
+                  (std::istreambuf_iterator<char>()    ) );
+
+  return content.substr(0,32);
 }
 
 void Platform::RunOnGuiThread(TFunctor const & fn)

qt/qt.pro

@@ -21,6 +21,51 @@ win32*|linux* {
   QT *= network
 }
 
+linux* {
+  DEFINES += NO_DOWNLOADER
+  isEmpty(PREFIX):PREFIX = /usr
+  BINDIR = $$PREFIX/bin
+  DATADIR = $$PREFIX/share
+  RESDIR =  $$DATADIR/$${TARGET}
+
+  target.path = $$BINDIR
+  desktop.path = $$DATADIR/applications/
+  desktop.files += res/$${TARGET}.desktop
+  pixmaps.path = $$DATADIR/pixmaps/
+  pixmaps.files += res/icons/128/$${TARGET}.png
+  icon128.path = $$DATADIR/icons/hicolor/128x128/apps/
+  icon128.files += res/icons/128/$${TARGET}.png
+  OTHER_RES.path = $$RESDIR
+  OTHER_RES.files = ../data/about.html ../data/eula.html ../data/welcome.html \
+                    ../data/countries.txt  \
+                    ../data/languages.txt ../data/categories.txt \
+                    ../data/packed_polygons.bin
+  CLASSIFICATOR_RES.path = $$RESDIR
+  CLASSIFICATOR_RES.files = ../data/classificator.txt \
+                            ../data/types.txt
+  CONFIG(production) {
+    CLASSIFICATOR_RES.files += ../data/drules_proto.bin
+  } else {
+    CLASSIFICATOR_RES.files += ../data/drules_proto.txt
+  }
+  SKIN_RES.path = $$RESDIR/resources-mdpi
+  SKIN_RES.files = ../data/resources-mdpi/basic.skn ../data/resources-mdpi/symbols.png
+  FONT_RES.path = $$RESDIR
+  FONT_RES.files = ../data/01_dejavusans.ttf \
+                   ../data/02_wqy-microhei.ttf \
+                   ../data/03_jomolhari-id-a3d.ttf \
+                   ../data/04_padauk.ttf \
+                   ../data/05_khmeros.ttf \
+                   ../data/06_code2000.ttf \
+                   ../data/fonts_blacklist.txt \
+                   ../data/fonts_whitelist.txt \
+                   ../data/unicode_blocks.txt
+  MWM_RES.path = $$RESDIR
+  MWM_RES.files = ../data/World.mwm ../data/WorldCoasts.mwm
+
+  INSTALLS += target desktop pixmaps icon128 OTHER_RES CLASSIFICATOR_RES SKIN_RES FONT_RES MWM_RES
+}
+
 macx* {
   LIBS *= "-framework CoreLocation" "-framework Foundation" "-framework CoreWLAN" \
           "-framework QuartzCore" "-framework IOKit"

qt/res/MapsWithMe.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Name=MapsWithMe
+Version=1.0
+GenericName=Detailed Offline Maps of the World
+GenericName[ru]=Подробная оффлайновая карта мира
+Icon=MapsWithMe
+TryExec=/usr/bin/MapsWithMe
+Exec=/usr/bin/MapsWithMe
+Terminal=false
+StartupNotify=false
+Categories=Qt;Education;Science;Geography;Geoscience
+Keywords=Maps;Offline Maps;Minsk;London;Briefcase;Case;MapsWithMe;OSM;OpenStreetMap;Map

qt/update_dialog.cpp

@@ -292,8 +292,9 @@ namespace qt
         item->setData(KColumnIndexSize, Qt::UserRole, QVariant(qint64(size.second)));
       }
 
-      if (!statusString.isEmpty())
-        SetRowColor(*item, rowColor);
+    // commented out because it looks terrible on black backgrounds
+    //  if (!statusString.isEmpty())
+    //    SetRowColor(*item, rowColor);
     }
   }