diff options
Diffstat (limited to 'pyuno/source/loader')
-rw-r--r-- | pyuno/source/loader/makefile.mk | 6 | ||||
-rw-r--r-- | pyuno/source/loader/makefile.mk.orig | 94 | ||||
-rw-r--r-- | pyuno/source/loader/makefile.mk.rej | 20 |
3 files changed, 119 insertions, 1 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 76c3dc2ffecd..d8791e9ffa8e 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -85,10 +85,14 @@ $(DLLDEST)$/%.py: %.py cp $? $@ .ENDIF # L10N_framework -ALLTAR : $(MISC)/pythonloader.component +ALLTAR : $(MISC)/pythonloader.component $(eq,$(OS),MACOSX $(MISC)/installname_loader $(NULL)) $(MISC)/pythonloader.component .ERRREMOVE : \ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component $(XSLTPROC) --nonet --stringparam uri \ 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component + +$(MISC)/installname_loader : $(LB)/$(TARGET)$(DLLPOST) + install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $< + touch $@ diff --git a/pyuno/source/loader/makefile.mk.orig b/pyuno/source/loader/makefile.mk.orig new file mode 100644 index 000000000000..76c3dc2ffecd --- /dev/null +++ b/pyuno/source/loader/makefile.mk.orig @@ -0,0 +1,94 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* +PRJ=..$/.. + +PRJNAME=pyuno +TARGET=pythonloader.uno +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" +DLLPRE = + +#------------------------------------------------------------------- + +.IF "$(OS)$(COMEX)" == "SOLARIS4" +# no -Bdirect for SunWS CC +DIRECT= $(LINKFLAGSDEFS) +.ENDIF + +.IF "$(SYSTEM_PYTHON)" == "YES" +PYTHONLIB=$(PYTHON_LIBS) +CFLAGS+=$(PYTHON_CFLAGS) +.IF "$(EXTRA_CFLAGS)"!="" +PYTHONLIB+= -framework Python +.ENDIF # "$(EXTRA_CFLAGS)"!="" +.ELSE +.INCLUDE : pyversion.mk + +CFLAGS+= -I$(SOLARINCDIR)$/python +.ENDIF + +SHL1TARGET= $(TARGET) + +SHL1STDLIBS= \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALLIB) \ + $(PYUNOLIB) \ + $(PYTHONLIB) + +SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map +SHL1DEPN= +SHL1IMPLIB= i$(TARGET) +SHL1LIBS= $(SLB)$/$(TARGET).lib +SHL1DEF= $(MISC)$/$(SHL1TARGET).def + +DEF1NAME= $(SHL1TARGET) +SLOFILES= $(SLO)$/pyuno_loader.obj + +# --- Targets ------------------------------------------------------ + +ALL : ALLTAR \ + $(DLLDEST)$/pythonloader.py +.ENDIF # L10N_framework + +.INCLUDE : target.mk +.IF "$(L10N_framework)"=="" +$(DLLDEST)$/%.py: %.py + cp $? $@ +.ENDIF # L10N_framework + +ALLTAR : $(MISC)/pythonloader.component + +$(MISC)/pythonloader.component .ERRREMOVE : \ + $(SOLARENV)/bin/createcomponent.xslt pythonloader.component + $(XSLTPROC) --nonet --stringparam uri \ + 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt pythonloader.component diff --git a/pyuno/source/loader/makefile.mk.rej b/pyuno/source/loader/makefile.mk.rej new file mode 100644 index 000000000000..f8a8e489aeaf --- /dev/null +++ b/pyuno/source/loader/makefile.mk.rej @@ -0,0 +1,20 @@ +--- pyuno/source/loader/makefile.mk ++++ pyuno/source/loader/makefile.mk +@@ -89,11 +89,17 @@ + $(DLLDEST)$/pyuno_services.rdb + .ENDIF # L10N_framework + ++ALLTAR: $(eq,$(OS),MACOSX $(MISC)/installname_loader $(NULL)) ++ + .INCLUDE : target.mk + .IF "$(L10N_framework)"=="" + $(DLLDEST)$/%.py: %.py + cp $? $@ + ++$(MISC)/installname_loader : $(LB)/$(TARGET)$(DLLPOST) ++ install_name_tool -change $(PYTHON_MAKEINSTALLDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython @loader_path/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython $< ++ touch $@ ++ + $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST) + -rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb + cd $(DLLDEST) && $(REGCOMP) -register -r pyuno_services.tmp -wop $(foreach,i,$(COMPONENTS) -c $(i)) |