You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/11/29 04:49:14 UTC
svn commit: r480380 - in /harmony/enhanced/common_resources: ./ .project
build.xml build/ build/depends.properties build/depends.xml
build/properties.xml svn-commit.tmp
Author: geirm
Date: Tue Nov 28 19:49:14 2006
New Revision: 480380
URL: http://svn.apache.org/viewvc?view=rev&rev=480380
Log:
simple attempt at a common resource area to share
Added:
harmony/enhanced/common_resources/
harmony/enhanced/common_resources/.project (with props)
harmony/enhanced/common_resources/build/
harmony/enhanced/common_resources/build.xml (with props)
harmony/enhanced/common_resources/build/depends.properties (with props)
harmony/enhanced/common_resources/build/depends.xml (with props)
harmony/enhanced/common_resources/build/properties.xml (with props)
harmony/enhanced/common_resources/svn-commit.tmp
Added: harmony/enhanced/common_resources/.project
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/.project?view=auto&rev=480380
==============================================================================
--- harmony/enhanced/common_resources/.project (added)
+++ harmony/enhanced/common_resources/.project Tue Nov 28 19:49:14 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>common_resources</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange: harmony/enhanced/common_resources/.project
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/common_resources/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build.xml?view=auto&rev=480380
==============================================================================
--- harmony/enhanced/common_resources/build.xml (added)
+++ harmony/enhanced/common_resources/build.xml Tue Nov 28 19:49:14 2006
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+
+<!-- ======================================================================
+ Build source and lay out results in the required format
+ ====================================================================== -->
+<project name="common-resources" default="fetch-depends" basedir=".">
+ <description>
+ Fetch common resources
+ </description>
+
+ <target name="help">
+ <echo>
+Apache Harmony Ant Build
+
+Usage:
+
+ ant fetch-depends
+ Fetches all the common dependencies
+
+ ant clean
+ Removes all the files fetched
+
+
+ ant properties
+ Display the common properties that are use in the ant build files.
+
+ </echo>
+ </target>
+
+
+ <!-- import properties for snapshot targets -->
+ <import file="${basedir}/build/properties.xml" />
+
+
+ <target name="clean" description="Removes all the files generated by a build" />
+
+ <!-- =================================
+ target: -properties
+ ================================= -->
+ <target name="-properties" depends="svn-prop">
+ <property name="deploy.file.prefix"
+ value="incubator-harmony-classlib-r${svn.revision}" />
+ <property name="deploy.tar"
+ value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.tar.gz" />
+ <property name="deploy.zip"
+ value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.zip" />
+ </target>
+
+
+
+ <target name="check-depends"
+ description="Report on whether the dependencies are met">
+ <ant antfile="build/depends.xml" inheritall="false" target="check" />
+ </target>
+
+ <target name="fetch-depends"
+ description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
+ <ant antfile="build/depends.xml" inheritall="false" target="download" />
+ </target>
+
+ <target name="properties" depends="echo"
+ description="Display the properties that are use in the ant build files"
+ />
+
+ <macrodef name="chksum">
+ <attribute name="file" />
+ <attribute name="type" default="md5" />
+ <sequential>
+ <checksum property="@{file}.@{type}" file="@{file}"
+ algorithm="@{type}" />
+ <echo file="@{file}.@{type}"
+ message="${@{file}.@{type}} @{file}${line.separator}" />
+ </sequential>
+ </macrodef>
+
+</project>
+
Propchange: harmony/enhanced/common_resources/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/common_resources/build/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/depends.properties?view=auto&rev=480380
==============================================================================
--- harmony/enhanced/common_resources/build/depends.properties (added)
+++ harmony/enhanced/common_resources/build/depends.properties Tue Nov 28 19:49:14 2006
@@ -0,0 +1,116 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+depends.dir=depends
+depends.jars=${depends.dir}/jars
+ibiblio.base=http://www.ibiblio.org
+
+xalan.dir=${depends.jars}/xalan-j_2.7.0
+xalan.jar=${xalan.dir}/xalan.jar
+xalan.url=${ibiblio.base}/maven/xalan/jars/xalan-2.7.0.jar
+xalan.md5=a018d032c21a873225e702b36b171a10
+
+xerces.dir=${depends.jars}/xerces_2.8.0
+resolver.jar=${xerces.dir}/resolver.jar
+resolver.url=${ibiblio.base}/maven/xml-resolver/jars/xml-resolver-1.1.jar
+resolver.md5=39546d6a7f9cf0fd971874d43214dbe4
+
+xerces.impl.jar=${xerces.dir}/xercesImpl.jar
+xerces.impl.url=${ibiblio.base}/maven/xerces/jars/xercesImpl-2.8.0.jar
+xerces.impl.md5=7eb2db331a62e74744ab79aab5b454bd
+
+xml.apis.jar=${xerces.dir}/xml-apis.jar
+xml.apis.url=${ibiblio.base}/maven/xml-apis/jars/xml-apis-1.3.03.jar
+xml.apis.md5=6dee9238dd2900171197104951940778
+
+junit.dir=${depends.jars}/junit_3.8.2
+junit.jar=${junit.dir}/junit.jar
+junit.url=${ibiblio.base}/maven2/junit/junit/3.8.2/junit-3.8.2.jar
+junit.md5=28e7eb9eeefe31a657c68755bfccc541
+
+# will the next person to update bcprov.jar please remove the "signed."
+# prefix from the bcprov.jar property
+bcprov.dir=${depends.jars}/bcprov-jdk14-134
+bcprov.jar=${bcprov.dir}/signed.bcprov.jar
+bcprov.md5=dac389845d499bfa901f30bbe63250d1
+bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-134.jar
+
+msvcr71.dir=${depends.dir}/libs/windows.x86
+msvcr71.dll=${msvcr71.dir}/msvcr71.dll
+msvcr71.url=http://www.dlldump.com/dllfiles/M/MSVCR71.dll
+msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
+
+icu4j.dir=${depends.jars}/icu4j_3.4.4
+icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
+icu4j.url=${ibiblio.base}/maven2/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
+icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
+
+ecj.dir=${depends.jars}/ecj_3.2
+ecj.jar=${ecj.dir}/ecj_3.2.jar
+ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar
+ecj.md5=633e14a4dc14ca578b5548c3c088172f
+
+mx4j.dir=${depends.jars}/mx4j_3.0.1
+mx4j.jar=${mx4j.dir}/mx4j.jar
+mx4j.url=${ibiblio.base}/maven/mx4j/jars/mx4j-3.0.1.jar
+mx4j.md5=7a8675e26ee20f997ad4f54091e9b7a5
+
+mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
+mx4j.remote.url=${ibiblio.base}/maven/mx4j/jars/mx4j-remote-3.0.1.jar
+mx4j.remote.md5=bacb72e0fcad4259825c7cac1a0efe43
+
+yoko.dir=${depends.jars}/yoko_M1-20061027
+yoko.jar=${yoko.dir}/yoko.jar
+yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-incubating-M1-SNAPSHOT/yoko-spec-corba-1.0-incubating-M1-20061027.123852-2.jar
+yoko.md5=4725194d89a8451ab27a92545983789d
+
+yoko-rmi.dir=${depends.jars}/yoko_M1-20061027
+yoko-rmi.jar=${yoko-rmi.dir}/yoko-rmi.jar
+yoko-rmi.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi/1.0-incubating-M1-SNAPSHOT/yoko-rmi-1.0-incubating-M1-20061027.123852-2.jar
+yoko-rmi.md5=399402d33a0efed38539100727db2779
+
+# bcel is needed by yoko-rmi
+bcel.dir=${depends.jars}/bcel-5.2
+bcel.jar=${bcel.dir}/bcel-5.2.jar
+bcel.url=${ibiblio.base}/maven2/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+bcel.md5=43d54687362fc2991d61201c453a8286
+
+jetty.dir=${depends.jars}/jetty
+jetty.jar=${jetty.dir}/jetty-6.0.0.jar
+jetty.md5=930507973c9ad19a874af06f10be7223
+jetty.url=${ibiblio.base}/maven2/jetty/jetty/6.0.0/jetty-6.0.0.jar
+
+jetty-util.jar=${jetty.dir}/jetty-util-6.0.0.jar
+jetty-util.md5=7cf65d83814718afdd1d3bd74f8799fc
+jetty-util.url=${ibiblio.base}/maven2/jetty/jetty-util/6.0.0/jetty-util-6.0.0.jar
+
+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-api-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
+
+cpptasks.dir=${depends.jars}/cpptasks-1.0b4
+cpptasks.jarname=cpptasks.jar
+cpptasks.jar=${cpptasks.dir}/${cpptasks.jarname}
+cpptasks.zip=${cpptasks.dir}/cpptasks-1.0b4.zip
+cpptasks.url=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
+cpptasks.md5=118e601b58a48519208efa9893c7c5c0
Propchange: harmony/enhanced/common_resources/build/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/common_resources/build/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/depends.xml?view=auto&rev=480380
==============================================================================
--- harmony/enhanced/common_resources/build/depends.xml (added)
+++ harmony/enhanced/common_resources/build/depends.xml Tue Nov 28 19:49:14 2006
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
+
+ -->
+
+<project name="dependencies" default="check" basedir="..">
+ <description>
+ Confirm that dependencies are present and fetch missing dependencies
+ where possible.
+ </description>
+
+ <property file="build/depends.properties" />
+ <import file="${basedir}/build/properties.xml" />
+
+ <target name="check" description="Check whether dependencies are available"
+ depends="-check,-check-win,-check-unix" />
+
+ <target name="-check">
+ <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
+ <check-one-file src="${yoko-rmi.url}" dest="${yoko-rmi.jar}" />
+ <check-one-file src="${bcel.url}" dest="${bcel.jar}" />
+ <check-one-file src="${xalan.url}" dest="${xalan.jar}" />
+ <check-one-file src="${resolver.url}" dest="${resolver.jar}" />
+ <check-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}" />
+ <check-one-file src="${xml.apis.url}" dest="${xml.apis.jar}" />
+ <check-one-file src="${junit.url}" dest="${junit.jar}" />
+ <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
+ <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
+ <check-one-file src="${mx4j.url}" dest="${mx4j.jar}" />
+ <check-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}" />
+ <check-one-file src="${ecj.url}" dest="${ecj.jar}" />
+ <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
+ <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
+ <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
+ <check-one-file src="${cpptasks.url}" dest="${cpptasks.jar}" />
+ </target>
+
+ <target name="-check-win" if="is.windows" depends="-really-check-win" />
+
+ <target name="-really-check-win" if="is.windows">
+ <check-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" />
+ <check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
+ <uptodate property="awtdeps.uptodate"
+ srcfile="${awtdeps.tar}"
+ targetfile="${awtdeps.testfile}" />
+ <antcall target="-awt-tar-extract" />
+ </target>
+
+ <!--
+ * FIXME : the following awful little hack is because we noticed that for whatever
+ * reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
+ -->
+
+ <target name="-check-unix-common" if="is.unix">
+
+ <property name="lcms.msg"
+ value="liblcms development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
+${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev
+${line.separator}For Fedora try: yum install lcms-devel" />
+ <mkdir dir="depends/libs/build/lcms" />
+ <check-one-link src="${lcms.home}/include/icc34.h"
+ dest="depends/libs/build/lcms/icc34.h"
+ message="${lcms.msg}" />
+ <check-one-link src="${lcms.home}/include/lcms.h"
+ dest="depends/libs/build/lcms/lcms.h"
+ message="${lcms.msg}" />
+
+ <property name="png.msg"
+ value="libpng development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
+${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
+${line.separator}For Fedora try: yum install libpng-devel" />
+ <mkdir dir="depends/libs/build/png" />
+ <check-one-link src="${png.home}/include/pngconf.h"
+ dest="depends/libs/build/png/pngconf.h"
+ message="${png.msg}" />
+ <check-one-link src="${png.home}/include/png.h"
+ dest="depends/libs/build/png/png.h"
+ message="${png.msg}" />
+
+ <property name="jpeg.msg"
+ value="libjpeg development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
+${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
+${line.separator}For Fedora try: yum install libjpeg-devel" />
+ <mkdir dir="depends/libs/build/jpeg" />
+ <check-one-link src="${jpeg.home}/include/jconfig.h"
+ dest="depends/libs/build/jpeg/jconfig.lnx"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jpeglib.h"
+ dest="depends/libs/build/jpeg/jpeglib.h"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jmorecfg.h"
+ dest="depends/libs/build/jpeg/jmorecfg.h"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jerror.h"
+ dest="depends/libs/build/jpeg/jerror.h"
+ message="${jpeg.msg}" />
+ </target>
+
+ <target name="-check-unix-x86" if="is.x86" unless="is.windows" depends="-check-unix-common">
+ <check-one-link src="${lcms.home}/lib/liblcms.a"
+ dest="depends/libs/build/lcms/liblcms.${hy.platform}"
+ message="${lcms.msg}" />
+
+ <check-one-link src="${png.home}/lib/libpng.a"
+ dest="depends/libs/build/png/libpng.${hy.platform}"
+ message="${png.msg}" />
+
+ <check-one-link src="${jpeg.home}/lib/libjpeg.a"
+ dest="depends/libs/build/jpeg/libjpeg.${hy.platform}"
+ message="${jpeg.msg}" />
+ </target>
+
+ <target name="-check-unix-x86_64" if="is.x86_64" unless="is.windows" depends="-check-unix-common">
+ <check-one-link src="${lcms.home}/lib/liblcms.so"
+ dest="depends/libs/build/lcms/liblcms.${hy.platform}"
+ message="${lcms.msg}" />
+
+ <check-one-link src="${png.home}/lib/libpng.so"
+ dest="depends/libs/build/png/libpng.${hy.platform}"
+ message="${png.msg}" />
+
+ <check-one-link src="${jpeg.home}/lib/libjpeg.so"
+ dest="depends/libs/build/jpeg/libjpeg.${hy.platform}"
+ message="${jpeg.msg}" />
+ </target>
+
+ <target name="-check-unix" if="is.unix" depends="-check-unix-x86, -check-unix-x86_64">
+
+<!-- <property name="lcms.msg"
+ value="liblcms development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
+${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev
+${line.separator}For Fedora try: yum install lcms-devel" />
+ <mkdir dir="depends/libs/build/lcms" />
+ <check-one-link src="${lcms.home}/lib/liblcms.a"
+ dest="depends/libs/build/lcms/liblcms.${hy.platform}"
+ message="${lcms.msg}" />
+ <check-one-link src="${lcms.home}/include/icc34.h"
+ dest="depends/libs/build/lcms/icc34.h"
+ message="${lcms.msg}" />
+ <check-one-link src="${lcms.home}/include/lcms.h"
+ dest="depends/libs/build/lcms/lcms.h"
+ message="${lcms.msg}" />
+
+
+ <property name="png.msg"
+ value="libpng development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
+${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
+${line.separator}For Fedora try: yum install libpng-devel" />
+ <mkdir dir="depends/libs/build/png" />
+ <check-one-link src="${png.home}/lib/libpng.a"
+ dest="depends/libs/build/png/libpng.${hy.platform}"
+ message="${png.msg}" />
+ <check-one-link src="${png.home}/include/pngconf.h"
+ dest="depends/libs/build/png/pngconf.h"
+ message="${png.msg}" />
+ <check-one-link src="${png.home}/include/png.h"
+ dest="depends/libs/build/png/png.h"
+ message="${png.msg}" />
+
+
+ <property name="jpeg.msg"
+ value="libjpeg development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
+${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
+${line.separator}For Fedora try: yum install libjpeg-devel" />
+ <mkdir dir="depends/libs/build/jpeg" />
+ <check-one-link src="${jpeg.home}/lib/libjpeg.a"
+ dest="depends/libs/build/jpeg/libjpeg.${hy.platform}"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jconfig.h"
+ dest="depends/libs/build/jpeg/jconfig.lnx"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jpeglib.h"
+ dest="depends/libs/build/jpeg/jpeglib.h"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jmorecfg.h"
+ dest="depends/libs/build/jpeg/jmorecfg.h"
+ message="${jpeg.msg}" />
+ <check-one-link src="${jpeg.home}/include/jerror.h"
+ dest="depends/libs/build/jpeg/jerror.h"
+ message="${jpeg.msg}" />
+ -->
+
+ </target>
+
+ <target name="download" description="Download required jars"
+ depends="-download,-download-win" />
+
+ <target name="-download">
+
+ <mkdir dir="${yoko.dir}" />
+ <download-one-file src="${yoko.url}" dest="${yoko.jar}"
+ md5="${yoko.md5}" />
+
+ <mkdir dir="${yoko-rmi.dir}" />
+ <download-one-file src="${yoko-rmi.url}" dest="${yoko-rmi.jar}"
+ md5="${yoko-rmi.md5}" />
+
+ <mkdir dir="${bcel.dir}" />
+ <download-one-file src="${bcel.url}" dest="${bcel.jar}"
+ md5="${bcel.md5}" />
+
+ <mkdir dir="${xalan.dir}" />
+ <download-one-file src="${xalan.url}" dest="${xalan.jar}"
+ md5="${xalan.md5}" />
+
+ <mkdir dir="${xerces.dir}" />
+ <download-one-file src="${resolver.url}" dest="${resolver.jar}"
+ md5="${resolver.md5}" />
+
+ <download-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}"
+ md5="${xerces.impl.md5}" />
+
+ <download-one-file src="${xml.apis.url}" dest="${xml.apis.jar}"
+ md5="${xml.apis.md5}" />
+
+ <mkdir dir="${junit.dir}" />
+ <download-one-file src="${junit.url}" dest="${junit.jar}"
+ md5="${junit.md5}" />
+
+ <mkdir dir="${bcprov.dir}" />
+ <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
+ md5="${bcprov.md5}" />
+
+ <mkdir dir="${icu4j.dir}" />
+ <download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
+ md5="${icu4j.md5}" />
+
+ <mkdir dir="${mx4j.dir}" />
+ <download-one-file src="${mx4j.url}" dest="${mx4j.jar}"
+ md5="${mx4j.md5}" />
+
+ <download-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}"
+ md5="${mx4j.remote.md5}" />
+
+ <mkdir dir="${ecj.dir}" />
+ <download-one-file src="${ecj.url}" dest="${ecj.jar}"
+ md5="${ecj.md5}" />
+
+ <mkdir dir="${jetty.dir}" />
+ <download-one-file src="${jetty.url}" dest="${jetty.jar}"
+ md5="${jetty.md5}" />
+
+ <download-one-file src="${jetty-util.url}" dest="${jetty-util.jar}"
+ md5="${jetty-util.md5}" />
+
+ <download-one-file src="${servlet-api.url}" dest="${servlet-api.jar}"
+ md5="${servlet-api.md5}" />
+
+ <mkdir dir="${cpptasks.dir}" />
+ <download-one-file src="${cpptasks.url}" dest="${cpptasks.zip}"
+ md5="${cpptasks.md5}" />
+
+ <unzip src="${cpptasks.zip}" dest="${depends.jars}">
+ <patternset>
+ <include name="cpptasks-1.0b4/${cpptasks.jarname}"/>
+ </patternset>
+ </unzip>
+
+ </target>
+
+ <target name="-download-win" if="is.windows">
+
+ <mkdir dir="${msvcr71.dir}" />
+ <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">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <attribute name="md5" />
+ <sequential>
+ <echo>Checking @{dest}</echo>
+ <available file="@{dest}" type="file"
+ property="@{dest}.exists" />
+ <antcall target="-really-download">
+ <param name="src" value="@{src}" />
+ <param name="dest" value="@{dest}" />
+ </antcall>
+ <checksum file="@{dest}" property="@{dest}.md5" />
+ <condition property="@{dest}.md5.verified" value="true">
+ <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
+ </condition>
+ <antcall target="-remove-file-if-bad">
+ <param name="jar" value="@{dest}" />
+ </antcall>
+ <fail unless="@{dest}.md5.verified">
+...
+
+File @{dest} has incorrect md5 checksum. Expected:
+ @{md5}
+found:
+ ${@{dest}.md5}
+
+ </fail>
+ <echo>Checksum verified (${@{dest}.md5.verified})</echo>
+ </sequential>
+ </macrodef>
+
+ <target name="-really-download" unless="${dest}.exists">
+ <echo>Fetching ${dest}</echo>
+ <get src="${src}" dest="${dest}" usetimestamp="true" verbose="true" />
+ </target>
+
+ <target name="-remove-file-if-bad" unless="${dest}.md5.verified">
+ <delete file="${dest}" />
+ </target>
+
+ <macrodef name="check-one-file">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <sequential>
+ <echo>Checking for @{dest}</echo>
+ <available file="@{dest}" type="file"
+ property="@{dest}.exists" />
+ <fail>
+ <condition>
+ <not>
+ <isset property="@{dest}.exists" />
+ </not>
+ </condition>
+...
+
+Missing dependency. The jar from:
+
+ @{src}
+
+should be downloaded to:
+
+ @{dest}
+
+Run "ant fetch-depends" to automatically fetch dependencies.
+Note: Some of Harmony's dependencies are licensed under terms other
+than the Apache License v2.
+ </fail>
+ </sequential>
+ </macrodef>
+
+ <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">
+ <attribute name="src" />
+ <attribute name="dest" />
+ <attribute name="message" />
+ <sequential>
+ <echo>Checking for @{dest}</echo>
+ <available file="@{dest}" type="file"
+ property="@{dest}.exists" />
+ <available file="@{src}" type="file"
+ property="@{src}.exists" />
+ <fail>
+ <condition>
+ <and>
+ <not>
+ <isset property="@{dest}.exists" />
+ </not>
+ <not>
+ <isset property="@{src}.exists" />
+ </not>
+ </and>
+ </condition>
+...
+
+Missing dependency. The file from:
+
+ @{src}
+
+should be linked to:
+
+ @{dest}
+
+But @{src} doesn't exist.
+@{message}
+ </fail>
+ <antcall target="-really-link">
+ <param name="src" value="@{src}" />
+ <param name="dest" value="@{dest}" />
+ </antcall>
+ </sequential>
+ </macrodef>
+
+ <target name="-really-link" unless="${dest}.exists">
+ <echo>Linking ${dest}</echo>
+ <symlink resource="${src}" link="${basedir}/${dest}" />
+ </target>
+
+</project>
Propchange: harmony/enhanced/common_resources/build/depends.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/common_resources/build/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/build/properties.xml?view=auto&rev=480380
==============================================================================
--- harmony/enhanced/common_resources/build/properties.xml (added)
+++ harmony/enhanced/common_resources/build/properties.xml Tue Nov 28 19:49:14 2006
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
+
+ -->
+
+<project name="Top-Level property definitions" default="echo" basedir="..">
+ <description>
+ Ant file of common properties to be imported by other ant files
+ </description>
+
+ <!-- Javac properties -->
+ <!-- Explicitly set to ECJ as the default compiler. -->
+ <property name="hy.javac.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ <property name="hy.javac.source" value="1.5" />
+ <property name="hy.javac.target" value="1.5" />
+ <property name="hy.javac.debug" value="on" />
+ <property name="hy.javac.maxmem" value="384M" />
+
+ <!-- Test run property -->
+ <property name="hy.test.forkmode" value="once" />
+ <property name="hy.test.timeout" value="900000" />
+ <property name="hy.test.vm.name" value="ibm" />
+
+ <!-- Conditions for operating systems -->
+ <condition property="is.windows">
+ <os family="Windows" />
+ </condition>
+ <condition property="is.linux">
+ <os name="linux" />
+ </condition>
+ <condition property="is.unix">
+ <os family="unix" />
+ </condition>
+
+ <!-- Normalized operating system name -->
+
+ <!-- this special case makes sense -->
+ <condition property="hy.os" value="windows">
+ <isset property="is.windows"/>
+ </condition>
+ <condition property="hy.os" value="linux">
+ <os name="linux" />
+ </condition>
+
+ <property name="hy.os" value="${os.name}" />
+
+
+
+ <!-- Conditions for different architectures -->
+ <condition property="is.x86_64">
+ <or>
+ <equals arg1="x86_64" arg2="${os.arch}"/>
+ <equals arg1="amd64" arg2="${os.arch}"/>
+ </or>
+ </condition>
+ <condition property="is.x86">
+ <and>
+ <not>
+ <isset property="is.x86_64" />
+ </not>
+ <or>
+ <equals arg1="x86" arg2="${os.arch}"/>
+ <equals arg1="i386" arg2="${os.arch}"/>
+ </or>
+ </and>
+ </condition>
+ <condition property="is.ia64">
+ <equals arg1="ia64" arg2="${os.arch}"/>
+ </condition>
+ <condition property="is.64bit">
+ <or>
+ <isset property="is.ia64" />
+ <isset property="is.x86_64" />
+ </or>
+ </condition>
+ <condition property="is.32bit">
+ <or>
+ <isset property="is.x86" />
+ </or>
+ </condition>
+ <condition property="hy.bits" value="32">
+ <isset property="is.32bit" />
+ </condition>
+ <property name="hy.bits" value="64" />
+
+ <!-- Normalized architecture name -->
+ <condition property="hy.arch" value="x86_64">
+ <isset property="is.x86_64" />
+ </condition>
+ <condition property="hy.arch" value="x86">
+ <and>
+ <isset property="is.x86" />
+ <isset property="is.32bit" />
+ </and>
+ </condition>
+ <property name="hy.arch" value="${os.arch}" />
+
+ <condition property="hy.arch.define" value="HYX86">
+ <equals arg1="${hy.arch}" arg2="x86"/>
+ </condition>
+ <condition property="hy.arch.define" value="HYX86_64">
+ <equals arg1="${hy.arch}" arg2="x86_64"/>
+ </condition>
+ <condition property="hy.arch.define" value="HYIA64">
+ <equals arg1="${hy.arch}" arg2="ia64"/>
+ </condition>
+
+ <condition property="hy.cflags" value="-fpic">
+ <equals arg1="${hy.arch}" arg2="x86_64"/>
+ </condition>
+ <condition property="hy.cflags" value="-march=pentium3">
+ <not>
+ <equals arg1="${hy.arch}" arg2="ia64"/>
+ </not>
+ </condition>
+
+ <!-- Normalized platform name -->
+ <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
+ <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
+
+ <condition property="exe.suffix" value=".exe">
+ <isset property="is.windows"/>
+ </condition>
+ <property name="exe.suffix" value="" />
+
+ <condition property="shlib.suffix" value=".dll">
+ <isset property="is.windows"/>
+ </condition>
+ <property name="shlib.suffix" value=".so" />
+
+ <condition property="linklib.suffix" value=".lib">
+ <isset property="is.windows"/>
+ </condition>
+ <property name="linklib.suffix" value=".so" />
+
+ <condition property="make.command" value="nmake.exe">
+ <isset property="is.windows"/>
+ </condition>
+ <property name="make.command" value="make" />
+
+ <property name="png.home" value="/usr" />
+ <property name="lcms.home" value="/usr" />
+ <property name="jpeg.home" value="/usr" />
+
+ <property name="build.compilerarg" value="-warn:none" />
+
+ <!-- default property for call-modules macro - i.e. all modules -->
+ <property name="build.module" value="*" />
+
+ <target name="echo" depends="svn-prop, svn-info"
+ description="Display the properties defined by this ant file" >
+ <echo>
+Harmony javac properties:
+
+ hy.javac.compiler = ${hy.javac.compiler}
+ hy.javac.target = ${hy.javac.target}
+ hy.javac.source = ${hy.javac.source}
+ hy.javac.debug = ${hy.javac.debug}
+ hy.javac.maxmem = ${hy.javac.maxmem}
+
+Harmony platform properties:
+
+ hy.os = ${hy.os}
+ hy.arch = ${hy.arch}
+ hy.bits = ${hy.bits}
+ hy.platform = ${hy.platform}
+ hy.platform.path = ${hy.platform.path}
+
+ is.windows = ${is.windows}
+ is.unix = ${is.unix}
+ is.linux = ${is.linux}
+ is.32bit = ${is.32bit}
+ is.64bit = ${is.64bit}
+ is.x86 = ${is.x86}
+ is.x86_64 = ${is.x86_64}
+ is.ia64 = ${is.ia64}
+
+ exe.suffix = ${exe.suffix}
+ shlib.suffix = ${shlib.suffix}
+ make.command = ${make.command}
+
+ hy.hdk = ${hy.hdk}
+ hy.cflags = ${hy.cflags}
+ hy.arch.define = ${hy.arch.define}
+
+
+The following property is only set if the "svn-prop" target has been
+called:
+
+ svn.revision = ${svn.revision}
+
+
+The following property is only set if the "svn-info" target has been
+called:
+
+ svn.info = ${svn.info}
+
+Ant native properties, for information, but please use Harmony
+properties in preference to these:
+
+ os.name = ${os.name}
+ os.arch = ${os.arch}
+
+ </echo>
+ </target>
+
+ <target name="svn-prop">
+ <exec executable="svn">
+ <arg value="--non-interactive" />
+ <arg value="info" />
+ <redirector outputproperty="svn.revision">
+ <outputfilterchain>
+ <linecontains>
+ <contains value="Revision: " />
+ </linecontains>
+ <tokenfilter>
+ <replacestring from="Revision: " to=""/>
+ </tokenfilter>
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ </target>
+
+ <target name="svn-info">
+ <exec executable="svn"
+ failifexecutionfails="false"
+ resultproperty="svn.rc">
+ <arg value="info" />
+ <redirector outputproperty="svn.info.tmp">
+ <outputfilterchain>
+ <linecontainsregexp>
+ <regexp pattern="Repository Root:|Revision:" />
+ </linecontainsregexp>
+ <tokenfilter>
+ <replacestring from="Repository Root: " to=""/>
+ <replacestring from="Revision: " to=" "/>
+ </tokenfilter>
+ <striplinebreaks/>
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ <condition property="svn.info" value="${svn.info.tmp}" >
+ <equals arg1="${svn.rc}" arg2="0" />
+ </condition>
+ <tstamp>
+ <format property="svn.info" pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
+ </tstamp>
+ </target>
+
+ <macrodef name="call-modules">
+ <attribute name="target" />
+ <sequential>
+ <subant target="@{target}">
+ <dirset dir="modules" includes="${build.module}" />
+ </subant>
+ </sequential>
+ </macrodef>
+
+ <!-- macros for modules -->
+ <!-- TOFIX move to a shared file in the HDK/build/make directory. -->
+
+ <macrodef name="make">
+ <attribute name="dir" />
+ <attribute name="target" default="" />
+ <sequential>
+ <exec failonerror="true"
+ executable="${make.command}"
+ dir="@{dir}">
+ <env key="HY_HDK" value="${hy.hdk}" />
+ <env key="HY_ARCH" value="${hy.arch}" />
+ <env key="HY_OS" value="${hy.os}" />
+ <env key="HY_PLATFORM" value="${hy.platform}" />
+ <env key="HY_CFLAGS" value="${hy.cflags}" />
+ <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
+ <arg line="@{target}" />
+ </exec>
+ </sequential>
+ </macrodef>
+</project>
Propchange: harmony/enhanced/common_resources/build/properties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/common_resources/svn-commit.tmp
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/svn-commit.tmp?view=auto&rev=480380
==============================================================================
--- harmony/enhanced/common_resources/svn-commit.tmp (added)
+++ harmony/enhanced/common_resources/svn-commit.tmp Tue Nov 28 19:49:14 2006
@@ -0,0 +1,11 @@
+simple attempt at a common resources area
+
+--This line, and those below, will be ignored--
+
+A .
+A build
+AM build/depends.xml
+AM build/properties.xml
+AM build/depends.properties
+AM .project
+AM build.xml