Attachment #2966 for issue #7458

View | Details | Raw Unified | Return to issue 7458
Collapse All | Expand All

Lines 526-532 Link Here

(-)bin/deliver.pl (-1 lines)
526	if ( $^O eq 'darwin' )	526	if ( $^O eq 'darwin' )
527	{	527	{
528	system("create-bundle", $to) if ( $to =~ /\.dylib/ );	528	system("create-bundle", $to) if ( $to =~ /\.dylib/ );
529	system("create-bundle", "$to=$from.app") if ( -d "$from.app" );
530	system("ranlib", "$to" ) if ( $to =~ /\.a/ );	529	system("ranlib", "$to" ) if ( $to =~ /\.a/ );
531	}	530	}
532	push_on_ziplist($to) if $opt_zip;	531	push_on_ziplist($to) if $opt_zip;




	@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

	@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

	@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

	@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

	@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

	@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

	@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

	@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

	@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

	@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

Lines 179-188 Link Here

(-)inc/tg_app.mk (-4 lines)
179	@echo "Rerunning static data member initializations"	179	@echo "Rerunning static data member initializations"
180	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	180	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
181	.ENDIF	181	.ENDIF
182	.IF "$(TARGETTYPE)"=="GUI"
183	@echo "Making: $@.app"
184	@create-bundle $@
185	.ENDIF # "$(TARGETTYPE)"=="GUI"
186	.ELSE # "$(OS)"=="MACOSX"	182	.ELSE # "$(OS)"=="MACOSX"
187	@+echo unx	183	@+echo unx
188	@+-$(RM) $(MISC)$/$(@:b).cmd	184	@+-$(RM) $(MISC)$/$(@:b).cmd




# 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")
.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] 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
.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")
.ENDIF

# GrP remove -U options (can't use for two-level)

.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=




	# 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

		# Do nothing as this step is obsolete
        :

			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"
	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

Lines 146-152 Link Here

(-)unxmacxp/bin/init-static-template-data (-1 / +1 lines)
146	# instance that c++filt can process	146	# instance that c++filt can process
147	paramcount=`printf "$tokens" \| awk '{print NF - 1}'`	147	paramcount=`printf "$tokens" \| awk '{print NF - 1}'`
148	classtoken=`printf "$tokens" \| awk '{print $1}' \| sed 's/'"$paramcount"'$//'`	148	classtoken=`printf "$tokens" \| awk '{print $1}' \| sed 's/'"$paramcount"'$//'`
149	paramtoken=`print "$tokens" \| awk '{print $2}'`	149	paramtoken=`printf "$tokens" \| awk '{print $2}'`
150	datamembertoken=`printf "$tokens" \| awk '{print $NF}' \| sed 's/^.*\.//'`	150	datamembertoken=`printf "$tokens" \| awk '{print $NF}' \| sed 's/^.*\.//'`
151		151
152	# Unmangle name	152	# Unmangle name

Return to issue 7458

Lines 84-93 Link Here

(-)inc/_tg_app.mk (-40 lines)
84	@echo "Rerunning static data member initializations"	84	@echo "Rerunning static data member initializations"
85	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	85	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
86	.ENDIF	86	.ENDIF
87	.IF "$(TARGETTYPE)"=="GUI"
88	@echo "Making: $@.app"
89	@create-bundle $@
90	.ENDIF # "$(TARGETTYPE)"=="GUI"
91	.ELSE # "$(OS)"=="MACOSX"	87	.ELSE # "$(OS)"=="MACOSX"
92	@+echo unx	88	@+echo unx
93	@+-$(RM) $(MISC)$/$(@:b).cmd	89	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 280-289 Link Here
280	@echo "Rerunning static data member initializations"	276	@echo "Rerunning static data member initializations"
281	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	277	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
282	.ENDIF	278	.ENDIF
283	.IF "$(TARGETTYPE)"=="GUI"
284	@echo "Making: $@.app"
285	@create-bundle $@
286	.ENDIF # "$(TARGETTYPE)"=="GUI"
287	.ELSE # "$(OS)"=="MACOSX"	279	.ELSE # "$(OS)"=="MACOSX"
288	@+echo unx	280	@+echo unx
289	@+-$(RM) $(MISC)$/$(@:b).cmd	281	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 476-485 Link Here
476	@echo "Rerunning static data member initializations"	468	@echo "Rerunning static data member initializations"
477	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	469	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
478	.ENDIF	470	.ENDIF
479	.IF "$(TARGETTYPE)"=="GUI"
480	@echo "Making: $@.app"
481	@create-bundle $@
482	.ENDIF # "$(TARGETTYPE)"=="GUI"
483	.ELSE # "$(OS)"=="MACOSX"	471	.ELSE # "$(OS)"=="MACOSX"
484	@+echo unx	472	@+echo unx
485	@+-$(RM) $(MISC)$/$(@:b).cmd	473	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 672-681 Link Here
672	@echo "Rerunning static data member initializations"	660	@echo "Rerunning static data member initializations"
673	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	661	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
674	.ENDIF	662	.ENDIF
675	.IF "$(TARGETTYPE)"=="GUI"
676	@echo "Making: $@.app"
677	@create-bundle $@
678	.ENDIF # "$(TARGETTYPE)"=="GUI"
679	.ELSE # "$(OS)"=="MACOSX"	663	.ELSE # "$(OS)"=="MACOSX"
680	@+echo unx	664	@+echo unx
681	@+-$(RM) $(MISC)$/$(@:b).cmd	665	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 868-877 Link Here
868	@echo "Rerunning static data member initializations"	852	@echo "Rerunning static data member initializations"
869	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	853	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
870	.ENDIF	854	.ENDIF
871	.IF "$(TARGETTYPE)"=="GUI"
872	@echo "Making: $@.app"
873	@create-bundle $@
874	.ENDIF # "$(TARGETTYPE)"=="GUI"
875	.ELSE # "$(OS)"=="MACOSX"	855	.ELSE # "$(OS)"=="MACOSX"
876	@+echo unx	856	@+echo unx
877	@+-$(RM) $(MISC)$/$(@:b).cmd	857	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 1064-1073 Link Here
1064	@echo "Rerunning static data member initializations"	1044	@echo "Rerunning static data member initializations"
1065	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	1045	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1066	.ENDIF	1046	.ENDIF
1067	.IF "$(TARGETTYPE)"=="GUI"
1068	@echo "Making: $@.app"
1069	@create-bundle $@
1070	.ENDIF # "$(TARGETTYPE)"=="GUI"
1071	.ELSE # "$(OS)"=="MACOSX"	1047	.ELSE # "$(OS)"=="MACOSX"
1072	@+echo unx	1048	@+echo unx
1073	@+-$(RM) $(MISC)$/$(@:b).cmd	1049	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 1260-1269 Link Here
1260	@echo "Rerunning static data member initializations"	1236	@echo "Rerunning static data member initializations"
1261	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	1237	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1262	.ENDIF	1238	.ENDIF
1263	.IF "$(TARGETTYPE)"=="GUI"
1264	@echo "Making: $@.app"
1265	@create-bundle $@
1266	.ENDIF # "$(TARGETTYPE)"=="GUI"
1267	.ELSE # "$(OS)"=="MACOSX"	1239	.ELSE # "$(OS)"=="MACOSX"
1268	@+echo unx	1240	@+echo unx
1269	@+-$(RM) $(MISC)$/$(@:b).cmd	1241	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 1456-1465 Link Here
1456	@echo "Rerunning static data member initializations"	1428	@echo "Rerunning static data member initializations"
1457	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	1429	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1458	.ENDIF	1430	.ENDIF
1459	.IF "$(TARGETTYPE)"=="GUI"
1460	@echo "Making: $@.app"
1461	@create-bundle $@
1462	.ENDIF # "$(TARGETTYPE)"=="GUI"
1463	.ELSE # "$(OS)"=="MACOSX"	1431	.ELSE # "$(OS)"=="MACOSX"
1464	@+echo unx	1432	@+echo unx
1465	@+-$(RM) $(MISC)$/$(@:b).cmd	1433	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 1652-1661 Link Here
1652	@echo "Rerunning static data member initializations"	1620	@echo "Rerunning static data member initializations"
1653	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	1621	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1654	.ENDIF	1622	.ENDIF
1655	.IF "$(TARGETTYPE)"=="GUI"
1656	@echo "Making: $@.app"
1657	@create-bundle $@
1658	.ENDIF # "$(TARGETTYPE)"=="GUI"
1659	.ELSE # "$(OS)"=="MACOSX"	1623	.ELSE # "$(OS)"=="MACOSX"
1660	@+echo unx	1624	@+echo unx
1661	@+-$(RM) $(MISC)$/$(@:b).cmd	1625	@+-$(RM) $(MISC)$/$(@:b).cmd
Lines 1848-1857 Link Here
1848	@echo "Rerunning static data member initializations"	1812	@echo "Rerunning static data member initializations"
1849	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"	1813	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1850	.ENDIF	1814	.ENDIF
1851	.IF "$(TARGETTYPE)"=="GUI"
1852	@echo "Making: $@.app"
1853	@create-bundle $@
1854	.ENDIF # "$(TARGETTYPE)"=="GUI"
1855	.ELSE # "$(OS)"=="MACOSX"	1815	.ELSE # "$(OS)"=="MACOSX"
1856	@+echo unx	1816	@+echo unx
1857	@+-$(RM) $(MISC)$/$(@:b).cmd	1817	@+-$(RM) $(MISC)$/$(@:b).cmd

Lines 152-171 Link Here

(-)inc/unxmacxp.mk (-4 / +9 lines)
152	# Currently, there is no nas support for OS X...	152	# Currently, there is no nas support for OS X...
153	CDEFS+= -DNO_AUDIO	153	CDEFS+= -DNO_AUDIO
154		154
155	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")	155	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")
156	.IF "$(STLPORT4)"!=""	156	.IF "$(STLPORT4)"!=""
157	.IF "$(STLPORT4)"=="NO_STLPORT4"	157	.IF "$(STLPORT4)"=="NO_STLPORT4"
158	# Look for STLport 4.5 libraries in SOLARLIBDIR	158	# Look for STLport 4.5 libraries in SOLARLIBDIR
159	SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9].[0-9] 2>/dev/null")	159	SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).*[0-9] 2>/dev/null")
160	.ELSE	160	.ELSE
161	# Look for STLport 4.0 libraries in the STLport4 home directory	161	# Look for STLport 4.0 libraries in the STLport4 home directory
162	SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/$(DLLPOST) $(STLPORT4)$/lib$/$(DLLPOST).[0-9] 2>/dev/null")	162	SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/$(DLLPOST) $(STLPORT4)$/lib$/$(DLLPOST).*[0-9] 2>/dev/null")
163	.ENDIF	163	.ENDIF
164	.ENDIF	164	.ENDIF
165		165
166	# GrP mega-hack! no cppuhelper for cppuhelper	166	# GrP mega-hack! no cppuhelper for cppuhelper
167	.IF "$(PRJNAME)"!="cppuhelper"	167	.IF "$(PRJNAME)"!="cppuhelper"
168	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")	168	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")
169	.ENDIF	169	.ENDIF
170		170
171	# GrP remove -U options (can't use for two-level)	171	# GrP remove -U options (can't use for two-level)
Lines 178-183 Link Here
178	.IF "$(GUIBASE)" == "aqua"	178	.IF "$(GUIBASE)" == "aqua"
179	LINKFLAGS+=-lobjc	179	LINKFLAGS+=-lobjc
180	INCGUI+= -I$(PRJ)$/unx/inc	180	INCGUI+= -I$(PRJ)$/unx/inc
		181	.ENDIF
		182
		183	# [ed] 9/1/02 Since we've removed the internal freetype, add the default X11R6 path onto the linkline
		184	.IF "$(GUIBASE)" == "unx"
		185	INCGUI+= -I/usr/X11R6/include/freetype2
181	.ENDIF	186	.ENDIF
182		187
183	LINKFLAGSAPPGUI=	188	LINKFLAGSAPPGUI=

Lines 114-199 Link Here

(-)unxmacxp/bin/create-bundle (-78 / +4 lines)
114	# Determine file type	114	# Determine file type
115	filetype=`file -L "$inputfile"`	115	filetype=`file -L "$inputfile"`
116		116
117	# Since this script replaces executable with shell scripts, we may need to
118	# search elsewhere if the file is a shell script.
119	if printf "$filetype" \| grep -q 'Bourne shell script text'; then
120	realfile="$sourcedir/Contents/MacOS/$inputfilename"
121	if [ -r "$realfile" ]; then
122	filetype=`file "$realfile"`
123	fi
124	fi
125
126	# Create bundle based on file type	117	# Create bundle based on file type
127	if printf "$filetype" \| grep -q 'Mach-O executable ppc'; then	118	if printf "$filetype" \| grep -q 'Mach-O executable ppc'; then
128	# If the script has already been packaged into a bundle, recover the	119
129	# packaged executable	120	# Do nothing as this step is obsolete
130	if [ -s "$realfile" ]; then	121	:
131	rm -Rf "$inputfile"	122
132	cp -f "$realfile" "$inputfile"
133	fi
134	# Create bundle directories
135	if [ -r "$outputdir/$inputfilename.app" ]; then
136	rm -Rf "$outputdir/$inputfilename.app"
137	fi
138	mkdir -p "$outputdir/$inputfilename.app/Contents/MacOS"
139	# Move executable into bundle directory
140	mv -f "$inputfile" "$outputdir/$inputfilename.app/Contents/MacOS"
141	# Create softlinks to StarOffice shared libraries so that we can run
142	# this bundle from the Mac OS X Finder
143	targetdir="$outputdir/$inputfilename.app/Contents/MacOS"
144	for i in `cd "$targetdir" ; ls -d1 "$solverlibdir/".dylib 2>/dev/null \| grep -v -E 'lib\w+static'`
145	do
146	targetfile="$targetdir"/`basename "$i"`
147	if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
148	rm -Rf "$targetfile"
149	fi
150	ln -sf "$i" "$targetfile"
151	done
152	# Note the hack where we filter out libstatic*.dylib in addition
153	# instead of only lib\w+static files. This is because the local
154	# libstatic.dylib is not getting updated like the libstatic.dylib in
155	# $solverlibdir
156	for i in `cd "$targetdir" ; ls -d1 "$locallibdir/".dylib 2>/dev/null \| grep -v 'lib.*static'`
157	do
158	targetfile="$targetdir"/`basename "$i"`
159	if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
160	rm -Rf "$targetfile"
161	fi
162	ln -sf "$i" "$targetfile"
163	done
164	# Create softlinks to any other files in the executable directories
165	# so that we can run this bundle from the Mac OS X Finder
166	targetdir="$outputdir/$inputfilename.app/Contents/MacOS"
167	for i in `cd "$targetdir" ; ls -d1 "$solverbindir/"* 2>/dev/null`
168	do
169	if [ -d "$i" -o `basename "$i"` = "$inputfilename" ]; then
170	continue
171	fi
172	targetfile="$targetdir"/`basename "$i"`
173	if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
174	rm -Rf "$targetfile"
175	fi
176	ln -sf "$i" "$targetfile"
177	done
178	for i in `cd "$targetdir" ; ls -d1 "$localbindir/"* 2>/dev/null`
179	do
180	if [ -d "$targetdir/$i" -o "$i" = "$inputfilename" ]; then
181	continue
182	fi
183	targetfile="$targetdir"/`basename "$i"`
184	if [ ! -L "$targetfile" -a -r "$targetfile" ]; then
185	rm -Rf "$targetfile"
186	fi
187	ln -sf "$i" "$targetfile"
188	done
189	# Create stub PkgInfo file
190	printf "APPL????" > "$outputdir/$inputfilename.app/Contents/PkgInfo"
191	# Replace executable with shell script
192	rm -Rf "$outputdir/$inputfilename"
193	printf "#!/bin/sh\n" > "$outputdir/$inputfilename"
194	printf "exec \`dirname \$0\`/$inputfilename.app/Contents/MacOS/$inputfilename \"\$@\"\n" >> "$outputdir/$inputfilename"
195	chmod a+x "$outputdir/$inputfilename"
196	printf "create-bundle: $outputdir/$inputfilename.app successfully created\n"
197	elif printf "$filetype" \| grep -q 'Mach-O dynamically linked shared library ppc'; then	123	elif printf "$filetype" \| grep -q 'Mach-O dynamically linked shared library ppc'; then
198	# Screen out lib\w+static libraries as they are not used directly	124	# Screen out lib\w+static libraries as they are not used directly
199	if ! printf "$inputfilename" \| grep -q -x -E 'lib\w+static.*\.dylib'; then	125	if ! printf "$inputfilename" \| grep -q -x -E 'lib\w+static.*\.dylib'; then