Project

General

Profile

« Previous | Next » 

Revision c39c6b9e

Added by jahoti almost 2 years ago

Distinguish testing and installation browsers

The configure script now accepts BROWSER and TEST_BROWSER

View differences:

configure
17 17 

  		




  18
  18
  
    
# Set BROWSERPATH appropriately


  		




  19
  19
  
    
set_browserpath () {


  		




  20
  
  
    
    BROWSERPATH="${BINARY:-$(realpath "$1")}"


  		




  
  20
  
    
    BROWSERPATH="${BROWSERPATH:-$(realpath "$1")}"


  		




  21
  21
  
    
}


  		




  22
  22
  
    

  		




  23
  
  
    
BINARY="$BROWSER_BIN"


  		




  24
  
  
    
BROWSERPATH=''


  		




  25
  23
  
    
SRCDIR=''


  		




  26
  24
  
    
TARGET=''


  		




  27
  25
  
    

  		




  ......




  30
  28
  
    
    case "$1" in


  		




  31
  29
  
    
	--srcdir=*)           SRCDIR="$(echo "$1" | cut -c 10-)";;


  		




  32
  30
  
    
	--srcdir)                             SRCDIR="$2"; shift;;


  		




  33
  
  
    
	BROWSER_BIN=*)        BINARY="$(echo "$1" | cut -c 13-)";;


  		




  
  31
  
    
	BROWSER=*)        BROWSERPATH="$(echo "$1" | cut -c 9-)";;


  		




  34
  32
  
    
	DESTDIR=*)            DESTDIR="$(echo "$1" | cut -c 9-)";;


  		




  35
  33
  
    
	PYTEST=*)              PYTEST="$(echo "$1" | cut -c 8-)";;


  		




  36
  34
  
    
	PYTHON=*)              PYTHON="$(echo "$1" | cut -c 8-)";;


  		




  
  35
  
    
	TEST_BROWSER=*) TEST_BROWSER="$(echo "$1" | cut -c 14-)";;


  		




  37
  36
  
    
	TEST_PORT=*)       TEST_PORT="$(echo "$1" | cut -c 11-)";;


  		




  38
  37
  
    
	TEST_PROFILE=*) TEST_PROFILE="$(echo "$1" | cut -c 14-)";;


  		




  39
  38
  
    
	UPDATE_URL=*)     UPDATE_URL="$(echo "$1" | cut -c 12-)";;


  		




  ......




  81
  80
  
    
    set_browserpath "$(which $TARGET)"


  		




  82
  81
  
    
fi


  		




  83
  82
  
    

  		




  
  83
  
    
TEST_BROWSER="${TEST_BROWSER:-$BROWSERPATH}"


  		




  
  84
  
    

  		




  84
  85
  
    
# Check and standardize target


  		




  85
  86
  
    
case "$TARGET" in


  		




  86
  87
  
    
    mozilla | firefox | abrowser | icecat | iceweasel-uxp |\


  		




  ......




  115
  116
  
    

  		




  116
  117
  
    
# (Re-)write testing.conf


  		




  117
  118
  
    
rm -f testing.conf


  		




  118
  
  
    
[ "x$BINARY" != x ] && echo BINARY "$BINARY" >> testing.conf


  		




  
  119
  
    
[ "x$TEST_BROWSER" != x ] && echo BINARY "$TEST_BROWSER" >> testing.conf


  		




  119
  120
  
    
[ "x$TEST_PROFILE" != x ] && echo TEST_PROFILE "$TEST_PROFILE" >> testing.conf


  		




  120
  121
  
    
[ "x$TEST_PORT" != x ] && echo TEST_PORT "$TEST_PORT" >> testing.conf


  		




  121
  122
  
    

  		












Also available in:  Unified diff