makeJava - directory expansion and remapping added

[kaffe@rufus.w3.org]

--0__=378gjxFHqioHlA5ZkbccQIR61EzyWGOF5wk0rggKiYRglllYeSkDpYiT
Content-type: text/plain; charset=US-ASCII




Hello!

Unfortunately, my previous version of makeJava has problems with
srcdir!='.' and with compiling of separate files. This version fixes these
bugs. It is also possible to specify directories in the command line. For
example, "makeJava java/lang" will find all java sources in
$srcdir/java/lang and subdirectories.
I have tested this version fairly well, so it should be Ok to put it on the
CVS. Anyway, all functionality of the old makeJava is completely retained,
so I see no reason why it should not be done.
'-unsafe' is no longer required when compiling java/awt/widget, since I
introduced directory remapping for output files.
Now "makeJava all" really compiles the library.
Currently it works under Cygwin32 only if JAVAC_CP is redefined, because
Kaffe (erroneously?) doesn't accept colon as classpath separator under
Windows.

Pavel Roskin <pavel.roskin@ecsoft.co.uk>

(See attached file: makeJava)

--0__=378gjxFHqioHlA5ZkbccQIR61EzyWGOF5wk0rggKiYRglllYeSkDpYiT
Content-type: application/octet-stream; 
	name="makeJava"
Content-transfer-encoding: base64

IyEgL2Jpbi9zaAojCiMgU2ltcGxlIGxpdHRsZSBzY3JpcHQgd2hpY2ggYnVpbGRzIHRoZSAuY2xh
c3MgZmlsZXMgd2hpY2ggYXJlIG9sZGVyCiMgdGhhbiB0aGUgLmphdmEgZmlsZXMuCiMKIyBFeGl0
IGNvZGVzOiAwIC0gT2ssIDEgLSBiYWQgb3B0aW9ucywgMiAtIGNvbXBpbGUgZXJyb3JzLCAzIC0g
ZmF0YWwgZXJyb3JzCiMKIyBDb3B5cmlnaHQgKGMpIDE5OTcsIDE5OTgKIyAgICAgIFRyYW5zdmly
dHVhbCBUZWNobm9sb2dpZXMsIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiMKIyBTZWUgdGhl
IGZpbGUgImxpY2Vuc2UudGVybXMiIGZvciBpbmZvcm1hdGlvbiBvbiB1c2FnZSBhbmQgcmVkaXN0
cmlidXRpb24KIyBvZiB0aGlzIGZpbGUuCiMKCmlmIHRlc3QgIiQqIiA9ICIiIDsgdGhlbgoJZWNo
byAidXNhZ2U6IG1ha2VKYXZhIG9wdGlvbnMge2phdmEgZmlsZXN8YWxsfSIKCWVjaG8gIi1zcmNk
aXIgcGF0aCAgIHdoZXJlIHNvdXJjZXMgYXJlIHBsYWNlZCAoZGVmYXVsdCBpcyAnLicpIgoJZWNo
byAiLWRzdGRpciBwYXRoICAgd2hlcmUgY29tcGlsZWQgY2xhc3NlcyB3aWxsIGJlIHBsYWNlZCAo
ZGVmYXVsdCBpcyAnbGliJykiCgllY2hvICItZm9yY2UgICAgICAgICBkb24ndCBjaGVjayB3aGV0
aGVyIGNsYXNzZXMgYXJlIG5ld2VyIHRoYW4gc291cmNlcyIKCWVjaG8gIi11bnNhZmUgICAgICAg
IGRvbid0IGNoZWNrIHdoZXRoZXIgY2xhc3NlcyBhcmUgY3JlYXRlZCIKCWVjaG8gIi1iYXRjaCAg
ICAgICAgIGNvbXBpbGUgYWxsIG5ld2VyIHNvdXJjZXMgdG9nZXRoZXIgKGltcGxpZXMgLXVuc2Fm
ZSkiCgllY2hvICJVc2UgJ2FsbCcgdG8gY29tcGlsZSBhbGwgc291cmNlcyBpbiBqYXZhIGFuZCBr
YWZmZSBkaXJlY3RvcmllcyIKCWV4aXQgMQpmaQoKc3JjZGlyPS4KZHN0ZGlyPWxpYgphbGx0b3Bk
aXJzPSJqYXZhIGthZmZlIgpiYXRjaD0wCmZvcmNlPTAKdW5zYWZlPTAKb3RoZXJhcmdzPSIiCmVy
cm9ybGlzdD0iIgpiYXRjaGxpc3Q9IiIKCndoaWxlIHRlc3QgeCQxICE9IHg7IGRvCgpjYXNlICQx
IGluCi1zcmNkaXIpCglpZiB0ZXN0IHgkMiA9IHg7IHRoZW4KCQllY2hvIGFyZ3VtZW50IHRvICQx
IG1pc3NpbmcKCQlleGl0IDEKCWZpCglzcmNkaXI9JDI7IHNoaWZ0OyBzaGlmdDs7Ci1kc3RkaXIp
CglpZiB0ZXN0IHgkMiA9IHg7IHRoZW4KCQllY2hvIGFyZ3VtZW50IHRvICQxIG1pc3NpbmcKCQll
eGl0IDEKCWZpCglkc3RkaXI9JDI7IHNoaWZ0OyBzaGlmdDs7Ci1iYXRjaCkKCWJhdGNoPTE7IHNo
aWZ0OzsKLWZvcmNlKQoJZm9yY2U9MTsgc2hpZnQ7OwotdW5zYWZlKQoJdW5zYWZlPTE7IHNoaWZ0
OzsKLSopCgllY2hvICJVbmtub3duIG9wdGlvbiAkMSI7IGV4aXQgMTs7CiopCglpZiB0ZXN0IHgi
JG90aGVyYXJncyIgPSB4OyB0aGVuCgkJb3RoZXJhcmdzPSIkMSIKCWVsc2UKCQlvdGhlcmFyZ3M9
IiRvdGhlcmFyZ3MgJDEiCglmaQoJc2hpZnQ7Owplc2FjCgpkb25lCgppZiB0ZXN0IHgiJG90aGVy
YXJncyIgPSB4OyB0aGVuCgllY2hvICJObyBmaWxlcyB0byBjb21waWxlIgoJZXhpdCAxCmVsaWYg
dGVzdCB4IiRvdGhlcmFyZ3MiID0geGFsbDsgdGhlbgoJZmlsZXM9YGNkICRzcmNkaXI7IGZpbmQg
JGFsbHRvcGRpcnMgLXR5cGUgZiAtbmFtZSBcKi5qYXZhIC1wcmludGAKZWxzZQoJZmlsZXM9IiIK
CWZvciBmaWxlIGluICRvdGhlcmFyZ3M7IGRvCgkJaWYgdGVzdCAtZiAkc3JjZGlyLyRmaWxlOyB0
aGVuCgkJCWZpbGVzPSIkZmlsZXMgJGZpbGUiCgkJZWxpZiB0ZXN0IC1mICRzcmNkaXIvJHtmaWxl
fS5qYXZhOyB0aGVuCgkJCWZpbGVzPSIkZmlsZXMgJHtmaWxlfS5qYXZhIgoJCWVsaWYgdGVzdCAt
ZCAkc3JjZGlyLyRmaWxlOyB0aGVuCgkJCWZpbGVzPSIkZmlsZXMgYGNkICRzcmNkaXI7IGZpbmQg
JGZpbGUgLXR5cGUgZiAtbmFtZSBcKi5qYXZhIC1wcmludGAiCgkJZWxzZQoJCQllY2hvIEZpbGUg
b3IgZGlyZWN0b3J5ICRzcmNkaXIvJGZpbGUgbm90IGZvdW5kCgkJCWV4aXQgMQoJCWZpCglkb25l
CmZpCgppZiB0ZXN0ICIkSkFWQUMiID0gIiIgOyB0aGVuCglKQVZBQz0iamF2YWMiCmZpCgppZiB0
ZXN0ICIkSkFWQUNfQ1AiID0gIiIgOyB0aGVuCglKQVZBQ19DUD0iJGRzdGRpcjokc3JjZGlyOiRD
TEFTU1BBVEg6JHNyY2Rpci9LbGFzc2VzLmphciIKZmkKCmlmIHRlc3QgIiRKRkxBR1MiID0gIiIg
OyB0aGVuCglKRkxBR1M9Ii1jbGFzc3BhdGggJEpBVkFDX0NQIC12ZXJib3NlIgpmaQoKcmVtYXAo
KQp7CgljZj1gZWNobyAkY2YgfCBzZWQgJ3MvamF2YVwvYXd0XC93aWRnZXRzXC8vamF2YVwvYXd0
XC8vJ2AKfQoKZm9yIGZpbGUgaW4gJGZpbGVzCmRvCglqZj0kc3JjZGlyLyRmaWxlCgljZj0kZHN0
ZGlyL2BlY2hvICRmaWxlIHwgc2VkIHMvXFwuamF2YSQvL2AuY2xhc3MKCXJlbWFwCglkb2NvbXBp
bGU9MAoJaWYgdGVzdCAhIC1mICRjZiA7IHRoZW4KCQlkb2NvbXBpbGU9MQoJZWxpZiB0ZXN0ICRm
b3JjZSA9IDEgLW8gJGNmIC1vdCAkamYgOyB0aGVuCgkJZG9jb21waWxlPTEKCWZpCglpZiB0ZXN0
ICIkZG9jb21waWxlIiA9ICIxIiA7IHRoZW4KCQlvdXRkaXI9YGRpcm5hbWUgJGNmYAoJCWlmIHRl
c3QgISAtZCAkb3V0ZGlyOyB0aGVuCgkJCWVjaG8gQ3JlYXRpbmcgZGlyZWN0b3J5ICRvdXRkaXIK
CQkJbWtkaXIgLXAgJG91dGRpcgoJCWZpCgkJaWYgdGVzdCAkYmF0Y2ggPSAxOyB0aGVuCgkJCWlm
IHRlc3QgeCIkYmF0Y2hsaXN0IiA9IHg7IHRoZW4KCQkJCWJhdGNobGlzdD0iJGpmIgoJCQllbHNl
CgkJCQliYXRjaGxpc3Q9IiRiYXRjaGxpc3QgJGpmIgoJCQlmaQoJCWVsc2UKCQkJZWNobyAiQ29t
cGlsaW5nICRqZiIKCQkJJEpBVkFDICRKRkxBR1MgLWQgJGRzdGRpciAkamYKCQkJaWYgdGVzdCAk
PyA9IDA7IHRoZW4KCQkJCWlmIHRlc3QgLWYgJGNmOyB0aGVuCgkJCQkJZWNobyAiZG9uZSIKCQkJ
CWVsaWYgdGVzdCAkdW5zYWZlID0gMDsgdGhlbgoJCQkJCWVjaG8gRmF0YWwgZXJyb3Igd2hpbGUg
cHJvY2Vzc2luZyAkamYKCQkJCQllY2hvIGJlbG9uZ2luZyB0byBgZ3JlcCBecGFja2FnZSAkamZg
CgkJCQkJZXhpdCAzCgkJCQlmaQoJCQllbHNlCgkJCQlpZiB0ZXN0IHgiJGVycm9ybGlzdCIgPSB4
OyB0aGVuCgkJCQkJZXJyb3JsaXN0PSIkamYiCgkJCQllbHNlCgkJCQkJZXJyb3JsaXN0PSIkZXJy
b3JsaXN0ICRqZiIKCQkJCWZpCgkJCQllY2hvICJub3QgZG9uZSIKCQkJZmkKCQlmaQoJZmkKZG9u
ZQoKaWYgdGVzdCAkYmF0Y2ggPSAxOyB0aGVuCglpZiB0ZXN0IHgiJGJhdGNobGlzdCIgPSB4OyB0
aGVuCgkJZWNobyAiRXZlcnl0aGluZyBzZWVtcyB0byBiZSB1cC10by1kYXRlIgoJCWV4aXQgMAoJ
ZWxzZQoJCWVjaG8gIkNvbXBpbGluZyAkYmF0Y2hsaXN0IgoJCSRKQVZBQyAkSkZMQUdTIC1kICRk
c3RkaXIgJGJhdGNobGlzdAoJCWlmIHRlc3QgJD8gPSAwOyB0aGVuCgkJCWVjaG8gImRvbmUiCgkJ
ZWxzZQoJCQllY2hvICJub3QgZG9uZSIKCQlmaQoJZmkKZWxpZiB0ZXN0IHgiJGVycm9ybGlzdCIg
IT0geDsgdGhlbgoJZWNobyBUaGVyZSB3ZXJlIGVycm9ycyB3aGlsZSBjb21waWxpbmc6CgllY2hv
ICRlcnJvcmxpc3QKCWV4aXQgMgplbHNlCgllY2hvIE5vIGVycm9ycyBlbmNvdW50ZXJlZApmaQo=

--0__=378gjxFHqioHlA5ZkbccQIR61EzyWGOF5wk0rggKiYRglllYeSkDpYiT--