diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-07 17:59:24 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-06-07 17:59:24 +0200 |
commit | a56953a238e240601c333e2349819a5da18496a2 (patch) | |
tree | 2d97f24a195e30352e64af9e8107c94cef0447b4 /pyuno/zipcore | |
parent | b47776d6924b32fcc78549591bb61576daaf9664 (diff) |
fix previous commit that introduced reverse logic
and remove *.orig and *.rej files that were committed by accident
Diffstat (limited to 'pyuno/zipcore')
-rwxr-xr-x | pyuno/zipcore/makefile.mk | 2 | ||||
-rwxr-xr-x | pyuno/zipcore/makefile.mk.orig | 132 |
2 files changed, 1 insertions, 133 deletions
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk index cd9439b48..633bdde60 100755 --- a/pyuno/zipcore/makefile.mk +++ b/pyuno/zipcore/makefile.mk @@ -86,7 +86,7 @@ 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)) < $? > $@ + $(eq,$(OS),MACOSX $(STRIPNONMAC) $(STRIPMAC)) < $? > $@ @chmod +x $@ .ENDIF diff --git a/pyuno/zipcore/makefile.mk.orig b/pyuno/zipcore/makefile.mk.orig deleted file mode 100755 index 51cc6eb62..000000000 --- a/pyuno/zipcore/makefile.mk.orig +++ /dev/null @@ -1,132 +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 -# <http://www.openoffice.org/license.html> -# 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: - @echo "Not building python-core because system python is being used" -.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 - -FINDLIBFILES_TMP:=$(subst,/,$/ \ - $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed)) -FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP)) - -FILES=\ - $(PYTHONBINARY) \ - $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) - -.IF "$(OS)" == "WNT" -APP1TARGET = python -APP1OBJS = $(OBJFILES) $(SOLARLIBDIR)$/pathutils-obj.obj -APP1STDLIBS = -APP1RPATH = BRAND -OBJFILES = $(OBJ)$/python.obj -.ENDIF - - -.INCLUDE: target.mk - -ALLTAR: \ - $(BIN)$/$(PYDIRNAME).zip - -.IF "$(GUI)" == "UNX" -ALLTAR : $(BIN)$/python.sh -$(BIN)$/python.sh : python.sh - -rm -f $@ - cat $? > $@ - sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ | sed 's/%%OOO_LIBRARY_PATH_VAR%%/$(OOO_LIBRARY_PATH_VAR)/g' > $@.new - mv $@.new $@ - 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)" != "MACOSX" && "$(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 -ivo: - $(ECHO) -.ENDIF # L10N_framework |