[Libreoffice-commits] .: pyuno/demo pyuno/source pyuno/zipcore
Christian Lohmaier
cloph at kemper.freedesktop.org
Sun Jul 24 10:17:07 PDT 2011
pyuno/demo/makefile.mk | 60 +++++++++++++-------------
pyuno/demo/ooextract.py | 4 -
pyuno/demo/swriter.py | 3 -
pyuno/demo/swritercomp.py | 3 -
pyuno/source/loader/makefile.mk | 34 +++++++--------
pyuno/source/loader/pythonloader.py | 5 +-
pyuno/source/loader/pyuno_loader.cxx | 2
pyuno/source/module/makefile.mk | 78 +++++++++++++++++------------------
pyuno/source/module/uno.py | 3 +
pyuno/source/module/unohelper.py | 2
pyuno/zipcore/makefile.mk | 75 ++++++++++++++++-----------------
11 files changed, 134 insertions(+), 135 deletions(-)
New commits:
commit f10464a1060139c84f9c1671de088560bf2b4010
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Sun Jul 24 19:22:33 2011 +0200
minor whitespace/makefile cleanup
diff --git a/pyuno/demo/makefile.mk b/pyuno/demo/makefile.mk
index e369c8c..e00a2fb 100644
--- a/pyuno/demo/makefile.mk
+++ b/pyuno/demo/makefile.mk
@@ -4,39 +4,39 @@ PRJ=..
.INCLUDE : settings.mk
.INCLUDE : pyversion.mk
-ROOT=$(MISC)$/pyuno-doc
+ROOT=$(MISC)/pyuno-doc
FILES=\
- $(ROOT)$/python-bridge.html \
- $(ROOT)$/customized_setup.png \
- $(ROOT)$/mode_component.png \
- $(ROOT)$/mode_ipc.png \
- $(ROOT)$/modes.sxd \
- $(ROOT)$/optional_components.png \
- $(ROOT)$/samples$/swriter.py \
- $(ROOT)$/samples$/swritercomp.py \
- $(ROOT)$/samples$/ooextract.py \
- $(ROOT)$/samples$/biblioaccess.py \
- $(ROOT)$/samples$/swritercompclient.py \
- $(ROOT)$/samples$/hello_world_pyuno.zip
-
-
-$(MISC)$/pyuno-doc.zip : dirs $(FILES)
- -rm -f $@
- cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc
-dirs .PHONY :
- -mkdir $(ROOT)
- -mkdir $(ROOT)$/samples
+ $(ROOT)/python-bridge.html \
+ $(ROOT)/customized_setup.png \
+ $(ROOT)/mode_component.png \
+ $(ROOT)/mode_ipc.png \
+ $(ROOT)/modes.sxd \
+ $(ROOT)/optional_components.png \
+ $(ROOT)/samples/swriter.py \
+ $(ROOT)/samples/swritercomp.py \
+ $(ROOT)/samples/ooextract.py \
+ $(ROOT)/samples/biblioaccess.py \
+ $(ROOT)/samples/swritercompclient.py \
+ $(ROOT)/samples/hello_world_pyuno.zip
+
+
+$(MISC)/pyuno-doc.zip : dirs $(FILES)
+ -rm -f $@
+ cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc
+dirs .PHONY :
+ -mkdir $(ROOT)
+ -mkdir $(ROOT)/samples
-$(ROOT)$/samples$/hello_world_pyuno.zip : hello_world_comp.py Addons.xcu
- -rm -f $@
- zip $@ hello_world_comp.py Addons.xcu
+$(ROOT)/samples/hello_world_pyuno.zip : hello_world_comp.py Addons.xcu
+ -rm -f $@
+ zip $@ hello_world_comp.py Addons.xcu
-$(ROOT)$/samples$/% : %
- -rm -f $@
- cat $? > $@
+$(ROOT)/samples/% : %
+ -rm -f $@
+ $(COPY) $? $@
-$(ROOT)$/% : ..$/doc$/%
- -rm -f $@
- cat $? > $@
+$(ROOT)/% : ../doc/%
+ -rm -f $@
+ $(COPY) $? $@
diff --git a/pyuno/demo/ooextract.py b/pyuno/demo/ooextract.py
index 74e072f..3959bf7 100644
--- a/pyuno/demo/ooextract.py
+++ b/pyuno/demo/ooextract.py
@@ -43,8 +43,8 @@ def main():
print(filterName)
if not len(args):
- usage()
- sys.exit()
+ usage()
+ sys.exit()
ctxLocal = uno.getComponentContext()
smgrLocal = ctxLocal.ServiceManager
diff --git a/pyuno/demo/swriter.py b/pyuno/demo/swriter.py
index 3fafcd6..bf40a56 100644
--- a/pyuno/demo/swriter.py
+++ b/pyuno/demo/swriter.py
@@ -61,9 +61,6 @@ insertTextIntoCell( table, "B1", "SecondColumn", textColor )
insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
insertTextIntoCell( table, "D1", "SUM", textColor )
-values = ( (22.5,21.5,121.5),
- (5615.3,615.3,-615.3),
- (-2315.7,315.7,415.7) )
table.getCellByName("A2").setValue(22.5)
table.getCellByName("B2").setValue(5615.3)
table.getCellByName("C2").setValue(-2315.7)
diff --git a/pyuno/demo/swritercomp.py b/pyuno/demo/swritercomp.py
index be3109c..fd7025f 100644
--- a/pyuno/demo/swritercomp.py
+++ b/pyuno/demo/swritercomp.py
@@ -62,9 +62,6 @@ class SWriterComp(XMain,unohelper.Base):
insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
insertTextIntoCell( table, "D1", "SUM", textColor )
- values = ( (22.5,21.5,121.5),
- (5615.3,615.3,-615.3),
- (-2315.7,315.7,415.7) )
table.getCellByName("A2").setValue(22.5)
table.getCellByName("B2").setValue(5615.3)
table.getCellByName("C2").setValue(-2315.7)
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 76c3dc2..3f7a33c 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -24,7 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=pyuno
TARGET=pythonloader.uno
@@ -47,15 +47,15 @@ DIRECT= $(LINKFLAGSDEFS)
PYTHONLIB=$(PYTHON_LIBS)
CFLAGS+=$(PYTHON_CFLAGS)
.IF "$(EXTRA_CFLAGS)"!=""
-PYTHONLIB+= -framework Python
+PYTHONLIB+=-framework Python
.ENDIF # "$(EXTRA_CFLAGS)"!=""
.ELSE
.INCLUDE : pyversion.mk
-CFLAGS+= -I$(SOLARINCDIR)$/python
+CFLAGS+=-I$(SOLARINCDIR)/python
.ENDIF
-SHL1TARGET= $(TARGET)
+SHL1TARGET=$(TARGET)
SHL1STDLIBS= \
$(CPPULIB) \
@@ -64,31 +64,31 @@ SHL1STDLIBS= \
$(PYUNOLIB) \
$(PYTHONLIB)
-SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)/$(TARGET).lib
+SHL1DEF=$(MISC)/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-SLOFILES= $(SLO)$/pyuno_loader.obj
+DEF1NAME=$(SHL1TARGET)
+SLOFILES=$(SLO)/pyuno_loader.obj
# --- Targets ------------------------------------------------------
ALL : ALLTAR \
- $(DLLDEST)$/pythonloader.py
+ $(DLLDEST)/pythonloader.py
.ENDIF # L10N_framework
.INCLUDE : target.mk
.IF "$(L10N_framework)"==""
-$(DLLDEST)$/%.py: %.py
- cp $? $@
+$(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
+ $(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/pythonloader.py b/pyuno/source/loader/pythonloader.py
index 1f6716e..ad72cca 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -146,4 +147,6 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
return ServiceName in self.serviceNames
def getSupportedServiceNames( self ):
- return g_supportedServices
+ return g_supportedServices
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 4893a74..49ad71c 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -1,4 +1,4 @@
-/*nd '!=' comparisions are defined"126G -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk
index 935303f..f72e1c3 100644
--- a/pyuno/source/module/makefile.mk
+++ b/pyuno/source/module/makefile.mk
@@ -24,7 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..
+PRJ=../..
PRJNAME=pyuno
TARGET=pyuno
@@ -64,25 +64,25 @@ PYTHONLIB=$(PYTHON_LIBS)
CFLAGS+=$(PYTHON_CFLAGS)
.ELSE # "$(SYSTEM_PYTHON)" == "YES"
.INCLUDE : pyversion.mk
-CFLAGS+=-I$(SOLARINCDIR)$/python
+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
+ $(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
+ $(SLO)/pyuno_module.obj
.ENDIF # "$(COM)"=="GCC"
SHL1STDLIBS= \
@@ -93,13 +93,13 @@ SHL1STDLIBS= \
$(EXTRA_FRAMEWORK_FLAG)
SHL1DEPN=$(eq,$(OS),MACOSX $(MISC)/framework_link $(NULL))
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
+SHL1LIBS=$(SLB)/$(TARGET).lib
+SHL1IMPLIB=i$(TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+SHL1DEF=$(MISC)/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-DEF1DEPN= $(MISC)$/pyuno.flt
+DEF1NAME=$(SHL1TARGET)
+DEF1DEPN=$(MISC)/pyuno.flt
DEFLIB1NAME=$(TARGET)
@@ -107,55 +107,53 @@ DEFLIB1NAME=$(TARGET)
.IF "$(GUI)$(COM)"=="WNTGCC"
ALLTAR : \
- $(DLLDEST)$/uno.py \
- $(DLLDEST)$/unohelper.py \
- $(MISC)$/$(PYUNORC) \
- $(LB)$/lib$(TARGET).a
+ $(DLLDEST)/uno.py \
+ $(DLLDEST)/unohelper.py \
+ $(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
+$(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
.IF "$(GUI)"!="WNT"
# For some reason the build breaks on Windows if this is listed in the
# prerequisite list of ALLTAR, but pyuno.pyd still gets produced. Go
# figure. But we need it on non-Windows.
-targetdll=$(LB)$/$(TARGET)$(DLLPOST)
+targetdll=$(LB)/$(TARGET)$(DLLPOST)
.ENDIF
ALLTAR : \
- $(DLLDEST)$/uno.py \
- $(DLLDEST)$/unohelper.py \
+ $(DLLDEST)/uno.py \
+ $(DLLDEST)/unohelper.py \
$(targetdll) \
- $(MISC)$/$(PYUNORC)
+ $(MISC)/$(PYUNORC)
.ENDIF
.ENDIF
.INCLUDE : target.mk
.IF "$(L10N_framework)"==""
-$(DLLDEST)$/%.py: %.py
- cp $? $@
+$(DLLDEST)/%.py: %.py
+ cp $? $@
# make checkdll happy
$(MISC)/framework_link :
$(COMMAND_ECHO)ln -sf $(SOLARLIBDIR)/OOoPython.framework $(LB)/OOoPython.framework
@touch $@
-$(MISC)$/$(PYUNORC) : pyuno
- -rm -f $@
- cat pyuno > $@
+$(MISC)/$(PYUNORC) : pyuno
+ -rm -f $@
+ cat pyuno > $@
-$(MISC)$/pyuno.flt : pyuno.flt
- -rm -f $@
- cat $? > $@
+$(MISC)/pyuno.flt : pyuno.flt
+ -rm -f $@
+ cat $? > $@
.IF "$(DLLPRE)"!=""
# python does not accept the "lib" prefix in the module library
-$(LB)$/$(TARGET)$(DLLPOST) : $(LB)$/$(DLLPRE)$(TARGET)$(DLLPOST)
- -rm -f $@
- ln -s $? $@
+$(LB)/$(TARGET)$(DLLPOST) : $(LB)/$(DLLPRE)$(TARGET)$(DLLPOST)
+ -rm -f $@
+ ln -s $? $@
.ENDIF
.ENDIF # L10N_framework
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index bca8892..bb97205 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -355,3 +356,5 @@ def _uno_extract_printable_stacktrace( trace ):
else:
ret = "Couldn't import traceback module"
return ret
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/source/module/unohelper.py b/pyuno/source/module/unohelper.py
index 112d0d9..ee5f371 100644
--- a/pyuno/source/module/unohelper.py
+++ b/pyuno/source/module/unohelper.py
@@ -1,3 +1,4 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -302,3 +303,4 @@ class _FactoryHelper_( XSingleComponentFactory, XServiceInfo, Base ):
def createInstanceWithArgumentsAndContext( self, args, context ):
return self.clazz( context, *args )
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk
index 633bdde..abc42b3 100755
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -43,90 +43,89 @@ systempython:
.INCLUDE : pyversion.mk
PYDIRNAME=python-core-$(PYVERSION)
-DESTROOT=$(BIN)$/$(PYDIRNAME)
+DESTROOT=$(BIN)/$(PYDIRNAME)
.IF "$(GUI)" == "UNX"
-PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
+PYTHONBINARY=$(BIN)/python$(EXECPOST).bin
.ELSE
.IF "$(COM)" == "GCC"
-PYTHONBINARY=$(DESTROOT)$/bin$/python.bin
+PYTHONBINARY=$(DESTROOT)/bin/python.bin
.ELSE
-PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
+PYTHONBINARY=$(DESTROOT)/bin/python$(EXECPOST)
.ENDIF
.ENDIF
.IF "$(OS)" != "MACOSX"
-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))
+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))
+ $(foreach,i,$(FINDLIBFILES) $(DESTROOT)/lib$(i))
.IF "$(OS)" == "WNT"
-APP1TARGET = python
-APP1OBJS = $(OBJFILES) $(SOLARLIBDIR)$/pathutils-obj.obj
-APP1STDLIBS =
-APP1RPATH = BRAND
-OBJFILES = $(OBJ)$/python.obj
+APP1TARGET=python
+APP1OBJS=$(OBJFILES) $(SOLARLIBDIR)/pathutils-obj.obj
+APP1STDLIBS=
+APP1RPATH=BRAND
+OBJFILES=$(OBJ)/python.obj
.ENDIF
.INCLUDE: target.mk
ALLTAR: \
- $(BIN)$/$(PYDIRNAME).zip
+ $(BIN)/$(PYDIRNAME).zip
.ENDIF
.IF "$(GUI)" == "UNX"
-ALLTAR : $(BIN)$/python.sh
+ALLTAR : $(BIN)/python.sh
STRIPMAC=-e '/^NONMACSECTION/d' -e '/^MACSECTION/,$$d'
STRIPNONMAC=-e '/^NONMACSECTION/,/^MACSECTION/d'
-$(BIN)$/python.sh : python.sh
+$(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
+$(OBJ)/python.obj: $(OUT)/inc/pyversion.hxx
-$(OUT)$/inc$/pyversion.hxx: pyversion.inc
- $(SED) $(USQ)s/@/$(PYVERSION)/g$(USQ) < $< > $@
+$(OUT)/inc/pyversion.hxx: pyversion.inc
+ $(SED) $(USQ)s/@/$(PYVERSION)/g$(USQ) < $< > $@
-$(BIN)$/$(PYDIRNAME).zip : $(FILES)
+$(BIN)/$(PYDIRNAME).zip : $(FILES)
.IF "$(GUI)" == "UNX"
.IF "$(OS)" != "AIX"
- cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip
+ cd $(DESTROOT) && find . -name '*$(DLLPOST)' | xargs strip
.ENDIF
.ENDIF
- -rm -f $@
- cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)
+ -rm -f $@
+ cd $(BIN) && zip -r $(PYDIRNAME).zip $(PYDIRNAME)
-$(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/%
- -$(MKDIRHIER) $(@:d)
- -rm -f $@
- cat $< > $@
+$(DESTROOT)/lib/% : $(SOLARLIBDIR)/python/%
+ -$(MKDIRHIER) $(@:d)
+ -rm -f $@
+ cat $< > $@
.IF "$(GUI)"== "UNX"
-$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
- -$(MKDIRHIER) $(@:d)
- -rm -f $@
- cat $< > $@
+$(BIN)/python$(EXECPOST).bin : $(SOLARBINDIR)/python$(EXECPOST)
+ -$(MKDIRHIER) $(@:d)
+ -rm -f $@
+ cat $< > $@
.IF "$(OS)" != "MACOSX" && "$(OS)" != "AIX"
- strip $@
+ strip $@
.ENDIF
- chmod +x $@
+ chmod +x $@
.ELSE
.IF "$(COM)" == "GCC"
-$(DESTROOT)$/bin$/python.bin : $(SOLARBINDIR)$/python$(EXECPOST)
+$(DESTROOT)/bin/python.bin : $(SOLARBINDIR)/python$(EXECPOST)
.ELSE
-$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
+$(DESTROOT)/bin/python$(EXECPOST) : $(SOLARBINDIR)/python$(EXECPOST)
.ENDIF
- -$(MKDIRHIER) $(@:d)
- -rm -f $@
- cat $< > $@
+ -$(MKDIRHIER) $(@:d)
+ -rm -f $@
+ cat $< > $@
.ENDIF
.ENDIF
More information about the Libreoffice-commits
mailing list