Index: bin/deliver.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
retrieving revision 1.17.4.1.2.1
diff -u -r1.17.4.1.2.1 deliver.pl
--- bin/deliver.pl	7 Aug 2002 07:15:18 -0000	1.17.4.1.2.1
+++ bin/deliver.pl	25 Sep 2002 21:20:56 -0000
@@ -526,7 +526,6 @@
             if ( $^O eq 'darwin' )
             {
                 system("create-bundle", $to) if ( $to =~ /\.dylib/ );
-                system("create-bundle", "$to=$from.app") if ( -d "$from.app" );
                 system("ranlib", "$to" ) if ( $to =~ /\.a/ );
             }
             push_on_ziplist($to) if $opt_zip;
Index: inc/_tg_app.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/_tg_app.mk,v
retrieving revision 1.30
diff -u -r1.30 _tg_app.mk
--- inc/_tg_app.mk	2 Nov 2001 13:18:40 -0000	1.30
+++ inc/_tg_app.mk	25 Sep 2002 21:20:57 -0000
@@ -84,10 +84,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -280,10 +276,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -476,10 +468,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -672,10 +660,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -868,10 +852,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -1064,10 +1044,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -1260,10 +1236,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -1456,10 +1428,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -1652,10 +1620,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
@@ -1848,10 +1812,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
Index: inc/tg_app.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_app.mk,v
retrieving revision 1.31
diff -u -r1.31 tg_app.mk
--- inc/tg_app.mk	2 Nov 2001 13:19:11 -0000	1.31
+++ inc/tg_app.mk	25 Sep 2002 21:20:57 -0000
@@ -179,10 +179,6 @@
 	@echo "Rerunning static data member initializations"
 	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
-.IF "$(TARGETTYPE)"=="GUI"
-	@echo "Making: $@.app"
-	@create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
 .ELSE		# "$(OS)"=="MACOSX"
 	@+echo unx
 	@+-$(RM) $(MISC)$/$(@:b).cmd
Index: inc/unxmacxp.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxmacxp.mk,v
retrieving revision 1.40.4.3
diff -u -r1.40.4.3 unxmacxp.mk
--- inc/unxmacxp.mk	14 Aug 2002 06:05:08 -0000	1.40.4.3
+++ inc/unxmacxp.mk	25 Sep 2002 21:20:57 -0000
@@ -152,20 +152,20 @@
 # Currently, there is no nas support for OS X...
 CDEFS+=           -DNO_AUDIO
 
-SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper")
+SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).*[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).*[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).*[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper")
 .IF "$(STLPORT4)"!=""
 .IF "$(STLPORT4)"=="NO_STLPORT4"
   # Look for STLport 4.5 libraries in SOLARLIBDIR
-  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9].[0-9] 2>/dev/null")
+  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).*[0-9] 2>/dev/null")
 .ELSE
   # Look for STLport 4.0 libraries in the STLport4 home directory
-  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).[0-9] 2>/dev/null")
+  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).*[0-9] 2>/dev/null")
 .ENDIF
 .ENDIF
 
 # GrP mega-hack! no cppuhelper for cppuhelper
 .IF "$(PRJNAME)"!="cppuhelper"
-SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper")
+SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).*[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).*[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).*[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper")
 .ENDIF
 
 # GrP remove -U options (can't use for two-level)
@@ -178,6 +178,11 @@
 .IF "$(GUIBASE)" == "aqua"
 LINKFLAGS+=-lobjc
 INCGUI+= -I$(PRJ)$/unx/inc
+.ENDIF
+
+# [ed] 9/1/02 Since we've removed the internal freetype, add the default X11R6 path onto the linkline
+.IF "$(GUIBASE)" == "unx"
+INCGUI+= -I/usr/X11R6/include/freetype2
 .ENDIF
 
 LINKFLAGSAPPGUI=
Index: unxmacxp/bin/create-bundle
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/create-bundle,v
retrieving revision 1.24
diff -u -r1.24 create-bundle
--- unxmacxp/bin/create-bundle	23 Apr 2002 20:40:23 -0000	1.24
+++ unxmacxp/bin/create-bundle	25 Sep 2002 21:21:00 -0000
@@ -114,86 +114,12 @@
 	# Determine file type
 	filetype=`file -L "$inputfile"`
 
-	# Since this script replaces executable with shell scripts, we may need to
-	# search elsewhere if the file is a shell script.
-	if printf "$filetype" | grep -q 'Bourne shell script text'; then
-		realfile="$sourcedir/Contents/MacOS/$inputfilename"
-		if [ -r "$realfile" ]; then
-			filetype=`file "$realfile"`
-		fi
-	fi
-
 	# Create bundle based on file type
 	if printf "$filetype" | grep -q 'Mach-O executable ppc'; then
-		# If the script has already been packaged into a bundle, recover the
-		# packaged executable 
-		if [ -s "$realfile" ]; then
-			rm -Rf "$inputfile"
-			cp -f "$realfile" "$inputfile"
-		fi
-		# Create bundle directories
-		if [ -r "$outputdir/$inputfilename.app" ]; then
-			rm -Rf "$outputdir/$inputfilename.app"
-		fi
-		mkdir -p "$outputdir/$inputfilename.app/Contents/MacOS"
-		# Move executable into bundle directory
-		mv -f "$inputfile" "$outputdir/$inputfilename.app/Contents/MacOS"
-		# Create softlinks to StarOffice shared libraries so that we can run
-		# this bundle from the Mac OS X Finder
-		targetdir="$outputdir/$inputfilename.app/Contents/MacOS"
-		for i in `cd "$targetdir" ; ls -d1 "$solverlibdir/"*.dylib* 2>/dev/null | grep -v -E 'lib\w+static'`
-		do
-			targetfile="$targetdir"/`basename "$i"`
-			if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
-				rm -Rf "$targetfile"
-			fi
-			ln -sf "$i" "$targetfile"
-		done
-		# Note the hack where we filter out libstatic*.dylib in addition 
-		# instead of only lib\w+static files. This is because the local
-		# libstatic*.dylib is not getting updated like the libstatic*.dylib in
-		# $solverlibdir
-		for i in `cd "$targetdir" ; ls -d1 "$locallibdir/"*.dylib* 2>/dev/null | grep -v 'lib.*static'`
-		do
-			targetfile="$targetdir"/`basename "$i"`
-			if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
-				rm -Rf "$targetfile"
-			fi
-			ln -sf "$i" "$targetfile"
-		done
-		# Create softlinks to any other files in the executable directories
-		# so that we can run this bundle from the Mac OS X Finder
-		targetdir="$outputdir/$inputfilename.app/Contents/MacOS"
-		for i in `cd "$targetdir" ; ls -d1 "$solverbindir/"* 2>/dev/null`
-		do
-			if [ -d "$i" -o `basename "$i"` = "$inputfilename" ]; then
-				continue
-			fi
-			targetfile="$targetdir"/`basename "$i"`
-			if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
-				rm -Rf "$targetfile"
-			fi
-			ln -sf "$i" "$targetfile"
-		done
-		for i in `cd "$targetdir" ; ls -d1 "$localbindir/"* 2>/dev/null`
-		do
-			if [ -d "$targetdir/$i" -o "$i" = "$inputfilename" ]; then
-				continue
-			fi
-			targetfile="$targetdir"/`basename "$i"`
-			if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
-				rm -Rf "$targetfile"
-			fi
-			ln -sf "$i" "$targetfile"
-		done
-		# Create stub PkgInfo file
-		printf "APPL????" > "$outputdir/$inputfilename.app/Contents/PkgInfo"
-		# Replace executable with shell script
-		rm -Rf "$outputdir/$inputfilename"
-		printf "#!/bin/sh\n" > "$outputdir/$inputfilename"
-		printf "exec \`dirname \$0\`/$inputfilename.app/Contents/MacOS/$inputfilename \"\$@\"\n" >> "$outputdir/$inputfilename"
-		chmod a+x "$outputdir/$inputfilename"
-		printf "create-bundle: $outputdir/$inputfilename.app successfully created\n"
+
+		# Do nothing as this step is obsolete
+        :
+
 	elif printf "$filetype" | grep -q 'Mach-O dynamically linked shared library ppc'; then
 		# Screen out lib\w+static libraries as they are not used directly
 		if ! printf "$inputfilename" | grep -q -x -E 'lib\w+static.*\.dylib'; then
Index: unxmacxp/bin/init-static-template-data
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/init-static-template-data,v
retrieving revision 1.31.4.3
diff -u -r1.31.4.3 init-static-template-data
--- unxmacxp/bin/init-static-template-data	29 Aug 2002 02:04:28 -0000	1.31.4.3
+++ unxmacxp/bin/init-static-template-data	25 Sep 2002 21:21:00 -0000
@@ -146,7 +146,7 @@
 	# instance that c++filt can process
 	paramcount=`printf "$tokens" | awk '{print NF - 1}'`
 	classtoken=`printf "$tokens" | awk '{print $1}' | sed 's/'"$paramcount"'$//'`
-	paramtoken=`print "$tokens" | awk '{print $2}'`
+	paramtoken=`printf "$tokens" | awk '{print $2}'`
 	datamembertoken=`printf "$tokens" | awk '{print $NF}' | sed 's/^.*\.//'`
 
 	# Unmangle name