Skip to content

fix: don't install plugins on hardcord path #432

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.

Sign up for GitHub

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

Closed
hillwoodroc wants to merge 1 commit into from
Closed

fix: don't install plugins on hardcord path #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0-
dh $@

override_dh_auto_configure:
dh_auto_configure -- -DDS_VERSION=${PACK_VER} -DENABLE_DEEPIN_NMQT=${ENABLE_DEEPIN_NMQT}
dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR=lib -DDS_VERSION=${PACK_VER} -DENABLE_DEEPIN_NMQT=${ENABLE_DEEPIN_NMQT}
8 changes: 8 additions & 0 deletions panels/dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")

if((CMAKE_INSTALL_LIBDIR MATCHES "lib") OR (CMAKE_INSTALL_LIBDIR MATCHES "lib64"))
set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/dde-dock/tmp" CACHE STRING "Plugin install path")
else()
set(PLUGIN_INSTALL_DIR "lib/dde-dock/tmp" CACHE STRING "Plugin install path")
endif()

add_definitions(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" -DPLUGIN_INSTALL_DIR=\"${PLUGIN_INSTALL_DIR}\")

configure_file(environments.h.in environments.h @ONLY)

find_package(PkgConfig REQUIRED)
Expand Down
6 changes: 3 additions & 3 deletions panels/dock/dockpanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
namespace dock {
class DockHelper;
const QStringList pluginDirs = {
"/usr/lib/dde-dock/tmp/plugins/",
"/usr/lib/dde-dock/tmp/plugins/quick-trays/",
"/usr/lib/dde-dock/tmp/plugins/system-trays/"
QString("%1/%2/plugins/").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR),
QString("%1/%2/plugins/quick-trays/").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR),
QString("%1/%2/plugins/system-trays/").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR)
};

class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/frame/controller/quicksettingcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void QuickSettingController::startLoader()
#ifdef QT_DEBUG
AbstractPluginsController::startLoader(new PluginLoader(QString("%1/%2").arg(qApp->applicationDirPath()).arg("/../panels/dock/tray/plugins/loader"), this));
#else
AbstractPluginsController::startLoader(new PluginLoader("/usr/lib/dde-dock/tmp/plugins/loader", this));
AbstractPluginsController::startLoader(new PluginLoader(QString("%1/%2/plugins/loader").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR), this));
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/airplane-mode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Dtk6::Gui
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/bluetooth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Qt6::DBus
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/dde-network-core/dock-network-plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
dde-network-core_static
)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)
# 安装 .qm 文件
install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${PLUGIN_NAME}/tmp/translations)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/disk-mount/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ PRIVATE

install(
TARGETS ${PLUGIN_NAME}
LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays
LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays
)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/display/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Qt6::DBus
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/keyboard-layout/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Dtk6::Gui
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/)
install(FILES ./keybord_layout.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dde-dock/indicator)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/media/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Qt6::DBus
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/notification/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Dtk6::Gui
)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/onboard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Dtk6::Gui
)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/overlay-warning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Dtk6::Gui
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)

# policy kit
install(FILES org.deepin.dde.dock.overlay.policy
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/pluginmanager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Dtk6::Widget
)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/loader)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/loader/plugins)
6 changes: 3 additions & 3 deletions panels/dock/tray/plugins/pluginmanager/pluginmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ QStringList PluginManager::getPluginPaths() const
<< QString("%1%2%3").arg(qApp->applicationDirPath()).arg("/../panels/dock/tray").arg(PLUGIN_PATH)
<< QString("%1%2%3").arg(qApp->applicationDirPath()).arg("/../panels/dock/tray").arg(TRAY_PATH);
#else
pluginPaths << QString("/usr/lib/dde-dock/tmp%1").arg(QUICK_PATH)
<< QString("/usr/lib/dde-dock/tmp%1").arg(PLUGIN_PATH)
<< QString("/usr/lib/dde-dock/tmp%1").arg(TRAY_PATH);
pluginPaths << QString("%1/%2%3").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR).arg(QUICK_PATH)
<< QString("%1/%2%3").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR).arg(PLUGIN_PATH)
<< QString("%1/%2%3").arg(CMAKE_INSTALL_PREFIX).arg(PLUGIN_INSTALL_DIR).arg(TRAY_PATH);

const QStringList pluginsDirs = (getPathFromConf("PATH") << getPathFromConf("SYSTEM_TRAY_PATH"));
if (!pluginsDirs.isEmpty())
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/power/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Qt6::DBus
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/recordtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
)

set(CMAKE_INSTALL_PREFIX "/usr")
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/shotstart/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
)

set(CMAKE_INSTALL_PREFIX "/usr")
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/shutdown/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
PkgConfig::XCB_EWMH
)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/sound/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Qt6::DBus
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/system-monitor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE
USE_MONITOR_POPUP_PLUGIN
)

INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins)
INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins)
2 changes: 1 addition & 1 deletion panels/dock/tray/plugins/uos-ai/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
Qt6::DBus
Qt6::Svg)

install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/tmp/plugins/quick-trays)
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/quick-trays)