Patch to set compiler/linker binary path
"Vane, Edwin" <[email protected]> Mon, 30 Jan 2012 20:40:25 +0000
| Newsgroups | gmane.comp.java.ant-contrib.devel |
|---|---|
| Message-ID | <C2522D317533D545B75749D9242795D20E59BACB@FMSMSX102.amr.corp.intel.com> |
--_004_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_
Content-Type: multipart/alternative;
boundary="_000_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_"
--_000_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Hi all,
Quick question: is this project still alive? I don't see any writes to the =
project for over a year according to sourceforge's little widget. Earlier e=
mail's with patches seem to have gone unanswered so perhaps this email will=
go that way too.
Attached is a patch I wrote to add a 'bin' attribute for the 'compiler' ele=
ment that allows one to give the full path to the binary to execute for com=
piling or linking. 'gcc' itself was not enough for me because I'm cross com=
piling and the compiler has a name of <prefix>-gcc which is not handled by =
the cross compiler support in cpptasks. Perhaps this patch is not the right=
way to approach the problem but if not I'd like to know what the right way=
is.
I also fixed GccLinker.decorateLinkerOption() so that the -sysroot option i=
s passed directly to gcc without being prefixed with -Wl, which was causing=
problems for me.
Comments?
--
Edwin Vane
Software Developer
SSG/DPD/ECDL/ArBB
Phone: +1 519 772 2567
iNET: 87722567
--_000_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"EN-US" link=3D"blue" vlink=3D"purple">
<div class=3D"WordSection1">
<p class=3D"MsoNormal"><span lang=3D"EN-CA">Hi all,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA">Quick question: is this project=
still alive? I don’t see any writes to the project for over a year a=
ccording to sourceforge’s little widget. Earlier email’s with p=
atches seem to have gone unanswered so perhaps this email
will go that way too.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA">Attached is a patch I wrote to =
add a ‘bin’ attribute for the ‘compiler’ element th=
at allows one to give the full path to the binary to execute for compiling =
or linking. ‘gcc’ itself was not enough for me because I’=
m cross
compiling and the compiler has a name of <prefix>-gcc which is not h=
andled by the cross compiler support in cpptasks. Perhaps this patch is not=
the right way to approach the problem but if not I’d like to know wh=
at the right way is.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA">I also fixed GccLinker.decorate=
LinkerOption() so that the –sysroot option is passed directly to gcc =
without being prefixed with –Wl, which was causing problems for me.<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA">Comments?<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">--<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D">Edwin Vane<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> Software Develo=
per<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> SSG/DPD/ECDL/Ar=
BB<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> Phone: +1 5=
19 772 2567<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span style=3D"color:#1F497D"> iNET: 87722567<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-CA"><o:p> </o:p></span></p>
</div>
</body>
</html>
--_000_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_--
--_004_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_
Content-Type: application/octet-stream; name="bin_patch.patch"
Content-Description: bin_patch.patch
Content-Disposition: attachment; filename="bin_patch.patch"; size=8439;
creation-date="Mon, 30 Jan 2012 20:39:35 GMT";
modification-date="Mon, 30 Jan 2012 20:40:19 GMT"
Content-Transfer-Encoding: base64
SW5kZXg6IHNyYy9tYWluL2phdmEvbmV0L3NmL2FudGNvbnRyaWIvY3BwdGFza3MvZ2NjL0djY0xp
bmtlci5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIHNyYy9tYWluL2phdmEvbmV0L3NmL2FudGNvbnRyaWIv
Y3BwdGFza3MvZ2NjL0djY0xpbmtlci5qYXZhCShyZXZpc2lvbiAxNzcpCisrKyBzcmMvbWFpbi9q
YXZhL25ldC9zZi9hbnRjb250cmliL2NwcHRhc2tzL2djYy9HY2NMaW5rZXIuamF2YQkod29ya2lu
ZyBjb3B5KQpAQCAtNzgsNiArNzgsMTIgQEAKICAgICAgKi8KICAgICBwdWJsaWMgU3RyaW5nIGRl
Y29yYXRlTGlua2VyT3B0aW9uKFN0cmluZ0J1ZmZlciBidWYsIFN0cmluZyBhcmcpIHsKICAgICAg
ICAgU3RyaW5nIGRlY29yYXRlZEFyZyA9IGFyZzsKKyAgICAgICAgaWYgKGFyZy5zdGFydHNXaXRo
KCItLXN5c3Jvb3QiKSkgeworICAgICAgICAgIHJldHVybiBhcmc7CisgICAgICAgIH0KKyAgICAg
ICAgaWYgKGFyZy5zdGFydHNXaXRoKCItbm9zdGRsaWIiKSkgeworICAgICAgICAgIHJldHVybiBh
cmc7CisgICAgICAgIH0KICAgICAgICAgaWYgKGFyZy5sZW5ndGgoKSA+IDEgJiYgYXJnLmNoYXJB
dCgwKSA9PSAnLScpIHsKICAgICAgICAgICAgIHN3aXRjaCAoYXJnLmNoYXJBdCgxKSkgewogICAg
ICAgICAgICAgICAgIC8vCkluZGV4OiBzcmMvbWFpbi9qYXZhL25ldC9zZi9hbnRjb250cmliL2Nw
cHRhc2tzL2NvbXBpbGVyL0NvbW1hbmRMaW5lQ29tcGlsZXJDb25maWd1cmF0aW9uLmphdmEKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gc3JjL21haW4vamF2YS9uZXQvc2YvYW50Y29udHJpYi9jcHB0YXNrcy9jb21w
aWxlci9Db21tYW5kTGluZUNvbXBpbGVyQ29uZmlndXJhdGlvbi5qYXZhCShyZXZpc2lvbiAxNzcp
CisrKyBzcmMvbWFpbi9qYXZhL25ldC9zZi9hbnRjb250cmliL2NwcHRhc2tzL2NvbXBpbGVyL0Nv
bW1hbmRMaW5lQ29tcGlsZXJDb25maWd1cmF0aW9uLmphdmEJKHdvcmtpbmcgY29weSkKQEAgLTQ3
LDggKzQ3LDEwIEBACiAgICAgcHJpdmF0ZS8qIGZpbmFsICovUHJvY2Vzc29yUGFyYW1bXSBwYXJh
bXM7CiAgICAgcHJpdmF0ZS8qIGZpbmFsICovYm9vbGVhbiByZWJ1aWxkOwogICAgIHByaXZhdGUv
KiBmaW5hbCAqL0ZpbGVbXSBzeXNJbmNsdWRlUGF0aDsKKyAgICBwcml2YXRlIFN0cmluZyBiaW5f
cGF0aDsKKwogICAgIHB1YmxpYyBDb21tYW5kTGluZUNvbXBpbGVyQ29uZmlndXJhdGlvbihDb21t
YW5kTGluZUNvbXBpbGVyIGNvbXBpbGVyLAotICAgICAgICAgICAgU3RyaW5nIGlkZW50aWZpZXIs
IEZpbGVbXSBpbmNsdWRlUGF0aCwgRmlsZVtdIHN5c0luY2x1ZGVQYXRoLAorICAgICAgICAgICAg
U3RyaW5nIGlkZW50aWZpZXIsIFN0cmluZyBiaW5fcGF0aCwgRmlsZVtdIGluY2x1ZGVQYXRoLCBG
aWxlW10gc3lzSW5jbHVkZVBhdGgsCiAgICAgICAgICAgICBGaWxlW10gZW52SW5jbHVkZVBhdGgs
IFN0cmluZyBpbmNsdWRlUGF0aElkZW50aWZpZXIsIFN0cmluZ1tdIGFyZ3MsCiAgICAgICAgICAg
ICBQcm9jZXNzb3JQYXJhbVtdIHBhcmFtcywgYm9vbGVhbiByZWJ1aWxkLCBTdHJpbmdbXSBlbmRB
cmdzKSB7CiAgICAgICAgIGlmIChjb21waWxlciA9PSBudWxsKSB7CkBAIC04MCw2ICs4Miw3IEBA
CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLmVudkluY2x1ZGVQYXRoID0gKEZp
bGVbXSkgZW52SW5jbHVkZVBhdGguY2xvbmUoKTsKICAgICAgICAgfQorICAgICAgICB0aGlzLmJp
bl9wYXRoID0gYmluX3BhdGg7CiAgICAgICAgIHRoaXMuY29tcGlsZXIgPSBjb21waWxlcjsKICAg
ICAgICAgdGhpcy5wYXJhbXMgPSAoUHJvY2Vzc29yUGFyYW1bXSkgcGFyYW1zLmNsb25lKCk7CiAg
ICAgICAgIHRoaXMucmVidWlsZCA9IHJlYnVpbGQ7CkBAIC05Miw2ICs5NSw3IEBACiAgICAgcHVi
bGljIENvbW1hbmRMaW5lQ29tcGlsZXJDb25maWd1cmF0aW9uKAogICAgICAgICAgICAgQ29tbWFu
ZExpbmVDb21waWxlckNvbmZpZ3VyYXRpb24gYmFzZSwgU3RyaW5nW10gYWRkaXRpb25hbEFyZ3Ms
CiAgICAgICAgICAgICBTdHJpbmdbXSBleGNlcHRGaWxlcywgYm9vbGVhbiBpc1ByZWNvbXBpbGVI
ZWFkZXJHZW5lcmF0aW9uKSB7CisgICAgICAgIHRoaXMuYmluX3BhdGggPSBiYXNlLmJpbl9wYXRo
OwogICAgICAgICBjb21waWxlciA9IGJhc2UuY29tcGlsZXI7CiAgICAgICAgIGlkZW50aWZpZXIg
PSBiYXNlLmlkZW50aWZpZXI7CiAgICAgICAgIHJlYnVpbGQgPSBiYXNlLnJlYnVpbGQ7CkBAIC0x
MjQsNiArMTI4LDEyIEBACiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGNvbXBpbGVyQmlkOwog
ICAgIH0KKyAgICBwdWJsaWMgYm9vbGVhbiBoYXNCaW5QYXRoKCkgeworICAgICAgICByZXR1cm4g
bnVsbCAhPSBnZXRCaW5QYXRoKCk7CisgICAgfQorICAgIHB1YmxpYyBTdHJpbmcgZ2V0QmluUGF0
aCgpIHsKKyAgICAgICAgcmV0dXJuIGJpbl9wYXRoOworICAgIH0KICAgICBwdWJsaWMgdm9pZCBj
b21waWxlKENDVGFzayB0YXNrLCBGaWxlIG91dHB1dERpciwgU3RyaW5nW10gc291cmNlRmlsZXMs
CiAgICAgICAgICAgICBib29sZWFuIHJlbGVudGxlc3MsIFByb2dyZXNzTW9uaXRvciBtb25pdG9y
KSB0aHJvd3MgQnVpbGRFeGNlcHRpb24gewogICAgICAgICBpZiAobW9uaXRvciAhPSBudWxsKSB7
CkluZGV4OiBzcmMvbWFpbi9qYXZhL25ldC9zZi9hbnRjb250cmliL2NwcHRhc2tzL2NvbXBpbGVy
L0NvbW1hbmRMaW5lQ29tcGlsZXIuamF2YQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzcmMvbWFpbi9qYXZhL25l
dC9zZi9hbnRjb250cmliL2NwcHRhc2tzL2NvbXBpbGVyL0NvbW1hbmRMaW5lQ29tcGlsZXIuamF2
YQkocmV2aXNpb24gMTc3KQorKysgc3JjL21haW4vamF2YS9uZXQvc2YvYW50Y29udHJpYi9jcHB0
YXNrcy9jb21waWxlci9Db21tYW5kTGluZUNvbXBpbGVyLmphdmEJKHdvcmtpbmcgY29weSkKQEAg
LTEzOCw3ICsxMzgsMTIgQEAKICAgICAgICAgLy8KICAgICAgICAgLy8gICBkZXRlcm1pbmUgbGVu
Z3RoIG9mIGV4ZWN1dGFibGUgbmFtZSBhbmQgYXJncwogICAgICAgICAvLwotICAgICAgICBTdHJp
bmcgY29tbWFuZCA9IGdldENvbW1hbmQoKTsKKyAgICAgICAgU3RyaW5nIGNvbW1hbmQgPSBudWxs
OworICAgICAgICBpZiAoY29uZmlnLmhhc0JpblBhdGgoKSkgeworICAgICAgICAgIGNvbW1hbmQg
PSBjb25maWcuZ2V0QmluUGF0aCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGNvbW1h
bmQgPSBnZXRDb21tYW5kKCk7CisgICAgICAgIH0KICAgICAgICAgaW50IGJhc2VMZW5ndGggPSBj
b21tYW5kLmxlbmd0aCgpICsgYXJncy5sZW5ndGggKyBlbmRBcmdzLmxlbmd0aDsKICAgICAgICAg
aWYgKGxpYnRvb2wpIHsKICAgICAgICAgICAgIGJhc2VMZW5ndGggKz0gODsKQEAgLTM2Miw3ICsz
NjcsMTggQEAKICAgICAgICAgYXJncy5jb3B5SW50byhhcmdBcnJheSk7CiAgICAgICAgIGJvb2xl
YW4gcmVidWlsZCA9IHNwZWNpZmljRGVmLmdldFJlYnVpbGQoYmFzZURlZnMsIDApOwogICAgICAg
ICBGaWxlW10gZW52SW5jbHVkZVBhdGggPSBnZXRFbnZpcm9ubWVudEluY2x1ZGVQYXRoKCk7Ci0g
ICAgICAgIHJldHVybiBuZXcgQ29tbWFuZExpbmVDb21waWxlckNvbmZpZ3VyYXRpb24odGhpcywg
Y29uZmlnSWQsIGluY1BhdGgsCisKKyAgICAgICAgLy8gU2V0IGJpbl9wYXRoIGFjY29yZGluZyB0
byBkZWYgaW5oZXJpdGFuY2UgcnVsZXMuCisgICAgICAgIFN0cmluZyBiaW5fcGF0aCA9IG51bGw7
CisgICAgICAgIGZvciAoaW50IGkgPSBkZWZhdWx0UHJvdmlkZXJzLmxlbmd0aCAtIDE7IGkgPj0g
MDsgaS0tKSB7CisgICAgICAgICAgU3RyaW5nIHBhdGggPSBkZWZhdWx0UHJvdmlkZXJzW2ldLmdl
dEJpblBhdGgoKTsKKyAgICAgICAgICBpZiAobnVsbCA9PSBwYXRoKSB7CisgICAgICAgICAgICBj
b250aW51ZTsKKyAgICAgICAgICB9CisgICAgICAgICAgYmluX3BhdGggPSBwYXRoOworICAgICAg
ICB9CisgICAgICAgCisgICAgICAgIHJldHVybiBuZXcgQ29tbWFuZExpbmVDb21waWxlckNvbmZp
Z3VyYXRpb24odGhpcywgY29uZmlnSWQsIGJpbl9wYXRoLCBpbmNQYXRoLAogICAgICAgICAgICAg
ICAgIHN5c0luY1BhdGgsIGVudkluY2x1ZGVQYXRoLCBpbmNsdWRlUGF0aElkZW50aWZpZXIudG9T
dHJpbmcoKSwKICAgICAgICAgICAgICAgICBhcmdBcnJheSwgcGFyYW1BcnJheSwgcmVidWlsZCwg
ZW5kQXJncyk7CiAgICAgfQpJbmRleDogc3JjL21haW4vamF2YS9uZXQvc2YvYW50Y29udHJpYi9j
cHB0YXNrcy9jb21waWxlci9Db21tYW5kTGluZUxpbmtlckNvbmZpZ3VyYXRpb24uamF2YQo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBzcmMvbWFpbi9qYXZhL25ldC9zZi9hbnRjb250cmliL2NwcHRhc2tzL2NvbXBp
bGVyL0NvbW1hbmRMaW5lTGlua2VyQ29uZmlndXJhdGlvbi5qYXZhCShyZXZpc2lvbiAxNzcpCisr
KyBzcmMvbWFpbi9qYXZhL25ldC9zZi9hbnRjb250cmliL2NwcHRhc2tzL2NvbXBpbGVyL0NvbW1h
bmRMaW5lTGlua2VyQ29uZmlndXJhdGlvbi5qYXZhCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw4ICsz
OSwxMCBAQAogICAgIHByaXZhdGUvKiBmaW5hbCAqL2Jvb2xlYW4gcmVidWlsZDsKICAgICBwcml2
YXRlIGJvb2xlYW4gZGVidWc7CiAgICAgcHJpdmF0ZSBTdHJpbmcgc3RhcnR1cE9iamVjdDsKKyAg
ICBwcml2YXRlIFN0cmluZyBiaW5fcGF0aDsKKwogICAgIHB1YmxpYyBDb21tYW5kTGluZUxpbmtl
ckNvbmZpZ3VyYXRpb24oQ29tbWFuZExpbmVMaW5rZXIgbGlua2VyLAotICAgICAgICAgICAgU3Ry
aW5nIGlkZW50aWZpZXIsIFN0cmluZ1tdW10gYXJncywgUHJvY2Vzc29yUGFyYW1bXSBwYXJhbXMs
CisgICAgICAgICAgICBTdHJpbmcgaWRlbnRpZmllciwgU3RyaW5nIGJpbl9wYXRoLCBTdHJpbmdb
XVtdIGFyZ3MsIFByb2Nlc3NvclBhcmFtW10gcGFyYW1zLAogICAgICAgICAgICAgYm9vbGVhbiBy
ZWJ1aWxkLCBib29sZWFuIG1hcCwgYm9vbGVhbiBkZWJ1ZywgU3RyaW5nW10gbGlicmFyeU5hbWVz
LAogICAgICAgICAgICAgU3RyaW5nIHN0YXJ0dXBPYmplY3QpIHsKICAgICAgICAgaWYgKGxpbmtl
ciA9PSBudWxsKSB7CkBAIC01MSw2ICs1Myw3IEBACiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg
ICAgICB0aGlzLmFyZ3MgPSAoU3RyaW5nW11bXSkgYXJncy5jbG9uZSgpOwogICAgICAgICB9Cisg
ICAgICAgIHRoaXMuYmluX3BhdGggPSBiaW5fcGF0aDsKICAgICAgICAgdGhpcy5saW5rZXIgPSBs
aW5rZXI7CiAgICAgICAgIHRoaXMucGFyYW1zID0gKFByb2Nlc3NvclBhcmFtW10pIHBhcmFtcy5j
bG9uZSgpOwogICAgICAgICB0aGlzLnJlYnVpbGQgPSByZWJ1aWxkOwpAQCAtNzEsNiArNzQsMTMg
QEAKICAgICAgICAgU3RyaW5nW10gY2xvbmUgPSAoU3RyaW5nW10pIGFyZ3NbMV0uY2xvbmUoKTsK
ICAgICAgICAgcmV0dXJuIGNsb25lOwogICAgIH0KKyAgICBwdWJsaWMgYm9vbGVhbiBoYXNCaW5Q
YXRoKCkgeworICAgICAgICByZXR1cm4gbnVsbCAhPSBnZXRCaW5QYXRoKCk7CisgICAgfQorICAg
IHB1YmxpYyBTdHJpbmcgZ2V0QmluUGF0aCgpIHsKKyAgICAgICAgcmV0dXJuIGJpbl9wYXRoOwor
ICAgIH0KKwogICAgIC8qKgogICAgICAqIFJldHVybnMgYSBzdHJpbmcgcmVwcmVzZW50YXRpb24g
b2YgdGhpcyBjb25maWd1cmF0aW9uLiBTaG91bGQgYmUKICAgICAgKiBjYW5vbmljYWwgc28gdGhh
dCBlcXVpdmFsZW50IGNvbmZpZ3VyYXRpb25zIHdpbGwgaGF2ZSBlcXVpdmFsZW50IHN0cmluZwpJ
bmRleDogc3JjL21haW4vamF2YS9uZXQvc2YvYW50Y29udHJpYi9jcHB0YXNrcy9jb21waWxlci9D
b21tYW5kTGluZUxpbmtlci5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHNyYy9tYWluL2phdmEvbmV0L3Nm
L2FudGNvbnRyaWIvY3BwdGFza3MvY29tcGlsZXIvQ29tbWFuZExpbmVMaW5rZXIuamF2YQkocmV2
aXNpb24gMTc3KQorKysgc3JjL21haW4vamF2YS9uZXQvc2YvYW50Y29udHJpYi9jcHB0YXNrcy9j
b21waWxlci9Db21tYW5kTGluZUxpbmtlci5qYXZhCSh3b3JraW5nIGNvcHkpCkBAIC0xNjksMTIg
KzE2OSwyMiBAQAogICAgICAgfQogICAgICAgYXJnc1syXS5jb3B5SW50byhvcHRpb25zWzFdKTsK
IAorICAgICAgLy8gU2V0IGJpbl9wYXRoIGFjY29yZGluZyB0byBkZWYgaW5oZXJpdGFuY2UgcnVs
ZXMuCisgICAgICBTdHJpbmcgYmluX3BhdGggPSBudWxsOworICAgICAgZm9yIChpbnQgaSA9IGRl
ZmF1bHRQcm92aWRlcnMubGVuZ3RoIC0gMTsgaSA+PSAwOyBpLS0pIHsKKyAgICAgICAgICBTdHJp
bmcgcGF0aCA9IGRlZmF1bHRQcm92aWRlcnNbaV0uZ2V0QmluUGF0aCgpOworICAgICAgICAgIGlm
IChudWxsID09IHBhdGgpIHsKKyAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgfQor
ICAgICAgICAgIGJpbl9wYXRoID0gcGF0aDsKKyAgICAgIH0KIAogICAgICAgYm9vbGVhbiByZWJ1
aWxkID0gc3BlY2lmaWNEZWYuZ2V0UmVidWlsZChiYXNlRGVmcywwKTsKICAgICAgIGJvb2xlYW4g
bWFwID0gc3BlY2lmaWNEZWYuZ2V0TWFwKGRlZmF1bHRQcm92aWRlcnMsMSk7CiAKICAgICAgIC8v
dGFzay5sb2coImxpYm5hbWVzOiIrbGlibmFtZXMubGVuZ3RoLCBQcm9qZWN0Lk1TR19WRVJCT1NF
KTsKLSAgICAgIHJldHVybiBuZXcgQ29tbWFuZExpbmVMaW5rZXJDb25maWd1cmF0aW9uKHRoaXMs
Y29uZmlnSWQsb3B0aW9ucywKKyAgICAgIHJldHVybiBuZXcgQ29tbWFuZExpbmVMaW5rZXJDb25m
aWd1cmF0aW9uKHRoaXMsIGNvbmZpZ0lkLCBiaW5fcGF0aCwKKyAgICAgICAgICAgICAgb3B0aW9u
cywKICAgICAgICAgICAgICAgcGFyYW1BcnJheSwKICAgICAgICAgICAgICAgcmVidWlsZCxtYXAs
IGRlYnVnLGxpYm5hbWVzLCBzdGFydHVwT2JqZWN0KTsKICAgICB9CkBAIC0zMTEsNyArMzIxLDEy
IEBACiAgICAgICAgIGlmIChpc0xpYnRvb2wpIHsKICAgICAgICAgICBhbGxBcmdzW2luZGV4Kytd
ID0gImxpYnRvb2wiOwogICAgICAgICB9Ci0gICAgICAgIGFsbEFyZ3NbaW5kZXgrK10gPSB0aGlz
LmdldENvbW1hbmQoKTsKKyAgICAgICAgLy8gU2V0IHRoZSBleGVjdXRhYmxlIG5hbWUKKyAgICAg
ICAgaWYgKGNvbmZpZy5oYXNCaW5QYXRoKCkpIHsKKyAgICAgICAgICAgIGFsbEFyZ3NbaW5kZXgr
K10gPSBjb25maWcuZ2V0QmluUGF0aCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg
YWxsQXJnc1tpbmRleCsrXSA9IHRoaXMuZ2V0Q29tbWFuZCgpOworICAgICAgICB9CiAgICAgICAg
IFN0cmluZ0J1ZmZlciBidWYgPSBuZXcgU3RyaW5nQnVmZmVyKCk7CiAgICAgICAgIGZvciAoaW50
IGkgPSAwOyBpIDwgcHJlYXJncy5sZW5ndGg7IGkrKykgewogICAgICAgICAgIGFsbEFyZ3NbaW5k
ZXgrK10gPSBkZWNvcmF0ZUxpbmtlck9wdGlvbihidWYsIHByZWFyZ3NbaV0pOwpJbmRleDogc3Jj
L21haW4vamF2YS9uZXQvc2YvYW50Y29udHJpYi9jcHB0YXNrcy9Qcm9jZXNzb3JEZWYuamF2YQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBzcmMvbWFpbi9qYXZhL25ldC9zZi9hbnRjb250cmliL2NwcHRhc2tzL1By
b2Nlc3NvckRlZi5qYXZhCShyZXZpc2lvbiAxNzcpCisrKyBzcmMvbWFpbi9qYXZhL25ldC9zZi9h
bnRjb250cmliL2NwcHRhc2tzL1Byb2Nlc3NvckRlZi5qYXZhCSh3b3JraW5nIGNvcHkpCkBAIC03
MSw2ICs3MSw3IEBACiAgICAgcHJpdmF0ZSBib29sZWFuIGluaGVyaXQ7CiAgICAgcHJpdmF0ZSBC
b29sZWFuIGxpYnRvb2wgPSBudWxsOwogICAgIHByb3RlY3RlZCBib29sZWFuIG5ld0Vudmlyb25t
ZW50ID0gZmFsc2U7CisgICAgcHJpdmF0ZSBTdHJpbmcgYmluX3BhdGggPSBudWxsOwogICAgIC8q
KgogICAgICAqIFByb2Nlc3Nvci4KICAgICAgKi8KQEAgLTU2OCw2ICs1NjksMTUgQEAKICAgICBw
dWJsaWMgdm9pZCBzZXROZXdlbnZpcm9ubWVudChib29sZWFuIG5ld2VudikgewogICAgICAgICBu
ZXdFbnZpcm9ubWVudCA9IG5ld2VudjsKICAgICB9CisKKyAgICBwdWJsaWMgdm9pZCBzZXRCaW4o
U3RyaW5nIHBhdGgpIHsKKyAgICAgICAgdGhpcy5iaW5fcGF0aCA9IHBhdGg7CisgICAgfQorCisg
ICAgcHVibGljIFN0cmluZyBnZXRCaW5QYXRoKCkgeworICAgICAgICByZXR1cm4gdGhpcy5iaW5f
cGF0aDsKKyAgICB9CisKICAgICAvKioKICAgICAgKiBTZXRzIHRoZSBwcm9jZXNzb3IKICAgICAg
KiAK
--_004_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
--_004_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
Ant-contrib-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ant-contrib-developers
--_004_C2522D317533D545B75749D9242795D20E59BACBFMSMSX102amrcor_--