[javatools] 06/06: Remove trailing whitespaces and replace tabs with spaces.
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 7 11:42:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch experimental
in repository javatools.
commit 488337c00bc1946efafe42fd6ba265c40638bd3d
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Dec 7 11:21:02 2014 +0100
Remove trailing whitespaces and replace tabs with spaces.
---
fetch-eclipse-source | 38 +++++------
jardetector | 2 +-
jarwrapper | 8 +--
java-arch.sh | 62 ++++++++---------
java-propose-classpath | 6 +-
java-propose-classpath.1 | 2 +-
java-vars.mk | 4 +-
jh_build | 164 ++++++++++++++++++++++-----------------------
jh_classpath | 112 +++++++++++++++----------------
jh_clean | 2 +-
jh_compilefeatures | 2 +-
jh_depends | 170 +++++++++++++++++++++++------------------------
jh_exec | 4 +-
jh_installjavadoc | 98 +++++++++++++--------------
jh_installlibs | 74 ++++++++++-----------
jh_lib.sh.in | 2 +-
jh_linkjars | 126 +++++++++++++++++------------------
jh_makepkg | 34 +++++-----
jh_repack | 46 ++++++-------
tutorial.txt | 36 +++++-----
20 files changed, 496 insertions(+), 496 deletions(-)
diff --git a/fetch-eclipse-source b/fetch-eclipse-source
index 5a467ff..e17200a 100755
--- a/fetch-eclipse-source
+++ b/fetch-eclipse-source
@@ -21,21 +21,21 @@ VERSION=$2
DIRECTORY_TXT=$3
if ! which cvs > /dev/null 2>&1; then
- echo "$0: Cannot find cvs. Please install the cvs package." >&2
- exit 1
+ echo "$0: Cannot find cvs. Please install the cvs package." >&2
+ exit 1
fi
if ! which gawk > /dev/null 2>&1; then
- echo "$0: Cannot find gawk. Please install the gawk package." >&2
- exit 1
+ echo "$0: Cannot find gawk. Please install the gawk package." >&2
+ exit 1
fi
if ! which fromdos > /dev/null 2>&1; then
- echo "$0: Cannot find fromdos. Please install the tofrodos package." >&2
- exit 1
+ echo "$0: Cannot find fromdos. Please install the tofrodos package." >&2
+ exit 1
fi
if test ! -f debian/control; then
- echo "$0: Could not find debian/control." >&2
- exit 1
+ echo "$0: Could not find debian/control." >&2
+ exit 1
fi
NAME=$(grep "Source:" debian/control | sed "s/^Source: //")
@@ -53,22 +53,22 @@ fromdos $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE
gawk 'BEGIN {
- FS=","
+ FS=","
}
{
if (NF < 4) {
- split($1, version, "=");
- split(version[1], directory, "@");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+ split($1, version, "=");
+ split(version[1], directory, "@");
+ cvsdir=split($2, dirName, ":");
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {
- split($1, version, "=");
- total=split($4, directory, "/");
- cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
+ split($1, version, "=");
+ total=split($4, directory, "/");
+ cvsdir=split($2, dirName, ":");
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
}
}' $TEMPMAPFILE
@@ -84,8 +84,8 @@ echo "Remove empty directories..."
find $NAME-$VERSION -depth -type d -empty -delete
echo "Creating tarball '../${NAME}_$VERSION$DEBV.orig.tar.bz2'..."
if test -f debian/fetch-eclipse-source.exclude; then
- tar -acf ../${NAME}_$VERSION$DEBV.orig.tar.bz2 ${NAME}-$VERSION -X debian/fetch-eclipse-source.exclude
+ tar -acf ../${NAME}_$VERSION$DEBV.orig.tar.bz2 ${NAME}-$VERSION -X debian/fetch-eclipse-source.exclude
else
- tar -acf ../${NAME}_$VERSION$DEBV.orig.tar.bz2 ${NAME}-$VERSION
+ tar -acf ../${NAME}_$VERSION$DEBV.orig.tar.bz2 ${NAME}-$VERSION
fi
rm -rf ${NAME}-$VERSION
diff --git a/jardetector b/jardetector
index 4cdd3c0..9276e62 100755
--- a/jardetector
+++ b/jardetector
@@ -1,3 +1,3 @@
-#!/bin/sh --
+#!/bin/sh --
jar tf $1 META-INF/MANIFEST.MF | grep META-INF/MANIFEST.MF >/dev/null
diff --git a/jarwrapper b/jarwrapper
index 4ae1dd6..0e64bf1 100755
--- a/jarwrapper
+++ b/jarwrapper
@@ -19,7 +19,7 @@ NEW_JAVA_HOMES="$(perl -0nE 's{\r?\n\s}{}gsm; print $1 if m{^Debian-Java-Home:\s
JAVAOPTS="$(perl -0nE 's{\r?\n\s}{}gsm; print $1 if m{^Debian-Java-Parameters:\s*([^\r\n]+)}m;' "$TEMP/META-INF/MANIFEST.MF")"
rm -rf "$TEMP"
-for i in $NEW_JAVA_HOMES; do
+for i in $NEW_JAVA_HOMES; do
if [ -x "$i/bin/java" ]; then
JAVA="$i/bin/java"
JAVA_HOME="$i"
@@ -34,8 +34,8 @@ if [ -z "$JAVA" ]; then
fi
if which "$JAVA" >/dev/null 2>&1; then
- export LD_LIBRARY_PATH=/usr/lib/jni
- exec $JAVA $JAVAOPTS -jar "$JAR" "$@"
+ export LD_LIBRARY_PATH=/usr/lib/jni
+ exec $JAVA $JAVAOPTS -jar "$JAR" "$@"
else
- echo "In order to run Java programs you must install a compatible JRE. If you don't know what JRE you need, default-jre is probably a good bet"
+ echo "In order to run Java programs you must install a compatible JRE. If you don't know what JRE you need, default-jre is probably a good bet"
fi
diff --git a/java-arch.sh b/java-arch.sh
index e98147d..e6d18fc 100755
--- a/java-arch.sh
+++ b/java-arch.sh
@@ -1,43 +1,43 @@
#!/bin/sh --
if [ "-h" = "$1" ] || [ "--help" = "$1" ]; then
- echo "Usage: java-arch.sh [debian arch name]"
- echo "Returns the equivelent name used by the JDK for that arch"
- echo "or the debian build arch if not specified"
- exit 0
+ echo "Usage: java-arch.sh [debian arch name]"
+ echo "Returns the equivelent name used by the JDK for that arch"
+ echo "or the debian build arch if not specified"
+ exit 0
fi
if [ -z "$1" ]; then
- DPKG_ARCH=`dpkg --print-architecture`
+ DPKG_ARCH=`dpkg --print-architecture`
else
- DPKG_ARCH="$1"
+ DPKG_ARCH="$1"
fi
-case $DPKG_ARCH in
- arm64)
- echo aarch64
- ;;
- armel|armeb|armhf)
- echo arm
- ;;
- powerpc|powerpcspe)
- echo ppc
- ;;
- ppc64el)
- echo ppc64
- ;;
- hppa)
- echo parisc
- ;;
- sparc64)
- echo sparc
- ;;
- sh4)
- echo sh
- ;;
- *)
- echo $DPKG_ARCH
- ;;
+case $DPKG_ARCH in
+ arm64)
+ echo aarch64
+ ;;
+ armel|armeb|armhf)
+ echo arm
+ ;;
+ powerpc|powerpcspe)
+ echo ppc
+ ;;
+ ppc64el)
+ echo ppc64
+ ;;
+ hppa)
+ echo parisc
+ ;;
+ sparc64)
+ echo sparc
+ ;;
+ sh4)
+ echo sh
+ ;;
+ *)
+ echo $DPKG_ARCH
+ ;;
esac
diff --git a/java-propose-classpath b/java-propose-classpath
index 1cda14a..fc303f4 100755
--- a/java-propose-classpath
+++ b/java-propose-classpath
@@ -30,7 +30,7 @@ dodepends()
`readlink -f "$j"`"
done
fi
- echo "$realdepends" | sort -biu | xargs
+ echo "$realdepends" | sort -biu | xargs
}
ARGS="c" parseargs "$@"
@@ -55,7 +55,7 @@ else
jar xf "$JAR" >/dev/null
classes="`find -name '*.class' -exec jcf-dump --print-constants java.lang.Object \{\} \; | grep 'Class name:' | cut -d'"' -f2| sed 's/\[\[*L\(.*\);/\1/;s/$/.class/' |sort -u | grep -v ^java[/\.]`"
-
+
cd "$OLDDIR"
rm -rf "$TEMPDIR"
@@ -64,7 +64,7 @@ else
if [ ! -f $j ]; then
classes2="$classes2 $j"
fi
- done
+ done
export SRC="${ARGV[$i]}"
dodepends $classes2
diff --git a/java-propose-classpath.1 b/java-propose-classpath.1
index ff49781..a10f983 100644
--- a/java-propose-classpath.1
+++ b/java-propose-classpath.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
.TH JAVAHELPER "1" "January 2008" "Javahelper Version 0.5" "User Commands"
.SH NAME
-Javahelper \- Part of the Java Helper packaging tools.
+Javahelper \- Part of the Java Helper packaging tools.
Refer to the tutorials in /usr/share/doc/javahelper for more detail
.SH SYNOPSIS
.B java-propose-classpath
diff --git a/java-vars.mk b/java-vars.mk
index 982a89e..11546cb 100644
--- a/java-vars.mk
+++ b/java-vars.mk
@@ -1,6 +1,6 @@
# Define useful Java-related variables. May be overridden by the package.
-# In particular, JAVA_HOME should be overridden before including this file,
-# so that it can give JRE_HOME and the CLIENT/SERVER dirs relative to the
+# In particular, JAVA_HOME should be overridden before including this file,
+# so that it can give JRE_HOME and the CLIENT/SERVER dirs relative to the
# correct JAVA_HOME
#
diff --git a/jh_build b/jh_build
index e898f30..c0c76f0 100755
--- a/jh_build
+++ b/jh_build
@@ -30,9 +30,9 @@ ARGS="q quiet m main j java-home o javacopts J javadoc N no-javadoc O javadoc-op
if [ -n "`getarg clean`" ]; then
rm -rf debian/_jh_manifest* debian/_jh_build*
- if [ -f debian/javabuild ]; then
- rm -f `awk '{print $1}' < debian/javabuild`
- fi
+ if [ -f debian/javabuild ]; then
+ rm -f `awk '{print $1}' < debian/javabuild`
+ fi
exit 0
fi
@@ -44,7 +44,7 @@ elif [ -z "$JAVA_HOME" ]; then
elif [ -d /usr/lib/jvm/java-gcj ]; then
JAVA_HOME=/usr/lib/jvm/java-gcj
else
- JAVA_HOME=invalid
+ JAVA_HOME=invalid
fi
fi
@@ -53,107 +53,107 @@ JH_JAVADOC_OPTS="`getarg O javadoc-opts`"
if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
if ! grep -- -target <<< "$JH_JAVAC_OPTS" &>/dev/null; then
- JH_JAVAC_OPTS="-source 1.5 -target 1.5 $JH_JAVAC_OPTS"
+ JH_JAVAC_OPTS="-source 1.5 -target 1.5 $JH_JAVAC_OPTS"
else
- JH_JAVAC_OPTS="-source 1.5 $JH_JAVAC_OPTS"
+ JH_JAVAC_OPTS="-source 1.5 $JH_JAVAC_OPTS"
fi
fi
if ! grep -- -source <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
- JH_JAVADOC_OPTS="-source 1.5 $JH_JAVADOC_OPTS"
+ JH_JAVADOC_OPTS="-source 1.5 $JH_JAVADOC_OPTS"
fi
function dobuild()
{
- jarfile="$1"
- shift
- ext="`basename "$jarfile" .jar`"
- srcdirs=
- srcfiles=
- while [ -n "$1" ]; do
- if [ -f "$1" ]; then
- srcfiles="$srcfiles $1"
- elif [ -d "$1" ]; then
- srcdirs="$srcdirs $1"
- else
- echo "Ignoring $1 because it does not exist"
- fi
- shift
- done
-
- if [ "$JAVA_HOME" == "invalid" ]; then
+ jarfile="$1"
+ shift
+ ext="`basename "$jarfile" .jar`"
+ srcdirs=
+ srcfiles=
+ while [ -n "$1" ]; do
+ if [ -f "$1" ]; then
+ srcfiles="$srcfiles $1"
+ elif [ -d "$1" ]; then
+ srcdirs="$srcdirs $1"
+ else
+ echo "Ignoring $1 because it does not exist"
+ fi
+ shift
+ done
+
+ if [ "$JAVA_HOME" == "invalid" ]; then
echo "Cannot find any JAVA_HOME: aborting" 1>&2
exit 1
- fi
+ fi
- rm -f debian/_jh_manifest.$ext
- (
+ rm -f debian/_jh_manifest.$ext
+ (
if [ -n "$CLASSPATH" ]; then
- echo -n "Class-Path: "
- echo $CLASSPATH | sed 's/:/ /g'
- fi
- if [ -n "`getarg m main`" ]; then
- echo "Main-Class: `getarg m main`"
- echo "Debian-Java-Home: $JAVA_HOME"
- fi
+ echo -n "Class-Path: "
+ echo $CLASSPATH | sed 's/:/ /g'
+ fi
+ if [ -n "`getarg m main`" ]; then
+ echo "Main-Class: `getarg m main`"
+ echo "Debian-Java-Home: $JAVA_HOME"
+ fi
) | perl -p -e 's/(.{72})(?=.)/$1\n /go' >> debian/_jh_manifest.$ext
# (NB: see D::JH::Java::write_manifest_section_fd on the regex above)
CLASSPATHDOCS="`for i in $(grep-dctrl --no-field-names --show-field Build-Depends,Build-Depends-Indep -F source "$pkg" debian/control | tr , ' ' | sed 's/([^)]*)//g') ; do dpkg -L $i 2>/dev/null | grep /usr/share/doc/.*/api$; done | sed 's/^/-link /' | xargs`"
- mkdir -p debian/_jh_build.$ext
- if [ -n "$srcdirs" ]; then
+ mkdir -p debian/_jh_build.$ext
+ if [ -n "$srcdirs" ]; then
- if [ -z "`getarg q quiet`" ]; then
- echo find $srcdirs -name '*.java' -and -type f -print0 '|' xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
- fi
+ if [ -z "`getarg q quiet`" ]; then
+ echo find $srcdirs -name '*.java' -and -type f -print0 '|' xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
+ fi
- find $srcdirs -name '*.java' -and -type f -print0 | xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
+ find $srcdirs -name '*.java' -and -type f -print0 | xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
- if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then
- if [ -z "`getarg q quiet`" ]; then
- echo find $srcdirs -name '*.java' -and -type f -print0 '|' xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
- fi
+ if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then
+ if [ -z "`getarg q quiet`" ]; then
+ echo find $srcdirs -name '*.java' -and -type f -print0 '|' xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
+ fi
- find $srcdirs -name '*.java' -and -type f -print0 | xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
- fi
+ find $srcdirs -name '*.java' -and -type f -print0 | xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
+ fi
- elif [ -n "$srcfiles" ]; then
+ elif [ -n "$srcfiles" ]; then
- if [ -z "`getarg q quiet`" ]; then
- echo $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
- fi
+ if [ -z "`getarg q quiet`" ]; then
+ echo $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
+ fi
- $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
+ $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles
- if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then
- if [ -z "`getarg q quiet`" ]; then
- echo $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
- fi
- $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
- fi
+ if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then
+ if [ -z "`getarg q quiet`" ]; then
+ echo $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
+ fi
+ $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles
+ fi
- else
- exit 0
- fi
-
- touch "$jarfile"
- jarpath="`readlink -f "$jarfile"`"
+ else
+ exit 0
+ fi
- (
- cd debian/_jh_build.$ext;
- if [ -z "`getarg q quiet`" ]; then
- echo $JAR cfm "$jarpath" ../_jh_manifest.$ext *
- fi
- $JAR cfm "$jarpath" ../_jh_manifest.$ext *
- )
- if [ -n "$JH_JAR_EXTRA" ]; then
- if [ -z "`getarg q quiet`" ]; then
- echo $JAR uf "$jarpath" $JH_JAR_EXTRA
- fi
- $JAR uf "$jarpath" $JH_JAR_EXTRA
- fi
+ touch "$jarfile"
+ jarpath="`readlink -f "$jarfile"`"
+
+ (
+ cd debian/_jh_build.$ext;
+ if [ -z "`getarg q quiet`" ]; then
+ echo $JAR cfm "$jarpath" ../_jh_manifest.$ext *
+ fi
+ $JAR cfm "$jarpath" ../_jh_manifest.$ext *
+ )
+ if [ -n "$JH_JAR_EXTRA" ]; then
+ if [ -z "`getarg q quiet`" ]; then
+ echo $JAR uf "$jarpath" $JH_JAR_EXTRA
+ fi
+ $JAR uf "$jarpath" $JH_JAR_EXTRA
+ fi
}
@@ -164,13 +164,13 @@ JAR="${JAVA_HOME}/bin/jar"
jarfile="${ARGV[0]}"
if [ -z "$jarfile" ]; then
- if [ -f debian/javabuild ]; then
- cat debian/javabuild | while read line; do
- dobuild $line
- done
- fi
+ if [ -f debian/javabuild ]; then
+ cat debian/javabuild | while read line; do
+ dobuild $line
+ done
+ fi
else
- dobuild "${ARGV[@]}"
+ dobuild "${ARGV[@]}"
fi
diff --git a/jh_classpath b/jh_classpath
index 3112d2b..5901523 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -13,8 +13,8 @@ syntax()
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-c<classpath> --classpath=<classpath>: The classpath to set on the jar(s)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
@@ -29,66 +29,66 @@ VERBOSE="`getarg v verbose`"
NOACT="`getarg n noact`"
if [ "$ARGC" == "0" ]; then
- # read debian/$package.classpath
- for p in `findpackages`; do
- if [ -f "debian/$p.classpath" ]; then
- cat "debian/$p.classpath" | while read jar cpath; do
- if [ ! -f "$jar" ] ; then
+ # read debian/$package.classpath
+ for p in `findpackages`; do
+ if [ -f "debian/$p.classpath" ]; then
+ cat "debian/$p.classpath" | while read jar cpath; do
+ if [ ! -f "$jar" ] ; then
jar="debian/$p/$jar"
fi
- if [ -n "$VERBOSE" ]; then
- echo "Setting classpath on $jar to $cpath"
- fi
- if [ -n "$NOACT" ]; then
- echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
- else
- jh_manifest "-p$p" "--classpath=$cpath" "$jar"
- fi
- done
- elif [ -f "debian/classpath" ]; then
- cat "debian/classpath" | while read jar cpath; do
- if [ ! -f "$jar" ] ; then
+ if [ -n "$VERBOSE" ]; then
+ echo "Setting classpath on $jar to $cpath"
+ fi
+ if [ -n "$NOACT" ]; then
+ echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
+ else
+ jh_manifest "-p$p" "--classpath=$cpath" "$jar"
+ fi
+ done
+ elif [ -f "debian/classpath" ]; then
+ cat "debian/classpath" | while read jar cpath; do
+ if [ ! -f "$jar" ] ; then
jar="debian/$p/$jar"
fi
- if [ -n "$VERBOSE" ]; then
- echo "Setting classpath on $jar to $cpath"
- fi
- if [ -n "$NOACT" ]; then
- echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
- else
- jh_manifest "-p$p" "--classpath=$cpath" "$jar"
- fi
- done
- fi
- done
+ if [ -n "$VERBOSE" ]; then
+ echo "Setting classpath on $jar to $cpath"
+ fi
+ if [ -n "$NOACT" ]; then
+ echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
+ else
+ jh_manifest "-p$p" "--classpath=$cpath" "$jar"
+ fi
+ done
+ fi
+ done
else
- # process jars with -c or $CLASSPATH
- for (( i=0 ; i<ARGC; i++ )); do
- jar=${ARGV[i]}
+ # process jars with -c or $CLASSPATH
+ for (( i=0 ; i<ARGC; i++ )); do
+ jar=${ARGV[i]}
p=$(firstpackage)
- if [ -f "$jar" ]; then
- cpath="`getarg c classpath`"
- if [ ! -f "$jar" ] ; then
- jar="debian/$p/$jar"
+ if [ -f "$jar" ]; then
+ cpath="`getarg c classpath`"
+ if [ ! -f "$jar" ] ; then
+ jar="debian/$p/$jar"
fi
- if [ -z "$cpath" ]; then
- cpath="`sed 's/:/ /g' <<< $CLASSPATH`"
- fi
- if [ -z "$cpath" ]; then
- echo "Could not find a classpath, doing nothing"
- exit 0
- fi
- if [ -n "$VERBOSE" ]; then
- echo "Setting classpath on $jar to $cpath"
- fi
- if [ -n "$NOACT" ]; then
- echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
- else
- jh_manifest "-p$p" "--classpath=$cpath" "$jar"
- fi
- else
- echo "Cannot find $jar: skipping"
- fi
- done
+ if [ -z "$cpath" ]; then
+ cpath="`sed 's/:/ /g' <<< $CLASSPATH`"
+ fi
+ if [ -z "$cpath" ]; then
+ echo "Could not find a classpath, doing nothing"
+ exit 0
+ fi
+ if [ -n "$VERBOSE" ]; then
+ echo "Setting classpath on $jar to $cpath"
+ fi
+ if [ -n "$NOACT" ]; then
+ echo "Would run jh_manifest -p$p --classpath=$cpath $jar"
+ else
+ jh_manifest "-p$p" "--classpath=$cpath" "$jar"
+ fi
+ else
+ echo "Cannot find $jar: skipping"
+ fi
+ done
fi
diff --git a/jh_clean b/jh_clean
index a0fed35..dd2a375 100755
--- a/jh_clean
+++ b/jh_clean
@@ -5,6 +5,6 @@ jh_linkjars --unlink
jh_setupenvironment --clean
[ ! -f "debian/orbitdeps.debhelper" ] || rm "debian/orbitdeps.debhelper"
if [ -f "debian/.javahelper_clean" ]; then
- rm -f `cat debian/.javahelper_clean` debian/.javahelper_clean
+ rm -f `cat debian/.javahelper_clean` debian/.javahelper_clean
fi
diff --git a/jh_compilefeatures b/jh_compilefeatures
index 02b0936..006b446 100755
--- a/jh_compilefeatures
+++ b/jh_compilefeatures
@@ -31,7 +31,7 @@ subject to the compat level (e.g. when parsing the eclipse.features file).
When specifying the dependencies for a feature, jh_compilefeatures will
see if this feature has just been compiled and will use the dependency
if it is among the results. This can be used together with
-debian/eclipse.features.
+debian/eclipse.features.
Dependencies are always resolved by first checking if it is a recently
built feature and if not, then the system installed eclipse's dropins
diff --git a/jh_depends b/jh_depends
index 5d2786c..63b0c64 100755
--- a/jh_depends
+++ b/jh_depends
@@ -12,15 +12,15 @@ syntax()
echo -e "Options:"
echo -e "\t-h --help: show this text"
echo -e "\t-V --version: print the version"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-i --indep: work on all indep packages"
echo -e "\t-a --arch: work on all arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, open6 or open7. Can be a space-separated list."
- echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"
+ echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"
echo -e ""
echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java7-runtime becomes"
echo -e " java7-runtime-headless) and \"default\" cannot be used with any other value except \"headless\""
@@ -32,50 +32,50 @@ syntax()
# returns the max of <current> and <all the classes under the path>
getclassversion()
{
- current=$1
- classes="$2"
- for i in `find "$classes" -name "*.class"`; do
- new=$(hexdump -n 1 -s 7 -e '/1 "%u"' "$i")
- if (( $current < $new )); then
- current=$new
- fi
- done
- echo $current
+ current=$1
+ classes="$2"
+ for i in `find "$classes" -name "*.class"`; do
+ new=$(hexdump -n 1 -s 7 -e '/1 "%u"' "$i")
+ if (( $current < $new )); then
+ current=$new
+ fi
+ done
+ echo $current
}
# getalternatedepends <version>
getalternatedepends()
{
- if (( $1 < 50 )); then
- echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2"
- elif [ "$1" == "50" ]; then
- echo "| java6-runtime$2 | java7-runtime$2"
- elif [ "$1" == "51" ]; then
- echo "| java7-runtime$2"
- else
- echo "Warning: Class version too new to recognise ($1), might not run with any JVMs" 1>&2
- fi
+ if (( $1 < 50 )); then
+ echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2"
+ elif [ "$1" == "50" ]; then
+ echo "| java6-runtime$2 | java7-runtime$2"
+ elif [ "$1" == "51" ]; then
+ echo "| java7-runtime$2"
+ else
+ echo "Warning: Class version too new to recognise ($1), might not run with any JVMs" 1>&2
+ fi
}
function home-to-jvm()
{
- JHOME="$1"
- if echo $JHOME | grep headless >/dev/null; then
- JVM="$JVM headless"
- fi
- if echo $JHOME | grep default >/dev/null; then
- JVM="$JVM default"
- fi
- if echo $JHOME | grep gcj >/dev/null; then
- JVM="$JVM gcj"
- fi
- if echo $JHOME | grep 6-openjdk >/dev/null; then
- JVM="$JVM open6"
- fi
- if echo $JHOME | grep 7-openjdk >/dev/null; then
- JVM="$JVM open7"
- fi
- echo "$JVM"
+ JHOME="$1"
+ if echo $JHOME | grep headless >/dev/null; then
+ JVM="$JVM headless"
+ fi
+ if echo $JHOME | grep default >/dev/null; then
+ JVM="$JVM default"
+ fi
+ if echo $JHOME | grep gcj >/dev/null; then
+ JVM="$JVM gcj"
+ fi
+ if echo $JHOME | grep 6-openjdk >/dev/null; then
+ JVM="$JVM open6"
+ fi
+ if echo $JHOME | grep 7-openjdk >/dev/null; then
+ JVM="$JVM open7"
+ fi
+ echo "$JVM"
}
ARGS="X exclude p package P tmpdir v verbose i indep a arch s same-arch n no-act j jvm" parseargs "$@"
@@ -117,21 +117,21 @@ for p in $PACKAGES; do
echo "Searching" $JARS
fi
- [ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
- cd "$TEMPDIR"
+ [ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
+ cd "$TEMPDIR"
JARDEPS=""
- classversion=0
+ classversion=0
for i in $JARS; do
if [ -x "$i" ]; then
WRAPPER="true"
fi
jar xf "$i"
- classversion=`getclassversion $classversion .`
+ classversion=`getclassversion $classversion .`
JARDEPS="$JARDEPS `extractline META-INF/MANIFEST.MF Class-Path`"
- if grep ^Main-Class META-INF/MANIFEST.MF >/dev/null; then
+ if grep ^Main-Class META-INF/MANIFEST.MF >/dev/null; then
JHOME="`extractline META-INF/MANIFEST.MF Debian-Java-Home`"
- JVM="`home-to-jvm "$JHOME"`"
+ JVM="`home-to-jvm "$JHOME"`"
fi
[ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
done
@@ -143,32 +143,32 @@ for p in $PACKAGES; do
LOCALDEBDEPS=""
DEBDEPS=""
- NEWJARDEPS=""
+ NEWJARDEPS=""
for i in $JARDEPS; do
# Strip out leading "file://"
i="$(echo "$i" | perl -pe 's{^\s*file://*}{/}')"
- if [ -e "$i" ]; then
- realjar="`readlink -f "$i"`"
- elif [ -e "/usr/share/java/$i" ]; then
- realjar="`readlink -f "/usr/share/java/$i"`"
- else
- realjar="$i"
- fi
+ if [ -e "$i" ]; then
+ realjar="`readlink -f "$i"`"
+ elif [ -e "/usr/share/java/$i" ]; then
+ realjar="`readlink -f "/usr/share/java/$i"`"
+ else
+ realjar="$i"
+ fi
for j in $PACKAGES; do
- if ! grep "$j" <<< "$EXCLUDES" > /dev/null; then
- if [ -n "$VERBOSE" ]; then
- echo "Checking: " $OLDDIR/debian/$j$realjar
- fi
- if [ -f $OLDDIR/debian/$j$realjar ]; then
- LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
- else
- NEWJARDEPS="$NEWJARDEPS $realjar"
- fi
- else
- if [ -n "$VERBOSE" ]; then
- echo "Excluding package $j from depends"
- fi
- fi
+ if ! grep "$j" <<< "$EXCLUDES" > /dev/null; then
+ if [ -n "$VERBOSE" ]; then
+ echo "Checking: " $OLDDIR/debian/$j$realjar
+ fi
+ if [ -f $OLDDIR/debian/$j$realjar ]; then
+ LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
+ else
+ NEWJARDEPS="$NEWJARDEPS $realjar"
+ fi
+ else
+ if [ -n "$VERBOSE" ]; then
+ echo "Excluding package $j from depends"
+ fi
+ fi
done
done
@@ -176,17 +176,17 @@ for p in $PACKAGES; do
DEBDEPS="$DEBDEPS `dpkg -S $NEWJARDEPS 2>/dev/null | grep -v ^$p: | cut -d: -f1 | sort -u`"
fi
- REALDEBDEPS=""
- for d in $DEBDEPS; do
- if grep "$d" <<< "$EXCLUDES" > /dev/null; then
- echo "Excluding package $d from depends"
- else
- REALDEBDEPS="$REALDEBDEPS $d"
- fi
- done
- DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"
-
-
+ REALDEBDEPS=""
+ for d in $DEBDEPS; do
+ if grep "$d" <<< "$EXCLUDES" > /dev/null; then
+ echo "Excluding package $d from depends"
+ else
+ REALDEBDEPS="$REALDEBDEPS $d"
+ fi
+ done
+ DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"
+
+
if [ -n "$VERBOSE" ]; then
echo "Found Debs:" $DEBDEPS
fi
@@ -198,13 +198,13 @@ for p in $PACKAGES; do
JVM="`getarg j jvm`"
fi
- if [ -n "$WRAPPER" ] && [ -z "$JVM" ]; then
- if [ -n "$JAVA_HOME" ]; then
- JVM="`home-to-jvm "$JAVA_HOME"`"
- else
- JVM="default"
- fi
- fi
+ if [ -n "$WRAPPER" ] && [ -z "$JVM" ]; then
+ if [ -n "$JAVA_HOME" ]; then
+ JVM="`home-to-jvm "$JAVA_HOME"`"
+ else
+ JVM="default"
+ fi
+ fi
if [ -n "$JVM" ]; then
if echo $JVM | grep -q headless ; then
@@ -214,7 +214,7 @@ for p in $PACKAGES; do
[ -z "`echo $JVM | sed s/\s*//g`" ] && JVM="default"
fi
for j in $JVM; do
- alternateversiondeps=`getalternatedepends $classversion $headless`
+ alternateversiondeps=`getalternatedepends $classversion $headless`
if [ -n "$JVMDEPS" ]; then
JVMDEPS="$JVMDEPS |"
fi
diff --git a/jh_exec b/jh_exec
index d031661..65635aa 100755
--- a/jh_exec
+++ b/jh_exec
@@ -15,8 +15,8 @@ syntax()
echo -e "\t-i --indep: run for all Arch: all packages"
echo -e "\t-a --arch: run for all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
exit 1
diff --git a/jh_installjavadoc b/jh_installjavadoc
index be848be..e69e62d 100755
--- a/jh_installjavadoc
+++ b/jh_installjavadoc
@@ -13,11 +13,11 @@ syntax()
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
- echo -e "\t-A<author> --author=<author>: Author of the javadoc"
+ echo -e "\t-A<author> --author=<author>: Author of the javadoc"
exit 1
}
@@ -28,43 +28,43 @@ dh_testdir
VERBOSE="`getarg v verbose`"
AUTHOR="`getarg A author`"
-function installjavadoc()
+function installjavadoc()
{
- package="$1"
- src="$2"
- target="$3"
-
- if [ -z "$AUTHOR" ]; then
- AUTHOR="The authors of $package"
- fi
- if [ -z "$src" ]; then
- echo "Error: trying to install from empty source"
- exit 1
- fi
- if [ ! -d "$src" ]; then
- echo "Javadoc source $src does not exist or is not a directory, skipping"
- return
- fi
-
- if [ -z "$target" ]; then
- target="debian/$package/usr/share/doc/$package/api"
- docbasepath="/usr/share/doc/$package/api"
- else
- docbasepath="/$target"
- target="debian/$package/$target"
- fi
-
- if [ -n "$VERBOSE" ]; then
- echo "Installing javadoc from $src into package $package"
- fi
-
- if [ -n "`getarg n no-act`" ]; then
- echo mkdir -p "`dirname "$target"`"
- echo cp -r "$src" "$target"
- echo cat \> debian/$package.doc-base.javadoc
- else
- cat > debian/$package.doc-base.javadoc <<END
+ package="$1"
+ src="$2"
+ target="$3"
+
+ if [ -z "$AUTHOR" ]; then
+ AUTHOR="The authors of $package"
+ fi
+ if [ -z "$src" ]; then
+ echo "Error: trying to install from empty source"
+ exit 1
+ fi
+ if [ ! -d "$src" ]; then
+ echo "Javadoc source $src does not exist or is not a directory, skipping"
+ return
+ fi
+
+ if [ -z "$target" ]; then
+ target="debian/$package/usr/share/doc/$package/api"
+ docbasepath="/usr/share/doc/$package/api"
+ else
+ docbasepath="/$target"
+ target="debian/$package/$target"
+ fi
+
+ if [ -n "$VERBOSE" ]; then
+ echo "Installing javadoc from $src into package $package"
+ fi
+
+ if [ -n "`getarg n no-act`" ]; then
+ echo mkdir -p "`dirname "$target"`"
+ echo cp -r "$src" "$target"
+ echo cat \> debian/$package.doc-base.javadoc
+ else
+ cat > debian/$package.doc-base.javadoc <<END
Document: $package
Title: API JavaDoc for $package
Author: $AUTHOR
@@ -75,18 +75,18 @@ Format: HTML
Index: $docbasepath
Files: $docbasepath/*.html
END
- echo "debian/$package.doc-base.javadoc" >> debian/.javahelper_clean
+ echo "debian/$package.doc-base.javadoc" >> debian/.javahelper_clean
- mkdir -p "`dirname "$target"`"
- cp -r "$src" "$target"
- fi
+ mkdir -p "`dirname "$target"`"
+ cp -r "$src" "$target"
+ fi
}
if [ "$ARGC" != "0" ] ; then
-
- p="`firstpackage`"
- installjavadoc "$p" "${ARGV[0]}" "${ARGV[1]}"
+
+ p="`firstpackage`"
+ installjavadoc "$p" "${ARGV[0]}" "${ARGV[1]}"
exit 0
fi
@@ -106,13 +106,13 @@ for p in `findpackages`; do
elif [ -f debian/javadoc ]; then
DIR="`awk '{print $1}' debian/javadoc`"
TARGET="`awk '{print $2}' debian/javadoc`"
- else
+ else
continue
fi
- if [ "$DIR" = "internal" ] && [ -d debian/_jh_build.javadoc/api ]; then
- DIR=debian/_jh_build.javadoc/api
- fi
+ if [ "$DIR" = "internal" ] && [ -d debian/_jh_build.javadoc/api ]; then
+ DIR=debian/_jh_build.javadoc/api
+ fi
installjavadoc "$p" "$DIR" "$TARGET"
unset PACKAGEDIR
diff --git a/jh_installlibs b/jh_installlibs
index 0760145..288fb6b 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -13,8 +13,8 @@ syntax()
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
echo -e "\t--no-mangle: don't try and sanitize the upstream version number"
@@ -34,42 +34,42 @@ DEFAULT_VERSION_MANGLE=".dfsg[0-9]*$"
function processjar()
{
- p="$1"
- j="$2"
- from="$j"
- to="`basename "$j"`"
-
- if [ -n "`getarg upstream-version`" ]; then
- VERSION="`getarg upstream-version`"
- elif [ -n "`getarg no-mangle`" ]; then
- true
- elif [ -n "`getarg version-strip`" ]; then
- VERSION="$(sed "s/`getarg version-strip`//" <<< $VERSION )"
- else
- VERSION="$(sed "s/$DEFAULT_VERSION_MANGLE//" <<< $VERSION )"
- fi
-
- if [ "$to" != "${to%-${VERSION}.jar}" ]; then
- to="${to%-${VERSION}.jar}.jar"
- fi
-
- if [ -n "`getarg n no-act`" ]; then
- echo mkdir -p "$PACKAGEDIR/usr/share/java"
- echo install -m 644 "$from" "$PACKAGEDIR/usr/share/java/${to%.jar}-${VERSION}.jar"
- echo ln -sf ${to%.jar}-${VERSION}.jar "$PACKAGEDIR/usr/share/java/$to"
- else
- if [ -n "$VERBOSE" ]; then
- echo "Installing library $j into package $p"
- fi
- mkdir -p "$PACKAGEDIR/usr/share/java"
- install -m 644 "$from" "$PACKAGEDIR/usr/share/java/${to%.jar}-${VERSION}.jar"
- ln -sf ${to%.jar}-${VERSION}.jar "$PACKAGEDIR/usr/share/java/$to"
- fi
+ p="$1"
+ j="$2"
+ from="$j"
+ to="`basename "$j"`"
+
+ if [ -n "`getarg upstream-version`" ]; then
+ VERSION="`getarg upstream-version`"
+ elif [ -n "`getarg no-mangle`" ]; then
+ true
+ elif [ -n "`getarg version-strip`" ]; then
+ VERSION="$(sed "s/`getarg version-strip`//" <<< $VERSION )"
+ else
+ VERSION="$(sed "s/$DEFAULT_VERSION_MANGLE//" <<< $VERSION )"
+ fi
+
+ if [ "$to" != "${to%-${VERSION}.jar}" ]; then
+ to="${to%-${VERSION}.jar}.jar"
+ fi
+
+ if [ -n "`getarg n no-act`" ]; then
+ echo mkdir -p "$PACKAGEDIR/usr/share/java"
+ echo install -m 644 "$from" "$PACKAGEDIR/usr/share/java/${to%.jar}-${VERSION}.jar"
+ echo ln -sf ${to%.jar}-${VERSION}.jar "$PACKAGEDIR/usr/share/java/$to"
+ else
+ if [ -n "$VERBOSE" ]; then
+ echo "Installing library $j into package $p"
+ fi
+ mkdir -p "$PACKAGEDIR/usr/share/java"
+ install -m 644 "$from" "$PACKAGEDIR/usr/share/java/${to%.jar}-${VERSION}.jar"
+ ln -sf ${to%.jar}-${VERSION}.jar "$PACKAGEDIR/usr/share/java/$to"
+ fi
}
if [ "$ARGC" != "0" ] ; then
-
- p="`firstpackage`"
+
+ p="`firstpackage`"
PACKAGEDIR="`getarg P tmpdir`"
if [ -z "$PACKAGEDIR" ]; then
PACKAGEDIR="`pwd`/debian/$p"
@@ -79,7 +79,7 @@ if [ "$ARGC" != "0" ] ; then
for (( i=0; i < $ARGC; i++ )); do
j=${ARGV[i]}
- processjar "$p" "$j"
+ processjar "$p" "$j"
done
exit 0
fi
@@ -109,7 +109,7 @@ for p in `findpackages`; do
IFS='
'
for i in `cat "$FILE"`; do
- processjar "$p" "$i"
+ processjar "$p" "$i"
done
diff --git a/jh_lib.sh.in b/jh_lib.sh.in
index 300f807..c9604c3 100644
--- a/jh_lib.sh.in
+++ b/jh_lib.sh.in
@@ -97,7 +97,7 @@ findpackages()
}
firstpackage()
-{
+{
findpackages | head -n1
}
diff --git a/jh_linkjars b/jh_linkjars
index 9cee97f..f8faf57 100755
--- a/jh_linkjars
+++ b/jh_linkjars
@@ -11,7 +11,7 @@ syntax()
echo -e "\t-h --help: show this text"
echo -e "\t-V --version: show the version"
echo -e "\t-v --verbose: show more information while running"
- echo -e "\t-t --transitive: transitively link jars"
+ echo -e "\t-t --transitive: transitively link jars"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
echo -e "\t-u --unlink: remove the links instead of adding them"
exit 1
@@ -22,82 +22,82 @@ ARGS="v verbose n no-act u unlink t transitive" parseargs "$@"
function findjars()
{
- pkg="$1"
- if [ -z "$pkg" ]; then
- pkg="$(sed -n '/^Source:/s/.*: //p' < debian/control)"
- BDS=$(grep-dctrl --no-field-names --show-field Build-Depends,Build-Depends-Indep -F source "$pkg" debian/control | tr , ' ' | sed 's/([^)]*)//g')
- else
- BDS=$(dpkg -s "$pkg" | sed -n 's/([^)]*)//g;s/,/ /g;/^Depends:/s/.*: //p')
- fi
+ pkg="$1"
+ if [ -z "$pkg" ]; then
+ pkg="$(sed -n '/^Source:/s/.*: //p' < debian/control)"
+ BDS=$(grep-dctrl --no-field-names --show-field Build-Depends,Build-Depends-Indep -F source "$pkg" debian/control | tr , ' ' | sed 's/([^)]*)//g')
+ else
+ BDS=$(dpkg -s "$pkg" | sed -n 's/([^)]*)//g;s/,/ /g;/^Depends:/s/.*: //p')
+ fi
- JARS=""
- for d in $BDS; do
- j="$(dpkg -L $d | grep "^/usr/share/java/.*\.jar$")"
- k=""
- if [ -n "$j" ] && [ `getarg t transitive` ]; then
- k=$(findjars "$d")
- fi
- JARS="$JARS $j $k"
- done
- echo $JARS
+ JARS=""
+ for d in $BDS; do
+ j="$(dpkg -L $d | grep "^/usr/share/java/.*\.jar$")"
+ k=""
+ if [ -n "$j" ] && [ `getarg t transitive` ]; then
+ k=$(findjars "$d")
+ fi
+ JARS="$JARS $j $k"
+ done
+ echo $JARS
}
function unlinkjars()
{
- target="$1"
- JARS="`findjars`"
-
- for j in $JARS; do
- if [ -n "`getarg n no-act`" ]; then
- echo rm -f "$target/`basename "$j"`"
- continue
- fi
- if [ -n "`getarg v verbose`" ]; then
- echo Removing link for $j from $target
- fi
- rm -f "$target/`basename "$j"`"
- done
+ target="$1"
+ JARS="`findjars`"
+
+ for j in $JARS; do
+ if [ -n "`getarg n no-act`" ]; then
+ echo rm -f "$target/`basename "$j"`"
+ continue
+ fi
+ if [ -n "`getarg v verbose`" ]; then
+ echo Removing link for $j from $target
+ fi
+ rm -f "$target/`basename "$j"`"
+ done
}
function linkjars()
{
- target="$1"
- JARS="`findjars`"
+ target="$1"
+ JARS="`findjars`"
+
+ if [ -z "`getarg n no-act`" ]; then
+ mkdir -p "$target"
+ fi
- if [ -z "`getarg n no-act`" ]; then
- mkdir -p "$target"
- fi
-
- for j in $JARS; do
- if [ -f "$j" ]; then
- if [ -n "`getarg n no-act`" ]; then
- echo ln -sf "$j" "$target/"
- continue
- fi
- if [ -n "`getarg v verbose`" ]; then
- echo Adding link for $j to $target
- fi
- ln -sf "$j" "$target/"
- fi
- done
+ for j in $JARS; do
+ if [ -f "$j" ]; then
+ if [ -n "`getarg n no-act`" ]; then
+ echo ln -sf "$j" "$target/"
+ continue
+ fi
+ if [ -n "`getarg v verbose`" ]; then
+ echo Adding link for $j to $target
+ fi
+ ln -sf "$j" "$target/"
+ fi
+ done
}
dh_testdir
if [ "$ARGC" != "0" ] ; then
-
- target="${ARGV[0]}"
- if [ -n "`getarg u unlink`" ]; then
- unlinkjars "$target"
- else
- linkjars "$target"
- fi
+
+ target="${ARGV[0]}"
+ if [ -n "`getarg u unlink`" ]; then
+ unlinkjars "$target"
+ else
+ linkjars "$target"
+ fi
elif [ -f debian/linkjars ]; then
- for target in `cat debian/linkjars`; do
- if [ -n "`getarg u unlink`" ]; then
- unlinkjars "$target"
- else
- linkjars "$target"
- fi
- done
+ for target in `cat debian/linkjars`; do
+ if [ -n "`getarg u unlink`" ]; then
+ unlinkjars "$target"
+ else
+ linkjars "$target"
+ fi
+ done
fi
diff --git a/jh_makepkg b/jh_makepkg
index 4d964e5..f465f41 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -99,7 +99,7 @@ if [ ! -f ../${PACKAGE}_${VERSION}.orig.tar.gz ]; then
fi
echo "Creating package $PACKAGE version $VERSION."
- echo
+ echo
echo "Building from source in $BUILDDIR"
cd ..
@@ -113,15 +113,15 @@ if [ -n "`getarg e email`" ]; then
DEBEMAIL="`getarg e email`"
fi
-if [ -z "$DEBEMAIL" ]; then
+if [ -z "$DEBEMAIL" ]; then
DEBEMAIL="$EMAIL"
fi
-if [ -z "$DEBEMAIL" ] && [ -f /etc/mailname ]; then
+if [ -z "$DEBEMAIL" ] && [ -f /etc/mailname ]; then
DEBEMAIL="`whoami`@`cat /etc/mailname`"
fi
-if [ -z "$DEBEMAIL" ]; then
+if [ -z "$DEBEMAIL" ]; then
DEBEMAIL="`whoami`@`hostname --fqdn`"
fi
@@ -129,11 +129,11 @@ if [ -n "`getarg m maintainer`" ]; then
DEBFULLNAME="`getarg m maintainer`"
fi
-if [ -z "$DEBFULLNAME" ]; then
+if [ -z "$DEBFULLNAME" ]; then
DEBFULLNAME="$NAME"
fi
-if [ -z "$DEBFULLNAME" ] ; then
+if [ -z "$DEBFULLNAME" ] ; then
DEBFULLNAME="$(getent passwd $(whoami) | cut -d: -f5 | cut -d, -f1)"
fi
@@ -161,7 +161,7 @@ else
TYPE="app"
echo "Selected: Application"
;;
- esac
+ esac
fi
case $TYPE in
"app")
@@ -291,7 +291,7 @@ esac
YEAR=$(date +%Y)
mkdir -p debian
-mkdir debian/source
+mkdir debian/source
echo '3.0 (quilt)' > debian/source/format
cat > debian/control <<END
Source: $SRCPACKAGE
@@ -349,7 +349,7 @@ END
echo $COMPAT > debian/compat
-EDITOR=true DEBFULLNAME="$DEBFULLNAME" DEBEMAIL="$DEBEMAIL" dch --create --package $SRCPACKAGE --newversion ${VERSION}-1 --distribution unstable --urgency low
+EDITOR=true DEBFULLNAME="$DEBFULLNAME" DEBEMAIL="$DEBEMAIL" dch --create --package $SRCPACKAGE --newversion ${VERSION}-1 --distribution unstable --urgency low
cat > debian/rules <<END
#!/usr/bin/make -f
@@ -360,7 +360,7 @@ export JAVA_HOME=${JAVA_HOME}
# export CLASSPATH=
%:
- dh \$@ --with javahelper
+ dh \$@ --with javahelper
END
case $BUILD in
@@ -369,19 +369,19 @@ END
"maven")
cat >> debian/rules <<END
override_dh_auto_build:
- # Build the package
- mvn-debian build
+ # Build the package
+ mvn-debian build
override_dh_auto_clean:
- mvn-debian clean
+ mvn-debian clean
END
;;
"make")
;;
"byhand")
- echo ${SRCPACKAGE}.jar src > debian/javabuild
+ echo ${SRCPACKAGE}.jar src > debian/javabuild
;;
esac
-
+
case $TYPE in
"app")
echo "$SRCPACKAGE.jar usr/share/$BINPACKAGE" > debian/$BINPACKAGE.install
@@ -395,9 +395,9 @@ END
"lib")
echo "$SRCPACKAGE.jar" > debian/$BINPACKAGE.jlibs
if [ "$BUILD" = "byhand" ]; then
- echo "internal" > debian/$BINPACKAGE-doc.javadoc
+ echo "internal" > debian/$BINPACKAGE-doc.javadoc
else
- echo "<javadoc build dir here>" > debian/$BINPACKAGE-doc.javadoc
+ echo "<javadoc build dir here>" > debian/$BINPACKAGE-doc.javadoc
fi
;;
esac
diff --git a/jh_repack b/jh_repack
index f9c5348..bb37571 100755
--- a/jh_repack
+++ b/jh_repack
@@ -20,8 +20,8 @@ ARGS="upstream-version v verbose n no-act" parseargs "$@"
VERBOSE="`getarg v verbose`"
if [ "$ARGC" != "2" ] ; then
- syntax
- exit 1
+ syntax
+ exit 1
fi
VERSION=${ARGV[0]}
@@ -32,30 +32,30 @@ TMPDIR=`mktemp -d`
cd "$TMPDIR"
if [ -n "$VERBOSE" ]; then
- echo "Repacking tarball $TARBALL"
+ echo "Repacking tarball $TARBALL"
fi
if [ -n "`getarg n no-act`" ]; then
- echo "Would repack $TARBALL"
- exit 0
+ echo "Would repack $TARBALL"
+ exit 0
fi
if grep tar.gz$ <<< $TARBALL &>/dev/null; then
- TYPE=gzip
- tar zxf "$TARBALL"
+ TYPE=gzip
+ tar zxf "$TARBALL"
elif grep tar.bz2$ <<< $TARBALL &>/dev/null; then
- TYPE=bzip2
- tar jxf "$TARBALL"
+ TYPE=bzip2
+ tar jxf "$TARBALL"
elif grep zip$ <<< $TARBALL &>/dev/null; then
- TYPE=zip
- unzip -qq "$TARBALL"
+ TYPE=zip
+ unzip -qq "$TARBALL"
else
- echo "Do not know how to unpack $TARBALL (expecting tar.gz, tar.bz2 or zip)"
+ echo "Do not know how to unpack $TARBALL (expecting tar.gz, tar.bz2 or zip)"
fi
SUBDIR=
if [ "`ls -1 | wc -l`" = "1" ]; then
- cd *
- SUBDIR=true
+ cd *
+ SUBDIR=true
fi
find . -name '*.class' -a -type f -print0 | xargs -0 rm -f
@@ -70,26 +70,26 @@ done
find * -depth -type d -print0 | xargs -0 rmdir --ignore-fail-on-non-empty
if [ -n "$SUBDIR" ]; then
- cd ..
+ cd ..
fi
rm -f "$TARBALL"
-case "$TYPE" in
+case "$TYPE" in
gzip)
- tar zcf "$TARBALL" *
- ;;
+ tar zcf "$TARBALL" *
+ ;;
bzip2)
- tar jcf "$TARBALL" *
- ;;
+ tar jcf "$TARBALL" *
+ ;;
zip)
- tar zcf "${TARBALL%.zip}.tar.gz" *
- ;;
+ tar zcf "${TARBALL%.zip}.tar.gz" *
+ ;;
esac
cd /
rm -rf "$TMPDIR"
if [ -n "$VERBOSE" ]; then
- echo "done"
+ echo "done"
fi
diff --git a/tutorial.txt b/tutorial.txt
index c9f8848..cf65b92 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -331,7 +331,7 @@ information).
java-vars.mk
------------
-
+
You can include /usr/share/javahelper/java-vars.mk in your
debian/rules to get the following variables defined:
@@ -341,7 +341,7 @@ debian/rules to get the following variables defined:
the architecture (you must depend on default-jdk or -headless if
you are not overriding this). To override this set `JAVA_HOME`
_before_ including java-vars.mk
-
+
* `JAVA_ARCH`
The JVM version of the build architecture (eg ppc not powerpc)
@@ -349,7 +349,7 @@ debian/rules to get the following variables defined:
* `JRE_HOME`
If `$JAVA_HOME/jre` exists then that, otherwise `$JAVA_HOME`
-
+
* `JVM_CLIENT_DIR` and `JVM_SERVER_DIR`
Set if the respective types of JVM are installed.
@@ -422,7 +422,7 @@ debian/control
Build-Depends: debhelper (>= 7), javahelper, default-jdk, libzlib-java
Standards-Version: 3.9.1
Homepage: http://www.jcraft.com/jsch/
-
+
Package: libjsch-java
Architecture: all
Depends: ${java:Depends}, ${misc:Depends}
@@ -437,10 +437,10 @@ debian/control
debian/rules
#!/usr/bin/make -f
-
+
export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=/usr/share/java/zlib.jar
-
+
build: build-stamp
build-stamp:
dh_testdir
@@ -453,13 +453,13 @@ debian/rules
jh_build --clean
dh_clean
rm -f build-stamp jsch.jar
-
+
install: build
dh_testdir
dh_testroot
dh_prep
dh_installdirs
-
+
binary-arch: build install
# Java packages are arch: all, nothing to do here
@@ -480,7 +480,7 @@ debian/rules
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
-
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
@@ -506,7 +506,7 @@ debian/control
libmatthew-debug-java, libcsv-java,
libitext-java, javahelper
Standards-Version: 3.9.1
-
+
Package: salliere
Architecture: all
Depends: ${java:Depends}, ${misc:Depends}
@@ -519,27 +519,27 @@ debian/rules
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
-
+
build: build-stamp
build-stamp:
dh_testdir
# Build the package
jh_build salliere.jar src
touch $@
-
+
clean:
dh_testdir
dh_testroot
rm -f build-stamp salliere.jar
jh_build --clean
dh_clean
-
+
install: build
dh_testdir
dh_testroot
dh_prep
dh_installdirs
-
+
binary-arch: build install
# Java packages are arch: all, nothing to do here
@@ -561,7 +561,7 @@ debian/rules
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
-
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
@@ -600,7 +600,7 @@ The above debian/rules can be rewritten with CDBS as follows:
export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
JH_BUILD_JAR=salliere.jar
JH_BUILD_SRC=src
-
+
include /usr/share/cdbs/1/class/javahelper.mk
Using javahelper with dh
@@ -619,9 +619,9 @@ debian/javabuild
debian/rules
#!/usr/bin/make -f
-
+
export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
-
+
%:
dh $@ --with javahelper
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git
More information about the pkg-java-commits
mailing list