incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1220726 [2/6] - in /incubator/ooo/branches/alg/svgreplacement: ./ ext_sources/ main/ main/beanshell/ main/berkeleydb/ main/bridges/source/cpp_uno/cc50_solaris_intel/ main/bridges/source/cpp_uno/cc50_solaris_sparc/ main/bridges/source/cpp_u...
Date Mon, 19 Dec 2011 13:03:57 GMT
Modified: incubator/ooo/branches/alg/svgreplacement/main/config.sub
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/config.sub?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/config.sub (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/config.sub Mon Dec 19 13:03:54 2011
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
-timestamp='2003-07-04'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,22 +22,26 @@ timestamp='2003-07-04'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -70,8 +75,9 @@ Report bugs and patches to <config-patch
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -83,11 +89,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +105,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +124,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,10 +153,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -169,6 +181,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +201,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,53 +248,71 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -292,56 +330,71 @@ case $basic_machine in
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -359,6 +412,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -376,6 +432,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -399,6 +458,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -407,10 +470,26 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -435,12 +514,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -463,6 +557,14 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -613,6 +715,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -624,10 +734,17 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -641,10 +758,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -657,6 +770,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -725,10 +841,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -736,9 +848,12 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -756,6 +871,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -765,6 +888,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -821,6 +950,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -847,6 +980,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -858,6 +995,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -947,6 +1087,15 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -960,6 +1109,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1003,6 +1156,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1014,6 +1171,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1033,6 +1194,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1049,13 +1213,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1102,6 +1263,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1122,25 +1286,30 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1158,12 +1327,15 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1176,6 +1348,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1197,6 +1372,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1219,6 +1397,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1255,6 +1436,14 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1277,6 +1466,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1286,9 +1481,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1314,6 +1509,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1332,9 +1530,15 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1437,7 +1641,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@@ -1467,9 +1671,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1494,7 +1704,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

Modified: incubator/ooo/branches/alg/svgreplacement/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/configure.in?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/configure.in (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/configure.in Mon Dec 19 13:03:54 2011
@@ -80,11 +80,6 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_ENABLE(pch,
 [  --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
 ],,)
-AC_ARG_ENABLE(mozilla,
-[  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
-                          binary for your platform, to build without this
-                          version, use this option.
-],,enable_mozilla="yes")
 AC_ARG_WITH(fonts,
 [  --without-fonts         OOo includes some third-party fonts to provide a reliable
                           basis for help content, templates, samples, etc.
@@ -212,9 +207,9 @@ AC_ARG_ENABLE(gtk,
                           where Gtk+ is available.
 ],,enable_gtk=yes)
 AC_ARG_ENABLE(gstreamer,
-[  --disable-gstreamer     Determines whether to use the GStreamer media
+[  --enable-gstreamer      Determines whether to use the GStreamer media
                           backend on platforms where GStreamer is available.
-],,enable_gstreamer=yes)
+],,enable_gstreamer=no)
 AC_ARG_ENABLE(systray,
 [  --disable-systray       Determines whether to build the systray quickstarter.
 ],,enable_systray=yes)
@@ -255,6 +250,11 @@ AC_ARG_ENABLE(static-gtk,
 AC_ARG_ENABLE(layout,
 [  --enable-layout         Enable the compilation and use of layout dialogs
 ],,)
+AC_ARG_ENABLE(mozilla,
+[  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
+                          binary for your platform, to build without this
+                          version, use this option.
+],,enable_mozilla="yes")
 AC_ARG_ENABLE(build-mozilla,
 [  --disable-build-mozilla Use this option if you do not want to build the
                           mozilla components from the mozilla source code but
@@ -269,6 +269,14 @@ AC_ARG_WITH(mozilla-toolkit,
 [  --with-mozilla-toolkit  Choose which GUI toolkit to use while building mozilla
                           components. Default: gtk2
 ],,)
+AC_ARG_WITH(system-mozilla,
+[  --with-system-mozilla   Use mozilla already on system. Note that some
+                          components cannot be built against a contemporary
+                          mozilla. The flavour used can be specified by
+                          --with-system-mozilla=<flavour>. Supported are:
+                          libxul (default), xulrunner, firefox, seamonkey,
+                          mozilla
+], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
 AC_ARG_ENABLE(nss_module,
 [  --disable-nss-module    Whether to use provided NSS module     
 ],,enable_nss_module=yes)
@@ -314,7 +322,7 @@ AC_ARG_ENABLE(randr-link,
 AC_ARG_WITH(system-dicts,
 [  --with-system-dicts    Use dictionaries from system paths- Specify
                          them via --with-{dict,hyph,thes}-path=/path
-			 if you want to override the default ones
+                        if you want to override the default ones
 ],,)
 AC_ARG_WITH(external-dict-dir,
 [  --with-external-dict-dir Specify external dictionary dir
@@ -370,9 +378,6 @@ AC_ARG_WITH(system-icu,
 AC_ARG_WITH(system-poppler,
 [  --with-system-poppler   Use poppler already on system
 ],,)
-AC_ARG_WITH(system-db,
-[  --with-system-db        Use berkeley db already on system
-],,)
 AC_ARG_WITH(system-lucene,
 [  --with-system-lucene    Use lucene already on system
 ],,)
@@ -409,7 +414,10 @@ AC_ARG_WITH(hsqldb-jar,
 [ HSQLDB_JAR="$withval"
 ])
 AC_ARG_WITH(system-beanshell,
-[  --with-system-beanshell Use beanshell already on system
+[  --with-system-beanshell Use beanshell already on system (default)
+],,)
+AC_ARG_ENABLE(beanshell,
+[  --disable-beanshell     Disable the use of beanshell.
 ],,)
 AC_ARG_WITH(beanshell-jar,
 [  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
@@ -503,10 +511,13 @@ AC_ARG_WITH(libbase-jar,
 [ LIBBASE_JAR="$withval"
 ])
 AC_ARG_WITH(system-saxon,
-[  --with-system-saxon     Use saxon already on system
+[  --with-system-saxon     Use saxon already on system (default)
+],,)
+AC_ARG_ENABLE(saxon,
+[  --disable-saxon         Disable use of saxon
 ],,)
 AC_ARG_WITH(saxon-jar,
-[  --with-saxon-jar=JARFILE   Specify path to jarfile manually ],
+[  --with-saxon-jar=JARFILE   Specify path to jarfile manually. This implies --with-system-saxon ],
 [ SAXON_JAR="$withval"
 ])
 AC_ARG_WITH(system-libxslt,
@@ -579,14 +590,6 @@ AC_ARG_WITH(system-cppunit,
 AC_ARG_WITH(system-redland,
 [  --with-system-redland   Use redland library already on system
 ],,)
-AC_ARG_WITH(system-mozilla,
-[  --with-system-mozilla   Use mozilla already on system. Note that some
-                          components cannot be built against a contemporary
-                          mozilla. The flavour used can be specified by
-                          --with-system-mozilla=<flavour>. Supported are:
-                          libxul (default), xulrunner, firefox, seamonkey,
-                          mozilla
-], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
 AC_ARG_WITH(stlport,
 [  --with-stlport         The location that STLport is installed in. The STL
                           header files are assumed to be in
@@ -730,6 +733,9 @@ AC_ARG_WITH(local-solver,
  
                           Usage: --with-local-solver=<absolute path to solver>
 ],,)
+AC_ARG_ENABLE(javascript,
+[  --disable-javascript    Disables support for JavaScript macros.
+],,)
 AC_ARG_ENABLE(check-only,
 [  --enable-check-only     Use this option option if you just want to check your
                           environment.  This option stops the generation of an 
@@ -848,8 +854,12 @@ AC_ARG_ENABLE(verbose,
 AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking  Disables generation of dependency information.
 ],,)
-AC_ARG_ENABLE(copyleft,
-[  --enable-copyleft      Whether to use copyleft components.
+AC_ARG_ENABLE(category-b,
+[  --enable-category-b     Activate components under a category B license 
+                          (see http://www.apache.org/legal/3party.html#category-b):
+                          MPL (seamonkey, hunspell, hyphen, nss, saxon, rhino),
+                          CPL (silgraphite), SPL (beanshell).
+                          Flags for individual libraries override this one.
 ],,)
 AC_ARG_WITH(arm-target,
 [  --arm-target        The minimal targeted arm processor
@@ -971,9 +981,9 @@ case "$build_os" in
 		test_cairo=yes
 		test_kde=yes
 		test_cups=yes
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
+        	test_gstreamer=yes
 		_os=SunOS
 		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
 		if test -z "$GNUTAR"; then
@@ -1006,10 +1016,10 @@ case "$build_os" in
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
-        _os=Linux	
+        	test_gstreamer=yes
+        	_os=Linux	
 		;;
 	gnu)
 		test_cups=no
@@ -1019,30 +1029,30 @@ case "$build_os" in
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
-        test_gstreamer=no
+        	test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
 		test_cups=yes
 		test_gtk=yes
 		test_cairo=yes
-        test_randr=no
+        	test_randr=no
 		test_freetype=no
-        test_gstreamer=no
+        	test_gstreamer=no
 		_os=Darwin
-      if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
-         echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
-         enable_systray=no
-      fi
+      		if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
+         	   AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
+         	   echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn
+         	   enable_systray=no
+      		fi
 		;;
 	os2*)
 		test_x=no
 		test_cups=no
-        test_randr=no
+        	test_randr=no
 		test_gtk=no
 		test_freetype=no
-        test_gstreamer=no
+        	test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -1051,9 +1061,9 @@ case "$build_os" in
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
+        	test_gstreamer=yes
 		AC_MSG_CHECKING([the FreeBSD operating system release])
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
@@ -1077,7 +1087,7 @@ case "$build_os" in
 		;;
 	osf)
 		test_cups=no
-        test_randr=no
+        	test_randr=no
 		_os=OSF1
 		;;
 	netbsd)
@@ -1086,19 +1096,19 @@ case "$build_os" in
 		test_kde=yes
 		test_kde4=yes
 		test_cups=no
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
+        	test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
 		;;
 	aix*)
 		test_cups=no
-        test_randr=no
+        	test_randr=no
 		test_freetype=yes
-        test_gstreamer=yes
-	   PTHREAD_LIBS=-pthread
+        	test_gstreamer=yes
+	   	PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
 		;;
@@ -1246,31 +1256,59 @@ else
       DISABLE_STRIP=
    fi
 fi
+if test -z "$DISABLE_STRIP"; then
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+fi
 AC_SUBST(DISABLE_STRIP)
 
 dnl ===================================================================
 dnl Build options
 dnl ===================================================================
 
-AC_MSG_CHECKING([whether to enable copyleft components])
-if test "$enable_copyleft" != "yes"; then
-
-   enable_mozilla="no"
-   enable_nss_module="no"
-   enable_gstreamer="no"
+# Disable or enable libraries seamonkey, nss, hunspell, hyphen, saxon,
+# rhino, silgraphite, beanshell.
 
-   DISABLE_SAXON="TRUE"
+# Note that further below they may be enabled or disabled again by
+# more specific options.
 
-   AC_MSG_RESULT([no])
+AC_MSG_CHECKING([whether to enable category B components])
+# Category B modules (libraries):
+#   moz (seamonkey)
+#   nss (nss)
+#   hunspell (hunspell)
+#   hyphen (hyphen)
+#   saxon (saxon)
+#   rhino (rhino)
+#   beanshell (beanshell)
+#   graphite (silgraphite)
+if test "$enable_category_b" == "yes"; then
+#   enable_mozilla="yes"
+#   enable_nss_module="yes"
+   enable_hunspell="yes"
+   enable_hyphen="yes"
+   enable_saxon="yes"
+   enable_javascript="yes"
+   enable_beanshell="yes"
+   enable_graphite="yes"
 
+   AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite to be built])
 else
+   # Disable libaries.
+   enable_mozilla="no"
+   enable_nss_module="no"
+   enable_hunspell="no"
+   enable_hyphen="no"
+   enable_saxon="no"
+   enable_javascript="no"
+   enable_beanshell="no"
+   enable_graphite="no"
 
-   DISABLE_SAXON=
-
-   AC_MSG_RESULT([yes])
-
+   AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite])
 fi
-AC_SUBST(DISABLE_SAXON)
+
+# gstreamer is used only via pre-installed libraries: not a problem
 
 
 AC_MSG_CHECKING([whether to enable native CUPS support])
@@ -3895,44 +3933,6 @@ HOME=`echo $HOME | sed 's:\\\\:/:g'`
 AC_SUBST(HOME)
 
 dnl ===================================================================
-dnl Check for system berkley db
-dnl ===================================================================
-AC_MSG_CHECKING([which db to use])
-if test -n "$with_system_db" -o -n "$with_system_libs" && \
-	test "$with_system_db" != "no"; then
-    SYSTEM_DB=YES
-    AC_MSG_RESULT([external])
-    AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
-        [
-             CFLAGS=-I/usr/include/db4
-             AC_CHECK_HEADER(db4/db.h,
-             [ DB_INCLUDES=/usr/include/db4 ],
-             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
-        ], []
-    )
-    AC_MSG_CHECKING([whether db is at least 4.1])
-    AC_TRY_RUN([
-#include <db.h>
-
-int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
-       else return 1;
-}
-    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
-    AC_HAVE_LIBRARY(db, [],
-      [AC_MSG_ERROR([db not installed or functional])], [])
-    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_DB=NO
-    BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
-fi
-AC_SUBST(SYSTEM_DB)
-AC_SUBST(DB_VERSION)
-AC_SUBST(DB_INCLUDES)
-AC_SUBST(DB_JAR)
-
-dnl ===================================================================
 dnl Check for system lucene
 dnl ===================================================================
 AC_MSG_CHECKING([which lucene to use])
@@ -4160,6 +4160,7 @@ AC_SUBST(HSQLDB_JAR)
 dnl ===================================================================
 dnl Check for system beanshell
 dnl ===================================================================
+ENABLE_BEANSHELL=YES
 AC_MSG_CHECKING([which beanshell to use])
 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
        test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
@@ -4170,19 +4171,29 @@ if test -n "$with_system_beanshell" -o -
         fi
         AC_CHECK_FILE($BSH_JAR, [],
                [AC_MSG_ERROR(bsh.jar not found.)], [])
-else
+elif test "x$enable_beanshell" = "xyes"; then
     AC_MSG_RESULT([internal])
     SYSTEM_BSH=NO
     BUILD_TYPE="$BUILD_TYPE BSH"
+else
+    AC_MSG_RESULT([none (disabled)])
+    SYSTEM_BSH=NO
+    ENABLE_BEANSHELL=NO
 fi
 AC_SUBST(SYSTEM_BSH)
 AC_SUBST(BSH_JAR)
+AC_SUBST(ENABLE_BEANSHELL)
 
 
 dnl ===================================================================
-dnl Check for system saxon
+dnl Check for saxon.  It can come from two different places:
+dnl - pre-installed on the system.  This is checked when the --with-system-saxon
+dnl   option is given to configure.
+dnl   The exact place can be specified with the --with-saxon-jar=<path> option.
+dnl - From the saxon tar ball in ext_sources/.  This is used when --enable-saxon
+dnl   is given to configure but not any of --with-system-saxon or --with-saxon-jar.
 dnl ===================================================================
-if test -n "$enable_copyleft" -a "$enable_copyleft" != "no"; then
+DISABLE_SAXON=
 AC_MSG_CHECKING([which saxon to use])
 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
        test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
@@ -4275,18 +4286,35 @@ _ACEOF
           cat saxontest.java >&5
           AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
         fi
-else
+elif test "x$enable_saxon" = "xyes"; then
     AC_MSG_RESULT([internal])
     SYSTEM_SAXON=NO
-    NEED_SAXON=TRUE
+    BUILD_TYPE="$BUILD_TYPE SAXON"
+else
+    AC_MSG_RESULT([none (disabled)])
+    SYSTEM_SAXON=NO
+    DISABLE_SAXON=YES
 fi
 AC_SUBST(SYSTEM_SAXON)
 AC_SUBST(SAXON_JAR)
+AC_SUBST(DISABLE_SAXON)
 
-if test -n "$NEED_SAXON"; then
-   BUILD_TYPE="$BUILD_TYPE SAXON"
-fi
+
+dnl ===================================================================
+dnl Check for rhino
+dnl ===================================================================
+ENABLE_JAVASCRIPT=
+AC_MSG_CHECKING([whether to enable support for JavaScript])
+if test "x$enable_javascript" = "xyes"; then
+   BUILD_TYPE="$BUILD_TYPE RHINO"
+   AC_MSG_RESULT([yes])
+   ENABLE_JAVASCRIPT=YES
+else
+   AC_MSG_RESULT([no])
+   ENABLE_JAVASCRIPT=NO
 fi
+AC_SUBST(ENABLE_JAVASCRIPT)
+
 
 dnl ===================================================================
 dnl Check for system curl
@@ -4418,6 +4446,7 @@ else
 fi
 AC_SUBST(SYSTEM_ODBC_HEADERS)
 
+WITH_MOZILLA=NO
 AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components])
 if test "$enable_mozilla" = "no"; then
    AC_MSG_RESULT([no])
@@ -4427,7 +4456,6 @@ else
    AC_MSG_RESULT([yes])
    WITH_MOZILLA=YES
 fi
-AC_SUBST(WITH_MOZILLA)
 
 AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
 if test "$enable_mozilla" = "no"; then
@@ -4586,6 +4614,7 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
+    WITH_MOZILLA=YES
 if test -z "$with_mozilla_version"; then
    MOZILLA_VERSION=
 else
@@ -4596,6 +4625,7 @@ else
 fi
 
 AC_SUBST(MOZILLA_VERSION)
+AC_SUBST(WITH_MOZILLA)
 
 AC_MSG_CHECKING([for toolkit mozilla should use])
 if test -z "$with_mozilla_toolkit"; then
@@ -4839,8 +4869,9 @@ dnl ====================================
 dnl Graphite
 dnl ===================================================================
 
+ENABLE_GRAPHITE="FALSE"
 AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
+if test "x$enable_graphite" = "xyes" -a \( "$_os" = "WINNT" -o "$_os" = "Linux" \) ; then
     AC_MSG_RESULT([yes])
     ENABLE_GRAPHITE="TRUE"
     AC_MSG_CHECKING([which graphite to use])
@@ -4856,6 +4887,7 @@ if test "$_os" = "WINNT" -o "$_os" = "Li
     fi
 else
    AC_MSG_RESULT([no])
+   ENABLE_GRAPHITE="FALSE"
 fi
 AC_SUBST(ENABLE_GRAPHITE)
 AC_SUBST(SYSTEM_GRAPHITE)
@@ -5805,7 +5837,7 @@ ENABLE_GSTREAMER=""
 if test "$test_gstreamer" = "yes"; then
     AC_MSG_CHECKING([whether to build the GStreamer media backend])
     if test "x$enable_gstreamer" != "xno" ; then
-        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
+        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Do not use --enable-gstreamer or install the missing packages]))
         ENABLE_GSTREAMER="TRUE"
         AC_MSG_RESULT([yes])
     else
@@ -6758,16 +6790,13 @@ else
 case "$_os" in
 	WINNT*) # Windows
 	    SYSTEM_LIBJPEG=NO
-	    AC_MSG_RESULT([yes])
 		;;
 	Darwin*)
 	    SYSTEM_LIBJPEG=NO
-	    AC_MSG_RESULT([yes])
 	    ;;
    *)
-   SYSTEM_LIBJPEG=YES
-   AC_MSG_RESULT([no])
-   ;;
+        SYSTEM_LIBJPEG=YES
+        ;;
 esac
 fi
 
@@ -7167,7 +7196,11 @@ AC_SUBST(BUILD_TYPE)
 # make sure config.guess is +x; we execute config.guess, so it has to be so; 
 chmod +x ./config.guess
 
-AC_OUTPUT([set_soenv Makefile])
+# Create files from their *.in templates.
+AC_CONFIG_FILES([set_soenv Makefile])
+
+AC_MSG_NOTICE([writing config.status])
+AC_OUTPUT
 
 dnl Executing the set_soenv script to setup the environment variables.
 chmod a+x set_soenv

Modified: incubator/ooo/branches/alg/svgreplacement/main/default_images/introabout/about.png
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/default_images/introabout/about.png?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/ooo/branches/alg/svgreplacement/main/default_images/introabout/intro.png
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/default_images/introabout/intro.png?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,4 +1,4 @@
-dt      desktop :    L10N:l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh filter LIBXSLT:libxslt NULL
+dt      desktop :    L10N:l10n sfx2 stoc sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh filter LIBXSLT:libxslt NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/dp_persmap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/dp_persmap.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/dp_persmap.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/dp_persmap.cxx Mon Dec 19 13:03:54 2011
@@ -19,231 +19,301 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
 #include "dp_misc.h"
-#include "dp_ucb.h"
 #include "dp_persmap.h"
 #include "rtl/strbuf.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "osl/file.hxx"
-#include "osl/thread.h"
 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
 using namespace ::rtl;
-using ::osl::File;
+
+// the persistent map is used to manage a handful of key-value string pairs
+// this implementation replaces a rather heavy-weight berkeleydb integration
+
+// the file backing up a persistent map consists of line pairs with
+// - a key string   (encoded with chars 0x00..0x0F being escaped)
+// - a value string (encoded with chars 0x00..0x0F being escaped)
 
 namespace dp_misc
 {
 
+static const char PmapMagic[4] = {'P','m','p','1'};
+
 //______________________________________________________________________________
-void PersistentMap::throw_rtexc( int err, char const * pmsg ) const
+PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
+:	m_MapFile( expandUnoRcUrl(url_) )
+,	m_bReadOnly( readOnly)
+,	m_bIsOpen( false)
+,	m_bToBeCreated( !readOnly)
+,	m_bIsDirty( false)
 {
-    OUStringBuffer buf;
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[") );
-    buf.append( m_sysPath );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] Berkeley Db error (") );
-    buf.append( static_cast<sal_Int32>(err) );
-    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("): ") );
-    if (pmsg == 0)
-        pmsg = DbEnv::strerror(err);
-    const OString msg(pmsg);
-    buf.append( OUString( msg.getStr(), msg.getLength(),
-                          osl_getThreadTextEncoding() ) );
-    const OUString msg_(buf.makeStringAndClear());
-    OSL_ENSURE( 0, rtl::OUStringToOString(
-                    msg_, RTL_TEXTENCODING_UTF8 ).getStr() );
-    throw RuntimeException( msg_, Reference<XInterface>() );
+	open();
 }
 
 //______________________________________________________________________________
+PersistentMap::PersistentMap()
+:	m_MapFile( OUString())
+,	m_bReadOnly( false)
+,	m_bIsOpen( false)
+,	m_bToBeCreated( false)
+,	m_bIsDirty( false)
+{}
+
+//______________________________________________________________________________
 PersistentMap::~PersistentMap()
 {
-    try {
-        m_db.close(0);
-    }
-    catch (DbException & exc) {
-        (void) exc; // avoid warnings
-        OSL_ENSURE( 0, DbEnv::strerror( exc.get_errno() ) );
-    }
+	if( m_bIsDirty)
+		flush();
+	if( m_bIsOpen)
+		m_MapFile.close();
 }
 
 //______________________________________________________________________________
-PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
-    : m_db( 0, 0 )
+
+// replace 0x00..0x0F with "%0".."%F"
+// replace "%" with "%%"
+static OString encodeString( const OString& rStr)
 {
-    try {
-        OUString url( expandUnoRcUrl(url_) );
-        if ( File::getSystemPathFromFileURL( url, m_sysPath ) != File::E_None )
-        {
-            OSL_ASSERT( false );
-        }
-        OString cstr_sysPath(
-            OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
-        char const * pcstr_sysPath = cstr_sysPath.getStr();
-        
-        u_int32_t flags = DB_CREATE;
-        if (readOnly) {
-            flags = DB_RDONLY;
-            if (! create_ucb_content(
-                    0, url,
-                    Reference<com::sun::star::ucb::XCommandEnvironment>(),
-                    false /* no throw */ )) {
-                // ignore non-existent file in read-only mode: simulate empty db
-                pcstr_sysPath = 0;
-                flags = DB_CREATE;
-            }
-        }
-        
-        int err = m_db.open(
-            // xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used
-            0, pcstr_sysPath, 0, DB_HASH, flags/* | DB_THREAD*/, 0664 /* fs mode */ );
-        if (err != 0)
-            throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
+	const sal_Char* pChar = rStr.getStr();
+	const sal_Int32 nLen = rStr.getLength();
+	sal_Int32 i = nLen;
+	// short circuit for the simple non-encoded case
+	while( --i >= 0)
+	{
+		const sal_Char c = *(pChar++);
+		if( (0x00 <= c) && (c <= 0x0F))
+			break;
+		if( c == '%')
+			break;
+	}
+	if( i < 0)
+		return rStr;
+
+	// escape chars 0x00..0x0F with "%0".."%F"
+	OStringBuffer aEncStr( nLen + 32);
+	aEncStr.append( pChar - (nLen-i), nLen - i);
+	while( --i >= 0)
+	{
+		sal_Char c = *(pChar++);
+		if( (0x00 <= c) && (c <= 0x0F))
+		{
+			aEncStr.append( '%');
+			c += (c <= 0x09) ? '0' : 'A'-10;
+		} else if( c == '%')
+			aEncStr.append( '%');
+		aEncStr.append( c);
+	}
+
+	return aEncStr.makeStringAndClear();
 }
 
 //______________________________________________________________________________
-PersistentMap::PersistentMap()
-    : m_db( 0, 0 )
+
+// replace "%0".."%F" with 0x00..0x0F
+// replace "%%" with "%"
+static OString decodeString( const sal_Char* pEncChars, int nLen)
 {
-    try {
-        // xxx todo: DB_THREAD, DB_DBT_MALLOC currently not used
-        int err = m_db.open( 0, 0, 0, DB_HASH, DB_CREATE/* | DB_THREAD*/, 0 );
-        if (err != 0)
-            throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
+	const char* pChar = pEncChars;
+	sal_Int32 i = nLen;
+	// short circuit for the simple non-encoded case
+	while( --i >= 0)
+		if( *(pChar++) == '%')
+			break;
+	if( i < 0)
+		return OString( pEncChars, nLen);
+
+	// replace escaped chars with their decoded counterparts
+	OStringBuffer aDecStr( nLen);
+	pChar = pEncChars;
+	for( i = nLen; --i >= 0;)
+	{
+		sal_Char c = *(pChar++);
+		// handle escaped character
+		if( c == '%')
+		{
+			--i;
+			OSL_ASSERT( i >= 0);
+			c = *(pChar++);
+			if( ('0' <= c) && (c <= '9'))
+				c -= '0';
+			else
+			{
+				OSL_ASSERT( ('A' <= c) && (c <= 'F'));
+				c -= ('A'-10);
+			}
+		}
+		aDecStr.append( c);
+	}
+
+	return aDecStr.makeStringAndClear();
+}
+
+//______________________________________________________________________________
+bool PersistentMap::open()
+{
+	// open the existing file
+	sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read;
+	if( !m_bReadOnly)
+		nOpenFlags |= osl_File_OpenFlag_Write;
+
+	const ::osl::File::RC rcOpen = m_MapFile.open( nOpenFlags);
+	m_bIsOpen = (rcOpen == osl::File::E_None);
+
+	// or create later if needed
+	m_bToBeCreated &= (rcOpen == osl::File::E_NOENT) && !m_bIsOpen;
+	if( !m_bIsOpen)
+		return m_bToBeCreated;
+
+	const bool readOK = readAll();
+	return readOK;
+}
+
+//______________________________________________________________________________
+bool PersistentMap::readAll()
+{
+	// prepare for re-reading the map-file
+	m_MapFile.setPos( osl_Pos_Absolut, 0);
+	m_entries.clear();
+
+	// read header and check magic
+	char aHeaderBytes[ sizeof(PmapMagic)];
+	sal_uInt64 nBytesRead = 0;
+	m_MapFile.read( aHeaderBytes, sizeof(aHeaderBytes), nBytesRead);
+	OSL_ASSERT( nBytesRead == sizeof(aHeaderBytes));
+	if( nBytesRead != sizeof(aHeaderBytes))
+		return false;
+	// check header magic
+	for( int i = 0; i < (int)sizeof(PmapMagic); ++i)
+		if( aHeaderBytes[i] != PmapMagic[i])
+			return false;
+
+	// read key value pairs and add them to the map
+	ByteSequence aKeyLine;
+	ByteSequence aValLine;
+	for(;;)
+	{
+		// read key-value line pair
+		// an empty key name indicates the end of the line pairs
+		if( m_MapFile.readLine( aKeyLine) != osl::File::E_None)
+			return false;
+		if( !aKeyLine.getLength())
+			break;
+		if( m_MapFile.readLine( aValLine) != osl::File::E_None)
+			return false;
+		// decode key and value strings
+		const OString aKeyName = decodeString( (sal_Char*)aKeyLine.getConstArray(), aKeyLine.getLength());
+		const OString aValName = decodeString( (sal_Char*)aValLine.getConstArray(), aValLine.getLength());
+		// insert key-value pair into map
+		put( aKeyName, aValName);
+		// check end-of-file status
+		sal_Bool bIsEOF = true;
+		if( m_MapFile.isEndOfFile( &bIsEOF) != osl::File::E_None)
+			return false;
+		if( bIsEOF)
+			break;
+	}
+
+	m_bIsDirty = false;
+	return true;
+}
+
+//______________________________________________________________________________
+void PersistentMap::flush( void)
+{
+	if( !m_bIsDirty)
+		return;
+	OSL_ASSERT( !m_bReadOnly);
+	if( m_bToBeCreated && !m_entries.empty())
+	{
+		const sal_uInt32 nOpenFlags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create;
+		const ::osl::File::RC rcOpen = m_MapFile.open( nOpenFlags);
+		m_bIsOpen = (rcOpen == osl::File::E_None);
+		m_bToBeCreated = !m_bIsOpen;
+	}
+	if( !m_bIsOpen)
+		return;
+
+	// write header magic
+	m_MapFile.setPos( osl_Pos_Absolut, 0);
+	sal_uInt64 nBytesWritten = 0;
+	m_MapFile.write( PmapMagic, sizeof(PmapMagic), nBytesWritten);
+
+	// write key value pairs
+	t_string2string_map::const_iterator it = m_entries.begin();
+	for(; it != m_entries.end(); ++it) {
+		// write line for key
+		const OString aKeyString = encodeString( (*it).first);
+		const sal_Int32 nKeyLen = aKeyString.getLength();
+		m_MapFile.write( aKeyString.getStr(), nKeyLen, nBytesWritten);
+		OSL_ASSERT( nKeyLen == (sal_Int32)nBytesWritten);
+		m_MapFile.write( "\n", 1, nBytesWritten);
+		// write line for value
+		const OString& rValString = encodeString( (*it).second);
+		const sal_Int32 nValLen = rValString.getLength();
+		m_MapFile.write( rValString.getStr(), nValLen, nBytesWritten);
+		OSL_ASSERT( nValLen == (sal_Int32)nBytesWritten);
+		m_MapFile.write( "\n", 1, nBytesWritten);
+	}
+
+	// write a file delimiter (an empty key-string)
+	m_MapFile.write( "\n", 1, nBytesWritten);
+	// truncate file here
+	sal_uInt64 nNewFileSize;
+	if( m_MapFile.getPos( nNewFileSize) == osl::File::E_None)
+		m_MapFile.setSize( nNewFileSize);
+	// flush to disk
+	m_MapFile.sync();
+	// the in-memory map now matches to the file on disk
+	m_bIsDirty = false;
 }
 
 //______________________________________________________________________________
 bool PersistentMap::has( OString const & key ) const
 {
-    return get( 0, key );
+    return get( NULL, key );
 }
 
 //______________________________________________________________________________
 bool PersistentMap::get( OString * value, OString const & key ) const
 {
-    try {
-        Dbt dbKey( const_cast< sal_Char * >(key.getStr()), key.getLength() );
-        Dbt dbData;
-        int err = m_db.get( 0, &dbKey, &dbData, 0 );
-        if (err == DB_NOTFOUND)
-            return false;
-        if (err == 0) {
-            if (value != 0) {
-                *value = OString(
-                    static_cast< sal_Char const * >(dbData.get_data()),
-                    dbData.get_size() );
-            }
-            return true;
-        }
-        throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
-    return false; // avoiding warning
+	t_string2string_map::const_iterator it = m_entries.find( key);
+	if( it == m_entries.end())
+		return false;
+	if( value)
+		*value = it->second;
+	return true;
 }
 
 //______________________________________________________________________________
 void PersistentMap::put( OString const & key, OString const & value )
 {
-    try {
-        Dbt dbKey( const_cast< sal_Char * >(key.getStr()), key.getLength() );
-        Dbt dbData( const_cast< sal_Char * >(
-                        value.getStr()), value.getLength() );
-        int err = m_db.put( 0, &dbKey, &dbData, 0 );
-        if (err == 0) {
-#if OSL_DEBUG_LEVEL > 0
-            OString v;
-            OSL_ASSERT( get( &v, key ) );
-            OSL_ASSERT( v.equals( value ) );
-#endif
-            err = m_db.sync(0);
-        }
-        if (err != 0)
-            throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
+	if( m_bReadOnly)
+		return;
+	typedef std::pair<t_string2string_map::iterator,bool> InsertRC;
+	InsertRC r = m_entries.insert( t_string2string_map::value_type(key,value));
+	m_bIsDirty = r.second;
 }
 
 //______________________________________________________________________________
 bool PersistentMap::erase( OString const & key, bool flush_immediately )
 {
-    try {
-        Dbt dbKey( const_cast< sal_Char * >(key.getStr()), key.getLength() );
-        int err = m_db.del( &dbKey, 0 );
-        if (err == 0) {
-            if (flush_immediately) {
-                err = m_db.sync(0);
-                if (err != 0)
-                    throw_rtexc(err);
-            }
-            return true;
-        }
-        if (err == DB_NOTFOUND)
-            return false;
-        throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
-    return false; // avoiding warning
+	if( m_bReadOnly)
+		return false;
+	size_t nCount = m_entries.erase( key);
+	if( !nCount)
+		return false;
+	m_bIsDirty = true;
+	if( flush_immediately)
+		flush();
+	return true;
 }
 
 //______________________________________________________________________________
 t_string2string_map PersistentMap::getEntries() const
 {
-    try {
-        Dbc * pcurs = 0;
-        int err = m_db.cursor( 0, &pcurs, 0 );
-        if (err != 0)
-            throw_rtexc(err);
-        
-        t_string2string_map ret;
-        for (;;) {
-            Dbt dbKey, dbData;
-            err = pcurs->get( &dbKey, &dbData, DB_NEXT );
-            if (err == DB_NOTFOUND)
-                break;
-            if (err != 0)
-                throw_rtexc(err);
-            
-            ::std::pair<t_string2string_map::iterator, bool > insertion(
-                ret.insert( t_string2string_map::value_type(
-                                t_string2string_map::value_type(
-                                    OString( static_cast< sal_Char const * >(
-                                                 dbKey.get_data()),
-                                             dbKey.get_size() ),
-                                    OString( static_cast< sal_Char const * >(
-                                                 dbData.get_data()),
-                                             dbData.get_size() ) ) ) ) );
-            OSL_ASSERT( insertion.second );
-        }
-        err = pcurs->close();
-        if (err != 0)
-            throw_rtexc(err);
-        return ret;
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
-    return t_string2string_map(); // avoiding warning
+	// TODO: return by const reference instead?
+	return m_entries;
 }
 
 }
-

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/inc/dp_persmap.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/inc/dp_persmap.h?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/inc/dp_persmap.h (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/inc/dp_persmap.h Mon Dec 19 13:03:54 2011
@@ -19,17 +19,13 @@
  * 
  *************************************************************/
 
-
-
 #if ! defined INCLUDED_DP_PERSMAP_H
 #define INCLUDED_DP_PERSMAP_H
 
 #include "rtl/ustring.hxx"
-#include "db.hxx"
+#include "osl/file.hxx"
 #include <hash_map>
 
-using namespace berkeleydbproxy;
-
 namespace dp_misc
 {
 
@@ -39,10 +35,13 @@ typedef ::std::hash_map<
 //==============================================================================
 class PersistentMap
 {
-    ::rtl::OUString m_sysPath;
-    mutable Db m_db;
-    void throw_rtexc( int err, char const * msg = 0 ) const;
-    
+	::osl::File m_MapFile;
+	t_string2string_map m_entries;
+	bool m_bReadOnly;
+	bool m_bIsOpen;
+	bool m_bToBeCreated;
+	bool m_bIsDirty;
+
 public:
     ~PersistentMap();
     PersistentMap( ::rtl::OUString const & url, bool readOnly );
@@ -54,8 +53,14 @@ public:
     t_string2string_map getEntries() const;
     void put( ::rtl::OString const & key, ::rtl::OString const & value );
     bool erase( ::rtl::OString const & key, bool flush_immediately = true );
+
+protected:
+	bool open( void);
+	bool readAll( void);
+	void flush( void);
 };
 
 }
 
 #endif
+

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/makefile.mk Mon Dec 19 13:03:54 2011
@@ -40,10 +40,6 @@ TARGET = deploy
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
- 
 INCPRE += inc
 
 DLLPRE =

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/dp_manager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/dp_manager.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/dp_manager.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/dp_manager.cxx Mon Dec 19 13:03:54 2011
@@ -185,12 +185,12 @@ void PackageManagerImpl::initActivationL
 
         OUString dbName;
         if (m_context.equals(OUSTR("user")))
-            dbName = m_activePackages_expanded + OUSTR(".db");
+            dbName = m_activePackages_expanded + OUSTR(".pmap");
         else
         {
             //Create the extension data base in the user installation
             create_folder( 0, m_registrationData_expanded, xCmdEnv, true);
-            dbName = m_registrationData_expanded + OUSTR("/extensions.db");
+            dbName = m_registrationData_expanded + OUSTR("/extensions.pmap");
         }
         //The data base can always be written because it it always in the user installation
         m_activePackagesDB.reset(

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/manager/makefile.mk Mon Dec 19 13:03:54 2011
@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE : settings.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 SRS1NAME = $(TARGET)
 SRC1FILES = \
 	dp_manager.src

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/misc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/misc/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/misc/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/misc/makefile.mk Mon Dec 19 13:03:54 2011
@@ -42,10 +42,6 @@ TARGET = deplmisc
 # Reduction of exported symbols:
 CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 SRS1NAME = $(TARGET)
 SRC1FILES = \
 	dp_misc.src
@@ -61,7 +57,6 @@ SHL1OBJS = \
         $(SLO)$/dp_identifier.obj \
         $(SLO)$/dp_interact.obj \
         $(SLO)$/dp_ucb.obj \
-        $(SLO)$/db.obj \
         $(SLO)$/dp_version.obj \
         $(SLO)$/dp_descriptioninfoset.obj \
         $(SLO)$/dp_dependencies.obj \
@@ -69,7 +64,6 @@ SHL1OBJS = \
         $(SLO)$/dp_update.obj
         
 SHL1STDLIBS = \
-    $(BERKELEYLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
     $(SALLIB) \

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/dp_configuration.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/dp_configuration.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/dp_configuration.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/dp_configuration.cxx Mon Dec 19 13:03:54 2011
@@ -224,7 +224,7 @@ BackendImpl::BackendImpl(
         configmgrini_verify_init( xCmdEnv );
         m_registeredPackages.reset(
             new PersistentMap(
-                makeURL( getCachePath(), OUSTR("registered_packages.db") ),
+                makeURL( getCachePath(), OUSTR("registered_packages.pmap") ),
                 false ) );       
      }
 }

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/configuration/makefile.mk Mon Dec 19 13:03:54 2011
@@ -35,10 +35,6 @@ INCPRE += ..$/..$/inc
 
 .INCLUDE : settings.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 SRS1NAME = $(TARGET)
 SRC1FILES = \
         dp_configuration.src

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/help/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/help/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/help/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/registry/help/makefile.mk Mon Dec 19 13:03:54 2011
@@ -35,10 +35,6 @@ INCPRE += ..$/..$/inc
 
 .INCLUDE : settings.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 SRS1NAME = $(TARGET)
 SRC1FILES = \
         dp_help.src

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/unopkg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/unopkg/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/unopkg/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/deployment/unopkg/makefile.mk Mon Dec 19 13:03:54 2011
@@ -33,10 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE : settings.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 SRS1NAME = $(TARGET)
 SRC1FILES = \
 	unopkg.src

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/migration/services/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/migration/services/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/migration/services/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/migration/services/makefile.mk Mon Dec 19 13:03:54 2011
@@ -42,10 +42,6 @@ DLLPRE =
 
 .INCLUDE :  cppumaker.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 SLOFILES= \
 		$(SLO)$/jvmfwk.obj \
 		$(SLO)$/cexports.obj \
@@ -76,7 +72,6 @@ SHL1STDLIBS= \
 	$(I18NISOLANGLIB) \
 	$(JVMFWKLIB) \
 	$(XMLSCRIPTLIB) \
-	$(BERKELEYLIB)
 
 SHL1DEPN=
 SHL1IMPLIB=imigrationoo2
@@ -104,7 +99,6 @@ SHL2STDLIBS= \
 	$(I18NISOLANGLIB) \
 	$(JVMFWKLIB) \
 	$(XMLSCRIPTLIB) \
-	$(BERKELEYLIB)
 
 SHL2DEPN=
 SHL2IMPLIB=imigrationoo3

Modified: incubator/ooo/branches/alg/svgreplacement/main/desktop/source/pkgchk/unopkg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/desktop/source/pkgchk/unopkg/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/desktop/source/pkgchk/unopkg/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/desktop/source/pkgchk/unopkg/makefile.mk Mon Dec 19 13:03:54 2011
@@ -41,10 +41,6 @@ PRJINC += ..$/..$/deployment ..$/..
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
-.IF "$(SYSTEM_DB)" == "YES"
-CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
-.ENDIF
-
 .IF "$(LINK_SO)"!=""
 APP1TARGET = so$/unopkg
 APP1OBJS = $(OBJFILES)

Modified: incubator/ooo/branches/alg/svgreplacement/main/extensions/source/update/feed/updatefeed.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/extensions/source/update/feed/updatefeed.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/extensions/source/update/feed/updatefeed.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/extensions/source/update/feed/updatefeed.cxx Mon Dec 19 13:03:54 2011
@@ -650,8 +650,11 @@ UpdateInformationProvider::getUpdateInfo
             if( m_bCancelled.check() )
                 break;
         }
-        // rethrow runtime exceptions
-        catch( uno::RuntimeException const & ) { throw; }
+        catch( uno::RuntimeException const& /*e*/)
+        {
+            // #i118675# ignore runtime exceptions for now
+            // especially the "unsatisfied query for interface of type com.sun.star.ucb.XCommandProcessor!" exception
+        }
 
         // rethrow only if last url in the list
         catch( uno::Exception const & )

Modified: incubator/ooo/branches/alg/svgreplacement/main/external/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/external/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/external/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/external/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,5 +1,4 @@
 el      external :       soltools NULL
 el	external					usr1 - all el_mkout NULL
-el	external\glibc		nmake	-	all	el_glibc NULL
 el	external\gcc3_specific	nmake	-	all	el_gcc3 NULL
 el	external\mingwheaders		nmake	-	w	el_mingwheaders NULL

Modified: incubator/ooo/branches/alg/svgreplacement/main/fetch_tarballs.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/fetch_tarballs.sh?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/fetch_tarballs.sh (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/fetch_tarballs.sh Mon Dec 19 13:03:54 2011
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,6 +26,8 @@
 #
 #*************************************************************************
 
+file_list_name=$1
+
 if [ -z "$TARFILE_LOCATION" ]; then
     echo "ERROR: no destination defined! please set TARFILE_LOCATION!"
     exit
@@ -63,7 +65,7 @@ else
     if [ $ret -eq 0 ]; then
         fetch_bin=$wg
 	    fetch_args="-nv -N"
-        echo found wget: $fetch_bin
+        echo found wget at `which $fetch_bin`
         break 2
     fi
   done
@@ -76,7 +78,7 @@ else
         if [ -x $c ]; then
             fetch_bin=$c
 	        fetch_args="$file_date_check -O"
-            echo found curl: $fetch_bin
+            echo found curl at `which $fetch_bin`
             break 2
         fi
     done
@@ -99,7 +101,7 @@ for i in md5 md5sum /usr/local/bin/md5su
     ret=$?
     if [ $ret -eq 0 ]; then
         md5sum=$i
-        echo found md5sum: $md5sum
+        echo found md5sum at `which $md5sum`
         break 2
     fi
 done
@@ -120,114 +122,124 @@ date >> $logfile
 mkdir -p $TARFILE_LOCATION/tmp
 cd $TARFILE_LOCATION/tmp
 
-if [ -n "$DMAKE_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" ]; then
-    # Determine the name of the downloaded file.
-    dmake_package_name=`echo $DMAKE_URL | sed "s/^\(.*\/\)//"`
-
-    if [ ! -f "../$dmake_package_name" ]; then
-        # Fetch the dmake source
-        echo fetching $DMAKE_URL to $TARFILE_LOCATION/tmp
-        $fetch_bin $fetch_args $DMAKE_URL 2>&1 | tee -a $logfile
-        wret=$?
-
-        # When the download failed then remove the remains, otherwise
-        # move the downloaded file up to TARFILE_LOCATION
-        if [ $wret -ne 0 ]; then
-            echo "download failed. removing $dmake_package_name"
-            rm "$dmake_package_name"
-            failed="$failed $i"
-            wret=0
-        else
-            mv "$dmake_package_name" ..
-            echo "successfully downloaded $dmake_package_name"
-        fi
-    else
-        echo "found $dmake_package_name, no need to download it again"
-    fi
-fi
-
-
-#Special handling of epm
-if [ -n "$EPM_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/epm$EXEEXT" ]; then
-    # Determine the name of the downloaded file.
-    epm_package_name=`echo $EPM_URL | sed "s/^\(.*\/\)//"`
-    epm_package=`echo $epm_package_name | sed "s/-source//"`
-    epm_wildcard_package_name="*-$epm_package"
 
-    epmtest=$(find .. -type f -name "$epm_wildcard_package_name")
+function basename ()
+{
+    echo $1 | sed "s/^\(.*\/\)//"
+}
 
-    # check with wildcard for the renamed package, md5 
-    if [ -z "$epmtest" ]; then
-        # Fetch the epm source
-	      echo fetching $EPM_URL to $TARFILE_LOCATION/tmp
-	      $fetch_bin $fetch_args $EPM_URL 2>&1 | tee -a $logfile
 
-        wret=$?
-
-        # When the download failed then remove the remains, otherwise
-        # move the downloaded file up to TARFILE_LOCATION and rename it
-	# according our naing convention for external tar balls.
-        if [ $wret -ne 0 ]; then
-            echo "download failed. removing $epm_package_name"
-            rm "$epm_package_name"
-            failed="$failed $i"
-            wret=0
+#
+# Download a file from a URL and add its md5 checksum to its name. 
+# 
+function download ()
+{
+    local URL=$1
+    
+    if [ -n "$URL" ]; then
+        local basename=$(basename $URL)
+        local candidate=$(find "$TARFILE_LOCATION" -type f -name "*-$basename")
+        if [ -n "$candidate" ]; then
+            echo "$basename is already present ($candidate)"
         else
-            #mv "$epm_package_name" ..
-	    epm_md5_sum=`$md5sum $md5special $epm_package_name | sed "s/ .*//"`
-	    epm_md5_package_name="$epm_md5_sum-$epm_package"
-	    
-	    rm -f ../$epm_md5_package_name && \
-		cp -pRP $epm_package_name ../$epm_md5_package_name && \
-		rm -rf $epm_package_name
-            echo "successfully downloaded $epm_package_name and renamed to $epm_md5_package_name"
+		    echo fetching $basename
+	        $fetch_bin $fetch_args $URL 2>&1 | tee -a $logfile
+
+            if [ $? -ne 0 ]; then
+                echo "download failed"
+                mv $basename ${basename}_broken
+                failed="$failed $i"
+            elif [ -f "$basename" -a -n "$md5sum" ]; then
+                local sum=`$md5sum $md5special $basename | sed "s/ .*//"`
+                mv $basename "$TARFILE_LOCATION/$sum-$basename"
+                echo "added md5 sum $sum"
+            fi
         fi
-    else
-        echo "found $epmtest, no need to download it again"
     fi
-fi 
-# end special 
+}
 
+#
+# Download a file from a URL and check its md5 sum to the one that is part of its name.
+#
+function download_and_check ()
+{
+    local URL=$1
+    
+    if [ -n "$URL" ]; then
+        local basename=$(basename $URL)
+        if [ -f "$TARFILE_LOCATION/$basename" ]; then
+            echo "$basename is already present"
+        else
+		    echo "fetching $basename"
+	        $fetch_bin $fetch_args $URL 2>&1 | tee -a $logfile
 
-cd $TARFILE_LOCATION/tmp
-filelist=`cat $1`
-echo $$ > fetch-running
-for i in $filelist ; do
-#    echo $i
-    if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
-        tarurl=$i
-    # TODO: check for comment    
-    else
-        if [ "$tarurl" != "" ]; then
-            if [ ! -f "../$i" ]; then
-                echo $i
-		echo fetching $i
-		$fetch_bin $fetch_args $tarurl/$i 2>&1 | tee -a $logfile
-                wret=$?
-                if [ $wret -ne 0 ]; then
-                    mv $i ${i}_broken
-                    failed="$failed $i"
-                    wret=0
-                fi
-                if [ -f $i -a -n "$md5sum" ]; then
-                    sum=`$md5sum $md5special $i | sed "s/ .*//"`
-                    sum2=`echo $i | sed "s/-.*//"`
-                    if [ "$sum" != "$sum2" ]; then
-                        echo checksum failure for $i 2>&1 | tee -a $logfile
-                        failed="$failed $i"
-                        mv $i ${i}_broken
-                    else
-                        mv $i ..
-                    fi
-                else
-                    mv $i ..
+            if [ $? -ne 0 ]; then
+                echo "download failed"
+                mv $basename ${basename}_broken
+                failed="$failed $i"
+            elif [ -f "$basename" -a -n "$md5sum" ]; then
+                local sum=`$md5sum $md5special $basename | sed "s/ .*//"`
+                local sum_in_name=`echo $basename | sed "s/-.*//"`
+                if [ "$sum" != "$sum_in_name" ]; then
+                    echo checksum failure for $basename 2>&1 | tee -a $logfile
+                    failed="$failed $basename"
+                    mv $basename ${basename}_broken
                 fi
+                mv $basename "$TARFILE_LOCATION/$basename"
             fi
         fi
     fi
-done
-rm $TARFILE_LOCATION/tmp/*-*
-cd $start_dir
+}
+
+echo "downloading tar balls to $TARFILE_LOCATION"
+
+while read line ; do
+    # Remove leading and trailing space and comments
+    line=`echo $line | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/[[:space:]]*#.*$//'`
+    case $line in
+        # Ignore empty lines.
+        '')
+            ;;
+
+        # When a URL ends in a / then it is taken as a partial URL
+        # to which the following lines will be appended.
+        ftp:\/\/*\/ | http:\/\/*\/)
+            UrlHead=$line
+            echo $UrlHead
+            ;;
+
+        # A full URL represents a single file which is downloaded.
+        ftp:\/\/* | http:\/\/*)
+            download $line
+            ;;
+
+        # Any other line is interpreted as the second part of a partial URL.
+        # It is appended to UrlHead and then downloaded.
+        *)
+            download_and_check $UrlHead$line
+            ;;
+    esac
+done < "$file_list_name"
+
+
+# Special handling of dmake
+if [ -n "$DMAKE_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" ]; then
+    download $DMAKE_URL
+fi
+
+# Special handling of epm-3.7
+# Basically just a download of the epm archive.  
+# When its name contains "-source" than that part is removed.
+epm_archive_tail=`echo $(basename $EPM_URL) | sed 's/-source//'`
+epm_archive_name=$(find "$TARFILE_LOCATION" -type f -name "*-$epm_archive_tail")
+if [ -n "$EPM_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/epm$EXEEXT" -a -z "$epm_archive_name" ]; then
+    download $EPM_URL
+    archive_name=$(find "$TARFILE_LOCATION" -type f -name "*-epm-3.7-source*")
+    if [ -n "$archive_name" ]; then
+        epm_archive_name=`echo $archive_name | sed 's/-source//'`
+        mv "$archive_name" "$epm_archive_name"
+    fi
+fi
 
 if [ ! -z "$failed" ]; then
     echo

Modified: incubator/ooo/branches/alg/svgreplacement/main/graphite/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/graphite/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/graphite/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/graphite/makefile.mk Mon Dec 19 13:03:54 2011
@@ -38,13 +38,20 @@ TARGET=so_graphite
 .INCLUDE :	settings.mk
 
 .IF "$(SYSTEM_GRAPHITE)" == "YES"
+
 all:
         @echo "An already available installation of silgraphite should exist on your system."
         @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
+
+.ELIF "$(ENABLE_GRAPHITE)" != "TRUE"
+
+all:
+        @echo "Support for silgraphite has been disabled.  Nothing to do."
+
+.ELSE
 
 # --- Files --------------------------------------------------------
-.IF "$(ENABLE_GRAPHITE)"=="TRUE"
+
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
 PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
@@ -162,10 +169,7 @@ OUTDIR2INC= \
 .IF "$(OS)"=="WNT"
 OUT2INC=wrappers$/win32$/WinFont.h
 .ENDIF
-.ELSE
-dddd:
-	@echo Nothing to do
-.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 
@@ -173,3 +177,4 @@ dddd:
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
+.ENDIF
\ No newline at end of file

Modified: incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/settings.pmk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/settings.pmk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/settings.pmk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/settings.pmk Mon Dec 19 13:03:54 2011
@@ -8,8 +8,4 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCEN
 my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
 .ENDIF
  
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF 
-
 aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))

Modified: incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/util/target.pmk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/util/target.pmk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/util/target.pmk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/helpcontent2/util/target.pmk Mon Dec 19 13:03:54 2011
@@ -30,10 +30,6 @@ LINKALLADDEDDEPS=$(foreach,i,$(aux_allla
 
 ALLTAR : $(LINKALLTARGETS)
 
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
 XSL_DIR*:=$(SOLARBINDIR)
 
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag 

Modified: incubator/ooo/branches/alg/svgreplacement/main/hunspell/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/hunspell/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/hunspell/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/hunspell/makefile.mk Mon Dec 19 13:03:54 2011
@@ -36,7 +36,12 @@ TARGET=hunspell
 
 # --- Files --------------------------------------------------------
 
-.IF "$(ENABLE_HUNSPELL)" == "YES"
+.IF "$(ENABLE_HUNSPELL)" != "YES"
+
+all:
+	@echo "hunspell is disabled"
+
+.ELSE
 
 TARFILE_NAME=hunspell-1.2.9
 TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
@@ -47,7 +52,7 @@ PATCH_FILES=\
     hunspell-solaris.patch \
     hunspell-stacksmash.patch \
     hunspell.patch
-	
+
 .IF "$(GUI)"=="UNX"
 
 #relative to CONFIGURE_DIR
@@ -100,8 +105,4 @@ OUT2INC= \
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-
-.ELSE
-all:
-	@echo "hunspell disabled"
 .ENDIF

Modified: incubator/ooo/branches/alg/svgreplacement/main/hyphen/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/hyphen/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/hyphen/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/hyphen/makefile.mk Mon Dec 19 13:03:54 2011
@@ -36,7 +36,12 @@ TARGET=hyphen
 
 # --- Files --------------------------------------------------------
 
-.IF "$(DISABLE_HYPHEN)" == ""
+.IF "$(ENABLE_HYPHEN)" != "YES"
+
+all:
+	@echo "hyphen is disabled"
+
+.ELSE
 
 TARFILE_NAME=hyphen-2.7.1
 TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
@@ -109,8 +114,4 @@ OUT2INC += hyphen.h
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
-.ELSE
-all:
-	@echo "hyphen disabled"
-
-.ENDIF
+.ENDIF # "$(ENABLE_HYPHEN)"

Modified: incubator/ooo/branches/alg/svgreplacement/main/icu/icu4c-4_0_1-src.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/icu/icu4c-4_0_1-src.patch?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/icu/icu4c-4_0_1-src.patch (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/icu/icu4c-4_0_1-src.patch Mon Dec 19 13:03:54 2011
@@ -245,3 +245,23 @@
      T_FileStream_writeLine(makefile, tmp);
  
      if(o->hadStdin == FALSE) { /* shortcut */
+--- misc/icu/source/common/uloc.c	2009-01-15 08:45:56.000000000 +0100
++++ misc/build/icu/source/common/uloc.c	2009-12-14 10:51:38.000000000 +0100
+@@ -1736,7 +1736,7 @@
+                 int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
+                 len -= variantLen;
+                 if (variantLen > 0) {
+-                    if (name[len-1] == '_') { /* delete trailing '_' */
++                    if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
+                         --len;
+                     }
+                     addKeyword = VARIANT_MAP[j].keyword;
+@@ -1744,7 +1744,7 @@
+                     break;
+                 }
+             }
+-            if (name[len-1] == '_') { /* delete trailing '_' */
++            if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
+                 --len;
+             }
+         }

Modified: incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,5 +1,4 @@
-ic	idlc	:	registry NULL
+ic	idlc	:	ucpp registry NULL
 ic	idlc					usr1	-	all	ic_mkout NULL
 ic	idlc\inc				nmake	-	all	ic_inc NULL
-ic	idlc\source\preproc		nmake	-	all	ic_preproc ic_inc NULL
 ic	idlc\source				nmake	-	all ic_source ic_inc NULL

Modified: incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/d.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/d.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/idlc/prj/d.lst Mon Dec 19 13:03:54 2011
@@ -1,7 +1,4 @@
 ..\%__SRC%\bin\idlc.exe %_DEST%\bin%_EXT%\idlc.exe
 ..\%__SRC%\bin\idlc.pdb %_DEST%\bin%_EXT%\idlc.pdb
-..\%__SRC%\bin\idlcpp.exe %_DEST%\bin%_EXT%\idlcpp.exe
-..\%__SRC%\bin\idlcpp.pdb %_DEST%\bin%_EXT%\idlcpp.pdb
 
 ..\%__SRC%\bin\idlc %_DEST%\bin%_EXT%\idlc
-..\%__SRC%\bin\idlcpp %_DEST%\bin%_EXT%\idlcpp



Mime
View raw message