[Pkg-mozext-commits] [SCM] system tray extension for thunderbird/firefox alike apps branch, dfsg-clean, updated. upstream/dfsg-clean-0.3.1-12-g057315d

[Sascha Girrulat]

The following commit has been merged in the dfsg-clean branch:
commit 6b0784b583fe56d5a246484e7efde66c87386586
Merge: 4b163cb9abefbfe92fa1a4af62ff4a14feb79360 f6f44b63539b90da9c025403a5f7263a0d434f6e
Author: Sascha Girrulat <sascha at girrulat.de>
Date:   Sun Jan 29 10:53:01 2012 +0100

    Merge branch 'upstream' into dfsg-clean
    
    Conflicts:
    	changes
    	components/SConscript
    	generate_install_rdf.sh

diff --combined components/SConscript
index f10b0f9,06011af..c1e8004
--- a/components/SConscript
+++ b/components/SConscript
@@@ -46,6 -46,7 +46,7 @@@ except
          print "Using GECKO_SDK=" + geckosdk
          if geckosdk[-1] != os.sep: geckosdk += os.sep
          gecko_bin = geckosdk + 'bin'
 -	gecko_sdk_bin = geckosdk + 'sdk/bin'
++    	gecko_sdk_bin = geckosdk + 'sdk/bin'
          gecko_include = geckosdk + 'include'
          gecko_idl = geckosdk + 'idl'
          gecko_lib = geckosdk + 'lib'
@@@ -73,8 -74,9 +74,9 @@@ with open(gecko_include + os.sep + 'moz
              break
  
  # Create two builders to create xpt and header files from idl.
- bxpt = Builder(action = 'xpidl -w -m typelib -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
- bhdr = Builder(action = 'xpidl -w -m header -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
+ bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
+ bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
+ 
  
  # Create environment object for build
  env = Environment(
@@@ -83,6 -85,7 +85,7 @@@
      LIBS = xpcom_libs,
      ENV = os.environ)
  env.AppendENVPath('PATH', gecko_bin)
+ env.AppendENVPath('PATH', gecko_sdk_bin)
  env.Append(BUILDERS = {'MozXPT' : bxpt, 'MozHeader' : bhdr })
  
  env.ParseConfig('pkg-config ' + linking_options + ' --cflags gtk+-2.0') # libnotify
@@@ -105,3 -108,4 +108,3 @@@ r = env.Install('#dist/components', [np
  
  Default([xpts, headers, nptray])
  Return('r')
 -

-- 
system tray extension for thunderbird/firefox alike apps