Return-Path: Delivered-To: apmail-harmony-dev-archive@www.apache.org Received: (qmail 22272 invoked from network); 11 Dec 2006 18:18:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Dec 2006 18:18:51 -0000 Received: (qmail 15884 invoked by uid 500); 11 Dec 2006 18:18:55 -0000 Delivered-To: apmail-harmony-dev-archive@harmony.apache.org Received: (qmail 15855 invoked by uid 500); 11 Dec 2006 18:18:55 -0000 Mailing-List: contact dev-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list dev@harmony.apache.org Received: (qmail 15846 invoked by uid 99); 11 Dec 2006 18:18:55 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Dec 2006 10:18:55 -0800 X-ASF-Spam-Status: No, hits=1.4 required=10.0 tests=SPF_HELO_PASS,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (herse.apache.org: 216.86.168.178 is neither permitted nor denied by domain of geir@pobox.com) Received: from [216.86.168.178] (HELO mxout-03.mxes.net) (216.86.168.178) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Dec 2006 10:18:43 -0800 Received: from [192.168.1.104] (unknown [67.86.14.213]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.mxes.net (Postfix) with ESMTP id 7A2C951934 for ; Mon, 11 Dec 2006 13:18:22 -0500 (EST) Message-ID: <457DA0EE.9020907@pobox.com> Date: Mon, 11 Dec 2006 13:18:22 -0500 From: "Geir Magnusson Jr." Reply-To: geir@pobox.com User-Agent: Thunderbird 1.5.0.8 (Macintosh/20061025) MIME-Version: 1.0 To: dev@harmony.apache.org Subject: Re: svn commit: r485680 - /harmony/enhanced/drlvm/trunk/build/make/build.xml References: <20061211143908.85EBF1A9846@eris.apache.org> <208da7a50612110832r10d400c3ycc4e9fa118990eb4@mail.gmail.com> <457D8A5D.1030400@pobox.com> <457D8C79.1060505@pobox.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org whew :) Gregory Shimansky wrote: > Gregory Shimansky wrote: >> Geir Magnusson Jr. wrote: >>> ok - I fixed and committed, and now am testing. I know that's >>> backwards, but I figure I didn't break it more :) I'll ping when I >>> think it's right. >> >> Your fix helped on linux, but on windows cunit tests still can't find >> HYTHR.dll although build sets PATH variable to include VM dirs. That's >> the one thing I don't understand in cunit tests. > > Sorry for a false alarm. After clean rebuild cunit tests work again. > >>> Geir Magnusson Jr. wrote: >>>> >>>> >>>> Gregory Shimansky wrote: >>>>> Hello Geir >>>>> >>>>> Looks like this commit broke all drlvm tests. I've fixed JVMTI >>>>> tests, but I >>>>> can't figure out how to fix cunit ones. Smoke and kernel are >>>>> probably broken >>>>> too, the execution doesn't get to them. You've changed the >>>>> definition of >>>>> build.deploy.dir, so everywhere where it is used the build should be >>>>> corrected. >>>> >>>> Ah - thanks for the heads up. >>>> >>>> geir >>>> >>>>> >>>>> 2006/12/11, geirm@apache.org : >>>>>> >>>>>> Author: geirm >>>>>> Date: Mon Dec 11 06:39:06 2006 >>>>>> New Revision: 485680 >>>>>> >>>>>> URL: http://svn.apache.org/viewvc?view=rev&rev=485680 >>>>>> Log: >>>>>> more fixes towards a better jdk deployment >>>>>> >>>>>> >>>>>> Modified: >>>>>> harmony/enhanced/drlvm/trunk/build/make/build.xml >>>>>> >>>>>> Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml >>>>>> URL: >>>>>> http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=485680&r1=485679&r2=485680 >>>>>> >>>>>> >>>>>> ============================================================================== >>>>>> >>>>>> --- harmony/enhanced/drlvm/trunk/build/make/build.xml (original) >>>>>> +++ harmony/enhanced/drlvm/trunk/build/make/build.xml Mon Dec 11 >>>>>> 06:39:06 >>>>>> 2006 >>>>>> @@ -226,7 +226,7 @@ >>>>>> >>>>>> >>>>>> >>>>>> - >>>>> location="../${build.os.short >>>>>> }_${build.arch}_${build.cxx}_${build.cfg}/deploy/jre" /> >>>>>> + >>>>> location="../${build.os.short >>>>>> }_${build.arch}_${build.cxx}_${build.cfg}/deploy" /> >>>>>> >>>>>> >>>>>> >>>>>> @@ -476,24 +476,24 @@ >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> - >>>>>> + >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> - >>>>> file="${build.deploy.dir}/bin" /> >>>>>> + >>>>> file="${build.deploy.dir}/jdk/jre/bin" >>>>>> /> >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> @@ -507,17 +507,6 @@ >>>>>> >>>>>> >>>>>> - >>>>>> - >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> @@ -602,7 +596,7 @@ >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> @@ -614,7 +608,7 @@ >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> + >>>>>> >>>>>> Apache Harmony JRE with DRLVM >>>>>> Binary Release for ${build.os}*/${build.arch} >>>>>> @@ -642,7 +636,7 @@ >>>>>> >>>>>> >>>>>> >>>>>> - >>>>>> + >>>>> append="true"> >>>>>> >>>>>> >>>>>> JIT EXECUTION MODE >>>>>> @@ -653,15 +647,15 @@ >>>>>> right after the executable name. >>>>>> >>>>>> >>>>>> - >>>>> includes="readme.txt" /> >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>> depends="plugin.antcontrib, >>>>>> set.semis.dirs"> >>>>>> - >>>>>> + >>>>>> >>>>>> - >>>>>> + >>>>>> >>>>>> >>>>>> >>>>>> @@ -669,7 +663,7 @@ >>>>>> >>>>>> >>>>>> >>>>>> - >>>>> /> >>>>>> + >>>>> includes="*.htm >>>>>> *.css" /> >>>>>> >>>>>> >>>>>> >>>>>> @@ -700,20 +694,20 @@ >>>>>> >>>>>> >>>>> regexp="(.+),\s*" replace="${build.@{deploy.property.tail}.pattern}," >>>>>> global="true" defaultValue="${component.deploy.filenames}" >>>>>> override="true" >>>>>> /> >>>>>> >>>>>> - >>>>>> + >>>>> dir="${build.deploy.dir}/jdk/jre/${ >>>>>> component.deploy.filedir}" /> >>>>>> >>>>>> >>>>>> - >>>>> todir="${build.deploy.dir}/${ >>>>>> component.deploy.filedir}" verbose="true"> >>>>>> + >>>>>> >>>>> dir="${build.semi.dir >>>>>> }/${component.as.path}/_jar" >>>>>> includes="${component.deploy.filenames}" /> >>>>>> >>>>>> >>>>>> >>>>>> - >>>>> todir="${build.deploy.dir}/${ >>>>>> component.deploy.filedir}" verbose="true"> >>>>>> + >>>>>> >>>>> dir="${build.semi.dir >>>>>> }/${component.as.path}/_other" >>>>>> includes="${component.deploy.filenames}" /> >>>>>> >>>>>> >>>>>> >>>>>> - >>>>> todir="${build.deploy.dir}/${ >>>>>> component.deploy.filedir}" verbose="true"> >>>>>> + >>>>>> >>>>> dir="${build.semi.dir >>>>>> }/${component.as.path}/_bin" >>>>>> includes="${component.deploy.filenames}" /> >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >>>>> >>>>> >>> >> >> > >