strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS macosxmapfiles (1.100.16); FILE MERGED

Browse source 
2007/01/26 09:47:52 tra 1.100.16.5: #69351#Now also handling '?'
2007/01/24 06:58:26 tra 1.100.16.4: #i69351# general cleanup and better documentation
2007/01/21 13:27:04 tra 1.100.16.3: #i69351#a more flexible approach to generate the exported symbols list for Mac OS X out of a map file
2007/01/11 09:00:38 tra 1.100.16.2: RESYNC: (1.100-1.101); FILE MERGED
2007/01/11 08:42:45 tra 1.100.16.1: #69351#support for exported symbols lists as replacement for missing map file support on Mac OS X
This commit is contained in:
Rüdiger Timm 2007-01-31 07:59:13 +00:00
parent 7e56f83bc3
commit 3b93e7f245
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
solenv/inc/tg_shl.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: tg_shl.mk,v $
#
# $Revision: 1.104 $
# $Revision: 1.105 $
#
# last change: $Author: hjs $ $Date: 2007-01-26 10:58:42 $
# last change: $Author: rt $ $Date: 2007-01-31 08:59:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -142,11 +142,9 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(OS)"!="IRIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
.ENDIF
.ENDIF
$(USE_SHL$(TNR)VERSIONMAP): \
$(SHL$(TNR)OBJS)\
@ -179,14 +177,22 @@ $(USE_SHL$(TNR)VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
.IF "$(OS)"!="MACOSX"
.IF "$(OS)"!="IRIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
.ENDIF
.ENDIF
$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
@-$(RM) -f $@ >& $(NULLDEV)
# The following files will only be generated and needed on Mac OS X as temporary files
# in order to generate exported symbols list out of Linux/Solaris map files
.IF "$(OS)"=="MACOSX"
@+-$(RM) -f $@.symregexp >& $(NULLDEV)
@+-$(RM) -f $@.expsymlist >& $(NULLDEV)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
# happens if somebody will change it in the future
.IF "$(COMID)"=="gcc3"
tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@
.ELSE # "$(COMID)"=="gcc3"
@ -194,6 +200,25 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
# for details on exported symbols list see man ld on Mac OS X
.IF "$(OS)"=="MACOSX"
+-cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
+-cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
.IF "$(SHL$(TNR)OBJS)"!=""
+-echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
.ENDIF
.IF "$(SHL$(TNR)LIBS)"!=""
+-$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $(MISC)$/symbols-regexp.tmp >> $@.exported-symbols
.ENDIF
# overwrite the map file generate into the local output tree with the generated
# exported symbols list
+cp $@.exported-symbols $@
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL$(TNR)VERSIONMAP)"!=""
.ENDIF # "$(GUI)" != "UNX"
@ -386,16 +411,11 @@ $(SHL$(TNR)TARGETN) : \
@echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \
`cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
@echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
@echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
`macosx-dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \
$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
@cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
@+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
.IF "$(DEBUG)"==""
@strip -i -r -u -S -s $(SHL$(TNR)VERSIONMAP) $@
.ENDIF
.ENDIF
@echo "Making: $@.jnilib"
@macosx-create-bundle $@
.IF "$(UPDATER)"=="YES"