From bb63782258d99dc700ef0672fb3563ec0511ee6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 1 Jun 2008 22:27:54 +0000
Subject: [PATCH] generate files into the source tree

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23242 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/wind/gen-bidi.py              | 8 ++++----
 lib/wind/gen-combining.py         | 8 ++++----
 lib/wind/gen-errorlist.py         | 8 ++++----
 lib/wind/gen-map.py               | 8 ++++----
 lib/wind/gen-normalize.py         | 8 ++++----
 lib/wind/gen-punycode-examples.py | 6 +++---
 lib/wind/generate.py              | 3 ++-
 7 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/lib/wind/gen-bidi.py b/lib/wind/gen-bidi.py
index 0b77c3bc5..a08f60c24 100755
--- a/lib/wind/gen-bidi.py
+++ b/lib/wind/gen-bidi.py
@@ -41,15 +41,15 @@ import sys
 import generate
 import rfc3454
 
-if len(sys.argv) != 2:
-    print "usage: %s rfc3454.txt" % sys.argv[0]
+if len(sys.argv) != 3:
+    print "usage: %s rfc3454.txt outdir" % sys.argv[0]
     sys.exit(1)
 
 tables = rfc3454.read(sys.argv[1])
 
-bidi_h = generate.Header('bidi_table.h')
+bidi_h = generate.Header('%s/bidi_table.h' % sys.argv[2])
 
-bidi_c = generate.Implementation('bidi_table.c')
+bidi_c = generate.Implementation('%s/bidi_table.c' % sys.argv[2])
 
 bidi_h.file.write(
 '''
diff --git a/lib/wind/gen-combining.py b/lib/wind/gen-combining.py
index 4eb19e8c8..64891a738 100755
--- a/lib/wind/gen-combining.py
+++ b/lib/wind/gen-combining.py
@@ -41,8 +41,8 @@ import sys
 import generate
 import UnicodeData
 
-if len(sys.argv) != 2:
-    print "usage: %s UnicodeData.txt" % sys.argv[0]
+if len(sys.argv) != 3:
+    print "usage: %s UnicodeData.txt out-dir" % sys.argv[0]
     sys.exit(1)
 
 ud = UnicodeData.read(sys.argv[1])
@@ -54,8 +54,8 @@ for k,v in ud.items():
 
 # trans = [(x[0], int(x[3]), x[1]) for x in UnicodeData.read() if int(x[3]) != 0]
 
-combining_h = generate.Header('combining_table.h')
-combining_c = generate.Implementation('combining_table.c')
+combining_h = generate.Header('%s/combining_table.h' % sys.argv[2])
+combining_c = generate.Implementation('%s/combining_table.c' % sys.argv[2])
 
 combining_h.file.write(
 '''
diff --git a/lib/wind/gen-errorlist.py b/lib/wind/gen-errorlist.py
index 4daa022b0..8ccbcfdaf 100755
--- a/lib/wind/gen-errorlist.py
+++ b/lib/wind/gen-errorlist.py
@@ -43,8 +43,8 @@ import rfc3454
 import rfc4518
 import stringprep
 
-if len(sys.argv) != 2:
-    print "usage: %s rfc3454.txt" % sys.argv[0]
+if len(sys.argv) != 3:
+    print "usage: %s rfc3454.txt out-dir" % sys.argv[0]
     sys.exit(1)
 
 tables = rfc3454.read(sys.argv[1])
@@ -55,9 +55,9 @@ for x in t2.iterkeys():
 
 error_list = stringprep.get_errorlist()
 
-errorlist_h = generate.Header('errorlist_table.h')
+errorlist_h = generate.Header('%s/errorlist_table.h' % sys.argv[2])
 
-errorlist_c = generate.Implementation('errorlist_table.c')
+errorlist_c = generate.Implementation('%s/errorlist_table.c' % sys.argv[2])
 
 errorlist_h.file.write(
 '''
diff --git a/lib/wind/gen-map.py b/lib/wind/gen-map.py
index a31be38f8..9a9904217 100755
--- a/lib/wind/gen-map.py
+++ b/lib/wind/gen-map.py
@@ -44,8 +44,8 @@ import rfc4518
 import stringprep
 import util
 
-if len(sys.argv) != 2:
-    print "usage: %s rfc3454.txt" % sys.argv[0]
+if len(sys.argv) != 3:
+    print "usage: %s rfc3454.txt out-dir" % sys.argv[0]
     sys.exit(1)
 
 tables = rfc3454.read(sys.argv[1])
@@ -56,9 +56,9 @@ for x in t2.iterkeys():
 
 map_list = stringprep.get_maplist()
 
-map_h = generate.Header('map_table.h')
+map_h = generate.Header('%s/map_table.h' % sys.argv[2])
 
-map_c = generate.Implementation('map_table.c')
+map_c = generate.Implementation('%s/map_table.c' % sys.argv[2])
 
 map_h.file.write(
 '''
diff --git a/lib/wind/gen-normalize.py b/lib/wind/gen-normalize.py
index 7b0a0590f..7ea5f47ba 100755
--- a/lib/wind/gen-normalize.py
+++ b/lib/wind/gen-normalize.py
@@ -42,9 +42,9 @@ import generate
 import UnicodeData
 import util
 
-if len(sys.argv) != 3:
+if len(sys.argv) != 4:
     print "usage: %s UnicodeData.txt"
-    " CompositionExclusions-3.2.0.txt" % sys.argv[0]
+    " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0]
     sys.exit(1)
 
 ud = UnicodeData.read(sys.argv[1])
@@ -62,8 +62,8 @@ maxLength = 0
 for v in trans.values():
     maxLength = max(maxLength, len(v[0].split()))
 
-normalize_h = generate.Header('normalize_table.h')
-normalize_c = generate.Implementation('normalize_table.c')
+normalize_h = generate.Header('%s/normalize_table.h' % sys.argv[3])
+normalize_c = generate.Implementation('%s/normalize_table.c' % sys.argv[3])
 
 normalize_h.file.write(
 '''
diff --git a/lib/wind/gen-punycode-examples.py b/lib/wind/gen-punycode-examples.py
index 1c0a79aca..5ce19bbe2 100755
--- a/lib/wind/gen-punycode-examples.py
+++ b/lib/wind/gen-punycode-examples.py
@@ -40,14 +40,14 @@ import sys
 
 import generate
 
-if len(sys.argv) != 2:
+if len(sys.argv) != 3:
     print "usage: %s rfc3492.txt" % sys.argv[0]
     sys.exit(1)
 
 f = open(sys.argv[1], 'r')
 
-examples_h = generate.Header('punycode_examples.h')
-examples_c = generate.Header('punycode_examples.c')
+examples_h = generate.Header('%s/punycode_examples.h' % sys.argv[2])
+examples_c = generate.Header('%s/punycode_examples.c' % sys.argv[2])
 
 start = False
 
diff --git a/lib/wind/generate.py b/lib/wind/generate.py
index e7f381576..68ed58308 100644
--- a/lib/wind/generate.py
+++ b/lib/wind/generate.py
@@ -36,12 +36,13 @@
 
 import datetime
 import string
+import os
 
 class GeneratedFile :
     "Represents a generated file"
     def __init__(self, name) :
         "Create a new GeneratedFile with name"
-        self.name  = name
+        self.name  = os.path.basename(name)
         self.file  = open(name, 'w')
         self.file.write('/* ' + name + ' */\n')
         self.file.write('/* Automatically generated at ' +