Excuse the change in subject line... Mark Hindess wrote: > With this change, the awt dependencies should now be automated for > windows and at least fairly trivial (installing a few packages on > Linux[0]). I think it is time we removed the with.awt.swing flag. > Anyone object?
To the contrary, ditch it. > Please test the current setup with -Dwith.awt.swing=true and report any > problems. Problem 1: My machine is too slow running all these tests. Regards, Tim > [0] Details of the required packages for distributions other than > Debian/Ubuntu would be welcome. > > On 4 October 2006 at 10:24, [EMAIL PROTECTED] wrote: >> Author: hindessm >> Date: Wed Oct 4 03:24:29 2006 >> New Revision: 452826 >> >> URL: http://svn.apache.org/viewvc?view=rev&rev=452826 >> Log: >> Update check/fetch depends targets to handle the awt dependencies. >> >> Modified: >> incubator/harmony/enhanced/classlib/trunk/depends/libs/build/ (props ch >> anged) >> incubator/harmony/enhanced/classlib/trunk/depends/libs/windows.x86/ (pr >> ops changed) >> incubator/harmony/enhanced/classlib/trunk/make/depends.properties >> incubator/harmony/enhanced/classlib/trunk/make/depends.xml >> >> Propchange: incubator/harmony/enhanced/classlib/trunk/depends/libs/build/ >> ----------------------------------------------------------------------------- >> - >> --- svn:ignore (original) >> +++ svn:ignore Wed Oct 4 03:24:29 2006 >> @@ -1,3 +1,4 @@ >> jpeg >> lcms >> png >> +winxp_2006-09-28.txt >> >> Propchange: incubator/harmony/enhanced/classlib/trunk/depends/libs/windows.x8 >> 6/ >> ----------------------------------------------------------------------------- >> - >> --- svn:ignore (original) >> +++ svn:ignore Wed Oct 4 03:24:29 2006 >> @@ -1 +1,2 @@ >> msvcr71.dll >> +swing_awt_deps_winxp_2006-09-28.tgz >> >> Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties >> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/m >> ake/depends.properties?view=diff&rev=452826&r1=452825&r2=452826 >> ============================================================================= >> = >> --- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (origin >> al) >> +++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Wed Oct >> 4 03:24:29 2006 >> @@ -98,3 +98,11 @@ >> servlet-api.jar=${jetty.dir}/servlet-api-2.5-6.0.0.jar >> servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e >> servlet-api.url=${ibiblio.base}/maven2/jetty/servlet-api/2.5-6.0.0/servlet-a >> pi-2.5-6.0.0.jar >> + >> +people.apache.base=http://people.apache.org/~geirm/harmony/ >> +awtdeps.dir=${depends.dir}/libs/windows.x86 >> +awtdeps.tar=${awtdeps.dir}/swing_awt_deps_winxp_2006-09-28.tgz >> +awtdeps.url=${people.apache.base}swing_awt_deps_winxp_2006-09-28.tgz >> +awtdeps.md5=d61a27e4b305d9fcabaaacf34f8f534a >> +awtdeps.extract.dir=${depends.dir}/libs/build >> +awtdeps.testfile=${awtdeps.extract.dir}/winxp_2006-09-28.txt >> >> Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml >> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/m >> ake/depends.xml?view=diff&rev=452826&r1=452825&r2=452826 >> ============================================================================= >> = >> --- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original) >> +++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Wed Oct 4 03: >> 24:29 2006 >> @@ -72,17 +72,22 @@ >> >> </target> >> >> - <target name="-check-win" if="is.windows"> >> + <target name="-check-win" if="is.windows" >> + depends="-really-check-win,-awt-tar-extract" /> >> + >> + <target name="-really-check-win" if="is.windows"> >> >> <check-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" /> >> >> - </target> >> + <check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" /> >> + >> + <uptodate property="awtdeps.uptodate" >> + srcfile="${awtdeps.tar}" >> + targetfile="${awtdeps.testfile}" /> >> >> - <target name="-check-unix" if="with.awt.swing"> >> - <antcall target="--check-unix" /> >> </target> >> >> - <target name="--check-unix" if="is.unix"> >> + <target name="-check-unix" if="is.unix"> >> >> <property name="lcms.msg" >> value="liblcms development package not installed >> @@ -214,6 +219,10 @@ >> <download-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" >> md5="${msvcr71.md5}" /> >> >> + <mkdir dir="${awtdeps.dir}" /> >> + <download-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" >> + md5="${awtdeps.md5}" /> >> + >> </target> >> >> <macrodef name="download-one-file"> >> @@ -298,6 +307,14 @@ >> <jar destfile="${bcprov.jar}" basedir="${bcprov.dir}/temp" >> manifest="${bcprov.dir}/temp/META-INF/MANIFEST.MF" /> >> <delete dir="${bcprov.dir}/temp" /> >> + </target> >> + >> + <target name="-awt-tar-extract" unless="awtdeps.uptodate"> >> + <echo>Extracting awt dependencies</echo> >> + <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}" >> + compression="gzip" /> >> + <echo file="${awtdeps.testfile}" >> + message="${awtdeps.tar} extracted${line.separator}" /> >> </target> >> >> <macrodef name="check-one-link"> >> > > > > --------------------------------------------------------------------- > Terms of use : http://incubator.apache.org/harmony/mailing.html > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- Tim Ellison ([EMAIL PROTECTED]) IBM Java technology centre, UK. --------------------------------------------------------------------- Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
