andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

no more hal-lock 

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1327843
This commit is contained in:
Volker Lanz 2012-12-09 18:41:46 +00:00
parent 971b6780ef
commit 88c0384bed
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2008 by Volker Lanz <vl@fidra.de>
# Copyright (C) 2008,2012 by Volker Lanz <vl@fidra.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -36,27 +36,21 @@ kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc)
kde4_add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS})
target_link_libraries(partitionmanagerprivate libfatlabel ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${UUID_LIBRARIES} ${BLKID_LIBRARIES} ${LIBATASMART_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS})
target_link_libraries(partitionmanagerprivate ${LIBFATLABEL_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${UUID_LIBRARIES} ${BLKID_LIBRARIES} ${LIBATASMART_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS})
install(TARGETS partitionmanagerprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
############################################
file(GLOB partitionmanager-bin_SRCS main.cpp)
file(GLOB partitionmanager_SRCS main.cpp)
kde4_add_app_icon(partitionmanager-bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-partitionmanager.png")
kde4_add_app_icon(partitionmanager_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-apps-partitionmanager.png")
kde4_add_executable(partitionmanager-bin ${partitionmanager-bin_SRCS})
kde4_add_executable(partitionmanager ${partitionmanager_SRCS})
target_link_libraries(partitionmanager-bin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
target_link_libraries(partitionmanager partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
if(UNIX)
add_custom_target(partitionmanager ALL
COMMAND sed -e 's,@INSTALL_PATH@,${BIN_INSTALL_DIR},g' < ${CMAKE_CURRENT_SOURCE_DIR}/partitionmanager.in > ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager
)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager DESTINATION ${BIN_INSTALL_DIR})
endif(UNIX)
install(TARGETS partitionmanager-bin ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager)
install(PROGRAMS partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

31
src/partitionmanager.in
View File

@ -1,31 +0,0 @@
#!/bin/sh
# Copyright (C) 2009 by Volker Lanz <vl@fidra.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
HAL_LOCK=`which hal-lock`
PARTITIONMANAGER_BIN=@INSTALL_PATH@/partitionmanager-bin
RUN_WITHOUT_LOCK=1
if [ "x$HAL_LOCK" != "x" ]; then
$HAL_LOCK --interface org.freedesktop.Hal.Device.Storage --exclusive --run "$PARTITIONMANAGER_BIN $*" && RUN_WITHOUT_LOCK=0
fi
if [ $RUN_WITHOUT_LOCK -eq 1 ]; then
$PARTITIONMANAGER_BIN $*
fi