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

INTEGRATION: CWS sb83 (1.11.28); FILE MERGED

Browse source 
2008/01/23 11:12:44 sb 1.11.28.2: #i84200# improved previous change
2008/01/21 08:55:17 sb 1.11.28.1: #i84200# For external modules, use the install_name_tool -id feature to adapt install names of built dynamic libraries in a postprocess step.
This commit is contained in:
Vladimir Glazounov 2008-03-18 11:35:11 +00:00
parent 9a9e6f013d
commit c7c6561c11
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
moz/extractfiles.mk
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: extractfiles.mk,v $ # $RCSfile: extractfiles.mk,v $
# #
# $Revision: 1.11 $ # $Revision: 1.12 $
# #
# last change: $Author: vg $ $Date: 2007-03-26 13:53:19 $ # last change: $Author: vg $ $Date: 2008-03-18 12:35:11 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -240,6 +240,34 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST) cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST)
.ENDIF .ENDIF
.ENDIF .ENDIF
.IF "$(OS)"=="MACOSX"
$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \
$(RUNTIME_DIR)$/*$(DLLPOST)
# A crude hack to adapt all the install names in the components subdir:
$(foreach,file,$(shell ls $(RUNTIME_DIR)$/components$/*$(DLLPOST)) \
install_name_tool \
-change @executable_path/libldap50.dylib \
@loader_path/../libldap50.dylib \
-change @executable_path/libmozjs.dylib @loader_path/../libmozjs.dylib \
-change @executable_path/libmozz.dylib @loader_path/../libmozz.dylib \
-change @executable_path/libmsgbaseutil.dylib \
@loader_path/../libmsgbaseutil.dylib \
-change @executable_path/libnspr4.dylib @loader_path/../libnspr4.dylib \
-change @executable_path/libnss3.dylib @loader_path/../libnss3.dylib \
-change @executable_path/libplc4.dylib @loader_path/../libplc4.dylib \
-change @executable_path/libplds4.dylib @loader_path/../libplds4.dylib \
-change @executable_path/libprldap50.dylib \
@loader_path/../libprldap50.dylib \
-change @executable_path/libsmime3.dylib \
@loader_path/../libsmime3.dylib \
-change @executable_path/libsoftokn3.dylib \
@loader_path/../libsoftokn3.dylib \
-change @executable_path/libssl3.dylib @loader_path/../libssl3.dylib \
-change @executable_path/libxpcom.dylib @loader_path/../libxpcom.dylib \
-change @executable_path/libxpcom_compat.dylib \
@loader_path/../libxpcom_compat.dylib \
$(file) &&) true
.ENDIF
# zip runtime files to mozruntime.zip # zip runtime files to mozruntime.zip
cd $(RUNTIME_DIR) && .$/regxpcom$(REG_SUBFIX) cd $(RUNTIME_DIR) && .$/regxpcom$(REG_SUBFIX)
@ -271,11 +299,18 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
.ENDIF .ENDIF
$(TOUCH) $@ $(TOUCH) $@
$(MISC)$/build$/so_moz_lib_files: $(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)) # On UNX the rules for so_moz_runtime_files copy files into the same directory
# used here (LIB_DIR), and on MACOSX all those files together need to be
# processed here, hence the dependency on so_moz_runtime_files:
$(MISC)$/build$/so_moz_lib_files: $(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)) $(MISC)$/build$/so_moz_runtime_files
echo $(foreach,file,$(LIBLIST) $(MOZ_DIST_DIR)$/lib$/$(file)) echo $(foreach,file,$(LIBLIST) $(MOZ_DIST_DIR)$/lib$/$(file))
$(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \ $(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \
$(LIB_DIR)$/$(file) &&) \ $(LIB_DIR)$/$(file) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
.IF "$(OS)"=="MACOSX"
$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \
$(LIB_DIR)$/*$(DLLPOST)
.ENDIF
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
chmod -R 775 $(LB) chmod -R 775 $(LB)
.ENDIF .ENDIF