Revision 37824 branches/v2_0_0_prep/build/product/gvSIG.sh

View differences:

gvSIG.sh
7 7

  
8 8
# Java home
9 9
export JAVA_HOME=${JAVA_HOME}
10
if [ "$JAVA_HOME" = "" ] ; then
11
  JAVA="java"
12
else
13
  JAVA="$JAVA_HOME/bin/java"
14
fi
10 15

  
16

  
11 17
# gvSIG installation folder
12 18
GVSIG_HOME=`dirname "$0"`
13 19

  
......
30 36
# Go into the gvSIG installation folder, just in case
31 37
cd "${GVSIG_HOME}"
32 38

  
39
LIBRARIES=""
33 40
# Load gvSIG Andami jars and dependencies for the classpath 
34 41
for i in ./lib/*.jar ; do
35 42
  LIBRARIES=$LIBRARIES:"$i"
......
41 48
# echo Initial libraries found: ${LIBRARIES}
42 49

  
43 50
# gvSIG Andami launcher
44
GVSIG_LAUNCHER=org.gvsig.andamiupdater.Updater
51
if [ "$GVSIG_LAUNCHER" = "" ] ; then
52
  GVSIG_LAUNCHER=org.gvsig.andamiupdater.Updater
53
fi
54
if [ "$GVSIG_PARAMS" = "" ] ; then
55
  GVSIG_PARAMS=gvSIG gvSIG/extensiones "$@"
56
fi
45 57

  
46 58
# gvSIG initial classpath
47
GVSIG_CLASSPATH=$LIBRARIES
59
GVSIG_CLASSPATH="$LIBRARIES:$GVSIG_CLASSPATH"
48 60

  
49 61
########################
50 62
# Memory configuration #
......
68 80
# http://download.oracle.com/javase/6/docs/technotes/tools/windows/java.html
69 81
# http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
70 82

  
71
echo Launching gvSIG: ${JAVA_HOME}/bin/java \
83
echo Launching gvSIG: ${JAVA} \
72 84
	-Djava.library.path=/usr/lib:"${GVSIG_NATIVE_LIBS}" \
73 85
	-cp $GVSIG_CLASSPATH \
74 86
	-Xms${GVSIG_INITIAL_MEM} \
75 87
	-Xmx${GVSIG_MAX_MEM} \
76 88
	-XX:MaxPermSize=${GVSIG_MAX_PERM_SIZE} \
77
	$GVSIG_LAUNCHER gvSIG gvSIG/extensiones "$@"
89
	$GVSIG_LAUNCHER $GVSIG_PARAMS
78 90

  
79
${JAVA_HOME}/bin/java \
91
${JAVA} \
80 92
	-Djava.library.path=/usr/lib:"${GVSIG_NATIVE_LIBS}" \
81 93
	-cp $GVSIG_CLASSPATH \
82 94
	-Xms${GVSIG_INITIAL_MEM} \
83 95
	-Xmx${GVSIG_MAX_MEM} \
84 96
	-XX:MaxPermSize=${GVSIG_MAX_PERM_SIZE} \
85
	$GVSIG_LAUNCHER gvSIG gvSIG/extensiones "$@"
97
	$GVSIG_LAUNCHER $GVSIG_PARAMS

Also available in: Unified diff