You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2013/08/28 23:14:40 UTC
svn commit: r1518387 [3/5] - in
/ant/sandbox/antdsl/branches/import-experiment: ./ build/
org.apache.ant.antdsl.ui/ org.apache.ant.antdsl/ p2repo/
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl.ui/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml (added)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml Wed Aug 28 21:14:40 2013
@@ -0,0 +1,83 @@
+<!--
+ 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" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <import file="../build/common-build.xml" />
+ <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" />
+ </target>
+
+ <target name="generate-antlr" depends="init" description="Generate the simple ANTLR parser">
+ <mkdir dir="${basedir}/src/org/apache/ant/antdsl/antlr" />
+ <antlr3 target="${basedir}/src/org/apache/ant/antdsl/AntDSL.g" outputdirectory="${basedir}/src/org/apache/ant/antdsl/antlr" />
+ </target>
+
+ <target name="generate-xtext" depends="ivy:resolve" description="Generate XText and Ecore files for the full plugin">
+ <java classname="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher" dir="${basedir}" fork="true" failonerror="true">
+ <jvmarg line="-Xmx256M" />
+ <classpath>
+ <pathelement path="${basedir}/src/" />
+ <pathelement path="${target.dir}/classes" />
+ <path refid="generate.classpath" />
+ </classpath>
+ <arg line="src/org/apache/ant/antdsl/xtext/GenerateAntDSL.mwe2" />
+ </java>
+ <delete file="src/org/apache/ant/antdsl/xtext/generator/AntDSLGenerator.xtend" />
+ </target>
+
+ <target name="test-xtext" description="Test the run of an antdsl file with Xtext-generated parser">
+ <loadpath pathid="antruntime.classpath" file=".antruntime.classpath" />
+ <typedef classname="org.apache.ant.antdsl.xtext.AntDslXTextProjectHelper" name="antDslProjectHelper">
+ <classpath>
+ <pathelement path="${basedir}/build/antdsl.jar" />
+ <path refid="antruntime.classpath" />
+ </classpath>
+ </typedef>
+ <projecthelper>
+ <antDslProjectHelper />
+ </projecthelper>
+ <ant antfile="test/build.ant" target="build" />
+ </target>
+
+ <target name="test-antlr" description="Test the run of an antdsl file with Xtext-generated parser">
+ <loadpath pathid="antruntime.classpath" file=".antruntime.classpath" />
+ <typedef classname="org.apache.ant.antdsl.antlr.AntDslAntlrProjectHelper" name="antDslProjectHelper">
+ <classpath>
+ <pathelement path="${basedir}/build/antdsl.jar" />
+ <path refid="antruntime.classpath" />
+ </classpath>
+ </typedef>
+ <projecthelper>
+ <antDslProjectHelper />
+ </projecthelper>
+ <ant antfile="test/build.ant" target="build" />
+ </target>
+
+ <target name="test-update-build" description="Test the run of an antdsl file with Xtext-generated parser">
+ <loadfile property="antruntime.classpath" srcFile=".antruntime.classpath"/>
+ <exec executable="ant" dir="test">
+ <arg line="-lib" />
+ <arg line="${antruntime.classpath}" />
+ <arg line="-update-build" />
+ </exec>
+ </target>
+
+</project>
\ No newline at end of file
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml?rev=1518387&view=auto
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml (added)
+++ ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml Wed Aug 28 21:14:40 2013
@@ -0,0 +1,64 @@
+<!--
+ 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" module="ant-dsl">
+ <extends organisation="bundle" module="org.apache.ant.antdsl" 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.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 -->
+ <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="*" />
+
+ <!-- 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" />
+ </dependencies>
+</ivy-module>
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/sandbox/antdsl/branches/import-experiment/org.apache.ant.antdsl/ivy-manifest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml