[Libreoffice-commits] core.git: Branch 'aoo/trunk' - RepositoryFixes.mk solenv/bin solenv/gbuild

[Libreoffice Gerrit user]

 RepositoryFixes.mk               |    1 +
 solenv/bin/macosx-create-bundle  |    2 +-
 solenv/gbuild/platform/macosx.mk |    9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ade5a721b1be8c114670b08b261deca37ea27e6a
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Thu Jul 26 23:26:13 2018 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Thu Jul 26 23:26:13 2018 +0000

    Let's re-arrange the logic... when we create the shared lib, create
    
    as before, w/o knowledge of UDK, but take care of UDK versioning
    following that.

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index dd85ed5334df..dcdb0538313e 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -73,6 +73,7 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jurt:libjpipe.dylib%,jurt:libjpipe.jnilib%,$(gb_Library_FILENAMES))
 
 ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
 gb_Library_FILENAMES := $(patsubst stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index 7800e03be696..bc61bdb69dfa 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -88,7 +88,7 @@ while [ $# != 0 ]; do
 				rm -Rf "$outputdir/$inputjnilibname"
 			fi
 			# Link jnilib
-			ln -sf "$inputfilename" "$outputdir/$inputjnilibname"
+			ln -shf "$inputfilename" "$outputdir/$inputjnilibname"
 
 			#printf "macosx-create-bundle: $outputdir/$inputjnilibname successfully created\n"
 		fi
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ef93faaaa28b..de50050fce45 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -294,19 +294,20 @@ $(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)),$(1).$(gb_UDK_MAJOR),$(1)) \
+		-o $(1) \
 		`cat $${DYLIB_FILE}` && \
 	$(if $(filter Library,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
-		ln -shf $(if $(call gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
-		      $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+		ln -f $(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) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR) $(1)))
+			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