giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgho...@apache.org
Subject svn commit: r1353700 - in /giraph/trunk: CHANGELOG bin/giraph src/main/assembly/assembly.xml
Date Mon, 25 Jun 2012 19:07:23 GMT
Author: jghoman
Date: Mon Jun 25 19:07:22 2012
New Revision: 1353700

URL: http://svn.apache.org/viewvc?rev=1353700&view=rev
Log:
GIRAPH-205. Move Giraph jar to root level of tar.gz. Contributed by Roman Shaposhnik.

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/bin/giraph
    giraph/trunk/src/main/assembly/assembly.xml

Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1353700&r1=1353699&r2=1353700&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Jun 25 19:07:22 2012
@@ -2,6 +2,9 @@ Giraph Change Log
 
 Release 0.2.0 - unreleased
 
+  GIRAPH-205: Move Giraph jar to root level of tar.gz. 
+  (Roman Shaposhnik via jghoman)
+  
   GIRAPH-206: Break out SimpleShortestPathVertex. (Eli Reisman via jghoman)
 
   GIRAPH-210: Hadoop 1.0 profile has no activation. (jghoman)

Modified: giraph/trunk/bin/giraph
URL: http://svn.apache.org/viewvc/giraph/trunk/bin/giraph?rev=1353700&r1=1353699&r2=1353700&view=diff
==============================================================================
--- giraph/trunk/bin/giraph (original)
+++ giraph/trunk/bin/giraph Mon Jun 25 19:07:22 2012
@@ -71,7 +71,7 @@ if [ -d "$GIRAPH_HOME/lib" ]; then
 	  CLASSPATH=${CLASSPATH}:$f;
 	done
 
-	for f in $GIRAPH_HOME/lib/giraph*.jar ; do
+	for f in $GIRAPH_HOME/giraph*.jar ; do
 	  if [ -e "$f" ]; then
 	    JAR=$f
 	    break
@@ -87,7 +87,7 @@ else
 	CLASSPATH2=`mvn dependency:build-classpath | grep -v "[INFO]"`
 	CLASSPATH=$CLASSPATH:$CLASSPATH2	
 
-	for f in $GIRAPH_HOME/target/giraph*.jar ; do
+	for f in `find $GIRAPH_HOME/target -name giraph\*.jar` ; do
 	  if [ -e "$f" ]; then
 	    JAR=$f
 	    break

Modified: giraph/trunk/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/assembly/assembly.xml?rev=1353700&r1=1353699&r2=1353700&view=diff
==============================================================================
--- giraph/trunk/src/main/assembly/assembly.xml (original)
+++ giraph/trunk/src/main/assembly/assembly.xml Mon Jun 25 19:07:22 2012
@@ -41,6 +41,17 @@
         <include>*.jar</include>
       </includes>
       <excludes>
+        <exclude>giraph*.jar</exclude>
+      </excludes>
+    </fileSet>
+
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>giraph*.jar</include>
+      </includes>
+      <excludes>
         <exclude>giraph*jar-with-dependencies.jar</exclude>
       </excludes>
     </fileSet>



Mime
View raw message