Changeset 946
- Timestamp:
- 03/16/08 11:06:01 (16 years ago)
- Files:
-
- trunk/libffado/SConstruct (modified) (2 diffs)
- trunk/libffado/support/xdg/ffado.org-ffadomixer.desktop (modified) (1 diff)
- trunk/libffado/support/xdg/hi64-apps-ffado.png (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/SConstruct
r935 r946 411 411 412 412 # 413 # Deal with the DESTDIR vs. xdg-tools conflict (which is basicely that the xdg-tools can't deal with DESTDIR, so the packagers have to deal with this their own :-) 413 # Deal with the DESTDIR vs. xdg-tools conflict (which is basicely that the 414 # xdg-tools can't deal with DESTDIR, so the packagers have to deal with this 415 # their own :-/ 414 416 # 415 417 if len(destdir) > 0: … … 425 427 """ 426 428 else: 429 430 def CleanAction( action ): 431 if env.GetOption( "clean" ): 432 env.Execute( action ) 433 427 434 if env.has_key( 'XDG_TOOLS' ) and env.has_key( 'PYUIC' ): 428 env.Command( "support/xdg/.ffado.org-ffadomixer.desktop", "support/xdg/ffado.org-ffadomixer.desktop", "xdg-desktop-menu install $SOURCES && touch $TARGET" ) 429 env.NoCache( "support/xdg/.ffado.org-ffadomixer.desktop" ) 430 env.Alias( "install", "support/xdg/.ffado.org-ffadomixer.desktop" ) 435 if not env.GetOption("clean"): 436 action = "install" 437 else: 438 action = "uninstall" 439 mixerdesktopaction = env.Action( "xdg-desktop-menu %s support/xdg/ffado.org-ffadomixer.desktop" % action ) 440 mixericonaction = env.Action( "xdg-icon-resource %s --size 64 --context apps support/xdg/hi64-apps-ffado.png" % action ) 441 env.Command( "__xdgstuff1", None, mixerdesktopaction ) 442 env.Command( "__xdgstuff2", None, mixericonaction ) 443 env.Alias( "install", ["__xdgstuff1", "__xdgstuff2" ] ) 444 CleanAction( mixerdesktopaction ) 445 CleanAction( mixericonaction ) 431 446 432 447 # trunk/libffado/support/xdg/ffado.org-ffadomixer.desktop
r855 r946 1 1 [Desktop Entry] 2 2 Comment= 3 Exec [$e]=ffadomixer3 Exec=ffadomixer 4 4 GenericName= 5 5 Icon=ffado 6 6 Name=ffadomixer 7 Path [$e]=7 Path= 8 8 Type=Application 9 9 Categories=Mixer;Audio;AudioVideo;HardwareSettings;Qt