Author: hibou
Date: Wed Aug 28 21:14:40 2013
New Revision: 1518387
URL: http://svn.apache.org/r1518387
Log:
Review the build, use the latest and greatest of Ivy's OSGi support
Added:
ant/sandbox/antdsl/branches/import-experiment/build/ (with props)
ant/sandbox/antdsl/branches/import-experiment/build/.project (with props)
ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml (with
props)
ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml (with
props)
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml (with
props)
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy.xml
(with props)
ant/sandbox/antdsl/branches/import-experiment/p2repo/ (with props)
ant/sandbox/antdsl/branches/import-experiment/p2repo/.project (with props)
ant/sandbox/antdsl/branches/import-experiment/p2repo/build.xml (with
props)
ant/sandbox/antdsl/branches/import-experiment/p2repo/category.xml (with
props)
Removed:
ant/sandbox/antdsl/branches/import-experiment/build.xml
ant/sandbox/antdsl/branches/import-experiment/ivy-fixed.xml
ant/sandbox/antdsl/branches/import-experiment/ivy.xml
ant/sandbox/antdsl/branches/import-experiment/ivysettings.xml
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 28 21:14:40 2013
@@ -0,0 +1 @@
+repo-caches
Added: ant/sandbox/antdsl/branches/import-experiment/build/.project
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/.project?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/build/.project (added)
+++ ant/sandbox/antdsl/branches/import-experiment/build/.project Wed Aug 28
21:14:40 2013
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>antdsl-build</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/.project
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/.project
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml (added)
+++ ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml Wed Aug
28 21:14:40 2013
@@ -0,0 +1,18 @@
+<!--
+ 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.
+-->
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/ASL2-header.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml (added)
+++ ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml Wed Aug
28 21:14:40 2013
@@ -0,0 +1,52 @@
+<!--
+ 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="antdsl-build-all" default="build-all">
+
+ <import file="common-build.xml" />
+
+ <target name="clean">
+ <ant antfile="${antdsl-root.dir}/org.apache.ant.antdsl/build.xml"
target="clean" dir="${antdsl-root.dir}/org.apache.ant.antdsl" />
+ <ant antfile="${antdsl-root.dir}/org.apache.ant.antdsl.ui/build.xml"
target="clean" dir="${antdsl-root.dir}/org.apache.ant.antdsl.ui" />
+ <ant
antfile="${antdsl-root.dir}/org.apache.ant.antdsl.feature/build.xml"
target="clean" dir="${antdsl-root.dir}/org.apache.ant.antdsl.feature" />
+ <ant antfile="${antdsl-root.dir}/p2repo/build.xml" target="clean"
dir="${antdsl-root.dir}/p2repo" />
+ </target>
+
+ <target name="build-all">
+ <!-- first, let's generate the code -->
+ <ant antfile="${antdsl-root.dir}/org.apache.ant.antdsl/build.xml"
target="generate-antlr" dir="${antdsl-root.dir}/org.apache.ant.antdsl" />
+ <ant antfile="${antdsl-root.dir}/org.apache.ant.antdsl/build.xml"
target="generate-xtext" dir="${antdsl-root.dir}/org.apache.ant.antdsl" />
+
+ <ant antfile="${antdsl-root.dir}/org.apache.ant.antdsl/build.xml"
target="install" dir="${antdsl-root.dir}/org.apache.ant.antdsl">
+ <property name="antdsl.version.full"
value="${antdsl.version.full}" />
+ </ant>
+
+ <ant antfile="${antdsl-root.dir}/org.apache.ant.antdsl.ui/build.xml"
target="install" dir="${antdsl-root.dir}/org.apache.ant.antdsl.ui">
+ <property name="antdsl.version.full"
value="${antdsl.version.full}" />
+ </ant>
+
+ <ant
antfile="${antdsl-root.dir}/org.apache.ant.antdsl.feature/build.xml"
target="install" dir="${antdsl-root.dir}/org.apache.ant.antdsl.feature">
+ <property name="antdsl.version.full"
value="${antdsl.version.full}" />
+ </ant>
+
+ <ant antfile="${antdsl-root.dir}/p2repo/build.xml"
target="generate-snapshots-repo" dir="${antdsl-root.dir}/p2repo">
+ <property name="antdsl.version.full"
value="${antdsl.version.full}" />
+ </ant>
+ </target>
+
+</project>
\ No newline at end of file
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/build-all.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml?rev=1518387&view=auto
==============================================================================
---
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
(added)
+++
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
Wed Aug 28 21:14:40 2013
@@ -0,0 +1,61 @@
+<!--
+ 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="antdsl-common-build-feature"
xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <property name="target.dir" location="${basedir}/target" />
+
+ <target name="clean" description="Clean build artifacts">
+ <delete dir="${target.dir}" />
+ </target>
+
+ <target name="build" description="Build the jar">
+ <loadresource property="antdsl.symbolicname">
+ <file file="feature.xml" />
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern="<feature"/>
+ </linecontainsregexp>
+ <striplinebreaks />
+ <tokenfilter>
+ <replaceregex pattern=".*id="([^"]*)".*"
replace="\1" flags="gi" />
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <copy file="feature.properties" todir="${target.dir}/classes" />
+ <copy file="feature.xml" todir="${target.dir}/classes"
overwrite="true">
+ <filterchain>
+ <tokenfilter>
+ <replaceregex
pattern="(.*<feature.*version=")[^"]*(".*)"
replace="\1${antdsl.version.full}\2" flags="gi" />
+ <replaceregex pattern="(.*<plugin
id="org.apache.ant.antdsl.*version=")[^"]*(".*)"
replace="\1${antdsl.version.full}\2" flags="gi" />
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ <jar
destfile="${target.dir}/${antdsl.symbolicname}_${antdsl.version.full}.jar"
basedir="${target.dir}/classes" />
+ </target>
+
+ <target name="install" depends="init,build">
+ <mkdir dir="${p2repo.dir}/dist/snapshots/features" />
+ <delete failonerror="false">
+ <fileset dir="${p2repo.dir}/dist/snapshots/features"
includes="${antdsl.symbolicname}_*.jar" />
+ </delete>
+ <copy
file="${target.dir}/${antdsl.symbolicname}_${antdsl.version.full}.jar"
todir="${p2repo.dir}/dist/snapshots/features" />
+ <ivy:buildobr baseDir="${p2repo.dir}/dist/snapshots/"
out="${p2repo.dir}/dist/snapshots/obr.xml" indent="true" />
+ </target>
+
+</project>
\ No newline at end of file
Propchange:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-feature.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
(added)
+++ ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
Wed Aug 28 21:14:40 2013
@@ -0,0 +1,93 @@
+<!--
+ 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="antdsl-common-build-plugin"
xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <property name="target.dir" location="${basedir}/target" />
+
+ <target name="clean" description="Clean build artifacts">
+ <delete dir="${target.dir}" />
+ </target>
+
+ <target name="clean-gen" description="Clean generated files">
+ <delete dir="${basedir}/src-gen" />
+ <delete dir="${basedir}/xtend-gen" />
+ <mkdir dir="${basedir}/src-gen" />
+ <mkdir dir="${basedir}/xtend-gen" />
+ </target>
+
+ <target name="ivy:resolve" depends="init,ivy:configure">
+ <property name="ivy.resolve.confs" value="compile,runtime" />
+ <ivy:resolve file="${basedir}/ivy.xml" conf="${ivy.resolve.confs}"
type="jar,bundle" uncompress="true" />
+ <ivy:cachepath pathid="compile.classpath" conf="compile"
type="jar,bundle" uncompress="true" osgi="true" />
+ <ivy:cachepath pathid="runtime.classpath" conf="runtime"
type="jar,bundle" uncompress="true" osgi="true" />
+ </target>
+
+ <target name="update-deps" depends="init,ivy:configure"
description="Update dependencies (to be called on ivy-manifest.xml or
MANIFEST.MF change)">
+ <ivy:resolve file="${basedir}/ivy-manifest.xml" conf="*" type="jar"
uncompress="true" resolveId="update-deps" />
+ <ivy:fixdeps tofile="${basedir}/ivy.xml" resolveId="update-deps">
+ <keep org="bundle" module="org.apache.ant.antdsl" />
+ <keep org="bundle" module="org.apache.ant.antdsl.ui" />
+ </ivy:fixdeps>
+ </target>
+
+ <target name="build" depends="ivy:resolve" description="Build the jar">
+ <loadresource property="antdsl.symbolicname">
+ <file file="META-INF/MANIFEST.MF" />
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern="Bundle-SymbolicName:"/>
+ </linecontainsregexp>
+ <striplinebreaks />
+ <tokenfilter>
+ <replaceregex pattern="Bundle-SymbolicName: (.*);.*"
replace="\1" flags="gi" />
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <mkdir dir="${target.dir}/classes/META-INF" />
+ <copy todir="${target.dir}/classes/META-INF"
file="META-INF/MANIFEST.MF" overwrite="true">
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="Bundle-Version: (.*)"
replace="Bundle-Version: ${antdsl.version.full}" flags="gi" />
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ <mkdir dir="${basedir}/src-gen" />
+ <javac srcdir="${basedir}/src/:${basedir}/src-gen/"
destdir="${target.dir}/classes" debug="on" includeantruntime="false"
source="1.7" target="1.7" classpathref="compile.classpath" />
+ <copy todir="${target.dir}/classes">
+ <fileset dir="${basedir}/src">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="${basedir}/src-gen">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="${basedir}" includes="META-INF/**/*,plugin.xml" />
+ </copy>
+ <jar
destfile="${target.dir}/${antdsl.symbolicname}_${antdsl.version.full}.jar"
basedir="${target.dir}/classes"
manifest="${target.dir}/classes/META-INF/MANIFEST.MF" />
+ </target>
+
+ <target name="install" depends="build">
+ <mkdir dir="${p2repo.dir}/dist/snapshots/plugins" />
+ <delete failonerror="false">
+ <fileset dir="${p2repo.dir}/dist/snapshots/plugins"
includes="${antdsl.symbolicname}_*.jar" />
+ </delete>
+ <copy
file="${target.dir}/${antdsl.symbolicname}_${antdsl.version.full}.jar"
todir="${p2repo.dir}/dist/snapshots/plugins" />
+ <ivy:buildobr baseDir="${p2repo.dir}/dist/snapshots/"
out="${p2repo.dir}/dist/snapshots/obr.xml" indent="true" />
+ </target>
+
+</project>
\ No newline at end of file
Propchange:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
ant/sandbox/antdsl/branches/import-experiment/build/common-build-plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml (added)
+++ ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml Wed
Aug 28 21:14:40 2013
@@ -0,0 +1,94 @@
+<!--
+ 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="antdsl-common-build" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <dirname property="antdsl-common-build.dir"
file="${ant.file.antdsl-common-build}" />
+ <property name="antdsl-root.dir" location="${antdsl-common-build.dir}/.."
/>
+ <property name="build-deps.dir" location="${antdsl-root.dir}/build-deps" />
+ <property name="p2repo.dir" location="${antdsl-root.dir}/p2repo" />
+
+ <property name="ivy.version" value="2.4.0-alpha" />
+
+ <property file="${basedir}/build.properties" />
+
+ <loadresource property="antdsl.version">
+ <file
file="${antdsl-root.dir}/org.apache.ant.antdsl/META-INF/MANIFEST.MF" />
+ <filterchain>
+ <linecontainsregexp>
+ <regexp pattern="Bundle-Version:"/>
+ </linecontainsregexp>
+ <striplinebreaks />
+ <tokenfilter>
+ <replaceregex pattern="Bundle-Version: (.*)\.qualifier"
replace="\1" flags="gi" />
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <tstamp />
+ <property name="antdsl.version.qualifier" value="dev" />
+ <property name="antdsl.version.full"
value="${antdsl.version}.${DSTAMP}${TSTAMP}-${antdsl.version.qualifier}" />
+
+ <target name="-check-build-deps">
+ <condition property="build-deps.exist">
+ <and>
+ <available
file="${build-deps.dir}/antlr-3.5-complete-no-st3.jar" />
+
+ <available file="${build-deps.dir}/antlr3-task/ant-antlr3.jar"
/>
+
+ <available file="${build-deps.dir}/ivy-${ivy.version}.jar" />
+
+ <available file="${build-deps.dir}/antlr-generator-3.2.0.jar"
/>
+
+ <available file="${build-deps.dir}/ant-contrib-20020829.jar" />
+ </and>
+ </condition>
+ <mkdir dir="${user.home}/.ivy2/lib/" />
+ </target>
+
+ <target name="-download-build-deps" depends="-check-build-deps"
unless="build-deps.exist">
+ <mkdir dir="${build-deps.dir}" />
+
+ <get
src="https://builds.apache.org/pview/job/Ivy/lastSuccessfulBuild/artifact/trunk/build/artifact/jars/ivy.jar";
dest="${build-deps.dir}/ivy-${ivy.version}.jar" usetimestamp="true" />
+
+ <get
src="http://www.antlr3.org/download/antlr-3.5-complete-no-st3.jar";
dest="${build-deps.dir}/antlr-3.5-complete-no-st3.jar" usetimestamp="true" />
+
+ <get src="http://download.itemis.com/antlr-generator-3.2.0.jar";
dest="${build-deps.dir}/antlr-generator-3.2.0.jar" usetimestamp="true" />
+ <copy file="${build-deps.dir}/antlr-generator-3.2.0.jar"
tofile="${antdsl-root.dir}/org.apache.ant.antdsl/.antlr-generator-3.2.0.jar" />
+
+ <get src="http://www.antlr.org/share/1169924912745/antlr3-task.zip";
dest="${build-deps.dir}/antlr3-task.zip" usetimestamp="true" />
+ <unzip src="${build-deps.dir}/antlr3-task.zip"
dest="${build-deps.dir}" />
+
+ <get
src="http://repo1.maven.org/maven2/ant-contrib/ant-contrib/20020829/ant-contrib-20020829.jar";
dest="${build-deps.dir}/ant-contrib-20020829.jar" usetimestamp="true" />
+ </target>
+
+ <target name="init" depends="-download-build-deps">
+ <taskdef name="antlr3" classname="org.apache.tools.ant.antlr.ANTLR3">
+ <classpath>
+ <pathelement
path="${build-deps.dir}/antlr-3.5-complete-no-st3.jar" />
+ <pathelement
path="${build-deps.dir}/antlr3-task/ant-antlr3.jar" />
+ </classpath>
+ </taskdef>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant"
classpath="${build-deps.dir}/ivy-${ivy.version}.jar" />
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
uri="antlib:net.sf.antcontrib"
classpath="${build-deps.dir}/ant-contrib-20020829.jar" />
+ </target>
+
+ <target name="ivy:configure" depends="init">
+ <ivy:configure file="${antdsl-common-build.dir}/ivysettings.xml" />
+ </target>
+
+</project>
\ No newline at end of file
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/common-build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml (added)
+++ ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml Wed Aug
28 21:14:40 2013
@@ -0,0 +1,52 @@
+<!--
+ 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.
+-->
+<ivysettings>
+
+ <settings defaultResolver="all" defaultLatestStrategy="latest-osgi" />
+
+ <property name="caches.basedir" value="${ivy.settings.dir}/repo-caches" />
+
+ <caches resolutionCacheDir="${caches.basedir}/resolution-cache">
+ <cache name="eclipse-juno" basedir="${caches.basedir}/eclipse-juno" />
+ <cache name="xtext" basedir="${caches.basedir}/xtext" />
+ <cache name="itemis" basedir="${caches.basedir}/itemis" />
+ <cache name="ivyde-snapshots"
basedir="${caches.basedir}/ivyde-snapshots" />
+ <cache name="snapshots" basedir="${caches.basedir}/snapshots" />
+ </caches>
+
+ <resolvers>
+ <obr name="snapshots"
repoXmlFile="${ivy.settings.dir}/../p2repo/dist/snapshots/obr.xml"
cache="snapshots" requirementStrategy="first" />
+ <updatesite name="eclipse-juno"
url="http://download.eclipse.org/releases/juno"; cache="eclipse-juno"
requirementStrategy="first" />
+ <updatesite name="xtext"
url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/";
cache="xtext" requirementStrategy="first" />
+ <updatesite name="itemis"
url="http://download.itemis.com/updates/milestones"; cache="itemis"
requirementStrategy="first" />
+ <updatesite name="ivyde-snapshots"
url="https://builds.apache.org/job/IvyDE-updatesite/lastSuccessfulBuild/artifact/trunk/build/";
cache="ivyde-snapshots" requirementStrategy="first" />
+ <ibiblio name="maven2" m2compatible="true"/>
+
+ <chain name="all" returnFirst="true">
+ <resolver ref="snapshots" />
+ <resolver ref="xtext" />
+ <resolver ref="itemis" />
+ <resolver ref="ivyde-snapshots" />
+ <resolver ref="eclipse-juno" />
+ <resolver ref="maven2" />
+ </chain>
+
+ </resolvers>
+
+</ivysettings>
\ No newline at end of file
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/build/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml?rev=1518387&view=auto
==============================================================================
---
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
(added)
+++
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
Wed Aug 28 21:14:40 2013
@@ -0,0 +1,24 @@
+<!--
+ 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="antdsl-ui" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <import file="../build/common-build.xml" />
+ <import file="../build/common-build-plugin.xml" />
+
+</project>
\ No newline at end of file
Propchange:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml?rev=1518387&view=auto
==============================================================================
---
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
(added)
+++
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
Wed Aug 28 21:14:40 2013
@@ -0,0 +1,51 @@
+<!--
+ 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.
+-->
+<ivy-module version="2.0">
+ <info organisation="org.apache.ant.antdsl" module="antdsl-ui">
+ <extends organisation="bundle" module="org.apache.ant.antdsl.ui"
revision="1.0.0" location="META-INF/MANIFEST.MF"/>
+ </info>
+ <configurations>
+ <conf name="compile" extends="generate" />
+ <conf name="runtime" extends="default" />
+ <conf name="generate" extends="optional" />
+ </configurations>
+ <dependencies>
+ <!-- ambiguity fix -->
+ <dependency org="bundle" name="org.apache.log4j"
rev="1.2.15.v201012070815" conf="*->default" />
+ <dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823"
conf="*->default" />
+ <dependency org="bundle" name="org.apache.commons.lang"
rev="2.6.0.v201205030909" conf="*->default" />
+ <dependency org="bundle" name="org.apache.commons.logging"
rev="1.1.1.v201101211721" conf="*->default" />
+
+ <!-- fragment -->
+ <dependency org="bundle" name="org.eclipse.swt.cocoa.macosx.x86_64"
rev="[3,)" conf="*->default" />
+
+ <!-- provided -->
+ <exclude org="package" module="javax.xml.parsers" />
+ <exclude org="package" module="javax.xml.transform" />
+ <exclude org="package" module="javax.xml.transform.dom" />
+ <exclude org="package" module="javax.xml.transform.stream" />
+ <exclude org="package" module="org.xml.sax" />
+ <exclude org="package" module="org.xml.sax.helpers" />
+ <exclude org="package" module="org.xml.sax.ext" />
+ <exclude org="package" module="org.w3c.dom" />
+ <exclude org="package" module="org.w3c.dom.events" />
+ <exclude org="package" module="org.w3c.dom.css" />
+ <exclude org="package" module="javax.annotation" />
+ </dependencies>
+</ivy-module>
Propchange:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy-manifest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
