Integrate cygstart with FD.o menu and mimetype system.

diff --git a/ChangeLog b/ChangeLog
index f455a1b418d332b80f6926e41bac74eaeb2b3853..7bcb97fb6df2474de5efc06596b140095f5ab66b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-27  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+       Integrate cygstart with FD.o menu and mimetype system.
+       * src/cygstart/cygstart.desktop: New file.
+       * src/cygstart/cygutils.xml: New file.
+       * Makefile.am: Dist and install these files.
+       * NEWS: Update documentation.
+
 2011-10-27  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
        Update bootstrap for libtool-2.[2,4]

diff --git a/Makefile.am b/Makefile.am
index 2ad420e3765ecb700ff8b30be2cf276b8bd82363..83f0beca25eac175dd7bb9de540d2960d18d7151 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,8 @@ windows_progs = src/banner/banner src/clip/getclip src/clip/putclip \
        src/readshortcut/readshortcut
 windows_ltlibraries = src/cygicons/libicons.la
 windows_headers = src/cygicons/cygicons.h
+xdg_menus       = src/cygstart/cygstart.desktop
+xdg_mimes       = src/cygstart/cygutils.xml
 cygicons_docs   = src/cygicons/README
 lpr_docs        = src/lpr/README
 endif
@@ -54,6 +56,12 @@ doc_DATA = \
 licensesdir = $(docdir)/licenses
 licenses_DATA = $(licenses)
 
+xdg_menudir   = $(datadir)/applications
+xdg_menu_DATA = $(xdg_menus)
+
+xdg_mimedir   = $(datadir)/mime/packages
+xdg_mime_DATA = $(xdg_mimes)
+
 EXTRA_PROGRAMS = src/banner/banner src/clip/getclip src/clip/putclip \
        src/cygstart/cygstart \
        src/ipc/semtool src/ipc/shmtool \
@@ -94,6 +102,7 @@ cygicons_list = \
 EXTRA_DIST = bootstrap common.h \
    BRANCHES $(man_MANS) $(doc_DATA) $(EXTRA_SCRIPTS) \
    $(licenses) $(po_files) $(extra_docs) $(cygicons_list) \
+   $(xdg_menus) $(xdg_mimes) \
    src/cygicons/hippo.svg
 
 DISTCLEANFILES = \

diff --git a/NEWS b/NEWS
index 052420f825854125ce48aaa9dbf0cf1ffcf2467b..8571f5094c6a37443651a2226a53d0c29be4b2e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 1.4.8
-  * Placeholder
+  * Integrate cygstart with FD.o menu and mimetype system.
+    (Yaakov Selkowitz)
 
 1.4.6
   * conv: no longer distribute as dos2unix, unix2dos, u2d, or d2u.

diff --git a/src/cygstart/cygstart.desktop b/src/cygstart/cygstart.desktop
new file mode 100644 (file)
index 0000000..91af2e6
--- /dev/null
+++ b/src/cygstart/cygstart.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=cygstart
+Comment=Open according to Windows filetype associations
+TryExec=cygstart
+Exec=cygstart %f
+Icon=application-x-executable
+NoDisplay=true
+Terminal=false
+StartupNotify=false
+MimeType=application/x-ms-dos-batch;application/x-ms-dos-executable;application/x-ms-shortcut;application/x-ms-win-installer;application/x-msi;application/x-windows-themepack;

diff --git a/src/cygstart/cygutils.xml b/src/cygstart/cygutils.xml
new file mode 100644 (file)
index 0000000..c59aed5
--- /dev/null
+++ b/src/cygstart/cygutils.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/x-ms-dos-batch">
+     <sub-class-of type="text/plain"/>
+     <generic-icon name="application-x-executable"/>
+     <comment>DOS/Windows Batch File</comment>
+     <glob pattern="*.bat"/>
+   </mime-type>
+</mime-info>