ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1566448 [3/7] - in /ant/sandbox/antdsl/branches/import-experiment: ./ build/ org.apache.ant.antdsl.xtext.tests/ org.apache.ant.antdsl.xtext.tests/META-INF/ org.apache.ant.antdsl.xtext.ui/ org.apache.ant.antdsl.xtext/ org.apache.ant.antdsl....
Date Sun, 09 Feb 2014 22:03:27 GMT
Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/.classpath
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/.classpath?rev=1566448&r1=1566447&r2=1566448&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/META-INF/MANIFEST.MF?rev=1566448&r1=1566447&r2=1566448&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/META-INF/MANIFEST.MF
(original)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/META-INF/MANIFEST.MF
Sun Feb  9 22:03:26 2014
@@ -6,9 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: org.apache.ant.antdsl.xtext;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.xbase;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
@@ -18,10 +16,10 @@ Require-Bundle: org.eclipse.xtext;visibi
  org.eclipse.emf.common,
  org.antlr.runtime,
  org.eclipse.xtext.common.types,
- org.apache.ant;bundle-version="1.8.0",
- org.apache.ivy;bundle-version="2.4.0",
- org.eclipse.osgi;bundle-version="3.8.2",
- org.apache.ant.antdsl;bundle-version="1.0.0"
+ org.apache.ant,
+ org.apache.ivy,
+ org.eclipse.osgi,
+ org.apache.ant.antdsl
 Import-Package: org.apache.log4j,
  org.apache.commons.logging,
  org.eclipse.xtext.xbase.lib,

Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.properties
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.properties?rev=1566448&r1=1566447&r2=1566448&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.properties
(original)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.properties
Sun Feb  9 22:03:26 2014
@@ -16,6 +16,7 @@
 #	 * specific language governing permissions and limitations
 #	 * under the License.
 #	 ***************************************************************
+ivy.update-deps.confs=compile,runtime,generate
 source.. = src/,\
           src-gen
 bin.includes = META-INF/,\

Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.xml?rev=1566448&r1=1566447&r2=1566448&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.xml (original)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/build.xml Sun
Feb  9 22:03:26 2014
@@ -22,7 +22,7 @@
     <import file="../build/common-build-plugin.xml" />
 
     <target name="ivy:resolve" depends="antdsl-common-build-plugin.ivy:resolve">
-        <ivy:cachepath pathid="generate.classpath" conf="generate" type="jar" uncompress="true"
osgi="true" />
+        <ivy:cachepath pathid="generate.classpath" conf="generate" type="jar" osgi="true"
/>
     </target>
 
     <target name="generate-xtext" depends="ivy:resolve" description="Generate XText and
Ecore files for the full plugin">

Modified: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/ivy-manifest.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/ivy-manifest.xml?rev=1566448&r1=1566447&r2=1566448&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/ivy-manifest.xml
(original)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.xtext/ivy-manifest.xml
Sun Feb  9 22:03:26 2014
@@ -17,48 +17,24 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.ant" module="ant-dsl">
-        <extends organisation="bundle" module="org.apache.ant.antdsl" revision="1.0.0"
location="META-INF/MANIFEST.MF"/>
+    <info organisation="org.apache.ant" module="antdsl-xtext">
+        <extends organisation="bundle" module="org.apache.ant.antdsl.xtext" revision="1.0.0"
location="META-INF/MANIFEST.MF"/>
     </info>
     <configurations>
-        <conf name="compile" extends="generate" />
+        <conf name="compile" extends="default" />
         <conf name="runtime" extends="default" />
-        <conf name="generate" extends="optional" />
+        <conf name="generate" extends="runtime" />
     </configurations>
     <dependencies>
-        <!-- ambiguity fix -->
-        <dependency org="bundle" name="org.apache.log4j" rev="1.2.15.v201005080500" conf="default->default"
/>
-        <dependency org="bundle" name="org.apache.commons.logging" rev="1.1.1.v201101211721"
conf="default->default" />
-        <dependency org="bundle" name="com.ibm.icu" rev="4.4.2.v20110823" conf="default->default"
/>
-        <dependency org="bundle" name="org.eclipse.xtext.xbase.lib" rev="2.4.2.v201306120542"
conf="default->default" />
-        <dependency org="bundle" name="org.eclipse.emf.mwe.utils" rev="1.3.0.v201306110341"
conf="default->default" />
-        <dependency org="bundle" name="org.eclipse.ui.forms" rev="3.5.200.v20120521-2329"
conf="default->default" />
-        <dependency org="bundle" name="org.eclipse.equinox.util" rev="1.0.400.v20120917-192807"
conf="default->default" />
-
-        <!-- force use of this version over the OTDT one -->
+        <!-- force use of this version over the OTDT one >
         <dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.3.v20130121-145325"
conf="*->default" force="true" />
         <dependency org="bundle" name="org.eclipse.jdt.compiler.apt" rev="1.0.600.v20130116-050536"
conf="*->default" force="true" />
-        <dependency org="bundle" name="org.eclipse.jdt.compiler.tool" rev="1.0.200.v20130116-050536"
conf="*->default" force="true" />
-
-        <!-- some optional dependency we do need -->
-        <dependency org="bundle" name="org.eclipse.emf.mwe2.lib" rev="2.4.0+" conf="generate->default"
/>
-
-        <!-- FIXME: we need to get this from a real OSGi repo with OSGi coordinates -->
-        <dependency org="org.apache.felix" name="org.apache.felix.framework" rev="4.0.3"
conf="default->default,sources" />
-        <dependency org="org.apache.ant" name="ant" rev="1.9.2" conf="default->default,sources"
/>
-        <exclude org="bundle" module="org.apache.ant" conf="*" />
+        <dependency org="bundle" name="org.eclipse.jdt.compiler.tool" rev="1.0.200.v20130116-050536"
conf="*->default" force="true" /-->
 
-        <!-- 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.css" />
-        <exclude org="package" module="org.w3c.dom.events" />
-        <exclude org="package" module="javax.annotation" />
+        <!-- for generation -->
+        <dependency org="bundle" name="org.eclipse.emf.mwe2.launch" rev="[2.5,3.0)" conf="generate->default"
/>
+        <dependency org="bundle" name="org.eclipse.emf.mwe2.lib" rev="[2.5,3.0)" conf="generate->default"
/>
+        <dependency org="bundle" name="org.eclipse.xtext.generator" rev="[2.5,3.0)" conf="generate->default"
/>
+        <dependency org="bundle" name="org.eclipse.emf.codegen.ecore" rev="[2.9,3.0)"
conf="generate->default" />
     </dependencies>
 </ivy-module>



Mime
View raw message