[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/sysadmin/shaman
From:       David Arturo Palacio <dpalacio () uninorte ! edu ! co>
Date:       2010-01-13 4:47:32
Message-ID: 1263358052.599900.22622.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073888 by davidp:

apt-pkg try. an API nightmare

 A             cmake/modules/FindApqt.cmake  
 M  +27 -2     libshaman/BackendSelector.cmake  
 A             libshaman/backends/apt (directory)  
 A             libshaman/backends/apt/AptBackend.cpp   [License: GPL (v2+)]
 A             libshaman/backends/apt/AptBackend.h   [License: GPL (v2+)]
 A             libshaman/backends/apt/DebPackage.cpp   [License: GPL (v2+)]
 A             libshaman/backends/apt/DebPackage.h   [License: GPL (v2+)]


--- trunk/playground/sysadmin/shaman/libshaman/BackendSelector.cmake #1073887:1073888
@@ -6,10 +6,13 @@
 ## 4.4: We leave polkit-0.9 having more priority over polkit-1. This will change \
from 4.5 on  if(NOT SHAMAN_BACKEND)
     macro_optional_find_package(Aqpm)
+    macro_optional_find_package(Apqt)
     macro_optional_find_package(QPackageKit)
 
     if (AQPM_FOUND)
         set (SHAMAN_BACKEND "Aqpm")
+    elseif (APQT_FOUND)
+        set (SHAMAN_BACKEND "Apt")
     elseif (QPACKAGEKIT_FOUND)
         set (SHAMAN_BACKEND "QPackageKit")
     else ()
@@ -28,10 +31,10 @@
     string(TOUPPER ${SHAMAN_BACKEND} SHAMAN_BACKEND)
 
     # Check if the specified backend is valid. If it is not, we fall back to the \
                Fake one
-    if (NOT SHAMAN_BACKEND STREQUAL "AQPM" AND NOT SHAMAN_BACKEND STREQUAL \
"QPACKAGEKIT" AND NOT SHAMAN_BACKEND STREQUAL "TESTSCRIPT" AND NOT SHAMAN_BACKEND \
STREQUAL "FAKE") +    if (NOT SHAMAN_BACKEND STREQUAL "AQPM" AND NOT SHAMAN_BACKEND \
STREQUAL "APT" AND NOT SHAMAN_BACKEND STREQUAL "QPACKAGEKIT" AND NOT SHAMAN_BACKEND \
                STREQUAL "TESTSCRIPT" AND NOT SHAMAN_BACKEND STREQUAL "FAKE")
         message ("WARNING: The Shaman Backend ${SHAMAN_BACKEND} you specified does \
not exist. Falling back to Fake backend")  set (SHAMAN_BACKEND "Fake")
-    endif (NOT SHAMAN_BACKEND STREQUAL "AQPM" AND NOT SHAMAN_BACKEND STREQUAL \
"QPACKAGEKIT" AND NOT SHAMAN_BACKEND STREQUAL "TESTSCRIPT" AND NOT SHAMAN_BACKEND \
STREQUAL "FAKE") +    endif (NOT SHAMAN_BACKEND STREQUAL "AQPM" AND NOT \
SHAMAN_BACKEND STREQUAL "APT" AND NOT SHAMAN_BACKEND STREQUAL "QPACKAGEKIT" AND NOT \
SHAMAN_BACKEND STREQUAL "TESTSCRIPT" AND NOT SHAMAN_BACKEND STREQUAL "FAKE")  
     # Check requirements for each backend. If not, fall back to the fake one
     if (SHAMAN_BACKEND STREQUAL "AQPM")
@@ -42,6 +45,14 @@
                       Falling back to Fake backend")
             set (SHAMAN_BACKEND "FAKE")
         endif (NOT AQPM_FOUND)
+    elseif (SHAMAN_BACKEND STREQUAL "APT")
+        macro_optional_find_package(Apqt)
+
+	if (NOT APQT_FOUND)
+	    message ("WARNING: You chose the Aqpm Shaman backend but you don't have Aqpm \
installed. +	              Falling back to Fake backend")
+            set (SHAMAN_BACKEND "FAKE")
+	endif (NOT APQT_FOUND)
     elseif (SHAMAN_BACKEND STREQUAL "QPACKAGEKIT")
         macro_optional_find_package(QPackageKit)
 
@@ -83,6 +94,20 @@
         include_directories(${POLKITQT_INCLUDE_DIR})
         add_subdirectory(backends/aqpm)
     endif (POLKITQT_FOUND)
+elseif(SHAMAN_BACKEND STREQUAL "APT")
+    message(STATUS "Building Shaman Apt Backend")
+    macro_log_feature(APQT_FOUND "Apqt" "Qt wrapper library around apt-pkg, Debian \
Advanced Package Tool." "http://wiki.debian.org/Apt" FALSE "" "Provides a backend for \
Shaman.") +    set_source_files_properties( backends/apt/AptBackend.cpp
+                             PROPERTIES COMPILE_FLAGS -DQT_STATICPLUGIN )
+    #find_package(KDE4Workspace REQUIRED)
+    include_directories(${APQT_INCLUDE_DIR})
+    set(BACKEND_SRCS
+        backends/apt/AptBackend.cpp
+        backends/apt/DebPackage.cpp
+    )
+    set(BACKEND_LIBS
+        ${APQT_LIBRARIES} apt-pkg
+    )
 elseif(SHAMAN_BACKEND STREQUAL "QPACKAGEKIT")
     message(STATUS "Building Shaman QPackageKit Backend")
     macro_log_feature(QPACKAGEKIT_FOUND "PackageKit" "A common package management \
system." "http://www.packagekit.org" FALSE "" "Provides a backend for Shaman.")


[prev in list] [next in list] [prev in thread] [next in thread]