ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r895001 - in /ant/sandbox/groovyfront: ./ .classpath build.properties build.xml doc/build.html doc/install.html get-deps.xml get-ivy.xml ivy.xml
Date Fri, 01 Jan 2010 12:41:27 GMT
Author: hibou
Date: Fri Jan  1 12:41:26 2010
New Revision: 895001

URL: http://svn.apache.org/viewvc?rev=895001&view=rev
Log:
Make the project buildable and add some doc about how to build and install

Added:
    ant/sandbox/groovyfront/build.properties   (with props)
    ant/sandbox/groovyfront/doc/build.html   (with props)
    ant/sandbox/groovyfront/doc/install.html   (with props)
    ant/sandbox/groovyfront/get-deps.xml   (with props)
    ant/sandbox/groovyfront/get-ivy.xml   (with props)
Modified:
    ant/sandbox/groovyfront/   (props changed)
    ant/sandbox/groovyfront/.classpath
    ant/sandbox/groovyfront/build.xml
    ant/sandbox/groovyfront/ivy.xml

Propchange: ant/sandbox/groovyfront/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan  1 12:41:26 2010
@@ -0,0 +1,5 @@
+local.build.properties
+lib
+lib-src
+
+target

Modified: ant/sandbox/groovyfront/.classpath
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/.classpath?rev=895001&r1=895000&r2=895001&view=diff
==============================================================================
--- ant/sandbox/groovyfront/.classpath (original)
+++ ant/sandbox/groovyfront/.classpath Fri Jan  1 12:41:26 2010
@@ -1,29 +1,15 @@
 <?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.
-    -->
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*&amp;acceptedTypes=jar%2Cbundle%2Cejb%2Cmaven-plugin&amp;sourceTypes=source&amp;javadocTypes=javadoc&amp;sourceSuffixes=-source%2C-sources%2C-src&amp;javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&amp;alphaOrder=true&amp;resolveInWorkspace=true"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="lib" path="lib/antlr-2.7.7.jar"/>
+	<classpathentry kind="lib" path="lib/asm-3.2.jar"/>
+	<classpathentry kind="lib" path="lib/groovy-1.7.0.jar" sourcepath="lib-src/groovy-sources-1.7.0.jar"/>
+	<classpathentry kind="lib" path="lib/ant.jar"/>
+	<classpathentry kind="lib" path="lib/ant-antunit-1.2alpha.jar"/>
 	<classpathentry kind="output" path="eclipse-classes"/>
 </classpath>

Added: ant/sandbox/groovyfront/build.properties
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/build.properties?rev=895001&view=auto
==============================================================================
--- ant/sandbox/groovyfront/build.properties (added)
+++ ant/sandbox/groovyfront/build.properties Fri Jan  1 12:41:26 2010
@@ -0,0 +1 @@
+project.version=1.0.0

Propchange: ant/sandbox/groovyfront/build.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/sandbox/groovyfront/build.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/build.xml?rev=895001&r1=895000&r2=895001&view=diff
==============================================================================
--- ant/sandbox/groovyfront/build.xml (original)
+++ ant/sandbox/groovyfront/build.xml Fri Jan  1 12:41:26 2010
@@ -20,50 +20,63 @@
 <!--
 	Bootstrap build
 -->
-<project name="ant-groovyfront" default="build" xmlns:ivy="ivy" xmlns:bushel="bushel"
xmlns:au="antlib:org.apache.ant.antunit">
+<project name="ant-groovyfront" default="jar" xmlns:au="antlib:org.apache.ant.antunit">
 
-    <property name="project.version" value="1.0.0" />
+	<property file="local.build.properties" />
+	<property file="build.properties" />
 
-    <path id="antlib.classpath">
-        <fileset dir="${basedir}/../common-build/lib">
-            <include name="*.jar" />
-        </fileset>
-    </path>
-
-    <target name="clean">
-        <delete dir="${basedir}/target" />
-    </target>
-
-    <target name="build">
-        <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" classpathref="antlib.classpath"
/>
-        <taskdef uri="bushel" resource="com/googlecode/bushel/ant/antlib.xml" classpathref="antlib.classpath"
/>
-        <bushel:buildobr dir="${basedir}/../external-bundles" out="${basedir}/../common-build/repo-external.xml"
indent="true" />
-        <ivy:configure file="${basedir}/../common-build/ivysettings.xml" />
-        <ivy:resolve file="ivy.xml" conf="*" />
-        <ivy:cachepath pathid="ivy.compile.classpath" conf="default" useOrigin="true"
/>
-        <mkdir dir="${basedir}/target/classes" />
-        <path id="compile.classpath">
-            <fileset dir="${basedir}/../common-build/apache-ant-1.7.1/lib" includes="*.jar"
/>
-            <path refid="ivy.compile.classpath" />
-        </path>
-        <javac srcdir="${basedir}/src/main/java" classpathref="compile.classpath" destdir="${basedir}/target/classes"
debug="true">
-        </javac>
-        <copy todir="${basedir}/target/classes">
-            <fileset dir="${basedir}/src/main/resources" />
-        </copy>
-        <jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}_${project.version}.jar">
-        </jar>
-    </target>
-
-    <target name="deploy" depends="clean,build">
-        <copy file="${basedir}/target/${ant.project.name}_${project.version}.jar" todir="${basedir}/../common-build/apache-ant-1.7.1/lib/"
/>
-    </target>
-
-    <target name="test">
-        <taskdef uri="antlib:org.apache.ant.antunit" resource="org/apache/ant/antunit/antlib.xml"
classpathref="antlib.classpath" />
-        <au:antunit>
-            <fileset dir="${basedir}/src/test/antunit" includes="**/*-test.xml" />
-            <au:plainlistener />
-        </au:antunit>
-    </target>
+	<path id="lib.path">
+		<fileset dir="${basedir}/lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+	<target name="clean">
+		<delete dir="${basedir}/target" />
+	</target>
+
+	<target name="compile" description="Compile the project">
+		<mkdir dir="${basedir}/target/classes" />
+		<javac srcdir="${basedir}/src/main/java" classpathref="lib.path" destdir="${basedir}/target/classes"
debug="true" source="1.4" target="1.4">
+		</javac>
+		<copy todir="${basedir}/target/classes">
+			<fileset dir="${basedir}/src/main/resources" />
+		</copy>
+	</target>
+
+	<target name="jar" depends="compile" description="Build the jar">
+		<jar basedir="${basedir}/target/classes" destfile="${basedir}/target/${ant.project.name}_${project.version}.jar">
+		</jar>
+	</target>
+
+	<target name="compile-test" depends="compile" description="Compile the unit tests">
+		<mkdir dir="${basedir}/target/test-classes" />
+		<javac srcdir="${basedir}/src/test/java" destdir="${basedir}/target/test-classes" debug="true">
+			<classpath>
+				<path refid="lib.path" />
+				<pathelement location="${basedir}/target/classes" />
+			</classpath>
+		</javac>
+		<copy todir="${basedir}/target/test-classes">
+			<fileset dir="${basedir}/src/test/resources" />
+		</copy>
+	</target>
+
+	<target name="test" depends="compile-test" description="Launch the unit tests">
+		<mkdir dir="${basedir}/target/junit" />
+		<junit printsummary="yes" haltonfailure="no" haltonerror="no" showoutput="true">
+			<classpath>
+				<path refid="lib.path" />
+				<pathelement location="${basedir}/target/classes" />
+				<pathelement location="${basedir}/target/test-classes" />
+			</classpath>
+			<formatter type="plain" />
+			<batchtest fork="true" todir="${basedir}/target/junit">
+				<fileset dir="${basedir}/src/test/java">
+					<include name="**/*TestSuite.java" />
+					<include name="**/*Test.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
 </project>

Added: ant/sandbox/groovyfront/doc/build.html
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/doc/build.html?rev=895001&view=auto
==============================================================================
--- ant/sandbox/groovyfront/doc/build.html (added)
+++ ant/sandbox/groovyfront/doc/build.html Fri Jan  1 12:41:26 2010
@@ -0,0 +1,44 @@
+<!--
+    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.
+    -->
+<html>
+<body>
+
+<h1>Building on the command line</h1>
+
+<h2>Requirements:</h2>
+<ul>
+<li>a JDK 1.5</li>
+<li>Ant 1.7</li>
+<li>a trunk build of Ant 1.8.0</li>
+<li>a trunk build of Ant-antunit 1.2</li>
+<li>at least the first time an internet connection to get some dependencies</li>
+</ul>
+
+<h2>Steps</h2>
+
+<p>Retrieve the dependencies which have a released version with from the
+internet. Once retrieved, you won't need to do that again.</p>
+<code>ant -f get-deps.xml</code>
+<p>Put the ant.jar you have build from the Ant trunk into the folder 'lib'</p>
+<p>Put the ant-antunit-1.2alpha.jar you have build from the Ant-unit trunk into the
folder 'lib'</p>
+<p>Launch the actual build:</p>
+<code>ant jar</code>
+
+</body>
+</html>

Propchange: ant/sandbox/groovyfront/doc/build.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/sandbox/groovyfront/doc/build.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/sandbox/groovyfront/doc/build.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: ant/sandbox/groovyfront/doc/install.html
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/doc/install.html?rev=895001&view=auto
==============================================================================
--- ant/sandbox/groovyfront/doc/install.html (added)
+++ ant/sandbox/groovyfront/doc/install.html Fri Jan  1 12:41:26 2010
@@ -0,0 +1,46 @@
+<!--
+    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.
+    -->
+<html>
+<body>
+
+<h1>Install the GroovyFront into an Ant installation</h1>
+
+<p>Actually you just need to make the groovyfront.jar and its dependences
+available in the classpath of Ant when it starts. It has to be added the same
+way the Ant's optional dependencies have to be added: see in the
+<a href="http://ant.apache.org/manual/install.html#optionalTasks">Ant manual</a>
+how to install an optional task.
+</p>
+
+<h2>The jars to be installed in Ant:</h2>
+<ul>
+<li>GroovyFront which you should have <a href="build.html">build</a>: ant-groovyfront.jar</li>
+<li>Groovy 1.7.0:
+<a href="http://repo1.maven.org/maven2/org/codehaus/groovy/groovy/1.7.0/groovy-1.7.0.jar">groovy-1.7.0.jar</a>
+</li>
+<li>ASM 3.2:
+<a href="http://repo1.maven.org/maven2/asm/asm/3.2/asm-3.2.jar">asm-3.2.jar</a>
+</li>
+<li>Antlr 2.7.7:
+<a href="http://repo2.maven.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7.jar">antlr-2.7.7.jar</a>
+</li>
+</ul>
+
+</body>
+</html>

Propchange: ant/sandbox/groovyfront/doc/install.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/sandbox/groovyfront/doc/install.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/sandbox/groovyfront/doc/install.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: ant/sandbox/groovyfront/get-deps.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/get-deps.xml?rev=895001&view=auto
==============================================================================
--- ant/sandbox/groovyfront/get-deps.xml (added)
+++ ant/sandbox/groovyfront/get-deps.xml Fri Jan  1 12:41:26 2010
@@ -0,0 +1,12 @@
+<project name="dependencies-retriever" default="ivy:retrieve" xmlns:ivy="antlib:org.apache.ivy.ant">
+	
+	<import file="get-ivy.xml" />
+
+	<target name="ivy:retrieve" depends="ivy:init">
+		<ivy:configure />
+		<ivy:resolve file="ivy.xml" conf="*" />
+		<ivy:retrieve pattern="${basedir}/lib/[artifact]-[revision].[ext]" type="jar" conf="*"
/>
+		<ivy:retrieve pattern="${basedir}/lib-src/[artifact]-sources-[revision].[ext]" type="source"
conf="*" />
+	</target>
+
+</project>
\ No newline at end of file

Propchange: ant/sandbox/groovyfront/get-deps.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/sandbox/groovyfront/get-deps.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: ant/sandbox/groovyfront/get-deps.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/sandbox/groovyfront/get-deps.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/sandbox/groovyfront/get-ivy.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/get-ivy.xml?rev=895001&view=auto
==============================================================================
--- ant/sandbox/groovyfront/get-ivy.xml (added)
+++ ant/sandbox/groovyfront/get-ivy.xml Fri Jan  1 12:41:26 2010
@@ -0,0 +1,33 @@
+<project name="ivy-installer">
+	<property name="ivy.install.version" value="2.1.0" />
+	<condition property="ivy.home" value="${env.IVY_HOME}">
+		<isset property="env.IVY_HOME" />
+	</condition>
+	<property name="ivy.home" value="${user.home}/.ant" />
+	<property name="ivy.jar.dir" value="${ivy.home}/lib" />
+	<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+	<target name="ivy:download" unless="offline">
+		<mkdir dir="${ivy.jar.dir}" />
+		<!--
+			download Ivy from web site so that it can be used even without any
+			special installation
+		-->
+		<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true" />
+	</target>
+
+	<target name="ivy:init" depends="ivy:download">
+		<!--
+			try to load ivy here from ivy home, in case the user has not already
+			dropped it into ant's lib dir (note that the latter copy will always
+			take precedence). We will not fail as long as local lib dir exists
+			(it may be empty) and ivy is in at least one of ant's lib dir or the
+			local lib dir.
+		-->
+		<path id="ivy.lib.path">
+			<fileset dir="${ivy.jar.dir}" includes="*.jar" />
+		</path>
+		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"
/>
+	</target>
+
+</project>
\ No newline at end of file

Propchange: ant/sandbox/groovyfront/get-ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/sandbox/groovyfront/get-ivy.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: ant/sandbox/groovyfront/get-ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/sandbox/groovyfront/get-ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/sandbox/groovyfront/ivy.xml
URL: http://svn.apache.org/viewvc/ant/sandbox/groovyfront/ivy.xml?rev=895001&r1=895000&r2=895001&view=diff
==============================================================================
--- ant/sandbox/groovyfront/ivy.xml (original)
+++ ant/sandbox/groovyfront/ivy.xml Fri Jan  1 12:41:26 2010
@@ -21,12 +21,14 @@
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
     <info organisation="org.apache.ant" module="groovyfront" />
+    <configurations>
+    	<conf name="default" />
+    </configurations>
     <dependencies>
-        <dependency org="org.apache.ant" name="ant" rev="1.8.0" />
-        <dependency org="org.apache.ant" name="antunit" rev="1.2.0" />
-
-        <dependency org="org.codehaus.groovy" name="groovy" rev="1.6.5" transitive="false"
/>
-        <dependency org="asm" name="asm" rev="2.2.3" />
-        <dependency org="antlr" name="antlr" rev="2.7.7" />
+        <!--dependency org="org.apache.ant"      name="ant"         rev="1.8.0"      
 conf="default->default,sources,javadoc" /-->
+        <!--dependency org="org.apache.ant"      name="ant-antunit" rev="1.2-SNAPSHOT"
conf="default->default,sources,javadoc" /-->
+        <dependency org="org.codehaus.groovy" name="groovy"      rev="1.7.0"        conf="default->default,sources,javadoc"
transitive="false" />
+        <dependency org="asm"                 name="asm"         rev="3.2"          conf="default->default,sources,javadoc"
/>
+        <dependency org="antlr"               name="antlr"       rev="2.7.7"        conf="default->default,sources,javadoc"
/>
     </dependencies>
 </ivy-module>



Mime
View raw message