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

List:       kde-commits
Subject:    kdesupport/emerge/portage/package/kdepim-ce-package
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2010-11-10 14:35:36
Message-ID: 20101110143536.5E251AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195171 by aheinecke:

Install the gpgcedev driver into windows instead of the root directory


 M  +3 -0      cab_template.inf  
 M  +3 -6      kdepim-ce-package-20100727.py  


--- trunk/kdesupport/emerge/portage/package/kdepim-ce-package/cab_template.inf \
#1195170:1195171 @@ -3,6 +3,9 @@
 Provider = "KDE"
 CESignature = "$$Windows CE$$"
 
+[InstallSection]
+SmartReboot=I
+
 [CEStrings]
 AppName = "Kontact-Mobile"
 InstallDir = %CE1%\%AppName%
--- trunk/kdesupport/emerge/portage/package/kdepim-ce-package/kdepim-ce-package-20100727.py \
#1195170:1195171 @@ -154,8 +154,8 @@
 
         # Drivers need to be installed in the root direcotry
         gpgcedev = os.path.join(wm_root, "bin", "gpgcedev.dll")
-        os.mkdir(os.path.join(self.workDir(), "rootdir"))
-        utils.copyFile(gpgcedev, os.path.join(self.workDir(), "rootdir"))
+        os.mkdir(os.path.join(self.workDir(), "Windows"))
+        utils.copyFile(gpgcedev, os.path.join(self.workDir(), "Windows"))
 
         # Create an empty file for DBus and his /etc/dbus-1/session.d
         dbus_session_d = os.path.join(self.workDir(), "etc", "dbus-1",
@@ -255,10 +255,7 @@
             sourcediskfiles.append("%s=%d" % (os.path.basename(f), dir_id))
             files.setdefault(dir_id, []).append(os.path.basename(f))
 
-
-        destinationdirs = [
-            (d.endswith("rootdir") and "a%d = 0,\\ ;%s"
-                    or "a%d = 0,%%CE1%%\\Kontact-Mobile%s") % (
+        destinationdirs = ["a%d = 0,%%CE1%%\\Kontact-Mobile%s") % (
                 dir_id, d.replace(self.workDir(), ""))
                 for d, dir_id in sourcedisknames.iteritems()]
 


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