Add '-client -Xmx256m' to VM arguments for 32-bit OS in package scripts.

cusax-fix
Sebastien Vincent 16 years ago
parent a04446550e
commit b3914e8d42

@ -704,6 +704,12 @@
<isset property="sparkle"/>
</condition>
<condition property="jvmarg"
value="-client -Xmx256m"
else="" >
<os arch="i386" />
</condition>
<!-- This creates the .app for MacOSX -->
<jarbundler dir="${macosx.app.dir}"
name="${application.name}"
@ -719,7 +725,7 @@
stubfile="${macosx.stubfile}"
extraclasspath="/System/Library/Java"
workingdirectory="$APP_PACKAGE/Contents/Resources/Java"
vmoptions="-agentlib:AEGetURLEventHandlerAgent">
vmoptions="-agentlib:AEGetURLEventHandlerAgent ${jvmarg}">
<javaproperty name="apple.laf.useScreenMenuBar" value="true"/>
<javaproperty name="apple.awt.brushMetalRounded" value="true"/>

@ -1,5 +1,16 @@
#!/bin/bash
# Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
# Additionnal JVM arguments
CLIENTARGS=""
if [ $ARCH -eq 32 ]
then
CLIENTARGS="-client -Xmx256m"
fi
javabin=`which java`
SCDIR=/usr/lib/sip-communicator
@ -7,7 +18,7 @@ LIBPATH=$SCDIR/lib
CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar
FELIX_CONFIG=$LIBPATH/felix.client.run.properties
LOG_CONFIG=$LIBPATH/logging.properties
COMMAND="$javabin -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"
COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"
# set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's)
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native

@ -1,4 +1,15 @@
mkdir -p $HOME/.sip-communicator/log
# Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
# Additionnal JVM arguments
CLIENTARGS=""
if [ $ARCH -eq 32 ]
then
CLIENTARGS="-client -Xmx256m"
fi
export PATH=$PATH:native
java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:lib/bcprovider.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
java $CLIENTARGS -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:lib/bcprovider.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator

Loading…
Cancel
Save