Index: unxmacxp/bin/create-libstatic-link
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/create-libstatic-link,v
retrieving revision 1.6
diff -u -r1.6 create-libstatic-link
--- unxmacxp/bin/create-libstatic-link	6 Mar 2001 18:15:02 -0000	1.6
+++ unxmacxp/bin/create-libstatic-link	24 Aug 2002 17:39:39 -0000
@@ -5,7 +5,7 @@
     rm -f "$tempfile"
 }
 
-print-error ()
+printerror ()
 {
 	if [ -n "$1" ]; then
 		printf "`basename $0`: error: $1\n"
@@ -16,11 +16,11 @@
 
 # Check arguments
 if [ $# != 1 ]; then
-	print-error
+	printerror
 fi
 
 if [ ! -d "$1" ]; then
-	print-error "argument is not a directory"
+	printerror "argument is not a directory"
 fi
 
 # We assume that the most current library has the most static data member
Index: unxmacxp/bin/init-static-template-data
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/init-static-template-data,v
retrieving revision 1.31
diff -u -r1.31 init-static-template-data
--- unxmacxp/bin/init-static-template-data	23 Apr 2002 20:42:56 -0000	1.31
+++ unxmacxp/bin/init-static-template-data	24 Aug 2002 17:39:40 -0000
@@ -73,7 +73,7 @@
 # 	init-static-template-data [-Eexcluded-classes-file] [inputfile1] ... [inputfileN] sourcefile
 #
 # The excluded-classes-file argument should be a plain text file that contains
-# a list of classes that need to be ignored by the set-forward-declarations
+# a list of classes that need to be ignored by the setforwarddeclarations
 # subroutine to avoid conflicts with the class declarations in #include files
 # added in the various process-<classname>-symbols subroutines. The format of
 # file is as follows:
@@ -107,7 +107,7 @@
 }
 
 # Subroutine to print a general usage statement and an optional error statement
-print-error ()
+printerror ()
 {
 	if [ -n "$1" ]; then
 		printf "init-static-template-data: error: $1\n"
@@ -126,7 +126,7 @@
 # This subroutine prints the unmangled symbol name to stdout.
 # Note that this subroutine cannot handle template classes that are nested
 # into the template parameters.
-extended-c++filt ()
+extendedcppfilt ()
 {
 	local classdelimiter;
 	local tokens;
@@ -181,7 +181,7 @@
 # Subroutine to turn a header filename into an #include statement and add
 # it to the target headerfile. The usage for this subroutine is as follows:
 #    set-include-declaration
-set-include-declaration ()
+setincludedeclaration ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local includeline;
@@ -199,11 +199,11 @@
 
 # Subroutine to turn a class name into a class forward declaration and add
 # it to the target classdecfile. The usage for this subroutine is as follows:
-#    set-forward-declarations classname
+#    setforwarddeclarations classname
 # This subroutine will take a fully qualified class name and generate lines of
 # source code with the class forward declaration nested within the appropriate
 # namespace declarations.
-set-forward-declarations ()
+setforwarddeclarations ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local instance;
@@ -235,7 +235,7 @@
 		# a modifier (e.g. const, unsigned, etc.) so we cannot use a for loop
 		paramclasses=`printf "$paramclasses" | tr ',' '\n'`
 		while read i; do
-			set-forward-declarations "$i" "$2"
+			setforwarddeclarations "$i" "$2"
 		done << !
 `printf "$paramclasses"`
 !
@@ -307,7 +307,7 @@
 # and add it to the target sourcefile. The usage for this subroutine is as
 # follows:
 #    set-init-statement datatype symbol value
-set-init-statement ()
+setinitstatement ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local initline;
@@ -332,7 +332,7 @@
 #    process-vos::ODynamicLoader-symbols unmangled-symbol
 # This subroutine will append any #includes, class forward declarations, and
 # symbol initializations to the sourcefile that don't already exist.
-process-vos::ODynamicLoader-symbols ()
+processvosODynamicLoadersymbols ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local instance;
@@ -344,7 +344,7 @@
 	return 0
 }
 
-process-salhelper::ODynamicLoader-symbols ()
+processsalhelperODynamicLoadersymbols ()
 {
 	local instance;
 
@@ -361,7 +361,7 @@
 #    process-vos::ImplHelper-symbols unmangled-symbol
 # This subroutine will append any #includes, class forward declarations, and
 # symbol initializations to the sourcefile that don't already exist.
-process-cppu::ImplHelper-symbols ()
+processcppuImplHelpersymbols ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local classname;
@@ -385,9 +385,9 @@
 		cppu::WeakAggComponentImplHelper[0-9]*)	value=3
 			headername="cppuhelper/compbase$num.hxx";;
 	esac
-	set-include-declaration "$headername"
-	set-forward-declarations "$instance"
-	set-init-statement "cppu::ClassData$num" "$symbol" "cppu::ClassData$num($value)"
+	setincludedeclaration "$headername"
+	setforwarddeclarations "$instance"
+	setinitstatement "cppu::ClassData$num" "$symbol" "cppu::ClassData$num($value)"
 	return 0
 }
 
@@ -396,15 +396,15 @@
 #    process-com::sun::star::uno::Sequence-symbols unmangled-symbol
 # This subroutine will append any #includes, class forward declarations, and
 # symbol initializations to the sourcefile that don't already exist.
-process-com::sun::star::uno::Sequence-symbols ()
+processcomsunstarunoSequencesymbols ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local instance;
 
 	instance=`printf "$1" | sed 's/>::.*$/>/'`
-	set-include-declaration "com/sun/star/uno/Sequence.hxx"
-	set-forward-declarations "$instance"
-	set-init-statement "typelib_TypeDescriptionReference *" "$symbol" "0"
+	setincludedeclaration "com/sun/star/uno/Sequence.hxx"
+	setforwarddeclarations "$instance"
+	setinitstatement "typelib_TypeDescriptionReference *" "$symbol" "0"
 	return 0
 }
 
@@ -414,7 +414,7 @@
 #    process-comphelper::OPropertyArrayUsageHelper-symbols unmangled-symbol
 # This subroutine will append any #includes, class forward declarations, and
 # symbol initializations to the sourcefile that don't already exist.
-process-comphelper::OPropertyArrayUsageHelper-symbols ()
+processcomphelperOPropertyArrayUsageHelpersymbols ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local instance;
@@ -424,8 +424,8 @@
 
 	instance=`printf "$1" | sed 's/>::.*$/>/'`
 	datamember=`printf "$1" | sed 's/^.*>:://'`
-	set-include-declaration "comphelper/proparrhlp.hxx"
-	set-forward-declarations "$instance"
+	setincludedeclaration "comphelper/proparrhlp.hxx"
+	setforwarddeclarations "$instance"
 	case "$datamember" in
 		s_nRefCount)	datatype="sal_Int32"
 			value="0";;
@@ -434,7 +434,7 @@
 		s_aMutex)		datatype="osl::Mutex"
 			value="";;
 	esac
-	set-init-statement "$datatype" "$symbol" "$value"
+	setinitstatement "$datatype" "$symbol" "$value"
 	return 0
 }
 
@@ -444,7 +444,7 @@
 #    process-comphelper::OIdPropertyArrayUsageHelper-symbols unmangled-symbol
 # This subroutine will append any #includes, class forward declarations, and
 # symbol initializations to the sourcefile that don't already exist.
-process-comphelper::OIdPropertyArrayUsageHelper-symbols ()
+processcomphelperOIdPropertyArrayUsageHelpersymbols ()
 {
 	# Declare variables as local so they don't conflict with rest of script
 	local instance;
@@ -454,8 +454,8 @@
 
 	instance=`printf "$1" | sed 's/>::.*$/>/'`
 	datamember=`printf "$1" | sed 's/^.*>:://'`
-	set-include-declaration "comphelper/IdPropArrayHelper.hxx"
-	set-forward-declarations "$instance"
+	setincludedeclaration "comphelper/IdPropArrayHelper.hxx"
+	setforwarddeclarations "$instance"
 	case "$datamember" in
 		s_nRefCount)	datatype="sal_Int32"
 			value="0";;
@@ -464,7 +464,7 @@
 		s_aMutex)		datatype="osl::Mutex"
 			value="";;
 	esac
-	set-init-statement "$datatype" "$symbol" "$value"
+	setinitstatement "$datatype" "$symbol" "$value"
 	return 0
 }
 
@@ -474,7 +474,7 @@
 
 # Parse command line arguments
 if [ $# = 0 ]; then
-	print-error "incorrect number of arguments"
+	printerror "incorrect number of arguments"
 fi
 
 # Parse arguments
@@ -491,7 +491,7 @@
 						# Get contents of file and remove comments
 						excludedclasses="$excludedclasses"`cat "$excludedclassesfile" | tr -d "\015" | sed 's/#.*$//'`
 					else
-						print-error "excluded classes file $excludedclassesfile does not exist"
+						printerror "excluded classes file $excludedclassesfile does not exist"
 					fi;;
 			*)		inputfiles="$inputfiles $1";;
 		esac;
@@ -501,7 +501,7 @@
 		classdecfile="`dirname $1`/`basename $1 .cxx`.hxx"
 		headerfile="`dirname $1`/`basename $1 .cxx`.h"
 		if [ ! -d "`dirname $sourcefile`" ]; then
-			print-error "directory `dirname $sourcefile` does not exist"
+			printerror "directory `dirname $sourcefile` does not exist"
 		fi
 		if [ ! -f "$sourcefile" ]; then
 			touch -f "$sourcefile"
@@ -513,13 +513,13 @@
 			touch -f "$headerfile"
 		fi
 		if [ ! -f "$sourcefile" ]; then
-			print-error "$sourcefile is not a file"
+			printerror "$sourcefile is not a file"
 		fi
 		if [ ! -f "$classdecfile" ]; then
-			print-error "$classdecfile is not a file"
+			printerror "$classdecfile is not a file"
 		fi
 		if [ ! -f "$headerfile" ]; then
-			print-error "$headerfile is not a file"
+			printerror "$headerfile is not a file"
 		fi
 		shift
 	fi
@@ -560,7 +560,7 @@
 cat "$tempfile.join" | grep -F '>::' > "$tempfile"
 while read i; do
 	if [ -n "$i" ]; then
-		symbol=`extended-c++filt "$i"`
+		symbol=`extendedcpfilt "$i"`
 	fi
 	if [ -n "$symbol" ]; then
 		printf "$symbol\n" >> $tempfile
@@ -587,16 +587,16 @@
 		fi
 	done
 	if [ $validsymbol != 0 ]; then
-		print-error "class $classname is not listed as a supported class in this script"
+		printerror "class $classname is not listed as a supported class in this script"
 	fi
 	case "$classname" in
-		vos::ODynamicLoader) process-vos::ODynamicLoader-symbols "$symbol";;
-		salhelper::ODynamicLoader) process-salhelper::ODynamicLoader-symbols "$symbol";;
-		cppu::*ImplHelper[0-9]*) process-cppu::ImplHelper-symbols "$symbol";;
-		com::sun::star::uno::Sequence) process-com::sun::star::uno::Sequence-symbols "$symbol";;
-		comphelper::OPropertyArrayUsageHelper) process-comphelper::OPropertyArrayUsageHelper-symbols "$symbol";;
-		comphelper::OIdPropertyArrayUsageHelper) process-comphelper::OIdPropertyArrayUsageHelper-symbols "$symbol";;
-		*)	print-error "script does not have code to initialize static data member $symbol"
+		vos::ODynamicLoader) processvosODynamicLoadersymbols "$symbol";;
+		salhelper::ODynamicLoader) processsalhelperODynamicLoadersymbols "$symbol";;
+		cppu::*ImplHelper[0-9]*) processcppuImplHelpersymbols "$symbol";;
+		com::sun::star::uno::Sequence) processcomsunstarunoSequencesymbols "$symbol";;
+		comphelper::OPropertyArrayUsageHelper) processcomphelperOPropertyArrayUsageHelpersymbols "$symbol";;
+		comphelper::OIdPropertyArrayUsageHelper) processcomphelperOIdPropertyArrayUsageHelpersymbols "$symbol";;
+		*)	printerror "script does not have code to initialize static data member $symbol"
 	esac
 done < "$tempfile"
 
Index: unxmacxp/bin/patch-STLport-4.0
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/patch-STLport-4.0,v
retrieving revision 1.2
diff -u -r1.2 patch-STLport-4.0
--- unxmacxp/bin/patch-STLport-4.0	23 Mar 2001 18:13:16 -0000	1.2
+++ unxmacxp/bin/patch-STLport-4.0	24 Aug 2002 17:39:40 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-print-error ()
+printerror ()
 {
 	if [ -n "$1" ]; then
 		printf "`basename $0`: error: $1\n"
@@ -12,7 +12,7 @@
 # Find patch file
 patchfile="`dirname $0`/../inc/STLport-4.0.patch"
 if [ ! -f "$patchfile" ]; then
-	print-error "cannot find patch file $patchfile"
+	printerror "cannot find patch file $patchfile"
 fi
 
 # Ask where the user's STLport-4.0 directory
@@ -21,18 +21,18 @@
 
 # Make sure a directory was entered
 if [ ! -d "$i" ]; then
-	print-error "the directory that you entered does not exist or is not a directory"
+	printerror "the directory that you entered does not exist or is not a directory"
 fi
 
 # Make sure that the required STLport-4.0 files and subdirectories are
 # present
 if [ ! -f "$i/INSTALL" -o ! -d "$i/src" -o ! -d "$i/stlport/stl/debug" -o ! -d "$i/stlport/config" -o ! -d "$i/test/eh" -o ! -d "$i/test/regression" ]; then
-	print-error "the directory that you entered does not appear to contain the standard STLport-4.0 source files"
+	printerror "the directory that you entered does not appear to contain the standard STLport-4.0 source files"
 fi
 
 # Make sure that we have the right STLport version
 if ! grep -q 'INSTALL file for STLport 4.0 ' "$i/INSTALL"; then
-	print-error "the directory that you entered does not appear to be version 4.0 of the STLport"
+	printerror "the directory that you entered does not appear to be version 4.0 of the STLport"
 fi
 
 # Patch files
@@ -46,7 +46,7 @@
 	printf "   cd $i/src ; /usr/bin/make -f gcc-apple-macosx.mak\n"
 	rm -f "$tempfile"
 else
-	print-error "patching failed"
+	printerror "patching failed"
 fi
 
 exit 0