Squashed 'waflib/' changes from 915dcb1..e7a29b6

e7a29b6 Upgrade to waf 2.0.15
8280f9d Add command for running executables from the build directory
8073c1a Make make_simple_dox() safe in case of exception
70d03b8 Avoid use of global counter hacks for configuration display
b7d689a Rewrite test framework
94deadf Automatically add options and move add_flags() to options context
f4259ee Reduce system include path noise
927b608 Automatically display configuration header
c44b8f3 Set line justification from a constant in the wscript
a48e26f Automatically detect if wscript has a test hook
ef66724 Save runtime variables in the environment
63bcbcd Clean up TestContext
b1d9505 Add ExecutionContext for setting runtime environment
387c1df Add show_diff() and test_file_equals() utilities
29d4d29 Fix in-tree library paths
9fde01f Add custom configuration context
6d3612f Add lib_path_name constant

git-subtree-dir: waflib
git-subtree-split: e7a29b6b9b2f842314244c23c14d8f8f560904e1

1 files changed, 0 insertions, 57 deletions

diff --git a/waflib/extras/satellite_assembly.py b/waflib/extras/satellite_assembly.py
deleted file mode 100644
index 005eb07..0000000
--- a/waflib/extras/satellite_assembly.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-# encoding: utf-8
-# vim: tabstop=4 noexpandtab
-
-"""
-Create a satellite assembly from "*.??.txt" files. ?? stands for a language code.
-
-The projects Resources subfolder contains resources.??.txt string files for several languages.
-The build folder will hold the satellite assemblies as ./??/ExeName.resources.dll
-
-#gen becomes template (It is called gen because it also uses resx.py).
-bld(source='Resources/resources.de.txt',gen=ExeName)
-"""
-
-import os, re
-from waflib import Task
-from waflib.TaskGen import feature,before_method
-
-class al(Task.Task):
-	run_str = '${AL} ${ALFLAGS}'
-
-@feature('satellite_assembly')
-@before_method('process_source')
-def satellite_assembly(self):
-	if not getattr(self, 'gen', None):
-		self.bld.fatal('satellite_assembly needs a template assembly provided with the "gen" parameter')
-	res_lang = re.compile(r'(.*)\.(\w\w)\.(?:resx|txt)',flags=re.I)
-
-	# self.source can contain node objects, so this will break in one way or another
-	self.source = self.to_list(self.source)
-	for i, x in enumerate(self.source):
-		#x = 'resources/resources.de.resx'
-		#x = 'resources/resources.de.txt'
-		mo = res_lang.match(x)
-		if mo:
-			template = os.path.splitext(self.gen)[0]
-			templatedir, templatename = os.path.split(template)
-			res = mo.group(1)
-			lang = mo.group(2)
-			#./Resources/resources.de.resources
-			resources = self.path.find_or_declare(res+ '.' + lang + '.resources')
-			self.create_task('resgen', self.to_nodes(x), [resources])
-			#./de/Exename.resources.dll
-			satellite = self.path.find_or_declare(os.path.join(templatedir,lang,templatename) + '.resources.dll')
-			tsk = self.create_task('al',[resources],[satellite])
-			tsk.env.append_value('ALFLAGS','/template:'+os.path.join(self.path.relpath(),self.gen))
-			tsk.env.append_value('ALFLAGS','/embed:'+resources.relpath())
-			tsk.env.append_value('ALFLAGS','/culture:'+lang)
-			tsk.env.append_value('ALFLAGS','/out:'+satellite.relpath())
-			self.source[i] = None
-	# remove the None elements that we just substituted
-	self.source = list(filter(lambda x:x, self.source))
-
-def configure(ctx):
-	ctx.find_program('al', var='AL', mandatory=True)
-	ctx.load('resx')
-