You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/07/20 23:01:50 UTC
svn commit: r796007 - in /felix/trunk/sigil: ./ bldcommon/
bldcommon/prepare/ common/ common/core.tests/ common/core/ common/junit/
common/obr/ eclipse/ eclipse/core/ eclipse/search/
Author: dsavage
Date: Mon Jul 20 21:01:49 2009
New Revision: 796007
URL: http://svn.apache.org/viewvc?rev=796007&view=rev
Log:
progress towards FELIX-1368
* bldcommon/prepare/build.xml downloads external eclipse dependencies to ivy cache
* set up ivy and build files for common and most of eclipse project
* set up sigil-repos.properties
Added:
felix/trunk/sigil/bldcommon/prepare/ (with props)
felix/trunk/sigil/bldcommon/prepare/build.xml
felix/trunk/sigil/bldcommon/prepare/ivy.xml
felix/trunk/sigil/common/build.xml
felix/trunk/sigil/common/core.tests/build.xml
felix/trunk/sigil/common/core.tests/ivy.xml
felix/trunk/sigil/common/core/build.xml
felix/trunk/sigil/common/core/ivy.xml
felix/trunk/sigil/common/obr/build.xml
felix/trunk/sigil/common/obr/ivy.xml
felix/trunk/sigil/eclipse/build.xml
felix/trunk/sigil/eclipse/core/build.xml
felix/trunk/sigil/eclipse/core/ivy.xml
Modified:
felix/trunk/sigil/ (props changed)
felix/trunk/sigil/bldcommon/build.properties
felix/trunk/sigil/bldcommon/common.xml
felix/trunk/sigil/bldcommon/ivysettings.xml
felix/trunk/sigil/bldcommon/sigil-repos.properties
felix/trunk/sigil/build.xml
felix/trunk/sigil/common/core/sigil.properties
felix/trunk/sigil/common/junit/build.xml
felix/trunk/sigil/common/junit/ivy.xml
felix/trunk/sigil/eclipse/search/sigil.properties
Propchange: felix/trunk/sigil/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 20 21:01:49 2009
@@ -0,0 +1 @@
+build
Modified: felix/trunk/sigil/bldcommon/build.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/build.properties?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/build.properties (original)
+++ felix/trunk/sigil/bldcommon/build.properties Mon Jul 20 21:01:49 2009
@@ -4,8 +4,8 @@
# set common.dir when used without ant (e.g. IvyDE)
common.dir = ${ivy.settings.dir}
-ivy.jar = ${common.dir}/../bld-ivy/lib/compile/ivy-2.0.0-rc1.jar
-sigil-ivy-plugin.jar = ${common.dir}/../bld-ivy/target/sigil-ivy-plugin.jar
+ivy.jar = ${common.dir}/sigil/ivy-2.0.0-rc1.jar
+sigil-ivy-plugin.jar = ${common.dir}/sigil/sigil-ivy-plugin.jar
build.dir = ${basedir}/build
build_xml = build.xml
Modified: felix/trunk/sigil/bldcommon/common.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/common.xml?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/common.xml (original)
+++ felix/trunk/sigil/bldcommon/common.xml Mon Jul 20 21:01:49 2009
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="common"
+<project name="bldcommon"
xmlns:ivy="antlib:org.apache.ivy.ant">
- <dirname property="common.dir" file="${ant.file.common}"/>
+ <dirname property="common.dir" file="${ant.file.bldcommon}"/>
<property file="${common.dir}/sigil-defaults.properties" prefix="default."/>
<property file="${common.dir}/build.properties"/>
@@ -141,8 +141,8 @@
<target name="compile" depends="resolve"
description="--> compile the project">
<!-- uncomment the following to debug classpath -->
- <!--pathconvert property="cp" refid="javac.classpath"/>
- <echo>Classpath - ${cp}</echo-->
+ <pathconvert property="cp" refid="javac.classpath"/>
+ <echo>Classpath - ${cp}</echo>
<mkdir dir="${classes.dir}" />
<javac srcdir="${src.dir}"
destdir="${classes.dir}"
Modified: felix/trunk/sigil/bldcommon/ivysettings.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/ivysettings.xml?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/ivysettings.xml (original)
+++ felix/trunk/sigil/bldcommon/ivysettings.xml Mon Jul 20 21:01:49 2009
@@ -21,7 +21,7 @@
<properties file="${ivy.settings.dir}/build.properties"/>
<caches defaultCacheDir="${cache.dir}" />
- <settings defaultResolver="local" circularDependencyStrategy="error" />
+ <settings defaultResolver="default" circularDependencyStrategy="error" />
<!--
<classpath file="${sigil-ivy-plugin.jar}" />
@@ -47,18 +47,26 @@
config="${ivy.settings.dir}/sigil-repos.properties"
extractBCP="true"/>
- <filesystem name="local">
- <ivy pattern="${repository.dir}/local/${repository.pattern}" />
- <artifact pattern="${repository.dir}/local/${repository.pattern}" />
- </filesystem>
-
- <filesystem name="shared">
- <ivy pattern="${repository.dir}/shared/${repository.pattern}" />
- <artifact pattern="${repository.dir}/shared/${repository.pattern}" />
- </filesystem>
+ <chain name="default" returnFirst="true">
+ <filesystem name="local">
+ <ivy pattern="${repository.dir}/local/${repository.pattern}" />
+ <artifact pattern="${repository.dir}/local/${repository.pattern}" />
+ </filesystem>
+
+ <filesystem name="shared">
+ <ivy pattern="${repository.dir}/shared/${repository.pattern}" />
+ <artifact pattern="${repository.dir}/shared/${repository.pattern}" />
+ </filesystem>
+
+ </chain>
+ <url name="eclipse">
+ <artifact pattern="http://download.eclipse.org/releases/ganymede/plugins/[module]_[revision].[ext]" />
+ <artifact pattern="http://download.eclipse.org/releases/ganymede/[module].[artifact]_[revision].[ext]" />
+ </url>
</resolvers>
<modules>
<module organisation="sigil" resolver="sigil"/>
+ <module organisation="org.eclipse" resolver="eclipse"/>
</modules>
</ivysettings>
Propchange: felix/trunk/sigil/bldcommon/prepare/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 20 21:01:49 2009
@@ -0,0 +1 @@
+build
Added: felix/trunk/sigil/bldcommon/prepare/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/prepare/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/bldcommon/prepare/build.xml (added)
+++ felix/trunk/sigil/bldcommon/prepare/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="prepare" default="resolve">
+ <import file="../common.xml"/>
+</project>
Added: felix/trunk/sigil/bldcommon/prepare/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/prepare/ivy.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/bldcommon/prepare/ivy.xml (added)
+++ felix/trunk/sigil/bldcommon/prepare/ivy.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,41 @@
+<ivy-module version="1.0">
+ <info organisation="org.apache"
+ module="felix.sigil.bldcommon.prepare"
+ status="integration"/>
+
+ <dependencies>
+ <!-- bundles -->
+ <dependency org="org.eclipse" name="org.eclipse.core.commands" rev="3.4.0.I20080509-2000" />
+ <dependency org="org.eclipse" name="org.eclipse.core.contenttype" rev="3.3.0.v20080604-1400" />
+ <dependency org="org.eclipse" name="org.eclipse.core.expressions" rev="3.4.1.r342_v20081203-0800" />
+ <dependency org="org.eclipse" name="org.eclipse.core.jobs" rev="3.4.1.R34x_v20081128" />
+ <dependency org="org.eclipse" name="org.eclipse.core.resources" rev="3.4.2.R34x_v20090126" />
+ <dependency org="org.eclipse" name="org.eclipse.debug.core" rev="3.4.1.v20090106_r342" />
+ <dependency org="org.eclipse" name="org.eclipse.debug.ui" rev="3.4.2.v20090110_r342" />
+ <dependency org="org.eclipse" name="org.eclipse.equinox.common" rev="3.4.0.v20080421-2006" />
+ <dependency org="org.eclipse" name="org.eclipse.jdt.core" rev="3.4.4.v_894_R34x" />
+ <dependency org="org.eclipse" name="org.eclipse.jdt.ui" rev="3.4.2.r342_v20090107-0800" />
+ <dependency org="org.eclipse" name="org.eclipse.jface.text" rev="3.4.2.r342_v20081119-0800" />
+ <dependency org="org.eclipse" name="org.eclipse.jface" rev="3.4.2.M20090107-0800" />
+ <dependency org="org.eclipse" name="org.eclipse.ltk.core.refactoring" rev="3.4.2.r342_v20081028-0800" />
+ <dependency org="org.eclipse" name="org.eclipse.pde.ui" rev="3.4.0.v20090202" />
+ <dependency org="org.eclipse" name="org.eclipse.swt.carbon.macosx" rev="3.4.1.v3452b" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.cheatsheets" rev="3.3.101.v20080702_34x" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.console" rev="3.3.1.v20090128_r342" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.editors" rev="3.4.0.v20080603-2000" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.forms" rev="3.3.103.v20081027_34x" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.ide" rev="3.4.2.M20090127-1700" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.workbench" rev="3.4.2.M20090127-1700" />
+
+ <dependency org="org.eclipse" name="org.eclipse.draw2d" rev="3.4.2.v20090114-1330" />
+ <dependency org="org.eclipse" name="org.eclipse.zest.core" rev="1.0.0.v20080115" />
+ <dependency org="org.eclipse" name="org.eclipse.zest.layouts" rev="1.0.0.v20080226" />
+ <!-- fragments -->
+ <dependency org="org.eclipse" name="org.eclipse.core.runtime" rev="3.4.0.v20080512" />
+ <dependency org="org.eclipse" name="org.eclipse.equinox.preferences" rev="3.2.201.R34x_v20080709" />
+ <dependency org="org.eclipse" name="org.eclipse.equinox.registry" rev="3.4.0.v20080516-0950" />
+ <dependency org="org.eclipse" name="org.eclipse.swt" rev="3.4.2.v3452b" />
+ <dependency org="org.eclipse" name="org.eclipse.text" rev="3.4.0.v20080605-1800" />
+ <dependency org="org.eclipse" name="org.eclipse.ui.workbench.texteditor" rev="3.4.1.r341_v20080827-1100" />
+ </dependencies>
+</ivy-module>
Modified: felix/trunk/sigil/bldcommon/sigil-repos.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/sigil-repos.properties?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/sigil-repos.properties (original)
+++ felix/trunk/sigil/bldcommon/sigil-repos.properties Mon Jul 20 21:01:49 2009
@@ -2,23 +2,25 @@
# repository config
--repositories: system, project, bld-common
+-repositories: system, project, bld-common, bld-hack
system;provider: system
system;level: -1
project;provider: project
project;level: 0
-project;pattern: ${..}/**/[sigilproject]
+project;pattern: \
+ ${..}/common/**/[sigilproject] \
+ ${..}/eclipse/**/[sigilproject] \
bld-common;provider: filesystem
bld-common;level: 1
bld-common;recurse: true
bld-common;dir: ${.}/lib
-spring;provider: obr
-spring;level: 2
-spring;url: http://sigil.codecauldron.org/spring-repository.obr
-spring;index: ../build/spring-repository.obr
+bld-hack;provider: filesystem
+bld-hack;level: 2
+bld-hack;recurse: true
+bld-hack;dir: ${.}/hack
# end
Modified: felix/trunk/sigil/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/build.xml?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/build.xml (original)
+++ felix/trunk/sigil/build.xml Mon Jul 20 21:01:49 2009
@@ -1,51 +1,8 @@
-<?xml version="1.0"?>
-<!--
- 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="Sigil" default="build">
-
- <target name="build-eclipse">
- <subant buildpath="sigil-builder" target="build"/>
- </target>
-
- <target name="build-ivy">
- <subant buildpath="bld-ivy" target="dist"/>
- </target>
-
- <target name="build-junit">
- <subant buildpath="bld-junit" target="install"/>
- <subant buildpath="bld-junit-cli" target="install"/>
- </target>
-
- <target name="clean">
- <delete dir="build" />
- <subant buildpath="sigil-builder" target="clean"/>
- <subant buildpath="bld-ivy" target="clean"/>
- <subant buildpath="bld-junit" target="clean"/>
- <subant buildpath="bld-junit-cli" target="clean"/>
- </target>
-
- <target name="build" depends="build-eclipse, build-ivy, build-junit" />
-
- <target name="ci-commit" depends="clean, build"/>
-
- <target name="ci-daily" depends="clean, build">
- <subant buildpath="sigil-builder" target="new.updateSite"/>
- </target>
-
+<project name="sigil" default="build-list">
+ <import file="bldcommon/common.xml"/>
+ <fileset id="my.projects" dir="${basedir}">
+ <exclude name="ivy/**/${build_xml}"/>
+ <exclude name="bldcommon/**/${build_xml}" />
+ <include name="**/${build_xml}"/>
+ </fileset>
</project>
Added: felix/trunk/sigil/common/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/build.xml (added)
+++ felix/trunk/sigil/common/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="common" default="build-list">
+ <import file="../bldcommon/common.xml"/>
+</project>
Added: felix/trunk/sigil/common/core.tests/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core.tests/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/core.tests/build.xml (added)
+++ felix/trunk/sigil/common/core.tests/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="core.tests" default="build">
+ <import file="../build.xml"/>
+</project>
Added: felix/trunk/sigil/common/core.tests/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core.tests/ivy.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/core.tests/ivy.xml (added)
+++ felix/trunk/sigil/common/core.tests/ivy.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,9 @@
+<ivy-module version="1.0">
+ <info
+ organisation="org.apache"
+ module="felix.sigil.common.core.tests"
+ status="integration"/>
+ <publications>
+ <artifact name="org.apache.felix.sigil.common.core.tests" />
+ </publications>
+</ivy-module>
Added: felix/trunk/sigil/common/core/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/core/build.xml (added)
+++ felix/trunk/sigil/common/core/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="common.core" default="build">
+ <import file="../build.xml"/>
+</project>
Added: felix/trunk/sigil/common/core/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/ivy.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/core/ivy.xml (added)
+++ felix/trunk/sigil/common/core/ivy.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,9 @@
+<ivy-module version="1.0">
+ <info
+ organisation="org.apache"
+ module="felix.sigil.common.core"
+ status="integration"/>
+ <publications>
+ <artifact name="org.apache.felix.sigil.common.core" />
+ </publications>
+</ivy-module>
Modified: felix/trunk/sigil/common/core/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/sigil.properties?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/common/core/sigil.properties (original)
+++ felix/trunk/sigil/common/core/sigil.properties Mon Jul 20 21:01:49 2009
@@ -32,4 +32,7 @@
org.eclipse.core.runtime;version=3.4.0, \
org.osgi.framework;version=1.4.0, \
+-libs: \
+ lib/bndlib.jar;kind=classpath, \
+
# end
Modified: felix/trunk/sigil/common/junit/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/build.xml?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/build.xml (original)
+++ felix/trunk/sigil/common/junit/build.xml Mon Jul 20 21:01:49 2009
@@ -18,6 +18,6 @@
under the License.
-->
-<project name="bld-junit" default="bundle" basedir=".">
- <import file="../bldcommon/common.xml"/>
+<project name="junit" default="bundle" basedir=".">
+ <import file="../build.xml"/>
</project>
Modified: felix/trunk/sigil/common/junit/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/junit/ivy.xml?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/common/junit/ivy.xml (original)
+++ felix/trunk/sigil/common/junit/ivy.xml Mon Jul 20 21:01:49 2009
@@ -19,10 +19,10 @@
-->
<ivy-module version="1.0">
<info
- organisation="org.cauldron"
- module="bld.junit"
+ organisation="org.apache"
+ module="felix.sigil.common.junit"
status="integration"/>
- <publications>
- <artifact name="org.cauldron.sigil.junit" />
- </publications>
+ <publications>
+ <artifact name="org.apache.felix.sigil.common.junit" />
+ </publications>
</ivy-module>
Added: felix/trunk/sigil/common/obr/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/obr/build.xml (added)
+++ felix/trunk/sigil/common/obr/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="core" default="build">
+ <import file="../build.xml"/>
+</project>
Added: felix/trunk/sigil/common/obr/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/obr/ivy.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/common/obr/ivy.xml (added)
+++ felix/trunk/sigil/common/obr/ivy.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,9 @@
+<ivy-module version="1.0">
+ <info
+ organisation="org.apache"
+ module="felix.sigil.common.obr"
+ status="integration"/>
+ <publications>
+ <artifact name="org.apache.felix.sigil.common.obr" />
+ </publications>
+</ivy-module>
Added: felix/trunk/sigil/eclipse/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/build.xml (added)
+++ felix/trunk/sigil/eclipse/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="eclipse" default="build-list">
+ <import file="../bldcommon/common.xml"/>
+</project>
Added: felix/trunk/sigil/eclipse/core/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/build.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/build.xml (added)
+++ felix/trunk/sigil/eclipse/core/build.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,3 @@
+<project name="eclipse.core" default="build">
+ <import file="../build.xml"/>
+</project>
Added: felix/trunk/sigil/eclipse/core/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/ivy.xml?rev=796007&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/ivy.xml (added)
+++ felix/trunk/sigil/eclipse/core/ivy.xml Mon Jul 20 21:01:49 2009
@@ -0,0 +1,9 @@
+<ivy-module version="1.0">
+ <info
+ organisation="org.apache"
+ module="felix.sigil.eclipse.core"
+ status="integration"/>
+ <publications>
+ <artifact name="org.apache.felix.sigil.eclipse.core" />
+ </publications>
+</ivy-module>
Modified: felix/trunk/sigil/eclipse/search/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/search/sigil.properties?rev=796007&r1=796006&r2=796007&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/search/sigil.properties (original)
+++ felix/trunk/sigil/eclipse/search/sigil.properties Mon Jul 20 21:01:49 2009
@@ -27,6 +27,9 @@
org.eclipse.ui.plugin;version=3.4.1, \
org.osgi.framework;version=1.4.0, \
+-libs: \
+ lib/bcel-5.2.jar;kind=classpath, \
+
-requires: \
org.eclipse.core.runtime;version=3.4.0, \