[SCM] UNNAMED PROJECT branch, master, updated. 0.31-66-gc5cd36a

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  c5cd36a7c0549a562eda61aa20aaa2d5af170dcb (commit)
      from  10eda07c40d8f857360a15fdeadf847b01994785 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5cd36a7c0549a562eda61aa20aaa2d5af170dcb
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 16 10:42:58 2011 +0200

    Made jh_manifest guess based on first package as well

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 jh_classpath     |   12 ++++++------
 jh_manifest      |    4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04fc672..c1a41ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ javatools (0.33) unreleased; urgency=low
   * Fixed typo in jh_generateorbitdir and in jh_compilefeatures.
   * Fixed jh_classpath, which was horribly broken after the 0.32 upload.
     - It now adds debian/<pkg> automatically if it appears to be needed.
+  * Made jh_manifest check the package dir if given a jar file, if said
+    jar file does not exist.
   * Updated file suggestions for jh_classpath and added a note about
     the sequence change in the tutorial.
 
diff --git a/jh_classpath b/jh_classpath
index 010f5a1..6dad090 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -39,9 +39,9 @@ if [ "$ARGC" == "0" ]; then
 					echo "Setting classpath on $jar to $cpath"
 				fi
 				if [ -n "$NOACT" ]; then
-					echo "Would run jh_manifest --classpath=$cpath $jar"
+					echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
 				else
-					jh_manifest "--classpath=$cpath" "$jar"
+					jh_manifest "-p$p" "--classpath=$cpath" "$jar"
 				fi
 			done
 		elif [ -f "debian/classpath" ]; then
@@ -53,9 +53,9 @@ if [ "$ARGC" == "0" ]; then
 					echo "Setting classpath on $jar to $cpath"
 				fi
 				if [ -n "$NOACT" ]; then
-					echo "Would run jh_manifest --classpath=$cpath $jar"
+					echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
 				else
-					jh_manifest "--classpath=$cpath" "$jar"
+					jh_manifest "-p$p" "--classpath=$cpath" "$jar"
 				fi
 			done
 		fi
@@ -81,9 +81,9 @@ else
 				echo "Setting classpath on $jar to $cpath"
 			fi
 			if [ -n "$NOACT" ]; then
-				echo "Would run jh_manifest --classpath=$cpath $jar"
+				echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
 			else
-				jh_manifest "--classpath=$cpath" "$jar"
+				jh_manifest "-p$p" "--classpath=$cpath" "$jar"
 			fi
 		else
 			echo "Cannot find $jar: skipping"
diff --git a/jh_manifest b/jh_manifest
index b25657f..b9c0ad2 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -111,7 +111,11 @@ if(!$cp && ($ENV{'CLASSPATH'}//'') ne ''){
 }
 
 if(@ARGV){
+    my $pkg = $dh{FIRSTPACKAGE};
+    my $dir = tmpdir($pkg);
     foreach my $jar (@ARGV){
+        # Look for it in $dir if it does not exist directly.
+        $jar = "$dir/$jar" unless -f $jar;
         update_jar($jar, undef);
     }
     inhibit_log();


hooks/post-receive
-- 
UNNAMED PROJECT