From 5706c479ff05c4ea9d6e25cebe7f0cd3b7469eae Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 14 Jun 2012 11:43:16 +0200 Subject: Remove dmake makefiles obsoleted by gbuild'ification Change-Id: I94b074d7d2e1ea2f80c3075ae49530225947442d --- pyuno/source/loader/makefile.mk | 94 ---------------------- pyuno/source/module/makefile.mk | 173 ---------------------------------------- pyuno/zipcore/makefile.mk | 135 ------------------------------- 3 files changed, 402 deletions(-) delete mode 100644 pyuno/source/loader/makefile.mk delete mode 100644 pyuno/source/module/makefile.mk delete mode 100644 pyuno/zipcore/makefile.mk diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk deleted file mode 100644 index 1760a88b5cb1..000000000000 --- a/pyuno/source/loader/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=../.. - -PRJNAME=pyuno -TARGET=$(ENFORCEDSHLPREFIX)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 \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \ - -o $@ $(SOLARENV)/bin/createcomponent.xslt pythonloader.component diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk deleted file mode 100644 index 5c9d81e7f032..000000000000 --- a/pyuno/source/module/makefile.mk +++ /dev/null @@ -1,173 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=../.. - -PRJNAME=pyuno -TARGET=pyuno -ENABLE_EXCEPTIONS=TRUE - -LINKFLAGSDEFS = # do not fail with missing symbols - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" - -#------------------------------------------------------------------- - -.IF "$(OS)$(COMEX)" == "SOLARIS4" -# no -Bdirect for SunWS CC -DIRECT = $(LINKFLAGSDEFS) -.ENDIF - -# special setting from environment -.IF "$(EXTRA_CFLAGS)"!="" -EXTRA_FRAMEWORK_FLAG=-framework Python -.ENDIF # .IF "$(EXTRA_CFLAGS)"!="" - -.IF "$(GUI)" == "UNX" -# python expects modules without the lib prefix -# pyuno.so even on Mac OS X, because it is a python module -PYUNO_MODULE=$(DLLDEST)$/pyuno.so -PYUNORC=pyunorc -.ELSE -.IF "$(CROSS_COMPILING)" != "YES" -.INCLUDE : pyversion.mk -.ENDIF -PYUNORC=pyuno.ini -DLLPOST=.pyd -.ENDIF - -.IF "$(SYSTEM_PYTHON)" == "YES" -PYTHONLIB=$(PYTHON_LIBS) -CFLAGS+=$(PYTHON_CFLAGS) -.ELSE # "$(SYSTEM_PYTHON)" == "YES" -.INCLUDE : pyversion.mk -CFLAGS+=-I$(SOLARINCDIR)/python -.ENDIF # "$(SYSTEM_PYTHON)" == "YES" - -SHL1TARGET=$(TARGET) -SLOFILES= \ - $(SLO)/pyuno_runtime.obj \ - $(SLO)/pyuno.obj \ - $(SLO)/pyuno_callable.obj \ - $(SLO)/pyuno_module.obj \ - $(SLO)/pyuno_type.obj \ - $(SLO)/pyuno_util.obj \ - $(SLO)/pyuno_except.obj \ - $(SLO)/pyuno_adapter.obj \ - $(SLO)/pyuno_gc.obj - -# remove this, when issue i35064 is integrated -.IF "$(COM)"=="GCC" -NOOPTFILES= \ - $(SLO)/pyuno_module.obj -.ENDIF # "$(COM)"=="GCC" - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(PYTHONLIB) \ - $(EXTRA_FRAMEWORK_FLAG) - -SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL)) -SHL1LIBS=$(SLB)/$(TARGET).lib -SHL1IMPLIB=i$(TARGET) - -SHL1DEF=$(MISC)/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1DEPN=$(MISC)/pyuno.flt - -DEFLIB1NAME=$(TARGET) - -# --- Targets ------------------------------------------------------ - -.IF "$(GUI)$(COM)"=="WNTGCC" -ALLTAR : \ - $(DLLDEST)/uno.py \ - $(DLLDEST)/unohelper.py \ - $(PYUNO_MODULE) \ - $(MISC)/$(PYUNORC) \ - $(LB)/lib$(TARGET).a - -$(LB)/lib$(TARGET).a: $(MISC)/$(TARGET).def - $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)/$(TARGET).def --kill-at --output-lib=$(LB)/lib$(TARGET).a -.ELSE - -ALLTAR : \ - $(DLLDEST)/uno.py \ - $(DLLDEST)/unohelper.py \ - $(PYUNO_MODULE) \ - $(MISC)/$(PYUNORC) -.ENDIF -.ENDIF - -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" -$(DLLDEST)/%.py: %.py - cp $? $@ - -# make checkdll happy -$(MISC)/framework_link : - $(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework - @touch $@ - -.IF "$(GUI)" == "UNX" -$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj -.IF "$(OS)" == "LINUX" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ELIF "$(OS)" == "SOLARIS" - @echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ELIF "$(OS)" == "FREEBSD" - @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ELIF "$(OS)" == "NETBSD" - @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ELIF "$(OS)" == "OPENBSD" - @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ELIF "$(OS)" == "DRAGONFLY" - @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ELIF "$(OS)" == "MACOSX" - @echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd -.ELSE - @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd -.ENDIF - cat $(MISC)$/$(@:b).cmd - @+source $(MISC)$/$(@:b).cmd -.ENDIF - -$(MISC)/$(PYUNORC) : pyuno - -rm -f $@ - cat pyuno > $@ - -$(MISC)/pyuno.flt : pyuno.flt - -rm -f $@ - cat $? > $@ - -.ENDIF # L10N_framework diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk deleted file mode 100644 index 166fff4393ae..000000000000 --- a/pyuno/zipcore/makefile.mk +++ /dev/null @@ -1,135 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJNAME=pyuno -PRJ=.. - -TARGET=zipcore -LIBTARGET=NO - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -UWINAPILIB = - -.IF "$(SYSTEM_PYTHON)" == "YES" - -systempython: -# nothing - -.ELSE - -.INCLUDE : pyversion.mk - -PYDIRNAME=python-core-$(PYVERSION) -DESTROOT=$(BIN)/$(PYDIRNAME) -.IF "$(GUI)" == "UNX" -PYTHONBINARY=$(BIN)/python$(EXECPOST).bin -.ELSE -.IF "$(COM)" == "GCC" -PYTHONBINARY=$(DESTROOT)/bin/python.bin -.ELSE -PYTHONBINARY=$(DESTROOT)/bin/python$(EXECPOST) -.ENDIF -.ENDIF - -.IF "$(OS)" != "MACOSX" -FINDLIBFILES:=$(subst,$(SOLARLIBDIR)/python, \ - $(shell @$(FIND) $(SOLARLIBDIR)/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed)) - -FILES=\ - $(PYTHONBINARY) \ - $(foreach,i,$(FINDLIBFILES) $(DESTROOT)/lib$(i)) - -.IF "$(OS)" == "WNT" -APP1TARGET=python -APP1OBJS=$(OBJFILES) $(SOLARLIBDIR)/pathutils-obj.obj -APP1STDLIBS= -APP1RPATH=OOO -OBJFILES=$(OBJ)/python.obj -.ENDIF - - -.INCLUDE: target.mk - -ALLTAR: \ - $(BIN)/$(PYDIRNAME).zip -.ENDIF - -.IF "$(GUI)" == "UNX" -ALLTAR : $(BIN)/python.sh - -STRIPMAC=-e '/^NONMACSECTION/d' -e '/^MACSECTION/,$$d' -STRIPNONMAC=-e '/^NONMACSECTION/,/^MACSECTION/d' - -$(BIN)/python.sh : python.sh - $(COMMAND_ECHO)sed -e 's/%%PYVERSION%%/$(eq,$(OS),MACOSX $(PYMAJOR).$(PYMINOR) $(PYVERSION))/g' -e 's/%%OOO_LIBRARY_PATH_VAR%%/$(OOO_LIBRARY_PATH_VAR)/g' \ - $(eq,$(OS),MACOSX $(STRIPNONMAC) $(STRIPMAC)) < $? > $@ - @chmod +x $@ -.ENDIF - -$(OBJ)/python.obj: $(OUT)/inc/pyversion.hxx - -$(OUT)/inc/pyversion.hxx: pyversion.inc - $(SED) $(USQ)s/@/$(PYVERSION)/g$(USQ) < $< > $@ - -$(BIN)/$(PYDIRNAME).zip : $(FILES) -.IF "$(GUI)" == "UNX" -.IF "$(OS)" != "AIX" - cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip -.ENDIF -.ENDIF - -rm -f $@ - cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME) - -$(DESTROOT)/lib/% : $(SOLARLIBDIR)/python/% - -$(MKDIRHIER) $(@:d) - -rm -f $@ - cat $< > $@ - -.IF "$(GUI)"== "UNX" -$(BIN)/python$(EXECPOST).bin : $(SOLARBINDIR)/python$(EXECPOST) - -$(MKDIRHIER) $(@:d) - -rm -f $@ - cat $< > $@ -.IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX" - strip $@ -.ENDIF - chmod +x $@ -.ELSE -.IF "$(COM)" == "GCC" -$(DESTROOT)/bin/python.bin : $(SOLARBINDIR)/python$(EXECPOST) -.ELSE -$(DESTROOT)/bin/python$(EXECPOST) : $(SOLARBINDIR)/python$(EXECPOST) -.ENDIF - -$(MKDIRHIER) $(@:d) - -rm -f $@ - cat $< > $@ -.ENDIF - -.ENDIF -.ELSE -.ENDIF # L10N_framework -- cgit