[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin jar,NONE,1.1.2.1 java,NONE,1.1.2.1 javac,NONE,1.1.2.1 javadoc,NONE,1.1.2.1 javah,NONE,1.1.2.1 rmic,NONE,1.1.2.1 rmiregistry,NONE,1.1.2.1



Update of /cvs/debian-openoffice/oo-deb/debian/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin
In directory gluck:/tmp/cvs-serv9379/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/bin

Added Files:
      Tag: OPENOFFICE_ORG680
	jar java javac javadoc javah rmic rmiregistry 
Log Message:
   - create links to /usr/bin/g{cc,++}-4.0 in debian/usr/bin and
     change path to use them, ooo-build doesn't honor CC and CXX [RE]
  * debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat
    1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it
    in Debian (in NEW...).
    Needed to overcome shortcomings in OOo's build which sometimes uses javac
    and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again
    Matthias Klose [RE]


--- NEW FILE: rmic ---
#!/bin/sh

exec /usr/bin/grmic-4.0 ${1+"$@"}

--- NEW FILE: rmiregistry ---
#!/bin/sh

exec /usr/bin/grmiregistry-4.0 ${1+"$@"}

--- NEW FILE: javah ---
#!/bin/sh

exec /usr/bin/gcjh-4.0 -jni ${1+"$@"}

--- NEW FILE: jar ---
#!/bin/sh

exec /usr/bin/fastjar ${1+"$@"}

--- NEW FILE: javac ---
#!/bin/sh

case $CLASSPATH in
*/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/lib/tools.jar*) ;;
*) export CLASSPATH=$CLASSPATH${CLASSPATH:+:}/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/lib/tools.jar
esac

case $CLASSPATH in
*/usr/share/java/ecj.jar*) ;;
*) export CLASSPATH=$CLASSPATH:/usr/share/java/ecj.jar
esac

exec /usr/bin/gij-4.0 com.sun.tools.javac.Main ${1+"$@"}

--- NEW FILE: java ---
#!/bin/sh
# Emulate the jdk java command using gcj
# (c) 2002-2003 Bernhard Rosenkraenzer <bero@arklinux.org>

libgcjjar="/usr/share/java/libgcj-`/usr/bin/gij-4.0 --version | \
    head -n 1 | sed 's:^gij .* version \([^[:space:]]*\) .*$:\1:'`.jar"

if [ -n "$CLASSPATH" ]; then
        clp="$CLASSPATH:$libgcjjar"
else
        clp="$libgcjjar"
fi
unset HAVE_APPNAME || :
while [ "$#" != 0 ]; do
        if [ -z "$HAVE_APPNAME" -a "$1" = "-version" ]; then
                echo 'java version "1.4.2"' 1>&2
                gcj-4.0 --version 1>&2
                exit 0
        elif [ -z "$HAVE_APPNAME" -a "$1" = "-jar" ]; then
		shift
		params="$params -jar $1"
		HAVE_APPNAME=yes
        elif [ -z "$HAVE_APPNAME" -a \( "$1" = "-help" -o "$1" = "-?" \) ]; then
		gij --help
		exit 0
        elif [ -z "$HAVE_APPNAME" -a "$1" = "-fullversion" ]; then
                echo 'java full version "gcj-1.4.2"' 1>&2
                exit 0
        elif [ -z "$HAVE_APPNAME" -a "$1" = "-showversion" ]; then
                echo 'java version "1.4.2"' 1>&2
                gcj-4.0 --version 1>&2
        elif [ -z "$HAVE_APPNAME" -a \( "$1" = "-classpath" -o "$1" = "-cp" \) ]; then
                shift
                clp="`echo $1 | sed \"s~.*/lib/rt.jar~$libgcjjar~\"`"
	elif [ "`echo $1 |cut -b1-2`" = "-D" ]; then
		if [ "`echo $1 |cut -b1-20`" = "-Djava.library.path=" ]; then
			export LD_LIBRARY_PATH=`echo $1 |cut -b21-`:$LD_LIBRARY_PATH
		elif [ "`echo $1 |cut -b1-12`" = "-Djava.home=" ]; then
		    HAVE_JAVA_HOME=yes
		elif [ "`echo $1 |cut -b1-15`" = "-Djava.version=" ]; then
		    HAVE_JAVA_VERSION=yes
		elif [ "`echo $1 |cut -b1-16`" = "-Djava.ext.dirs=" ]; then
		    HAVE_JAVA_EXT_DIRS=yes
		elif [ "`echo $1 |cut -b1-22`" = "-Dsun.boot.class.path=" ]; then
		    HAVE_SUN_BOOT_CLASS_PATH=yes
		fi
		params="$params $1"
        elif [ -z "$HAVE_APPNAME" -a "`echo $1 |cut -b1`" = "-" ]; then
                # Yuck. Unknown parameter. Let's pretend nothing happened.
                echo "Warning: $1 not understood. Ignoring." >&2
        else
		if [ -n "$HAVE_APPNAME" ]; then
			params="$params $1"
		else
			params="$params `echo $1 |sed -e 's,/,.,g'`"
			HAVE_APPNAME=yes
		fi
        fi
        shift
done

if [ -z "$HAVE_JAVA_HOME" ]; then
    params="-Djava.home=/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/jre $params"
fi

if [ -z "$HAVE_JAVA_VERSION" ]; then
    params="-Djava.version=1.4.2 $params"
fi

if [ -z "$HAVE_JAVA_EXT_DIRS" ]; then
    params="-Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext $params"
fi

if [ -z "$HAVE_SUN_BOOT_CLASS_PATH" ]; then
    params="-Dsun.boot.class.path=/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/jre/lib/rt.jar $params"
fi

if ! echo $clp |grep -q "$libgcjjar"; then
	# We NEED this
	clp="$clp:$libgcjjar"
fi
export CLASSPATH="$clp"
exec /usr/bin/gij-4.0 $params

--- NEW FILE: javadoc ---
#!/bin/sh

exec /usr/bin/gjdoc ${1+"$@"}



Reply to: