Author: sharad
Date: Wed May 13 06:30:17 2009
New Revision: 774232
URL: http://svn.apache.org/viewvc?rev=774232&view=rev
Log:
HADOOP-5203. TT's version build is too restrictive. Contributed by Rick Cox.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/core/org/apache/hadoop/HadoopVersionAnnotation.java
hadoop/core/trunk/src/core/org/apache/hadoop/util/VersionInfo.java
hadoop/core/trunk/src/saveVersion.sh
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=774232&r1=774231&r2=774232&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed May 13 06:30:17 2009
@@ -567,6 +567,8 @@
HADOOP-5808. Fix import never used javac warnings in hdfs. (szetszwo)
+ HADOOP-5203. TT's version build is too restrictive. (Rick Cox via sharad)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/trunk/src/core/org/apache/hadoop/HadoopVersionAnnotation.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/HadoopVersionAnnotation.java?rev=774232&r1=774231&r2=774232&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/HadoopVersionAnnotation.java
(original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/HadoopVersionAnnotation.java
Wed May 13 06:30:17 2009
@@ -42,7 +42,7 @@
* @return the date in unix 'date' format
*/
String date();
-
+
/**
* Get the url for the subversion repository.
*/
@@ -59,4 +59,11 @@
* @return The branch name, e.g. "trunk" or "branches/branch-0.20"
*/
String branch();
+
+ /**
+ * Get a checksum of the source files from which
+ * Hadoop was compiled.
+ * @return a string that uniquely identifies the source
+ **/
+ String srcChecksum();
}
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/util/VersionInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/util/VersionInfo.java?rev=774232&r1=774231&r2=774232&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/util/VersionInfo.java
(original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/util/VersionInfo.java Wed May
13 06:30:17 2009
@@ -87,7 +87,15 @@
public static String getUrl() {
return version != null ? version.url() : "Unknown";
}
-
+
+ /**
+ * Get the checksum of the source files from which Hadoop was
+ * built.
+ **/
+ public static String getSrcChecksum() {
+ return version != null ? version.srcChecksum() : "Unknown";
+ }
+
/**
* Returns the buildVersion which includes version,
* revision, user and date.
@@ -96,12 +104,13 @@
return VersionInfo.getVersion() +
" from " + VersionInfo.getRevision() +
" by " + VersionInfo.getUser() +
- " on " + VersionInfo.getDate();
+ " source checksum " + VersionInfo.getSrcChecksum();
}
public static void main(String[] args) {
System.out.println("Hadoop " + getVersion());
System.out.println("Subversion " + getUrl() + " -r " + getRevision());
System.out.println("Compiled by " + getUser() + " on " + getDate());
+ System.out.println("From source with checksum " + getSrcChecksum());
}
}
Modified: hadoop/core/trunk/src/saveVersion.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/saveVersion.sh?rev=774232&r1=774231&r2=774232&view=diff
==============================================================================
--- hadoop/core/trunk/src/saveVersion.sh (original)
+++ hadoop/core/trunk/src/saveVersion.sh Wed May 13 06:30:17 2009
@@ -41,16 +41,19 @@
branch="Unknown"
url="file://$cwd"
fi
+srcChecksum=`find src -name '*.java' | LC_ALL=C sort | xargs md5sum | md5sum |
cut -d ' ' -f 1`
+
mkdir -p build/src/org/apache/hadoop
cat << EOF | \
sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
-e "s|URL|$url|" -e "s/REV/$revision/" \
- -e "s|BRANCH|$branch|" \
+ -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
> build/src/org/apache/hadoop/package-info.java
/*
* Generated by src/saveVersion.sh
*/
@HadoopVersionAnnotation(version="VERSION", revision="REV", branch="BRANCH",
- user="USER", date="DATE", url="URL")
+ user="USER", date="DATE", url="URL",
+ srcChecksum="SRCCHECKSUM")
package org.apache.hadoop;
EOF
