[icedtea-web] RFC: add proxy auto config support

[Dr Andrew John Hughes]

On 12:57 Mon 07 Mar     , Omair Majid wrote:

(snip... getting crazy up here)

> I have pushed the PAC support. Thanks again for the extensive review.
> 
> The attached two patches fix build.properties and jrunscript. They will 
> probably conflict with each other if applied together; I will sort that 
> out when I commit them.
> 
> jrunscript.patch creates a jrunscript.in file which is processed to 
> create jrunscript.
> 
> rhino-build-properties.patch creates a build.properties.in file which is 
> processed by to create build.properties.
> 
> Any thoughts or comments?
> 

Fine.  Ok to commit.

> Cheers,
> Omair

> diff -r 167e9e2b3a20 Makefile.am
> --- a/Makefile.am	Mon Mar 07 11:24:34 2011 -0500
> +++ b/Makefile.am	Mon Mar 07 12:48:08 2011 -0500
> @@ -406,15 +406,6 @@
>  # check
>  # ==========================
>  
> -jrunscript:
> -if WITH_RHINO
> -	echo '$(BOOT_DIR)/bin/java -cp $(RHINO_JAR) org.mozilla.javascript.tools.shell.Main $$@' > jrunscript
> -	chmod u+x jrunscript
> -else
> -	echo "jrunscript requires rhino support"
> -	exit 1
> -endif
> -
>  check-pac-functions: stamps/bootstrap-directory.stamp jrunscript
>  	./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
>  	  $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
> diff -r 167e9e2b3a20 configure.ac
> --- a/configure.ac	Mon Mar 07 11:24:34 2011 -0500
> +++ b/configure.ac	Mon Mar 07 12:48:08 2011 -0500
> @@ -80,4 +80,7 @@
>  IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
>  IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
>  
> +
> +AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])
> +
>  AC_OUTPUT
> diff -r 167e9e2b3a20 jrunscript.in
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/jrunscript.in	Mon Mar 07 12:48:08 2011 -0500
> @@ -0,0 +1,8 @@
> +#!/bin/bash
> +
> +if [ x"@RHINO_JAR@" == x ] ; then
> +  echo "jrunscript requires rhino support"
> +  exit 1
> +fi
> +
> + at JAVA@ -cp "@RHINO_JAR@" org.mozilla.javascript.tools.shell.Main $@

> diff -r 167e9e2b3a20 Makefile.am
> --- a/Makefile.am	Mon Mar 07 11:24:34 2011 -0500
> +++ b/Makefile.am	Mon Mar 07 12:31:59 2011 -0500
> @@ -255,14 +255,6 @@
>  	sed -i '/RhinoBasedPacEvaluator/ d' $@
>  endif
>  
> -build.properties:
> -	echo "# This contains build-time settings " > $@
> -if WITH_RHINO
> -	echo "rhino.available=true" >> $@
> -else
> -	echo "rhino.available=false" >> $@
> -endif
> -
>  stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp \
>   build.properties
>  	mkdir -p $(NETX_DIR)
> diff -r 167e9e2b3a20 acinclude.m4
> --- a/acinclude.m4	Mon Mar 07 11:24:34 2011 -0500
> +++ b/acinclude.m4	Mon Mar 07 12:31:59 2011 -0500
> @@ -297,7 +297,13 @@
>    if test x"${RHINO_JAR}" = "xno"; then
>      RHINO_JAR=
>    fi
> +  if test -n ${RHINO_JAR} ; then
> +    RHINO_AVAILABLE=true
> +  else
> +    RHINO_AVAILABLE=false
> +  fi
>    AC_SUBST(RHINO_JAR)
> +  AC_SUBST(RHINO_AVAILABLE)
>  ])
>  
>  AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
> diff -r 167e9e2b3a20 build.properties.in
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/build.properties.in	Mon Mar 07 12:31:59 2011 -0500
> @@ -0,0 +1,2 @@
> +# build-time settings
> +rhino.available=@RHINO_AVAILABLE@
> diff -r 167e9e2b3a20 configure.ac
> --- a/configure.ac	Mon Mar 07 11:24:34 2011 -0500
> +++ b/configure.ac	Mon Mar 07 12:31:59 2011 -0500
> @@ -80,4 +80,6 @@
>  IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
>  IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
>  
> +AC_CONFIG_FILES([build.properties])
> +
>  AC_OUTPUT


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37