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	21 Nov 2002 03:42:05 -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	21 Nov 2002 03:42:06 -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	21 Nov 2002 03:42:06 -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	21 Nov 2002 03:42:06 -0000
@@ -60,29 +60,40 @@
 #
 #*************************************************************************
 
+##########################################################################
+# Platform MAKEFILE for Mac OS X and Darwin
+##########################################################################
+
 # DARWIN_VERSION holds the Darwin version in the format: 000000. For example,
 # if the Darwin version is 1.3.7, DARWIN_VERSION will be set to 010307.
 DARWIN_VERSION=$(shell -/bin/sh -c "uname -r | sed 's/\./ /g' | xargs printf %2.2i%2.2i%2.2i")  
 
-# mk file for unxmacxp
 ASM=
 AFLAGS=
-
 LINKOUTPUT_FILTER=
 
-# _PTHREADS is needed for the stl
+# Definitions that we may need on the compile line.
+# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
+#  compiling STLport sources too, either internally or externally.
 CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1
 
 # Name of library where static data members are initialized
 STATICLIBNAME=static$(DLLPOSTFIX)
 STATICLIB=-l$(STATICLIBNAME)
 
+# MacOS X specific Java compilation/link flags
 .IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-JAVAFLAGSDEBUG=-g
-JAVA_RUNTIME=-framework JavaVM
+	JAVADEF=-DSOLAR_JAVA
+	JAVAFLAGSDEBUG=-g
+	JAVA_RUNTIME=-framework JavaVM
 .ENDIF
 
+# Specify the compiler to use.  NOTE:  MacOS X should always specify
+# g++ for C++ compilation as it does certain C++ specific things
+# behind the scenes for us.
+# CC = C++ compiler to use
+# cc = C compiler to use
+# objc = Objective C compiler to use
 CC=cc
 cc=cc
 objc=cc
@@ -93,38 +104,41 @@
 # an error and not search for a file with that name in a following -I directive on the
 # command line.  Therefore...this ugly hack...put STL as the first include on the linkline.
 
-.IF "$(STLPORT4)"!=""
-.IF "$(STLPORT4)"=="NO_STLPORT4"
-
-# [ed] We need to add in the STLport include directory included with the standard OOo sources,
-# currently STLPORT 4.5.
-
-CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
-.ELSE
-
-# [ed] We've got stlport4!
-
-CFLAGS=-c -I$(STLPORT4)$/stlport $(INCLUDE)
-
-.ENDIF
-.ELSE
-
-# [ed] We need to add in the STLport include directory included with the standrad OOo sources,
-# currently STLPORT 4.5
-
-CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
-
-.ENDIF
+# Remeber:  STLPORT4=="NO_STLPORT4" generally indicates that we are using the _INTERNAL_ stlport
+# in OOo and not an external one.
 
+.IF "$(STLPORT4)"!=""
+	.IF "$(STLPORT4)"=="NO_STLPORT4"
+		# [ed] We need to add in the STLport include directory included with the standard OOo sources,
+		# currently STLPORT 4.5.
+		CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
+	.ELSE
+		# [ed] Add in external STLport includes directory if not using internal stlport
+		CFLAGS=-c -I$(STLPORT4)$/stlport $(INCLUDE)
+	.ENDIF
+.ELSE
+	# Otherwise, some indeterminiate STLport...
+	CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
+.ENDIF
+
+# ---------------------------------
+#  Compilation flags
+# ---------------------------------
+# Normal C compilation flags
 CFLAGSCC=-pipe -traditional-cpp -fno-common
 
+# Normal Objective C compilation flags
 OBJCFLAGS=-no-precomp
 
+# Comp Flags for files that need exceptions enabled (C and C++)
 CFLAGSEXCEPTIONS=-fexceptions
+# Comp Flags for files that do not need exceptions enabled (C and C++)
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
+# Normal C++ compilation flags
 CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce -fno-common
 
+# Other flags
 CFLAGSOBJGUIST=-fPIC
 CFLAGSOBJCUIST=-fPIC
 CFLAGSOBJGUIMT=-fPIC
@@ -132,71 +146,123 @@
 CFLAGSSLOGUIMT=-fPIC
 CFLAGSSLOCUIMT=-fPIC
 CFLAGSPROF=
+# Flag for including debugging information in object files
 CFLAGSDEBUG=-g
 CFLAGSDBGUTIL=
+# Flag to specify output file to compiler/linker
+CFLAGSOUTOBJ=-o
 
+# ---------------------------------
+#  Optimization flags
+# ---------------------------------
 # Workaround for the compiler's buggy opitmizer when exceptions are turned on.
 # Note that we have to define NO_OPTIMIZE for all files as once you turn off
 # optimizing for one file, we need to adjust our compiling of the remaining
 # optimized files.
 CDEFS+=-DNO_OPTIMIZE
 .IF "$(ENABLE_EXCEPTIONS)"==""
-CFLAGSOPT=-O2
-CFLAGSNOOPT=-O
-.ELSE
-CFLAGSOPT=
-CFLAGSNOOPT=
+	# Opt flags when exceptions are _dis_abled
+	CFLAGSOPT=-O2
+	CFLAGSNOOPT=-O
+.ELSE
+	# Opt flags when exceptions are enabled
+	CFLAGSOPT=
+	CFLAGSNOOPT=
 .ENDIF
-CFLAGSOUTOBJ=-o
 
 # Currently, there is no nas support for OS X...
-CDEFS+=           -DNO_AUDIO
+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")
-.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")
+# ---------------------------------
+#  Shared Library names
+# ---------------------------------
+# Add all libraries to the shared lib list that ARE NOT lib*static or cppuhelper (to prevent multiply defined errors)
+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")
+
+# ---------------------------------
+#  STLport library names
+# ---------------------------------
+# Option for adding STLport _dynamic_ library to the link line
+LIBSTLPORT=-lstlport_gcc
+
+# Get the name of the static STLport library
+.IF "$(STLPORT4)"=="" || "$(STLPORT4)"=="NO_STLPORT4"
+	LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
 .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")
+	LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
 .ENDIF
+
+# Get the name of the dynamic STLport library and add it to the shared lib list
+.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) 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")
+	.ENDIF
 .ENDIF
 
-# GrP mega-hack! no cppuhelper for cppuhelper
+# ---------------------------------
+#  Module specific shared lib requirements
+# ---------------------------------
 .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")
+	# For all projects _except_ cppuhelper, add cppuhelper's library to the shared lib list.
+	# Note this only adds cppuhelper and no other libraries.
+	# Attempting to link cppuhelper to itself results in multiple defines errors
+	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)
+# ---------------------------------
+#  Link stage flags
+# ---------------------------------
+# For MacOS X, always use C++ compiler for linking because it does some library
+# order magic behind the scenes
 LINK=cc
 LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \
-  $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) \
-  -L$(MISC)
+	$(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) -L$(MISC)
 
 # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
 .IF "$(GUIBASE)" == "aqua"
-LINKFLAGS+=-lobjc
-INCGUI+= -I$(PRJ)$/unx/inc
+	LINKFLAGS+=-lobjc
+	# Sometimes we still use files that would be in a GUIBASE="unx" specific directory
+	# because they really aren't GUIBASE specific, so we've got to account for that here.
+	INCGUI+= -I$(PRJ)$/unx/inc
 .ENDIF
 
+# Random link flags dealing with different cases of linking
+# UNIXVERSIONNAMES specifies whether or not to use library versioning
+#   (ie libstlport.dylib.4.5) rather than no versioning.  We currently
+#   use this on MacOS X.
 LINKFLAGSAPPGUI=
 .IF "$(UNIXVERSIONNAMES)"!=""
-LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
+	LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
 .ELSE
-LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
+	LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
 .ENDIF
 LINKFLAGSAPPCUI=-Wl,-u,__objcInit
 .IF "$(UNIXVERSIONNAMES)"!=""
-LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
+	LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
 .ELSE
-LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
+	LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
 .ENDIF
 LINKFLAGSTACK=
 LINKFLAGSPROF=
+# Flag to add debugging information to final products
 LINKFLAGSDEBUG=-g
 LINKFLAGSOPT=
 
+# ---------------------------------
+#  MacOS X shared library specifics
+# ---------------------------------
+# Tag to identify an output file as a MacOS X output file
+DLLPOSTFIX=mxp
+# Tag to identify an output file as a library
+DLLPRE=lib
+# File extension to identify dynamic shared libraries on MacOS X
+DLLPOST=.dylib
+
+# We don't use mapping on MacOS X
 LINKVERSIONMAPFLAG=
 
 # Reihenfolge der libs NICHT egal!
@@ -213,13 +279,6 @@
 STDSHLGUIMT=
 STDSHLCUIMT=
 
-LIBSTLPORT=-lstlport_gcc
-.IF "$(STLPORT4)"!=""
-LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
-.ELSE
-LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
-.ENDIF
-
 LIBMGR=libtool
 LIBFLAGS=-o
 
@@ -234,7 +293,3 @@
 RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
-
-DLLPOSTFIX=mxp
-DLLPRE=lib
-DLLPOST=.dylib
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	21 Nov 2002 03:42:06 -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	21 Nov 2002 03:42:08 -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
Index: unxmacxp/inc/makefile.mk
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/inc/makefile.mk,v
retrieving revision 1.27.4.1
diff -u -r1.27.4.1 makefile.mk
--- unxmacxp/inc/makefile.mk	7 Aug 2002 07:15:27 -0000	1.27.4.1
+++ unxmacxp/inc/makefile.mk	21 Nov 2002 03:42:08 -0000
@@ -77,26 +77,26 @@
 
 CPPUHELPERLIBNAME=$(DLLPRE)$(CPPUHELPERLIB:s/-l//)$(DLLPOST)
 .IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(CPPUHELPERLIBNAME) $(LB)$/$(CPPUHELPERLIBNAME) 2>/dev/null")"!=""
-LINKFLAGSSHL+=$(CPPUHELPERLIB)
+	LINKFLAGSSHL+=$(CPPUHELPERLIB)
 .ENDIF
 
 # sal needs to be on the static data link list after is it created.
 SALLIBNAME=$(DLLPRE)$(SALLIB:s/-l//)$(DLLPOST)
 .IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(SALLIBNAME) $(LB)$/$(SALLIBNAME) 2>/dev/null")"!=""
-LINKFLAGSSHL+=$(SALLIB)
+	LINKFLAGSSHL+=$(SALLIB)
 .ENDIF
 
 # get the name of the stlport .dylib for the init-static-data-template script.
-# Its called *.dylib.4.5 for STLport 4.5, and a number of things for 4.0
+# Its called *.dylib for STLport 4.5, and a number of things for 4.0
 ISDTSTLPORTLIB=
 .IF "$(STLPORT4)"!=""
-.IF "$(STLPORT4)"=="NO_STLPORT4"
-  # Look for STLport 4.5 libraries in SOLARLIBDIR
-  ISDTSTLPORTLIB+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9].[0-9] 2>/dev/null")
-.ELSE
-  # Look for STLport 4.0 libraries in the STLport4 home directory
-  ISDTSTLPORTLIB+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) $(STLPORT4)$/lib$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) $(STLPORT4)$/lib$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9] 2>/dev/null")
-.ENDIF
+	.IF "$(STLPORT4)"=="NO_STLPORT4"
+		# Look for STLport 4.5 libraries in SOLARLIBDIR
+		ISDTSTLPORTLIB+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) 2>/dev/null")
+	.ELSE
+		# Look for STLport 4.0 libraries in the STLport4 home directory
+		ISDTSTLPORTLIB+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) $(STLPORT4)$/lib$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) $(STLPORT4)$/lib$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9] 2>/dev/null")
+	.ENDIF
 .ENDIF
 
 # Update, compile and link static data member library. Note that we do all of