[#164132100] Brought back DEB changes that were lost in force push

- run dir fixes.
- change CEF cache folder.

.travis.yml

@@ -30,7 +30,7 @@ matrix:
         - libglew-dev
   - compiler: clang
     os: osx
-    osx_image: xcode9.1
+    osx_image: xcode9.4
     env:
     - OGRE_ENABLED=0
     - GSAGE_VERSION_BUILD=${TRAVIS_BUILD_NUMBER}

CMakeLists.txt

@@ -8,13 +8,8 @@ configure()
 
 include(${CMAKE_SOURCE_DIR}/conanbuildinfo.cmake OPTIONAL)
 
-if(CONAN_PACKAGE_NAME)
-  set(CMAKE_INSTALL_PATH "./")
-  include(cmake/ConanDependencies.cmake)
-else(CONAN_PACKAGE_NAME)
-  set(CMAKE_INSTALL_PATH "/usr/local")
-  include(cmake/Dependencies.cmake)
-endif(CONAN_PACKAGE_NAME)
+set(CMAKE_INSTALL_PATH "./")
+include(cmake/ConanDependencies.cmake)
 
 process_templates()
 
@@ -64,9 +59,15 @@ elseif(UNIX)
   set(CPACK_DEBIAN_PACKAGE_NAME "gsage")
   set(CPACK_DEBIAN_PACKAGE_VERSION "${GSAGE_VERSION_MAJOR}.${GSAGE_VERSION_MINOR}.${GSAGE_VERSION_PATCH}")
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Artem Chernyshev")
+  # additional dependencies for cef
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcups2, libgconf-2-4, libgtk2.0-dev, libgdk-pixbuf2.0-dev, freeglut3-dev")
+
+  # other deps will be generated automatically
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
   set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Open source game engine")
 
+  set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${gsage_SOURCE_DIR}/tools/postinst;${gsage_SOURCE_DIR}/tools/prerm")
+
   set(CPACK_GENERATOR "DEB")
 endif(APPLE)
 

Core/include/Filesystem.h

@@ -196,6 +196,20 @@ namespace Gsage {
         return Poco::Path(path).getBaseName();
       }
 
+      /**
+       * Same as Poco::Path::cacheHome
+       */
+      inline std::string getCacheHome() const {
+        return expand(Poco::Path::cacheHome());
+      }
+
+      /**
+       * Same as Poco::Path::expand
+       */
+      inline std::string expand(const std::string& path) const {
+        return Poco::Path::expand(path);
+      }
+
       /**
        * Flush all copy complete events
        */

Core/src/EngineSystem.cpp

@@ -119,6 +119,7 @@ namespace Gsage
     }
 
     mEngine->fireEvent(SystemChangeEvent(SystemChangeEvent::SYSTEM_STARTED, getName(), this));
+    LOG(INFO) << "System " << getName() << " was started";
     return true;
   }
 

PlugIns/CEF/src/CEFPlugin.cpp

@@ -917,13 +917,22 @@ namespace Gsage {
     std::stringstream ss;
     ss << dirname(path) << "/" << "cef.helper";
     CefString(&settings.browser_subprocess_path).FromASCII(ss.str().c_str());
+
+    if(!getcwd(path, sizeof(path)-1)) {
+      LOG(ERROR) << "Failed to get current working directory";
+      return false;
+    }
+    ss = std::stringstream();
+    ss << path << "/locales";
+    CefString(&settings.locales_dir_path) = ss.str().c_str();
 #elif GSAGE_PLATFORM == GSAGE_WIN32
     char filename[] = "cef.helper.exe";
     char fullFilename[MAX_PATH];
     GetFullPathName(filename, MAX_PATH, fullFilename, nullptr);
 
     CefString(&settings.browser_subprocess_path).FromASCII(fullFilename);
 #endif
+    CefString(&settings.cache_path) = (mFacade->filesystem()->getCacheHome() + "/gsage").c_str();
 
     if(!mFacade->filesystem()->exists(CefString(&settings.browser_subprocess_path).ToString())) {
       LOG(ERROR) << "Failed to locate cef.helper executable " << CefString(&settings.browser_subprocess_path).ToString();

README.md

@@ -51,7 +51,7 @@ You can read more documentation on [http://engine.readthedocs.io/](http://engine
 
 This engine supports three OS at the moment:
 * Windows, Visual Studio 2017 and later.
-* OSX, ci is using Xcode 9.1.
+* OSX, ci is using Xcode 9.4.
 * Linux, ci is using Ubuntu 16.04 with GCC 5.4.
 
 There are plans to support iOS and Android.

cmake/Functions.cmake

@@ -81,7 +81,7 @@ macro(configure)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 
     if(NOT APPLE)
-      set(INSTALL_BINARY_DIR "local/bin/")
+      set(INSTALL_BINARY_DIR "local/bin/gsage")
       set(INSTALL_LIB_DIR "local/lib/")
       set(INSTALL_PLUGINS_DIR "local/lib/gsage")
       set(INSTALL_RESOURCE_DIR "share/gsage/")

resources/editor/gsage.desktop.in

@@ -2,8 +2,8 @@
 Version=${GSAGE_VERSION_MAJOR}.${GSAGE_VERSION_MINOR}.${GSAGE_VERSION_PATCH}
 Name=GSAGE Editor
 Comment=Open source game engine
-Exec=env GSAGE_RUN_DIRECTORY=/usr/share/gsage/ env GSAGE_PLUGINS_DIRECTORIES=/usr/local/lib/gsage/ /usr/local/bin/gsage
-Icon=/usr/share/gsage/resources/editor/editor.ico
+Exec=env GSAGE_RUN_DIRECTORY=/usr/share/gsage/ env GSAGE_PLUGINS_DIRECTORIES=/usr/local/lib/gsage/ /usr/local/bin/gsage/gsage
+Icon=/usr/share/gsage/resources/editor/gsage.ico
 Terminal=false
 Type=Application
 Categories=Development

resources/scripts/editor/projectManager.lua

@@ -191,7 +191,7 @@ local ProjectManager = class(function(self)
     end
     self.awaitedSystems[event.systemID] = true
     local ready = true
-    for _, started in pairs(self.awaitedSystems) do
+    for id, started in pairs(self.awaitedSystems) do
       if started ~= true then
         ready = false
         break
@@ -263,7 +263,6 @@ function ProjectManager:create(settings, onProgress, onComplete)
         message(tostring(err), "#FF0000", true)
       end
     end
-
     onComplete(success)
   end
 
@@ -308,7 +307,7 @@ function ProjectManager:create(settings, onProgress, onComplete)
     end
     message(msg, color)
 
-    if percent == 100 then
+    if percent >= 100 then
       finalize(true)
     end
   end
@@ -337,7 +336,7 @@ function ProjectManager:create(settings, onProgress, onComplete)
     message(msg, color)
     percent = percent + step / filecount
 
-    if percent == 100 then
+    if percent >= 100 then
       finalize(true)
     end
   end
@@ -416,7 +415,6 @@ function ProjectManager:open(projectPath)
     log.error("Failed to open project " .. err)
     return false
   end
-  log.info("Read project file")
 
   self.openProjectFile = projectFile
   local sourcesDir = fs.path.join(self.openProjectFile.projectRoot, "sources")

resources/scripts/entrypoints/editor.lua

@@ -99,8 +99,10 @@ local mode = "world"
 local function saveSettings()
   log.info("Saving imgui dock state")
   dockstates[mode] = dockspace:getState()
-  projectManager.openProjectFile:setWorkspace(dockstates)
-  projectManager.openProjectFile:write()
+  if projectManager.openProjectFile then
+    projectManager.openProjectFile:setWorkspace(dockstates)
+    projectManager.openProjectFile:write()
+  end
   editor:putToGlobalState("bindings", bindings:getConfig())
   editor:saveGlobalState()
 end
@@ -378,14 +380,13 @@ if imguiInterface:available() then
 
   projectManager:onProjectOpen(function(projectFile)
     hideWizard()
-    if globalEditorState and globalEditorState.dockState then
-      log.info("Restoring imgui dock state")
-      dockstates = projectFile:getWorkspace() or globalEditorState.dockState or {
-        world = {},
-        character = {}
-      }
-      dockspace:setState(dockstates[mode] or {})
-    end
+    local dockstates = (projectFile:getWorkspace() or (globalEditorState or {}).dockState) or {
+      world = {},
+      character = {},
+    }
+
+    log.info("Restoring imgui dock state")
+    dockspace:setState(dockstates[mode])
     views.assets:configure()
     event:bind(core, EngineEvent.STOPPING, saveSettings)
   end)

tools/postinst

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+set -e
+
+echo "
+* TRACE:
+   ENABLED              = false
+* DEBUG:
+   ENABLED              = false
+* GLOBAL:
+   FORMAT               =  "%datetime [%level] [%fbase:%line] %msg"
+   ENABLED              = true
+   TO_FILE              = true
+" > /usr/share/gsage/log.cfg
+
+chmod 755 /usr/share/gsage/log.cfg
+
+# update editor configuration
+python -c "
+import sys, json;
+
+config_path = '/usr/share/gsage/resources/editorConfig.json'
+
+config = None
+
+with open(config_path, 'r') as f:
+  config = json.load(f)
+  config['logConfig'] = '/usr/share/gsage/log.cfg'
+
+with open(config_path, 'w') as f:
+  json.dump(config, f)
+
+"

tools/prerm

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+rm /usr/share/gsage/log.cfg