Re: [Straw-devel] How do I change the path of desktop_file?

[Terje Rosten]

* Jeremy Messenger
| 
| How do I change the path of desktop_file? In FreeBSD, I need to get
| it install in share/gnome/applications/.


Try the attached patch and use the new --with-desktop-file-dir option.

[ Jan: can you review and the apply the patch? ]


 - Terje


diff -ubNr straw-0.23.old/setup.cfg straw-0.23/setup.cfg
--- straw-0.23.old/setup.cfg    2004-04-26 19:17:31.000000000 +0200
+++ straw-0.23/setup.cfg        2004-05-02 18:41:50.310912762 +0200
@@ -3,7 +3,7 @@
 doc_files = README TODO NEWS LICENSE
 install_script = tools/rpm-install
 post_install = tools/rpm-post-install
-requires = python => 2.2, libglade2, pygtk2 => 1.99.13, pygtk2-libglade, 
gnome-python2, gnome-python2-gconf, gnome-python2-gnomevfs, 
gnome-python2-gtkhtml2, pyorbit, python-adns, python-bsddb3
+requires = python => 2.2, libglade2, pygtk2 => 1.99.13, pygtk2-libglade, 
gnome-python2, gnome-python2-gconf, gnome-python2-gnomevfs, 
gnome-python2-gtkhtml2, pyorbit
 group = Applications/Internet
 [sdist]
 force-manifest = 1
diff -ubNr straw-0.23.old/tools/straw_distutils.py 
straw-0.23/tools/straw_distutils.py
--- straw-0.23.old/tools/straw_distutils.py     2004-04-26 19:17:31.000000000 
+0200
+++ straw-0.23/tools/straw_distutils.py 2004-05-02 21:17:58.226511424 +0200
@@ -54,7 +54,7 @@
         self.announce('Building binary message catalog')
         if self.distribution.has_po_files():
             for mo, po in self.translations:
-                dest = os.path.normpath(os.path.join(self.build_base, mo))
+                dest = os.path.normpath(self.build_base + '/' + mo)
                 self.mkpath(os.path.dirname(dest))
                 if not self.force and not newer(po, dest):
                     self.announce("not building %s (up-to-date)" % dest)
@@ -84,7 +84,10 @@
          'short for `$(gconftool-2 --get-default-source)\'. '),
         ('with-gconf-schema-file-dir=', None,
          'Directory for installing schema files. Can also be set by the '
-         'variable GCONF_SCHEMA_FILE_DIR. [default=SYSCONFDIR/gconf/schemas]')]
+         'variable GCONF_SCHEMA_FILE_DIR. [default=SYSCONFDIR/gconf/schemas]'),
+        ('with-desktop-file-dir=', None,
+         'specify directory for the straw.desktop file 
[default=PREFIX/share/applications')]
+    
 
     user_options.extend(_user_options)
 
@@ -116,8 +119,10 @@
             'GCONF_SCHEMA_CONFIG_SOURCE', None)
         self.with_gconf_schema_file_dir = os.environ.get(
             'GCONF_SCHEMA_FILE_DIR', None)
+        self.with_desktop_file_dir = 'share/applications'
         
     def finalize_options(self):
+
         if self.prefix == 'auto':
             cmd = 'pkg-config --variable=prefix libgnome2.0'
             err, val = commands.getstatusoutput(cmd)
@@ -129,11 +134,11 @@
 
         self.sysconfdir = os.path.join(self.prefix, self.sysconfdir)
         if self.root:
-            self.sysconfdir = os.path.normpath(os.path.join(self.root, 
self.sysconfdir))
+            self.sysconfdir = os.path.normpath(self.root + '/' + 
self.sysconfdir)
 
         if self.root and self.with_gconf_schema_file_dir:
             self.with_gconf_schema_file_dir = os.path.normpath(
-                os.path.join(self.root, self.with_gconf_schema_file_dir))
+                self.root + '/' + self.with_gconf_schema_file_dir)
 
         if not self.disable_schemas_install:
             # Sanity check
@@ -204,9 +209,9 @@
             self.run_command('build_mo')
         if self.has_po_files():
             for mo, po in self.translations:
-                src = os.path.normpath(os.path.join(self.build_dir, mo))
+                src = os.path.normpath(self.build_dir + '/' + mo)
                 if not os.path.isabs(mo):
-                    dest =  os.path.join(self.install_dir, mo)
+                    dest =  os.path.normpath(self.install_dir + '/' + mo)
                 elif self.root:
                     dest = self.root + mo
                 else:
@@ -276,7 +281,7 @@
 
     user_options = [
         ('sysconfdir', None,
-         'specify SYSCONFDIR (default: default=PREFIX/etc)')]        
+         'specify SYSCONFDIR [default=PREFIX/etc]')]        
 
     def initialize_options(self):
         install_data.initialize_options(self)
@@ -296,7 +301,7 @@
                     data_files.append((dest, tup[1]))
                 else:
                     data_files.append((tup[0], tup[1]))
-                    dest = os.path.join(self.install_dir, tup[0])
+                    dest = os.path.normpath(self.install_dir + '/' + tup[0])
                     setattr(self, option, dest)
 
         self.data_files = data_files
@@ -365,7 +370,7 @@
 
     def run(self):
         self.announce("Building straw.desktop file....")
-        dest = 
os.path.normpath(os.path.join(self.build_base,'share/applications'))
+        dest = os.path.normpath(os.path.join(self.build_base, 
'share/applications'))
         self.mkpath(dest, 1)
         cmd = '%s -d -u po straw.desktop.in %s/straw.desktop' % 
(self.intl_merge, dest)
         err, val = commands.getstatusoutput(cmd)
@@ -378,12 +383,17 @@
 
     description = 'Installs generated desktop file'
 
+    user_options = [
+        ('with-desktop-file-dir=', None,
+         'specify directory for the straw.desktop file 
[default=PREFIX/share/applications]')]
+    
     def initialize_options(self):
         install_data.initialize_options(self)
         self.outfiles = []
         self.build_dir = None
         self.install_dir = None
         self.skip_build = None
+        self.with_desktop_file_dir = None
 
     def finalize_options(self):
         install_data.finalize_options(self)
@@ -391,13 +401,17 @@
         self.set_undefined_options('install',('install_data','install_dir'),
                                    ('skip_build', 'skip_build'))
 
+        self.set_undefined_options('install',
+                                   ('with_desktop_file_dir',
+                                    'with_desktop_file_dir'))
+
     def run(self):
         if not self.skip_build:
             self.run_command('build_desktop')
 
         src = os.path.normpath(os.path.join(
-            self.build_dir,'share/applications/straw.desktop'))
-        dest = os.path.join(self.install_dir, 'share/applications')
+            self.build_dir, 'share/applications/straw.desktop'))
+        dest = os.path.normpath(self.install_dir + '/' + 
self.with_desktop_file_dir)
         self.mkpath(dest)
         (out, _) = self.copy_file(src, dest)
         self.outfiles.append(out)