Author: jim
Date: Thu Jul 26 23:26:13 2018
New Revision: 1836767
URL: http://svn.apache.org/viewvc?rev=1836767&view=rev
Log:
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.
Modified:
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/solenv/bin/macosx-create-bundle
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1836767&r1=1836766&r2=1836767&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Thu Jul 26 23:26:13 2018
@@ -73,6 +73,7 @@ gb_Library_FILENAMES := $(patsubst salhe
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))
Modified: openoffice/trunk/main/solenv/bin/macosx-create-bundle
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/macosx-create-bundle?rev=1836767&r1=1836766&r2=1836767&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/macosx-create-bundle (original)
+++ openoffice/trunk/main/solenv/bin/macosx-create-bundle Thu Jul 26 23:26:13
2018
@@ -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
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1836767&r1=1836766&r2=1836767&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Thu Jul 26 23:26:13
2018
@@ -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
