Skip to content

Commit

Permalink
Corrected BuildInfo and other metadata.
Browse files Browse the repository at this point in the history
Change-Id: I34b46bc01ec94696dd7d75ea55e5fe5f471e00f5
Reviewed-on: http://review.couchbase.org/12577
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
  • Loading branch information
ragsns authored and ingenthr committed Jan 22, 2012
1 parent d9be869 commit b00f820
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions build.xml
Expand Up @@ -378,8 +378,8 @@
deprecation="${javac.deprecation}">
<classpath refid="${name}.common.classpath"/>
</javac>
<move file="${build.src.dir}/net/spy/memcached/changelog.txt"
tofile="${build.classes}/net/spy/memcached/changelog.txt" />
<move file="${build.src.dir}/com/couchbase/client/changelog.txt"
tofile="${build.classes}/com/couchbase/client/changelog.txt" />
</target>

<target name="srcjar" depends="init,jar"
Expand All @@ -401,7 +401,7 @@
<attribute name="Implementation-Version" value="${version}" />
<attribute name="Implementation-Vendor" value="${copyright}" />
<attribute name="Copyright" value="${copyright}" />
<attribute name="Main-Class" value="net.spy.memcached.BuildInfo" />
<attribute name="Main-Class" value="com.couchbase.client.BuildInfo" />
</manifest>
</jar>
<jar jarfile="${build.dir}/${name}-test-${version}.jar" basedir="${build.test.classes}"/>
Expand Down
4 changes: 2 additions & 2 deletions ivy/couchbase-client.xml
Expand Up @@ -22,9 +22,9 @@
SOFTWARE.
-->
<ivy-module version="1.0">
<info organisation="Couchbase" module="${name}">
<info organisation="couchbase" module="${name}" revision="${version}">
<license name="Apache 2.0"/>
<ivyauthor name="Couchbase" url="http://github.com/membase/java-membase-client" />
<ivyauthor name="couchbase" url="http://github.com/couchbase/java-couchbase-client" />
<description>
Couchbase Client
</description>
Expand Down
10 changes: 5 additions & 5 deletions src/scripts/write-version-info.sh
Expand Up @@ -30,7 +30,7 @@ version=$2
specifiedgithash=$3
echo $2

outputdir=${buildroot}/src/net/spy/memcached
outputdir=${buildroot}/src/com/couchbase/client
buildinfofile=${outputdir}/BuildInfo.java
changesfile=${outputdir}/changelog.txt

Expand All @@ -48,7 +48,7 @@ git log > ${changesfile}
cat > ${buildinfofile} <<EOF
// generated by src/scripts/write-version-info.sh
package net.spy.memcached;
package com.couchbase.client;
import java.net.URL;
import java.util.Properties;
Expand All @@ -72,7 +72,7 @@ public final class BuildInfo extends Properties {
public String toString() {
StringBuilder sb = new StringBuilder(256);
sb.append("Spymemcached ");
sb.append("Couchbase Java Client ");
sb.append(VERSION);
sb.append("\n\nTree Version: ");
sb.append(TREE_VERSION);
Expand Down Expand Up @@ -103,11 +103,11 @@ public final class BuildInfo extends Properties {
System.out.println(bi);
// If there was a changelog, let it be shown.
if(!cl.equals("net/spy/memcached/changelog.txt")) {
if(!cl.equals("com/couchbase/client/changelog.txt")) {
if(args.length > 0 && args[0].equals("-c")) {
System.out.println(" -- Changelog:\n");
URL u=bi.getFile("net/spy/memcached/changelog.txt");
URL u=bi.getFile("com/couchbase/client/changelog.txt");
InputStream is=u.openStream();
try {
byte data[]=new byte[8192];
Expand Down

0 comments on commit b00f820

Please sign in to comment.