Upload to experimental

[sven/java-package.git] / make-jpkg

diff --git a/make-jpkg b/make-jpkg
index f22594a0c0e931b815b81f844cfc22ec83a30f25..a90c26e9e964e1066b5dc45927272b521021314e 100755 (executable)
--- a/make-jpkg
+++ b/make-jpkg
@@ -15,8 +15,8 @@ lib_dir="/usr/share/java-package"
 [ "$J2SE_PACKAGE_LIBDIR" ] && lib_dir="$J2SE_PACKAGE_LIBDIR"
 
 # If a default has been set for either of the
-# environment variables, use it; otherwise, 
-# default to the name and email used by the 
+# environment variables, use it; otherwise,
+# default to the name and email used by the
 # Debian Java Maintainers project.
 if [ -z "$J2SE_PACKAGE_FULL_NAME" ]; then
     maintainer_name="Debian Java Maintainers"
@@ -31,6 +31,7 @@ else
 fi
 
 genchanges=""
+build_source=""
 
 ### check for run in fakeroot
 
@@ -71,9 +72,9 @@ $program_name builds a Debian package from the given Java binary distribution FI
 
 Supported java binary distributions currently include:
   * Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
-    - The Java Development Kit (JDK), version 6 and 7
-    - The Java Runtime Environment (JRE), version 6 and 7
-    - The Java API Javadoc, version 6 and 7
+    - The Java Development Kit (JDK), version 6, 7 and 8
+    - The Java Runtime Environment (JRE), version 6, 7 and 8
+    - The Java API Javadoc, version 6, 7 and 8
   (Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
 
 The following options are recognized:
@@ -82,6 +83,7 @@ The following options are recognized:
   --email EMAIL      email address used in the maintainer field of the package
   --changes          create a .changes file
   --revision         add debian revision
+  --source           build a source package instead of a binary deb package
 
   --help             display this help and exit
   --version          output version information and exit
@@ -127,6 +129,8 @@ while [[ $# -gt 0 && "x$1" == x--* ]]; do
     revision="-${1}"
     elif [[ "x$1" == x--changes ]]; then
     genchanges="true"
+    elif [[ "x$1" == x--source ]]; then
+    build_source="true"
     else
     unrecognized_option "$1"
     fi
@@ -200,11 +204,11 @@ echo -n "Creating temporary directory: "
 tmp="$( mktemp -d -t "$program_name.XXXXXXXXXX" )"
 echo "$tmp"
 
-debian_dir="$tmp/debian"
-install -d -m 755 "$debian_dir"
+package_dir="$tmp/package"
+install -d -m 755 "$package_dir"
 
-install_dir="$tmp/install"
-install -d -m 755 "$install_dir"
+debian_dir="$package_dir/debian"
+install -d -m 755 "$debian_dir"
 
 # load and execute plugins
 echo -n "Loading plugins:"
@@ -226,7 +230,7 @@ jvm_base="/usr/lib/jvm/"
 javadoc_base="/usr/share/doc/"
 
 j2se_found=
-for var in ${!j2se_detect_*}; do 
+for var in ${!j2se_detect_*}; do
     eval "\$$var"
     if [[ "$j2se_found" == "true" ]]; then
     break;