r1695 - in trunk/eclipse/debian: . extra

[Stephan Michels]

Author: tashiro-guest
Date: 2006-01-12 14:12:43 +0000 (Thu, 12 Jan 2006)
New Revision: 1695

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/extra/eclipse.sh
Log:
*debian/extra/eclipse.sh: Make the -vmargs and -install
 arguments usable. Closes: #347749


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-01-11 11:43:58 UTC (rev 1694)
+++ trunk/eclipse/debian/changelog	2006-01-12 14:12:43 UTC (rev 1695)
@@ -1,9 +1,14 @@
 eclipse (3.1.1-9) unstable; urgency=low
 
-  * debian/extra/eclipse.sh: Made the -vm option working. 
+  [ Michael Koch ]
+  * debian/extra/eclipse.sh: Made the -vm option working.
 
- -- Michael Koch <konqueror at gmx.de>  Sat,  7 Jan 2006 21:00:18 +0000
+  [ Stephan Michels ]
+  * debian/extra/eclipse.sh: Make the -vmargs and -install
+    arguments usable. Closes: #347749
 
+ -- Stephan Michels <stephan at apache.org>  Thu, 12 Jan 2006 14:44:53 +0100
+
 eclipse (3.1.1-8) unstable; urgency=low
 
   * debian/eclipse-platform.preinst: Make /usr/lib/eclipse/features a real

Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh	2006-01-11 11:43:58 UTC (rev 1694)
+++ trunk/eclipse/debian/extra/eclipse.sh	2006-01-12 14:12:43 UTC (rev 1695)
@@ -7,6 +7,8 @@
 #unset JAVA_HOME; export JAVA_HOME
 
 CMDLINEARGS=""
+VMARGS=""
+INSTALL="/usr/lib/eclipse"
 
 # Make sure this directory exists.
 if [ ! -d ~/.eclipse ]; then
@@ -43,6 +45,16 @@
         unset JAVA_HOME
         JAVACMD="$1"
         shift
+    elif [ "$1" = "-install" ]; then
+        shift
+        INSTALL="$1"
+        shift
+    elif [ "$1" = "-vmargs" ]; then
+        shift
+	while [ "$1" ]; do
+		VMARGS="${VMARGS} $1"
+	        shift
+        done
     else
         CMDLINEARGS="${CMDLINEARGS} $1"
         shift
@@ -108,10 +120,11 @@
 # Do the actual launch of Eclipse with the selected VM.
 /usr/lib/eclipse/eclipse \
     -vm "${JAVACMD}" \
-    -install /usr/lib/eclipse ${CMDLINEARGS} \
+    -install ${INSTALL} \
+    ${CMDLINEARGS} \
     -vmargs -Djava.library.path=/usr/lib/jni \
             -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \
             -Dgnu.gcj.runtime.VMClassLoader.library_control=never \
-            -Dosgi.locking=none
+            -Dosgi.locking=none ${VMARGS}
 
 exit $?