Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/jsoncpp/test/generate_expected.py b/lib/jsoncpp/test/generate_expected.py
new file mode 100644
index 0000000000..5b215c4670
--- /dev/null
+++ b/lib/jsoncpp/test/generate_expected.py
@@ -0,0 +1,11 @@
+import glob
+import os.path
+for path in glob.glob( '*.json' ):
+    text = file(path,'rt').read()
+    target = os.path.splitext(path)[0] + '.expected'
+    if os.path.exists( target ):
+        print 'skipping:', target
+    else:
+        print 'creating:', target
+        file(target,'wt').write(text)
+