Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linuxdeploy log directory rename #177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/linuxdeploy
4 changes: 2 additions & 2 deletions src/deployers/BasicPluginsDeployer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#include <utility>

// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>

// local headers
#include "BasicPluginsDeployer.h"

using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;
using namespace linuxdeploy::core::appdir;
using namespace linuxdeploy::plugin::qt;

Expand Down
4 changes: 2 additions & 2 deletions src/deployers/Multimedia6PluginsDeployer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#include <filesystem>

// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>

// local headers
#include "Multimedia6PluginsDeployer.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

namespace fs = std::filesystem;

Expand Down
4 changes: 2 additions & 2 deletions src/deployers/PlatformPluginsDeployer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
#include <filesystem>

// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>
#include <linuxdeploy/util/util.h>

// local headers
#include "PlatformPluginsDeployer.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

namespace fs = std::filesystem;

Expand Down
4 changes: 2 additions & 2 deletions src/deployers/SvgPluginsDeployer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#include <filesystem>

// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>

// local headers
#include "SvgPluginsDeployer.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

namespace fs = std::filesystem;

Expand Down
4 changes: 2 additions & 2 deletions src/deployers/TextToSpeechPluginsDeployer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#include <filesystem>

// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>

// local headers
#include "TextToSpeechPluginsDeployer.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

namespace fs = std::filesystem;

Expand Down
4 changes: 2 additions & 2 deletions src/deployers/WebEnginePluginsDeployer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
#include <fstream>

// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>
#include <util.h>

// local headers
#include "WebEnginePluginsDeployer.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

namespace fs = std::filesystem;

Expand Down
4 changes: 2 additions & 2 deletions src/deployers/XcbglIntegrationPluginsDeployer.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// library headers
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>

// local headers
#include "XcbglIntegrationPluginsDeployer.h"
#include "deployment.h"

using namespace linuxdeploy::plugin::qt;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

bool XcbglIntegrationPluginsDeployer::doDeploy() {
ldLog() << "Deploying xcb-gl integrations" << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions src/deployment.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// library includes
#include <linuxdeploy/core/appdir.h>
#include <linuxdeploy/core/elf_file.h>
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>
#include <linuxdeploy/util/util.h>

// local includes
Expand All @@ -19,7 +19,7 @@ namespace fs = std::filesystem;

using namespace linuxdeploy::core;
using namespace linuxdeploy::util::misc;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

// little helper called by other integration plugins
inline bool deployIntegrationPlugins(appdir::AppDir& appDir, const fs::path& qtPluginsPath, const std::initializer_list<fs::path>& subDirs) {
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// library includes
#include <linuxdeploy/core/appdir.h>
#include <linuxdeploy/core/elf_file.h>
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>
#include <linuxdeploy/util/util.h>

// local includes
Expand All @@ -22,7 +22,7 @@ namespace fs = std::filesystem;

using namespace linuxdeploy::core;
using namespace linuxdeploy::util::misc;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;
using namespace linuxdeploy::plugin::qt;


Expand Down
4 changes: 2 additions & 2 deletions src/qml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// library includes
#include <nlohmann/json.hpp>
#include <linuxdeploy/core/appdir.h>
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/log/log.h>
#include <linuxdeploy/core/elf_file.h>
#include <linuxdeploy/subprocess/subprocess.h>
#include <linuxdeploy/util/util.h>
Expand All @@ -14,7 +14,7 @@
#include "qml.h"

using namespace linuxdeploy::core;
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;
using namespace linuxdeploy::subprocess;
using namespace linuxdeploy::util;
using namespace nlohmann;
Expand Down
5 changes: 3 additions & 2 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <assert.h>

// library headers
#include <linuxdeploy/log/log.h>
#include <linuxdeploy/util/util.h>
#include <linuxdeploy/subprocess/subprocess.h>

Expand All @@ -13,7 +14,7 @@ using namespace linuxdeploy::subprocess;
std::map<std::string, std::string> queryQmake(const std::filesystem::path& qmakePath) {
auto qmakeCall = subprocess({qmakePath.string(), "-query"}).run();

using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

if (qmakeCall.exit_code() != 0) {
ldLog() << LD_ERROR << "Call to qmake failed:" << qmakeCall.stderr_string() << std::endl;
Expand Down Expand Up @@ -54,7 +55,7 @@ std::map<std::string, std::string> queryQmake(const std::filesystem::path& qmake
};

std::filesystem::path findQmake() {
using namespace linuxdeploy::core::log;
using namespace linuxdeploy::log;

std::filesystem::path qmakePath;

Expand Down
1 change: 0 additions & 1 deletion src/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

// library includes
#include <args.hxx>
#include <linuxdeploy/core/log.h>

typedef struct {
bool success;
Expand Down
Loading