Author: jim
Date: Fri Jan 11 21:46:09 2019
New Revision: 1851103
URL: http://svn.apache.org/viewvc?rev=1851103&view=rev
Log:
Backport r1851102 from trunk. Get macOS building again!
Modified:
openoffice/branches/AOO42X/main/cppu/prj/d.lst
openoffice/branches/AOO42X/main/cppu/util/makefile.mk
openoffice/branches/AOO42X/main/cppuhelper/source/makefile.mk
openoffice/branches/AOO42X/main/desktop/source/deployment/misc/dp_platform.cxx
openoffice/branches/AOO42X/main/mysqlc/source/makefile.mk
openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in
openoffice/branches/AOO42X/main/odk/settings/settings.mk
openoffice/branches/AOO42X/main/sal/inc/osl/module.h
openoffice/branches/AOO42X/main/sal/prj/d.lst
openoffice/branches/AOO42X/main/sal/util/makefile.mk
openoffice/branches/AOO42X/main/salhelper/source/makefile.mk
openoffice/branches/AOO42X/main/scp2/inc/macros.inc
openoffice/branches/AOO42X/main/scp2/source/ooo/ure.scp
openoffice/branches/AOO42X/main/solenv/bin/macosx-change-install-names.pl
openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk
openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk
openoffice/branches/AOO42X/main/store/util/makefile.mk
Modified: openoffice/branches/AOO42X/main/cppu/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/cppu/prj/d.lst?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/cppu/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/cppu/prj/d.lst Fri Jan 11 21:46:09 2019
@@ -57,10 +57,12 @@ mkdir: %_DEST%\inc%_EXT%\uno
..\%__SRC%\lib\cppu*.lib %_DEST%\lib%_EXT%\*
..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_cppu.dylib %_DEST%\lib%_EXT%\libuno_cppu.dylib
..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\*
..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\*
..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_purpenvhelper*.dylib %_DEST%\lib%_EXT%\*
..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\*
..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib%_EXT%\*
@@ -72,4 +74,4 @@ mkdir: %_DEST%\inc%_EXT%\uno
..\%__SRC%\lib\liblog_uno_uno.* %_DEST%\lib%_EXT%\*
linklib: libuno_cppu.*.*
-linklib: libuno_purpenvhelper*.*.*
+linklib: libuno_purpenvhelper*.*.*
\ No newline at end of file
Modified: openoffice/branches/AOO42X/main/cppu/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/cppu/util/makefile.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/cppu/util/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/cppu/util/makefile.mk Fri Jan 11 21:46:09
2019
@@ -28,7 +28,7 @@ USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
-.IF "$(OS)" != "WNT" && "$(OS)" != "OS2"
+.IF "$(OS)" != "WNT" && "$(OS)" != "OS2" && "$(OS)" != "MACOSX"
UNIXVERSIONNAMES=UDK
.ENDIF
Modified: openoffice/branches/AOO42X/main/cppuhelper/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/cppuhelper/source/makefile.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/cppuhelper/source/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/cppuhelper/source/makefile.mk Fri Jan 11
21:46:09 2019
@@ -34,9 +34,9 @@ VISIBILITY_HIDDEN=TRUE
# without "-L" (light) switch
BOOTSTRAP_SERVICE=TRUE
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" && "$(OS)" != "MACOSX"
UNIXVERSIONNAMES=UDK
-.ENDIF # WNT
+.ENDIF # WNT OS2 MACOSX
# --- Settings -----------------------------------------------------
Modified:
openoffice/branches/AOO42X/main/desktop/source/deployment/misc/dp_platform.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/desktop/source/deployment/misc/dp_platform.cxx?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/desktop/source/deployment/misc/dp_platform.cxx
(original)
+++
openoffice/branches/AOO42X/main/desktop/source/deployment/misc/dp_platform.cxx
Fri Jan 11 21:46:09 2019
@@ -180,7 +180,7 @@ namespace
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64)))
- ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("X86_64"));
+ ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
Modified: openoffice/branches/AOO42X/main/mysqlc/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/mysqlc/source/makefile.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/mysqlc/source/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/mysqlc/source/makefile.mk Fri Jan 11
21:46:09 2019
@@ -285,7 +285,7 @@ $(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBF
@@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@ > $(NULLDEV)
.IF "$(OS)" == "MACOSX"
- install_name_tool -id
@__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@
+ install_name_tool -id @_______OOO/$(MYSQL_LIBFILE:f) $@
.ENDIF
.ENDIF
Modified: openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/AOO42X/main/odk/setsdkenv_unix.sh.in Fri Jan 11
21:46:09 2019
@@ -282,28 +282,43 @@ then
# Only necessary on MacOSX, on other Unix systems the links are already
prepared
# in the SDK installation.
-# cleanup potential old links first
- rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
\
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
-
# prepare links
if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+ ln -shf
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}" \
+ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}.3"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}" \
+
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}.3"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}" \
+ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}.3"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}" \
+
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}.3"
+ ln -shf
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}" \
+
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}.3"
+
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}" \
+ "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}" \
+ "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}" \
+ "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3"
+ ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}" \
+ "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3"
+ ln -shf
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}" \
+ "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3"
+
fi
fi
Modified: openoffice/branches/AOO42X/main/odk/settings/settings.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/odk/settings/settings.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/odk/settings/settings.mk (original)
+++ openoffice/branches/AOO42X/main/odk/settings/settings.mk Fri Jan 11
21:46:09 2019
@@ -443,16 +443,16 @@ SALHELPERLIB=-luno_salhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
-SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
+SALDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_sal.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
+CPPUDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_cppu.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
+CPPUHELPERDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_cppuhelper'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
+SALHELPERDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_salhelper$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
+REGDYLIB=-Wl,-dylib_file,@_______URELIB/libreg.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
+STOREDYLIB=-Wl,-dylib_file,@_______URELIB/libstore.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change
@__________________________________________________URELIB/libuno_sal.dylib.3
@executable_path/libuno_sal.dylib.3 -change
@__________________________________________________URELIB/libuno_cppu.dylib.3
@executable_path/libuno_cppu.dylib.3 -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3
@executable_path/libuno_cppuhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3
@executable_path/libuno_salhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libreg.dylib.3
@executable_path/libreg.dylib.3 -change
@__________________________________________________URELIB/libstore.dylib.3
@executable_path/libstore.dylib.3
+INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @_______URELIB/libuno_sal.dylib
@executable_path/libuno_sal.dylib -change @_______URELIB/libuno_cppu.dylib
@executable_path/libuno_cppu.dylib -change
@_______URELIB/libuno_cppuhelper$(COMID).dylib
@executable_path/libuno_cppuhelper$(COMID).dylib -change
@_______URELIB/libuno_salhelper$(COMID).dylib
@executable_path/libuno_salhelper$(COMID).dylib -change
@_______URELIB/libreg.dylib @executable_path/libreg.dylib -change
@_______URELIB/libstore.dylib @executable_path/libstore.dylib
-INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change
@__________________________________________________URELIB/libuno_sal.dylib.3
libuno_sal.dylib.3 -change
@__________________________________________________URELIB/libuno_cppu.dylib.3
libuno_cppu.dylib.3 -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3
libuno_cppuhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3
libuno_salhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libreg.dylib.3
libreg.dylib.3 -change
@__________________________________________________URELIB/libstore.dylib.3
libstore.dylib.3
+INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change
@_______URELIB/libuno_sal.dylib libuno_sal.dylib -change
@_______URELIB/libuno_cppu.dylib libuno_cppu.dylib -change
@_______URELIB/libuno_cppuhelper$(COMID).dylib libuno_cppuhelper$(COMID).dylib
-change @_______URELIB/libuno_salhelper$(COMID).dylib
libuno_salhelper$(COMID).dylib -change @_______URELIB/libreg.dylib libreg.dylib
-change @_______URELIB/libstore.dylib libstore.dylib
EMPTYSTRING=
PATH_SEPARATOR=:
Modified: openoffice/branches/AOO42X/main/sal/inc/osl/module.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sal/inc/osl/module.h?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sal/inc/osl/module.h (original)
+++ openoffice/branches/AOO42X/main/sal/inc/osl/module.h Fri Jan 11 21:46:09
2019
@@ -44,7 +44,7 @@ extern "C" {
#elif defined(SAL_UNX)
#if defined(MACOSX)
-#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name
".dylib." version
+#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name ".dylib"
#else
#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name
SAL_DLLEXTENSION "." version
#endif
Modified: openoffice/branches/AOO42X/main/sal/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sal/prj/d.lst?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sal/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/sal/prj/d.lst Fri Jan 11 21:46:09 2019
@@ -18,8 +18,7 @@ mkdir: %_DEST%\inc%_EXT%\systools\win32
symlink: %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3
%_DEST%\lib%_EXT%\libsalalloc_malloc.so
..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3
symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so
-..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3
%_DEST%\lib%_EXT%\libuno_sal.dylib
+..\%__SRC%\lib\libuno_sal.dylib %_DEST%\lib%_EXT%\libuno_sal.dylib
..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
Modified: openoffice/branches/AOO42X/main/sal/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sal/util/makefile.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sal/util/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/sal/util/makefile.mk Fri Jan 11 21:46:09
2019
@@ -36,7 +36,9 @@ USE_DEFFILE=TRUE
TARGETTYPE=CUI
.ENDIF # UNX
+.IF "$(OS)" != "MACOSX"
UNIXVERSIONNAMES=UDK
+.ENDIF
# --- Settings -----------------------------------------------------
Modified: openoffice/branches/AOO42X/main/salhelper/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/salhelper/source/makefile.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/salhelper/source/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/salhelper/source/makefile.mk Fri Jan 11
21:46:09 2019
@@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
USE_DEFFILE=TRUE
-.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
+.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" && "$(OS)" != "MACOSX"
UNIXVERSIONNAMES=UDK
.ENDIF # WNT
Modified: openoffice/branches/AOO42X/main/scp2/inc/macros.inc
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/scp2/inc/macros.inc?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/scp2/inc/macros.inc (original)
+++ openoffice/branches/AOO42X/main/scp2/inc/macros.inc Fri Jan 11 21:46:09 2019
@@ -548,6 +548,8 @@ End
#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_COMID_VER(n, v) \
"lib" n STRING(COMID) STRING(UNXSUFFIX) "." v
+#define SCP2_URE_DL_COMID_NORMAL(n) \
+ "lib" n STRING(COMID) STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_COMID_VER(n, v) \
Modified: openoffice/branches/AOO42X/main/scp2/source/ooo/ure.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/scp2/source/ooo/ure.scp?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/AOO42X/main/scp2/source/ooo/ure.scp Fri Jan 11 21:46:09
2019
@@ -190,7 +190,11 @@ End
File gid_File_Dl_Cppu
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+ Name = SCP2_URE_DL_UNO_NORMAL("cppu");
+#else
Name = SCP2_URE_DL_UNO_VER("cppu", "3");
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
@@ -200,8 +204,12 @@ File gid_File_Dl_Cppuhelper
#ifdef OS2
Name = "cppuh3.dll";
#else
+#if defined MACOSX
+ Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
+#else
Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
#endif
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
@@ -211,15 +219,23 @@ File gid_File_Dl_PurpEnvHelper
#ifdef OS2
Name = "purpeh3.dll";
#else
+#if defined MACOSX
+ Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
+#else
Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
#endif
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
File gid_File_Dl_Sal
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+ Name = SCP2_URE_DL_UNO_NORMAL("sal");
+#else
Name = SCP2_URE_DL_UNO_VER("sal", "3");
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
@@ -229,8 +245,12 @@ File gid_File_Dl_Salhelper
#ifdef OS2
Name = "salhelp3.dll";
#else
+#if defined MACOSX
+ Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
+#else
Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
#endif
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
@@ -239,14 +259,22 @@ End
File gid_File_Dl_Reg
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+ Name = SCP2_URE_DL_NORMAL("reg");
+#else
Name = SCP2_URE_DL_VER("reg", "3");
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
File gid_File_Dl_Store
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+ Name = SCP2_URE_DL_NORMAL("store");
+#else
Name = SCP2_URE_DL_VER("store", "3");
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
@@ -267,15 +295,23 @@ File gid_File_Dl_Jvmaccess
#ifdef OS2
Name = "jvmacces.dll";
#else
+#if defined MACOSX
+ Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
+#else
Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
#endif
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
File gid_File_Dl_Jvmfwk
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+ Name = SCP2_URE_DL_NORMAL("jvmfwk");
+#else
Name = SCP2_URE_DL_VER("jvmfwk", "3");
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
Modified:
openoffice/branches/AOO42X/main/solenv/bin/macosx-change-install-names.pl
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/bin/macosx-change-install-names.pl?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/bin/macosx-change-install-names.pl
(original)
+++ openoffice/branches/AOO42X/main/solenv/bin/macosx-change-install-names.pl
Fri Jan 11 21:46:09 2019
@@ -114,7 +114,7 @@ if ($type eq "extshl")
{
foreach $file (@ARGV)
{
- my $call = "${::CC_PATH}install_name_tool$change -id
\@__________________________________________________$loc/$inames{$file} $file";
+ my $call = "${::CC_PATH}install_name_tool$change -id
\@_______$loc/$inames{$file} $file";
system($call) == 0 or die "cannot $call";
}
}
@@ -127,7 +127,7 @@ foreach $file (@ARGV)
while (<IN>)
{
$change .= " -change $1 " . action($type, $loc, $2) . "$3"
- if m'^\s*(@_{50}([^/]+)(/.+)) \(compatibility version
\d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$';
+ if m'^\s*(@_{7}([^/]+)(/.+)) \(compatibility version
\d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$';
}
close(IN);
if ($change ne "")
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk Fri Jan 11
21:46:09 2019
@@ -257,9 +257,9 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb
endef
gb_LinkTarget__RPATHS := \
- URELIB:@__________________________________________________URELIB/ \
+ URELIB:@_______URELIB/ \
UREBIN: \
- OOO:@__________________________________________________OOO/ \
+ OOO:@_______OOO/ \
BRAND: \
SDKBIN: \
NONEBIN: \
@@ -318,18 +318,10 @@ $(call gb_Helper_abbreviate_dirs,\
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library
$(LAYER) $(1) && \
- ln -f $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+ ln -shf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
rm -f $${DYLIB_FILE})
endef
-define gb_LinkTarget__command_symlink_udk_versioned_library
- $(if $(call gb_Library_is_udk_versioned,$(1)),
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(1).$(gb_UDK_MAJOR) && \
- mv $(1) $(1).$(gb_UDK_MAJOR) && \
- ln -shf $(1).$(gb_UDK_MAJOR) $(1)))
-endef
-
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
define gb_LinkTarget__command_staticlink
$(call gb_Helper_abbreviate_dirs,\
@@ -345,7 +337,6 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call
gb_LinkTarget__command_dynamiclink,$(1),$(2)))
-$(if $(filter Library,$(TARGETTYPE)),$(call
gb_LinkTarget__command_symlink_udk_versioned_library,$(1)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call
gb_LinkTarget__command_staticlink,$(1)))
endef
@@ -402,11 +393,6 @@ endef
define gb_Library_Library_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call
gb_Library_get_rpath,$(1))
$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call
gb_Library_get_layer,$(1))
-ifneq (,$(call gb_Library_is_udk_versioned,$(call gb_Library_get_target,$(1))))
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
- $(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR)
-endif
$(call gb_Library_get_target,$(1)) \
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_target,$(1)))
Modified: openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/inc/unxmacc.mk Fri Jan 11 21:46:09
2019
@@ -167,17 +167,15 @@ LINK*=$(CXX)
LINKC*=$(CC)
###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH)
-# Very long install_names are needed so that install_name_tool -change later on
-# does not complain that "larger updated load commands do not fit:"
-LINKFLAGSRUNPATH_URELIB=-install_name
'@__________________________________________________URELIB/$(@:f)'
+EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad,ff
+LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'
LINKFLAGSRUNPATH_UREBIN=
-LINKFLAGSRUNPATH_OOO=-install_name
'@__________________________________________________OOO/$(@:f)'
+LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)'
LINKFLAGSRUNPATH_SDK=
LINKFLAGSRUNPATH_BRAND=
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=
-LINKFLAGSRUNPATH_NONE=-install_name
'@__________________________________________________NONE/$(@:f)'
+LINKFLAGSRUNPATH_NONE=-install_name '@_______NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
LINKFLAGS+=-lobjc
Modified: openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/inc/unxmacx.mk Fri Jan 11 21:46:09
2019
@@ -186,19 +186,17 @@ LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/l
LINK*=$(CXX)
LINKC*=$(CC)
-LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
+LINKFLAGSDEFS*=-Wl,-headerpad,ff,-multiply_defined,suppress
# assure backwards-compatibility
EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
-# Very long install_names are needed so that install_name_tool -change later on
-# does not complain that "larger updated load commands do not fit:"
-LINKFLAGSRUNPATH_URELIB=-install_name
'@__________________________________________________URELIB/$(@:f)'
+LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'
LINKFLAGSRUNPATH_UREBIN=
-LINKFLAGSRUNPATH_OOO=-install_name
'@__________________________________________________OOO/$(@:f)'
+LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)'
LINKFLAGSRUNPATH_SDK=
LINKFLAGSRUNPATH_BRAND=
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=
-LINKFLAGSRUNPATH_NONE=-install_name
'@__________________________________________________NONE/$(@:f)'
+LINKFLAGSRUNPATH_NONE=-install_name '@_______NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS)
# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library
into our link line
Modified: openoffice/branches/AOO42X/main/store/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/store/util/makefile.mk?rev=1851103&r1=1851102&r2=1851103&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/store/util/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/store/util/makefile.mk Fri Jan 11 21:46:09
2019
@@ -33,7 +33,9 @@ USE_DEFFILE=TRUE
NO_BSYMBOLIC=TRUE
NO_DEFAULT_STL=TRUE
+.IF "$(OS)" != "MACOSX"
UNIXVERSIONNAMES=UDK
+.ENDIF
# --- Settings ---
