diff --git a/CMakeLists.txt b/CMakeLists.txt index bc52fb0..b9ff3a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.20) -project(dde-session-shell +project(dde-application-manager VERSION 0.1.0 DESCRIPTION "deepin applicaion manager" HOMEPAGE_URL "https://github.com/linuxdeepin/dde-application-manager" diff --git a/apps/dde-application-manager/src/CMakeLists.txt b/apps/dde-application-manager/src/CMakeLists.txt index 6376e59..45dd3b4 100644 --- a/apps/dde-application-manager/src/CMakeLists.txt +++ b/apps/dde-application-manager/src/CMakeLists.txt @@ -1,4 +1,4 @@ -set(BIN_NAME dde-application-manager) +set(BIN_NAME dde-application-manager-reborn) add_executable(${BIN_NAME} main.cpp utils.cpp) diff --git a/apps/dde-application-manager/src/utils.cpp b/apps/dde-application-manager/src/utils.cpp index 781497c..c472dad 100644 --- a/apps/dde-application-manager/src/utils.cpp +++ b/apps/dde-application-manager/src/utils.cpp @@ -10,7 +10,7 @@ bool registerObjectToDBus(QObject *o, const QString &path, const QString &interf if (!con.registerObject(path, interface, o, QDBusConnection::RegisterOption::ExportAdaptors)) { qCritical() << "register object failed:" << path << interface << con.lastError(); } else { - qInfo() << "register object:" << path << interface; + qDebug() << "register object:" << path << interface; } return true; } @@ -19,5 +19,5 @@ void unregisterObjectFromDBus(const QString &path) { auto &con = ApplicationManager1DBus::instance().globalServerBus(); con.unregisterObject(path); - qInfo() << "unregister object:" << path; + qDebug() << "unregister object:" << path; } diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt index 8345069..294bf4c 100644 --- a/misc/CMakeLists.txt +++ b/misc/CMakeLists.txt @@ -5,13 +5,13 @@ include(GNUInstallDirs) # # systemd service configure_file( - systemd/user/org.deepin.dde.ApplicationManager.service.in - systemd/user/org.deepin.dde.ApplicationManager.service + systemd/user/org.deepin.dde.ApplicationManager1.service.in + systemd/user/org.deepin.dde.ApplicationManager1.service @ONLY ) set(SYSTEMD_USER_FILE - ${CMAKE_CURRENT_BINARY_DIR}/systemd/user/org.deepin.dde.ApplicationManager.service + ${CMAKE_CURRENT_BINARY_DIR}/systemd/user/org.deepin.dde.ApplicationManager1.service ) install(FILES ${SYSTEMD_USER_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/user/) diff --git a/misc/dbus/org.deepin.dde.ApplicationManager1.service.in b/misc/dbus/org.deepin.dde.ApplicationManager1.service.in index ab5082a..30b537a 100644 --- a/misc/dbus/org.deepin.dde.ApplicationManager1.service.in +++ b/misc/dbus/org.deepin.dde.ApplicationManager1.service.in @@ -4,5 +4,5 @@ [D-BUS Service] Name=org.deepin.dde.ApplicationManager1 -Exec=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager +Exec=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager-reborn SystemdService=org.deepin.dde.ApplicationManager1.service diff --git a/misc/systemd/user/org.deepin.dde.ApplicationManager.service.in b/misc/systemd/user/org.deepin.dde.ApplicationManager1.service.in similarity index 68% rename from misc/systemd/user/org.deepin.dde.ApplicationManager.service.in rename to misc/systemd/user/org.deepin.dde.ApplicationManager1.service.in index 66dd70a..f607453 100644 --- a/misc/systemd/user/org.deepin.dde.ApplicationManager.service.in +++ b/misc/systemd/user/org.deepin.dde.ApplicationManager1.service.in @@ -8,5 +8,6 @@ Description=Deepin Application Manager [Service] Type=dbus BusName=org.deepin.dde.ApplicationManager1 -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager +ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager-reborn Restart=always +Environment=QT_LOGGING_RULES="*.debug=false" diff --git a/tests/ut_applicationmanager.cpp b/tests/ut_applicationmanager.cpp index c829a17..ef352e7 100644 --- a/tests/ut_applicationmanager.cpp +++ b/tests/ut_applicationmanager.cpp @@ -27,6 +27,9 @@ class TestApplicationManager : public testing::Test public: static void SetUpTestCase() { + if (!QDBusConnection::sessionBus().isConnected()) { + GTEST_SKIP() << "skip for now."; + } auto &bus = ApplicationManager1DBus::instance(); bus.initGlobalServerBus(DBusType::Session); bus.setDestBus(); @@ -51,6 +54,9 @@ public: TEST_F(TestApplicationManager, identifyService) { + if (m_am == nullptr) { + GTEST_SKIP() << "skip for now..."; + } using namespace std::chrono_literals; // for service unit auto workingDir = QDir::cleanPath(QDir::current().absolutePath() + QDir::separator() + ".." + QDir::separator() + "tools"); @@ -73,7 +79,7 @@ TEST_F(TestApplicationManager, identifyService) GTEST_SKIP() << "invoke systemd-run failed."; } - std::this_thread::sleep_for(100ms); + std::this_thread::sleep_for(500ms); auto success = pidFile.open(QFile::ReadOnly | QFile::Text | QFile::ExistingOnly); EXPECT_TRUE(success); @@ -113,7 +119,7 @@ TEST_F(TestApplicationManager, identifyService) {"Scope"}}, workingDir)); - std::this_thread::sleep_for(100ms); + std::this_thread::sleep_for(500ms); success = pidFile.open(QFile::ReadOnly | QFile::Text | QFile::ExistingOnly); EXPECT_TRUE(success);