Set implementation info in JAR's manifest
diff --git a/build.xml b/build.xml index 74198a1..17e1bfa 100644 --- a/build.xml +++ b/build.xml
@@ -1,5 +1,6 @@ <project name="plexi.googleauthn" default="build" basedir="."> <description>Google Authentication Adaptor</description> + <tstamp/> <property name="src.dir" location="src"/> <property name="test.dir" location="test"/> <property name="test.class" value="*Test"/> @@ -23,7 +24,11 @@ <property name="cobertura.dir" value="${basedir}/../cobertura/"/> <!-- Adaptor suffix for distribution files. Useful for placing version numbers on our jars. --> - <property name="adaptor.suffix" value=""/> + <condition property="adaptorlib.suffix" value="-${adaptor.version}"> + <isset property="adaptor.version"/> + </condition> + <!-- If adaptor.version isn't set, simply use the current date. --> + <property name="adaptor.suffix" value="-${DSTAMP}"/> <property name="mail.jar" value="${lib.dir}/mailapi.jar"/> <path id="adaptor.build.classpath"> @@ -153,11 +158,21 @@ </javac> </target> + <target name="-discover-version" unless="adaptor.version"> + <exec executable="git" outputproperty="adaptor.version" + logError="true" failifexecutionfails="false"> + <arg value="describe"/> + <arg value="--always"/> + </exec> + <!-- Set version if git describe failed. --> + <property name="adaptor.version" value="unknown"/> + </target> + <target name="dist" description="Generate distribution binaries" depends="clean,test,package"/> <target name="package" description="Generate binaries" - depends="build,javadoc"> + depends="build,javadoc,-discover-version"> <property name="dist.staging.dir" value="${build.dir}/dist/staging"/> <delete dir="${build.dir}/dist"/> @@ -179,6 +194,13 @@ <manifest> <attribute name="Main-Class" value="${adaptor.class}"/> <attribute name="Class-Path" value="${tmp.adaptor.classpath}"/> + <section name="com/google/enterprise/adaptor/googleauthn/"> + <attribute name="Implementation-Title" + value="Google Authnetication Adaptor"/> + <attribute name="Implementation-Vendor" value="Google Inc."/> + <attribute name="Implementation-Version" + value="${adaptor.version}"/> + </section> </manifest> </jar>