Author: jim
Date: Thu Jul 12 18:50:38 2018
New Revision: 1835762
URL: http://svn.apache.org/viewvc?rev=1835762&view=rev
Log:
Update targets for macOS
Modified:
openoffice/trunk/main/desktop/source/pagein/makefile.mk
openoffice/trunk/main/odk/setsdkenv_unix.sh.in
openoffice/trunk/main/odk/settings/settings.mk
openoffice/trunk/main/sal/prj/d.lst
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/inc/libs.mk
Modified: openoffice/trunk/main/desktop/source/pagein/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/pagein/makefile.mk?rev=1835762&r1=1835761&r2=1835762&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/pagein/makefile.mk (original)
+++ openoffice/trunk/main/desktop/source/pagein/makefile.mk Thu Jul 12 18:50:38
2018
@@ -63,13 +63,8 @@ ALL: \
.INCLUDE : target.mk
ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
-.IF "$(OS)" == "MACOSX"
-UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
-UNODLLPOST=.uno$(DLLPOST)
-.ELSE
UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
UNODLLPOST=.uno$(DLLPOST)
-.ENDIF
DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default
URELIBPATH=..$/ure-link$/lib
Modified: openoffice/trunk/main/odk/setsdkenv_unix.sh.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/setsdkenv_unix.sh.in?rev=1835762&r1=1835761&r2=1835762&view=diff
==============================================================================
--- openoffice/trunk/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/trunk/main/odk/setsdkenv_unix.sh.in Thu Jul 12 18:50:38 2018
@@ -293,15 +293,15 @@ then
if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}"
\
+ ln -s
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
fi
Modified: openoffice/trunk/main/odk/settings/settings.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1835762&r1=1835761&r2=1835762&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/settings.mk (original)
+++ openoffice/trunk/main/odk/settings/settings.mk Thu Jul 12 18:50:38 2018
@@ -436,23 +436,23 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-luno_sal3
-CPPULIB=-luno_cppu3
-CPPUHELPERLIB=-luno_cppuhelper3$(COMID)
-SALHELPERLIB=-luno_salhelper3$(COMID)
-REGLIB=-lreg3
-STORELIB=-lstore3
+SALLIB=-luno_sal
+CPPULIB=-luno_cppu
+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+SALHELPERLIB=-luno_salhelper$(COMID)
+REGLIB=-lreg
+STORELIB=-lstore
-SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper3'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper3$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
+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'
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change
@__________________________________________________URELIB/libuno3_sal.dylib
@executable_path/libuno_sal3.dylib -change
@__________________________________________________URELIB/libuno_cppu3.dylib
@executable_path/libuno_cppu3.dylib -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID)3.dylib
@executable_path/libuno_cppuhelper$(COMID)3.dylib -change
@__________________________________________________URELIB/libuno_salhelper$(COMID)3.dylib
@executable_path/libuno_salhelper$(COMID)3.dylib -change
@__________________________________________________URELIB/libreg3.dylib
@executable_path/libreg3.dylib -change
@__________________________________________________URELIB/libstore3.dylib
@executable_path/libstore3.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_BIN=$(INSTALLTOOL) -change
@__________________________________________________URELIB/libuno_sal3.dylib
libuno_sal3.dylib -change
@__________________________________________________URELIB/libuno_cppu3.dylib
libuno_cppu3.dylib -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID)3.dylib
libuno_cppuhelper$(COMID)3.dylib -change
@__________________________________________________URELIB/libuno_salhelper$(COMID)3.dylib
libuno_salhelper$(COMID)3.dylib -change
@__________________________________________________URELIB/libreg3.dylib
libreg3.dylib -change
@__________________________________________________URELIB/libstore3.dylib
libstore3.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
EMPTYSTRING=
PATH_SEPARATOR=:
Modified: openoffice/trunk/main/sal/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/d.lst?rev=1835762&r1=1835761&r2=1835762&view=diff
==============================================================================
--- openoffice/trunk/main/sal/prj/d.lst (original)
+++ openoffice/trunk/main/sal/prj/d.lst Thu Jul 12 18:50:38 2018
@@ -18,8 +18,8 @@ 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_sal3.dylib %_DEST%\lib%_EXT%\libuno_sal3.dylib
-symlink: %_DEST%\lib%_EXT%\libuno_sal3.dylib %_DEST%\lib%_EXT%\libuno_sal.dylib
+..\%__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\*.sl %_DEST%\lib%_EXT%\*.sl
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1835762&r1=1835761&r2=1835762&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Thu Jul 12 18:50:38
2018
@@ -294,7 +294,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
- -o $(if $(call gb_Library_is_udk_versioned,$(1)),$(patsubst
%.dylib,%$(gb_UDK_MAJOR).dylib,$(1)),$(1)) \
+ -o $(if $(call
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library
$(LAYER) $(1) && \
@@ -305,7 +305,7 @@ 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) && ln -s $(patsubst
%.dylib,%$(gb_UDK_MAJOR).dylib,$(notdir $(1))) $(1)))
+ rm -f $(1) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR)
$(1)))
endef
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
@@ -380,6 +380,11 @@ 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
endef
Modified: openoffice/trunk/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/libs.mk?rev=1835762&r1=1835761&r2=1835762&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/libs.mk (original)
+++ openoffice/trunk/main/solenv/inc/libs.mk Thu Jul 12 18:50:38 2018
@@ -21,7 +21,7 @@
LIBSMKREV!:="$$Revision$$"
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC" || "$(OS)"=="MACOSX")
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
#
#externe libs in plattform.mk
@@ -98,7 +98,7 @@ OPENSSLLIBST=-lssl_static -lcrypto_stati
OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.ENDIF # "$(SYSTEM_OPENSSL)" == "YES"
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
REGLIB=-lreg$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
REGLIB=-lreg
@@ -109,9 +109,6 @@ XMLOFFLLIB=-lxol
.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
STORELIB=-lstore$(UDK_MAJOR)
SALLIB=-lsal$(UDK_MAJOR)
-.ELIF "$(OS)"=="MACOSX"
-STORELIB=-lstore$(UDK_MAJOR)
-SALLIB=-luno_sal$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
STORELIB=-lstore
SALLIB=-luno_sal
@@ -120,7 +117,7 @@ SALLIB=-luno_sal
ODBCLIB=-lodbc$(DLLPOSTFIX)
ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
DBFILELIB=-lfile$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
RMCXTLIB=-lrmcxt$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
RMCXTLIB=-lrmcxt
@@ -273,7 +270,7 @@ ISCLIB=-lsc$(DLLPOSTFIX)
ISDLIB=-lsd$(DLLPOSTFIX)
PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMACCESSLIB = -ljvmaccess$(COMID)
@@ -286,7 +283,7 @@ XSLTLIB=$(LIBXSLT_LIBS)
.ELSE
XSLTLIB=-lxslt $(LIBXML2LIB)
.ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMFWKLIB = -ljvmfwk
