# HG changeset patch
# User Toby Crawley <toby@tcrawley.org>
# Date 1339609064 14400
# Node ID 200316dd613a9fce683836c907dbc82be9e00d63
# Parent  95f68fed6bbae48e04d2d2031e4310602ca9da54
Add bundle and install for the standalone jar; get install actually working.
***
set a default version

diff -r 95f68fed6bba -r 200316dd613a maven/build.xml
--- a/maven/build.xml	Wed Jun 13 09:06:10 2012 -0400
+++ b/maven/build.xml	Wed Jun 13 13:37:44 2012 -0400
@@ -30,116 +30,135 @@
 <project name="jython-maven" default="bundle-all" basedir="..">
 	
 	<property file="${basedir}/default.properties"/>
-	
+
+  <property name="project.version" value="2.7.0-SNAPSHOT"/>	
+
 	<property name="m2.repo" value="${user.home}/.m2/repository"/>
+	<property name="m2.groupDir" value="org/python"/>	
+
 	<property name="build.base" value="${basedir}/build"/>
-	<property name="build" value="${build.base}/maven"/>
+	<property name="build.dir" value="${build.base}/maven"/>
 	<property name="dist.base" value="${basedir}/dist"/>
-	<property name="dist"
-		value="${dist.base}/${project.name}-${project.version}"/>
 	<property name="src.dir" value="${basedir}/src"/>
-	
-	<property name="m2.groupDir" value="org.python"/>
-	<property name="m2.artifactId" value="jython"/>
-	
-	
-	<target name="bundle-all" depends="build-jython">
+
+	<condition property="do.build">
+          <not>
+            <and>
+              <available file="${dist.base}/jython.jar"/>
+              <available file="${dist.base}/jython-standalone.jar"/>
+            </and>
+          </not>
+        </condition>
+
+	<target name="install" depends="prep">
+          <m2-install artifactId="jython"/>
+        </target>
+
+        <target name="install-standalone" depends="prep">
+          <m2-install artifactId="jython-standalone"/>
+        </target>
+
+        <target name="bundle" depends="prep">
+          <m2-bundle artifactId="jython"/>
+        </target>
+
+        <target name="bundle-standalone" depends="prep">
+          <m2-bundle artifactId="jython-standalone"/>
+        </target>
+
+        <target name="install-all" depends="install, install-standalone"/>
+
+	<target name="bundle-all" depends="bundle, bundle-standalone"/>
+
+	<target name="clean">
+	    <delete dir="${build.dir}"/>
 		
-		<antcall target="bundle">
-			<param name="stage-target" value="stage"/>
-			<param name="m2.groupDir" value="org.python"/>
-			<param name="m2.artifactId" value="jython"/>
-		</antcall>
-		
-	</target>
-	
-	<!-- 
-		Removes staging dir.
-	-->
-	<target name="clean">
-		<delete dir="${build}"/>
-		
-		<delete>
-			<fileset dir="${dist.base}" includes="*-bundle.jar"/>
-		</delete>
-	</target>
-	
+	    <delete>
+	      <fileset dir="${dist.base}" includes="*-bundle.jar"/>
+	    </delete>
+        </target>
+
 	<!-- 
 		Installs artifact to the local repo specified.
 	-->
-	<target name="install" depends="stage">
+
+	<macrodef name="m2-install">
+          <attribute name="artifactId"/>
+	  <attribute name="install.dir"
+		     default="${m2.repo}/${m2.groupDir}/@{artifactId}/${project.version}"/>
+	  <attribute name="install.name"
+		     default="@{artifactId}-${project.version}"/>
+
+          <sequential>
+  	    <stage artifactId="@{artifactId}"/>		
+	    <mkdir dir="@{install.dir}"/>
+	    <copy file="maven/pom-template.xml"
+		  tofile="@{install.dir}/@{install.name}.pom">
+	      <filterset>
+		<filter token="PROJECT-VERSION" value="${project.version}"/>
+                <filter token="ARTIFACT-ID" value="@{artifactId}"/>
+	      </filterset>
+	    </copy>
+
+	    <move file="${build.dir}/@{install.name}.jar"
+		  tofile="@{install.dir}/@{install.name}.jar"/>
+	    <move file="${build.dir}/@{install.name}-sources.jar"
+		  tofile="@{install.dir}/@{install.name}-sources.jar"/>
 		
-		<property name="install.dir"
-			value="${m2.groupDir}/${m2.artifactId}/${project.version}"/>
-		<property name="install.name"
-			value="${m2.artifactId}-${project.version}"/>
-		<property name="stage" value="${build}"/>
+	    <checksum algorithm="SHA1" fileext=".sha1">
+	      <fileset dir="@{install.dir}" excludes="*.sha1,*.md5,*.tmp"/>
+	    </checksum>
 		
-		<mkdir dir="${install.dir}"/>
-		<copy file="maven/pom.xml"
-			tofile="${install.dir}/${install.name}.pom">
-			<filterset>
-				<filter token="PROJECT-VERSION" value="${project.version}"/>
-			</filterset>
-		</copy>
-		
-		<move file="${stage}/${install.name}.jar"
-			tofile="${install.dir}/${install.name}.jar"/>
-		<move file="${stage}/${install.name}-sources.jar"
-			tofile="${install.dir}/${install.name}-sources.jar"/>
-		
-		<checksum algorithm="SHA1" fileext=".sha1">
-			<fileset dir="${install.dir}" excludes="*.sha1,*.md5,*.tmp"/>
-		</checksum>
-		
-		<checksum algorithm="MD5" fileext=".md5">
-			<fileset dir="${install.dir}" excludes="*.sha1,*.md5,*.tmp"/>
-		</checksum>
-	</target>
+	    <checksum algorithm="MD5" fileext=".md5">
+	      <fileset dir="@{install.dir}" excludes="*.sha1,*.md5,*.tmp"/>
+	    </checksum>
+          </sequential>
+	</macrodef>
 	
 	<!-- 
 		Bundles staged artifact to release to ibiblio
 	-->
-	<target name="bundle">
-		<antcall target="${stage-target}"/>
+	<macrodef name="m2-bundle">
+          <attribute name="artifactId"/>
+          <sequential>
+	    <stage artifactId="@{artifactId}"/>
 		
-		<property name="stage" value="${build}"/>
-		
-		<jar
-			jarfile="${dist.base}/${m2.artifactId}-${project.version}-bundle.jar">
-			<fileset dir="${stage}"/>
-		</jar>
-	</target>
+	    <jar jarfile="${dist.base}/@{artifactId}-${project.version}-bundle.jar">
+	      <fileset dir="${build.dir}"/>
+	    </jar>
+          </sequential>
+        </macrodef>
 	
 	<!-- 
 		Performs Maven build staging
 	-->
-	<target name="stage" depends="validate-pom">
-		<property name="stage" value="${build}/"/>
-		<mkdir dir="${stage}"/>
+        <macrodef name="stage">
+          <attribute name="artifactId"/>
+          <sequential>
+	    <delete dir="${build.dir}"/>
+	    <mkdir dir="${build.dir}"/>
+	    <copy file="maven/pom-template.xml" tofile="${build.dir}/pom.xml">
+	      <filterset>
+		<filter token="PROJECT-VERSION" value="${project.version}"/>
+                <filter token="ARTIFACT-ID" value="@{artifactId}"/>
+	      </filterset>
+	    </copy>
 		
-		<copy file="maven/pom.xml" tofile="${stage}/pom.xml">
-			<filterset>
-				<filter token="PROJECT-VERSION" value="${project.version}"/>
-			</filterset>
-		</copy>
+	    <copy file="LICENSE.txt" tofile="${build.dir}/LICENSE.txt"/>
+	    <copy file="${dist.base}/@{artifactId}.jar"
+		  tofile="${build.dir}/@{artifactId}-${project.version}.jar"/>
 		
-		<copy file="LICENSE.txt" tofile="${stage}/LICENSE.txt"/>
-		
-		<copy
-			file="${dist.base}/jython.jar"
-			tofile="${stage}/${m2.artifactId}-${project.version}.jar"/>
-		
-		<jar jarfile="${stage}/${m2.artifactId}-${project.version}-sources.jar">
-			<fileset dir="${src.dir}" includes="**/*.java"/>
-		</jar>
-	</target>
+	    <jar jarfile="${build.dir}/@{artifactId}-${project.version}-sources.jar">
+	      <fileset dir="${src.dir}" includes="**/*.java"/>
+	    </jar>
+          </sequential>
+        </macrodef>
 
 	<!-- 
 		Performs POM Schema validation.
 	-->
 	<target name="validate-pom">
-		<xmlvalidate failonerror="true" file="maven/pom.xml">
+		<xmlvalidate failonerror="true" file="maven/pom-template.xml">
 			<attribute name="http://xml.org/sax/features/validation"
 				value="true"/>
 			<attribute name="http://apache.org/xml/features/validation/schema"
@@ -152,7 +171,9 @@
 		</xmlvalidate>
 	</target>
 	
-	<target name="build-jython" depends="clean">
-		<ant antfile="build.xml" target="jar-complete"/>
+	<target name="build-jython" if="do.build">
+		<ant antfile="build.xml" target="jar-standalone"/>
 	</target>
+
+        <target name="prep" depends="build-jython, validate-pom"/>
 </project>
diff -r 95f68fed6bba -r 200316dd613a maven/pom-template.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/maven/pom-template.xml	Wed Jun 13 13:37:44 2012 -0400
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.python</groupId>
+	<artifactId>@ARTIFACT-ID@</artifactId>
+	<packaging>jar</packaging>
+	<name>Jython</name>
+	<version>@PROJECT-VERSION@</version>
+	<url>http://www.jython.org/</url>
+	<description>
+		Jython is an implementation of the high-level, dynamic, object-oriented
+		language Python written in 100% Pure Java, and seamlessly integrated with
+		the Java platform. It thus allows you to run Python on any Java platform.
+	</description>
+	<licenses>
+    	<license>
+      		<name>Jython Software License</name>
+      		<url>http://www.jython.org/Project/license.html</url>
+      		<distribution>repo</distribution>
+    	</license>
+  	</licenses>
+  	<scm>
+  		<connection>scm:hg:http://hg.python.org/jython</connection>
+  		<developerConnection>scm:hg:ssh://hg@hg.python.org/jython</developerConnection>
+  		<url>http://hg.python.org/jython</url>
+  	</scm>
+</project>
diff -r 95f68fed6bba -r 200316dd613a maven/pom.xml
--- a/maven/pom.xml	Wed Jun 13 09:06:10 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.python</groupId>
-	<artifactId>jython</artifactId>
-	<packaging>jar</packaging>
-	<name>Jython</name>
-	<version>@PROJECT-VERSION@</version>
-	<url>http://www.jython.org/</url>
-	<description>
-		Jython is an implementation of the high-level, dynamic, object-oriented
-		language Python written in 100% Pure Java, and seamlessly integrated with
-		the Java platform. It thus allows you to run Python on any Java platform.
-	</description>
-	<licenses>
-    	<license>
-      		<name>Jython Software License</name>
-      		<url>http://www.jython.org/Project/license.html</url>
-      		<distribution>repo</distribution>
-    	</license>
-  	</licenses>
-  	<scm>
-  		<connection>scm:hg:http://hg.python.org/jython</connection>
-  		<developerConnection>scm:hg:ssh://hg@hg.python.org/jython</developerConnection>
-  		<url>http://hg.python.org/jython</url>
-  	</scm>
-</project>