Revision 41888

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/gvSIG.sh
110 110 
  local LOGGER_LEVEL="$1"
111 111 
  shift
112 112 
  echo "$LOGGER_LEVEL launch $@"
113 
  if [ ! -f "$LOGGER_FILE" ] ; then
114 
    LOGGER_TEMP1=$(dirname "$LOGGER_FILE")
115 
    mkdir -p "$LOGGER_TEMP1"
116 
  fi
117 113 
  echo "$LOGGER_LEVEL launch $@" >> "$LOGGER_FILE"
118 114 
}
119 115 

  		




  ......




  143
  139
  
    
# installeds and set as PREFERED_ARCHITECTURE


  		




  144
  140
  
    
##########################################################


  		




  145
  141
  
    

  		




  146
  
  
    
x=$(find "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones" -name package.info -exec grep "architecture=[^a]" {} ';' | sort|head -n 1)


  		




  
  142
  
    
cd "$GVSIG_INSTALL_FOLDER"


  		




  
  143
  
    
x=$(find "./gvSIG/extensiones" -name package.info)


  		




  
  144
  
    
x=$(grep -h "architecture=[^a]" $x | sort|head -n 1)


  		




  147
  145
  
    
if [ "X${x}X" != "XX" ] ; then


  		




  148
  146
  
    
	eval $x


  		




  149
  147
  
    
	PREFERED_ARCHITECTURE="$architecture"


  		




  150
  148
  
    
else


  		




  151
  149
  
    
	PREFERED_ARCHITECTURE="$ARCH"


  		




  152
  150
  
    
fi


  		




  
  151
  
    
cd -


  		




  153
  152
  
    

  		




  154
  153
  
    
##########################################################


  		




  155
  154
  
    

  		




  ......




  164
  163
  
    
PJH5=


  		




  165
  164
  
    
PJH6=


  		




  166
  165
  
    
if [ -d "$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586/jre" ] ; then


  		




  167
  
  
    
PJH5="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586/jre"


  		




  
  166
  
    
    PJH5="$GVSIG_INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586/jre"


  		




  168
  167
  
    
fi


  		




  169
  168
  
    
if [ -d /usr/lib/jvm ] ; then


  		




  170
  169
  
    
    PJH6=$(find /usr/lib/jvm -maxdepth 1 ! -name "jvm" -name "[a-zA-Z]*" ! -type l -print)


  		




  ......




  253
  252
  
    

  		




  254
  253
  
    
export LIBRARIES=""


  		




  255
  254
  
    
# Load gvSIG Andami jars and dependencies for the classpath 


  		




  256
  
  
    
for i in cd "$GVSIG_INSTALL_FOLDER/lib/"*.jar ; do


  		




  
  255
  
    
for i in "$GVSIG_INSTALL_FOLDER/lib/"*.jar ; do


  		




  257
  256
  
    
  if [ "$i" != "$GVSIG_INSTALL_FOLDER/lib/*.jar" -a "$i" != "" ]; then


  		




  258
  257
  
    
    LIBRARIES="${LIBRARIES}${CPSEP}${i}"


  		




  259
  258
  
    
  fi 


  		




  ......




  356
  355
  
    
        $GVSIG_JAVA_PARAMS \


  		




  357
  356
  
    
	$GVSIG_LAUNCHER $GVSIG_PARAMS


  		




  358
  357
  
    

  		




  359
  
  
    
eval ${JAVA} \


  		




  
  358
  
    
"${JAVA}" \


  		




  360
  359
  
    
	$FORCE_JAVA_32BITS \


  		




  361
  360
  
    
	-Xms${GVSIG_INITIAL_MEM} \


  		




  362
  361
  
    
	-Xmx${GVSIG_MAX_MEM} \


  		




  363
  362
  
    
	-XX:MaxPermSize=${GVSIG_MAX_PERM_SIZE} \


  		




  364
  363
  
    
        $DEBUG_OPTIONS \


  		




  365
  
  
    
	-Djava.library.path=\"${GVSIG_NATIVE_LIBS}\":/usr/lib \


  		




  366
  
  
    
	-cp $GVSIG_CLASSPATH \


  		




  
  364
  
    
	-Djava.library.path="${GVSIG_NATIVE_LIBS}":/usr/lib \


  		




  
  365
  
    
	-cp "$GVSIG_CLASSPATH" \


  		




  367
  366
  
    
        $GVSIG_JAVA_PARAMS \


  		




  368
  367
  
    
	$GVSIG_LAUNCHER $GVSIG_PARAMS


  		




  369
  
  
    
	


  		




  
  368
  
    
	


  		












Also available in:  Unified diff