[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 057315de282b407332335cfea9c8d6356509e6a0
Merge: 6b0784b583fe56d5a246484e7efde66c87386586 23803ad96e324f898771c7a0a94686e11b7632a0
Author: Sascha Girrulat <sascha at girrulat.de>
Date:   Wed Feb 8 18:51:09 2012 +0100

    Merge branch 'upstream' into dfsg-clean

diff --combined components/SConscript
index c1e8004,ce5ca1c..a94e59b
--- a/components/SConscript
+++ b/components/SConscript
@@@ -46,7 -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'
@@@ -74,8 -74,8 +74,8 @@@ with open(gecko_include + os.sep + 'moz
              break
  
  # Create two builders to create xpt and header files from 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')
+ bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.xpt', src_suffix = '.idl')
+ bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.h', src_suffix = '.idl')
  
  
  # Create environment object for build
@@@ -108,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