[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Tomáš Chvátal]

 solenv/gbuild/CppunitTest.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 141fdfa04807f49b1c4e89a90b477cc1714fc726
Author: Tomáš Chvátal tchva...@suse.cz
Date:   Tue Apr 3 14:21:23 2012 +0200

always pass --headless to cppunits

They should not need any actual UI anyway, and most of them already
pass the option manually.
http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html

This is partial code grab as cherry-pick had the test-mk files collisions
all over the place. I pick only the additional define which results in some
tests adding --headless twice, which does no harm.

Author: Luboš Luňák l.lu...@suse.cz
Signed-off-by: Tomáš Chvátal tchva...@suse.cz

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0d8959e..826d3f5 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -61,6 +61,7 @@ gb_CppunitTarget__make_url = file://$(if $(filter 
WNT,$(OS_FOR_BUILD)),/)$(1)
 gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
 define gb_CppunitTest__make_args
 $(ARGS) \
+--headless \
 $(if $(strip $(UNO_TYPES)),\
-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
$(call gb_CppunitTarget__make_url,$(call 
gb_CppunitTest__get_uno_type_target,$(rdb) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/gbuild.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3
Author: Lubos Lunak l.lu...@suse.cz
Date:   Thu Mar 22 17:26:11 2012 -0500

make gbuild follow --disable-dependency-tracking too

Signed-off-by: Jan Holesovsky ke...@suse.cz

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..574e851 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,12 +116,16 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
+ifneq ($(nodep),)
+gb_FULLDEPS := $(false)
+else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Lubos Lunak]

 solenv/gbuild/gbuild.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 17:36:14 2012 +0200

Revert make gbuild follow --disable-dependency-tracking too

3-5 branch is not ready for this, there are a number of build failures.
Okayed by Petr Mladek, but this is rather obvious.

This reverts commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 574e851..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,16 +116,12 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
-ifneq ($(nodep),)
-gb_FULLDEPS := $(false)
-else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
-endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Lubos Lunak]

 solenv/gbuild/gbuild.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3b1adf08e38c26c2d0d22b831f9582bc60049681
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 20:38:41 2012 +0200

Revert Revert make gbuild follow --disable-dependency-tracking too

Revert again, the option itself is correct. Resulting problems need to
be fixed and the option should not be used now where it breaks.

This reverts commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..574e851 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,12 +116,16 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
+ifneq ($(nodep),)
+gb_FULLDEPS := $(false)
+else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/JavaClassSet.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 7d7fa43c3ce3dff07023ee483bdbd685ffe03bd8
Author: Michael Stahl mst...@redhat.com
Date:   Fri Mar 23 15:26:35 2012 +0100

JavaClassSet: giving only changed java files to javac is bogus

(cherry picked from commit 526a31be4c31fe519c14c16241a48729dd9aa465)

Conflicts:

solenv/gbuild/JavaClassSet.mk

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 9104b9c..0fbb6b0 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -38,9 +38,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1))  \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
$(call gb_Helper_convert_native,\
-   $(if $(filter-out $(JARDEPS),$(3)),\
-   $(filter-out $(JARDEPS),$(3)),\
-   $(filter-out $(JARDEPS),$(4)  \
+   $(filter-out $(JARDEPS),$(4  \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
-cp $(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2)) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c6246139df005d6ac4627bc8f4665539effb6e94
Author: Noel Power noel.po...@novell.com
Date:   Thu Mar 8 16:01:36 2012 +

fix uno bootstrapping for .NET ( and perhaps c++ ) fdo#46832

(cherry picked from commit c3d806be7d30a437607d924a4d33f13fe20dd1ba)

Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 11d2a1e..2cf856c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -368,7 +368,9 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(if 
$(gb_PRODUCT),,oldnames.lib $(if $(filter libcmtd,$(LINKED_LIBS)),,msvcrtd.lib) 
msvcprtd.lib kernel32.lib) user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); 
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1)  false; 
fi) \
-   $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $@.manifest ]; then 
mt.exe $(MTFLAGS) -manifest $@.manifest -outputresource:$@\;1; fi) ; exit $$RC)
+   $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
+   $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+   ; exit $$RC)
 endef
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Noel Power]

 solenv/gbuild/JavaClassSet.mk |   10 +-
 solenv/gbuild/JunitTest.mk|8 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 19ea1b173ae9004a438903d1cb4ac197d27bacee
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Dec 9 14:31:53 2011 +0200

Don't misuse CLASSPATH for what goes into the -cp option to javac

CLASSPATH is supposed to show where to find the classes needed by Java
programs running at build time. The -cp switch to javac tells where to
find classes referenced by the code being compiled. These are
different things. (But it doesn't seem to have mattered much in our
build system.) So use T_CP instead, named in the same fashion as
T_CXXFLAGS etc.

But... for some reason this change, which as such should be just more
or less cosmetic, also fixes a build problem in the scripting module
on Windows, seen by Noel Grandin

(http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/19016
) and me.

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index d8c648e..9104b9c 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -43,7 +43,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(filter-out $(JARDEPS),$(4)  \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
-   -cp $(CLASSPATH)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2)) \
+   -cp $(T_CP)$(gb_CLASSPATHSEP)$(call 
gb_JavaClassSet_get_classdir,$(2)) \
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
@$$RESPONSEFILE ) \
rm -f $$RESPONSEFILE  \
@@ -60,8 +60,8 @@ $(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
 
-# no initialization of scoped variable CLASSPATH as it is inherited from 
controlling instance (e.g. JUnitTest, Jar)
 # UGLY: cannot use target local variable for REPO because it's needed in prereq
+# No idea what above comment means, and whether still relevant
 define gb_JavaClassSet_JavaClassSet
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
 endef
@@ -81,7 +81,7 @@ $(foreach sourcefile,$(2),$(call 
gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil
 endef
 
 define gb_JavaClassSet_set_classpath
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2))
 
 endef
 
@@ -89,13 +89,13 @@ endef
 # build order dependency is a hack to get these prerequisites out of the way 
in the build command
 define gb_JavaClassSet_add_jar
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := 
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := 
$$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
 endef
 
 # this does not generate dependency on the jar
 define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := 
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := 
$$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)))
 $(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
 endef
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5afe595..177cad6 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -47,7 +47,7 @@ $(call gb_JunitTest_get_target,%) :
 rm -rf $(call gb_JunitTest_get_userdir,$*)  \
mkdir -p $(call gb_JunitTest_get_userdir,$*)  \
 (DBGSV_ERROR_OUT=shell $(gb_JunitTest_JAVACOMMAND) \
--cp $(CLASSPATH) \
+-cp $(T_CP) \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES)  $@.log 21 || \
@@ -69,7 +69,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
 
 define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value 
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call 
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value 
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call 
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(call gb_JunitTest_JunitTest_platform,$(1))
 
@@ -105,12 +105,12 @@ $(foreach sourcefile,$(2),$(call 
gb_JunitTest_add_sourcefile,$(1),$(sourcefile))
 endef
 
 define gb_JunitTest_set_classpath
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[René Engelhard]

 solenv/gbuild/JavaClassSet.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f150e63a4df2f4dccc6eeeac3a2462429ebc4c2
Author: Rene Engelhard r...@debian.org
Date:   Thu Jan 19 15:19:42 2012 +0100

honour JAVAFLAGS in gbuild

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index cea27c0..d8c648e 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
+gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
 gb_JavaClassSet_JAVACDEBUG :=
 
 ifneq ($(gb_DEBUGLEVEL),0)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Eike Rathke]

 solenv/gbuild/platform/com_GCC_defs.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 5ee2cb58eb8cd3a29ca910bd57eda23aa04d1778
Author: Eike Rathke er...@redhat.com
Date:   Fri Jan 13 23:47:35 2012 +0100

make MacOSX happy again and have no /usr/include there

Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 7dddcbb..847ef0f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
 gb_COMPILERNOOPTFLAGS := -O0
 
+
+# At least with gcc 4.6.2 the situation was that if /usr/include was missing
+# from the -I... includes, header files were pulled from /usr/include/ instead
+# of solver/$INPATH/inc/external/
+# One should not add /usr/include, but ... have this as workaround now.
+# However, MacOSX would bail out with lots of deprecated methods as
+# /usr/include is not what's used on Mac.
+ifeq ($(OS_FOR_BUILD),MACOSX)
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+else
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) 
-I$(SYSBASE)/usr/include
+endif
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Eike Rathke]

 solenv/gbuild/platform/com_GCC_defs.mk |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 26e2705b90952ec2d736a97b28de205e1cf9da7e
Author: Eike Rathke er...@redhat.com
Date:   Sat Jan 14 01:02:44 2012 +0100

grml.. back to the drawing board

Reverted
80f60ef540528ec5304b9fb9624a7ff1b077f108
cf1f87948bcf9b8edf8487fa7938a928cfed8f2f
as also MinGW bails out. Don't add yet more quirks, keep in mind the faulty
behavior and hope for the best until solved.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 847ef0f..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,18 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
 gb_COMPILERNOOPTFLAGS := -O0
 
-
-# At least with gcc 4.6.2 the situation was that if /usr/include was missing
-# from the -I... includes, header files were pulled from /usr/include/ instead
-# of solver/$INPATH/inc/external/
-# One should not add /usr/include, but ... have this as workaround now.
-# However, MacOSX would bail out with lots of deprecated methods as
-# /usr/include is not what's used on Mac.
-ifeq ($(OS_FOR_BUILD),MACOSX)
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-else
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) 
-I$(SYSBASE)/usr/include
-endif
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Andras Timar]

 solenv/gbuild/Extension.mk |   21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 7cebed268a11ae9193cd0d7323e32cd138c7ef9d
Author: Andras Timar ati...@suse.com
Date:   Fri Jan 6 14:51:07 2012 +0100

gbuild: fix extension localization on Windows

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 7f004f6..0f1e092 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -36,13 +36,13 @@ endif
 gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
 gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target,propmerge)
+gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
 gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
 gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
 gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
-gb_Extension_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
+gb_Extension_SDFLOCATION := $(L10N_MODULE)/$(INPATH)/misc/sdf/
 # does not contain en-US because it is special cased in gb_Extension_Extension
 gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
@@ -64,6 +64,16 @@ else
 $(call gb_Extension_get_workdir,%)/description.xml : | \
$(gb_Extension_XRMEXTARGET)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
+ifeq ($(OS_FOR_BUILD),WNT)
+   $(call gb_Helper_abbreviate_dirs_native,\
+   mkdir -p $(call gb_Extension_get_workdir,$*)  \
+   $(gb_Extension_XRMEXCOMMAND) \
+   -p $(PRJNAME) \
+   -i $(shell cygpath -m $(filter %.xml,$^)) \
+   -o $(shell cygpath -m $@) \
+   -m $(SDF) \
+   -l all)
+else
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(call gb_Extension_get_workdir,$*)  \
$(gb_Extension_XRMEXCOMMAND) \
@@ -73,6 +83,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : | \
-m $(SDF) \
-l all)
 endif
+endif
 
 # rule to create oxt package in workdir
 # --filesync makes sure that all files in the oxt package will be removed that 
no longer are in $(FILES)
@@ -148,7 +159,7 @@ endef
 define gb_Extension_localize_help
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach 
lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := $(realpath 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf)
+$(call gb_Extension_get_target,$(1)) : SDF3 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_target,$(1)) : $$(SDF3)
 $(foreach lang,$(gb_Extension_LANGS),$(call 
gb_Extension_localize_help_onelang,$(1),$(subst 
lang,$(lang),$(2)),$(3),$(lang)))
 endif
@@ -160,7 +171,11 @@ $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
+ifeq ($(OS_FOR_BUILD),WNT)
+   $(gb_Extension_HELPEXCOMMAND) -i $$(shell cygpath -m $$) -o $$(shell 
cygpath -m $$@) -l $(4) -m $$(SDF3)
+else
$(gb_Extension_HELPEXCOMMAND) -i $$ -o $$@ -l $(4) -m $$(SDF3)
+endif
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[David Tardon]

 solenv/gbuild/Extension.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b047d494130a21b748a77e05f1843e0e897b6f8e
Author: David Tardon dtar...@redhat.com
Date:   Thu Jan 5 10:20:24 2012 +0100

always put unlocalized properties files to the oxt

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 6044f4f..7f004f6 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -127,15 +127,18 @@ endef
 # localize .properties file
 # source file is copied to $(WORKDIR)
 define gb_Extension_localize_properties
+$(call gb_Extension_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_target,$(1)) : FILES += $(2) $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
+$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
 $(call gb_Extension_get_target,$(1)) : SDF2 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_target,$(1)) : $$(SDF2)
+endif
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_workdir,$(1))/$(2)
 $(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@)
cp -f $$ $$@
+ifneq ($(strip $(gb_WITH_LANG)),)
$(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2)
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[René Engelhard]

 solenv/gbuild/extensions/post_AuxTargets.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 12775a8890726df230e2c8c93bacf552eee14b47
Author: Rene Engelhard r...@debian.org
Date:   Wed Dec 21 17:19:28 2011 +0100

don't remove configure and aclocal.m4 in distclean anymore

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index 119536c..72414b7 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -78,8 +78,8 @@ clean-build:
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
-   cd $(SRCDIR)  rm -rf Env.Host.sh aclocal.m4 autogen.lastrun 
autom4te.cache \
-   bin/repo-list build_env config.log config.status configure \
+   cd $(SRCDIR)  rm -rf Env.Host.sh autogen.lastrun autom4te.cache \
+   bin/repo-list build_env config.log config.status \
desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/ComponentTarget.mk |3 ++-
 solenv/gbuild/CppunitTest.mk |4 ++--
 solenv/gbuild/Library.mk |   16 
 solenv/gbuild/TargetLocations.mk |2 ++
 4 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 176e98241a09d5ccf3da59e61931cee9baa333bb
Author: Michael Stahl mst...@redhat.com
Date:   Fri Dec 16 19:58:33 2011 +0100

gbuild: refactor gb_Library_set_componentfile:

Reverse the dependency: now the component target depends (order-only) on the
library, which should ensure that gb_CppunitTest_add_component can set up
dependencies such that the unit test does not run concurrently with
a library loaded via UNO being overwritten.

Unfortunately this requires introducing another phony dummy library
target, on which the module can depend (because we don't want to register
the component target as a module target).
(cherry picked from commit 0ef8beedb1d2ce70e4d5ec7b24afd1711db29f38)

Conflicts:

solenv/gbuild/Library.mk

diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 031d118..efe4819 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -58,7 +58,8 @@ $(call gb_ComponentTarget_get_outdir_target,%) :
 define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
 $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call 
gb_ComponentTarget_get_target,$(1))
+$(call gb_ComponentTarget_get_outdir_target,$(1)) : \
+   $(call gb_ComponentTarget_get_target,$(1))
 $(call gb_Deliver_add_deliverable,$(call 
gb_ComponentTarget_get_outdir_target,$(1)),$(call 
gb_ComponentTarget_get_target,$(1)),$(1))
 
 endef
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index aa87be6..0d8959e 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -153,9 +153,9 @@ endef
 
 define gb_CppunitTest_add_component
 $(call gb_CppunitTest_get_target,$(1)) : \
-$(call gb_ComponentTarget_get_target,$(2))
+$(call gb_ComponentTarget_get_outdir_target,$(2))
 $(call gb_CppunitTest_get_target,$(1)) : \
-UNO_SERVICES += $(call gb_ComponentTarget_get_target,$(2))
+UNO_SERVICES += $(call gb_ComponentTarget_get_outdir_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 82daae1..631a553 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -39,6 +39,8 @@
 #  gb_Library_Library_platform
 #  gb_Library_TARGETS
 
+# doesn't do anything, just used for hooking up component target
+.PHONY: $(call gb_Library__get_final_target,%)
 
 # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because 
they are indistinguishable on windows
 .PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
@@ -69,21 +71,27 @@ $(call gb_LinkTarget_set_targettype,$(2),Library)
 $(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
 )
+$(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
 $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call 
gb_Library_get_dllname,$(1)))
-$$(eval $$(call gb_Module_register_target,$(call 
gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1
+$$(eval $$(call gb_Module_register_target,$(call 
gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1
 $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call 
gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
+# The dependency from workdir component target to outdir library should ensure
+# that gb_CppunitTest_add_component can transitively depend on the library.
+# But the component target also must be delivered, so a new phony target
+# gb_Library__get_final_target has been invented for that purpose...
 define gb_Library_set_componentfile
 $(call gb_ComponentTarget_ComponentTarget,$(2),$(call 
gb_Library__get_componentprefix,$(1)),\
$(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter 
$(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
+$(call gb_Library__get_final_target,$(1)) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call 
gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2
-
+$(call gb_ComponentTarget_get_target,$(2)) :| $(call 
gb_Library_get_target,$(1))
+$(call gb_Library_get_clean_target,$(1)) : \
+   $(call gb_ComponentTarget_get_clean_target,$(2))
 endef
 
 gb_Library__get_componentprefix = \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[David Tardon]

 solenv/gbuild/CustomTarget.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7c6c630b08b77f20f93cfa114c040fc3947f1c61
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 14 07:11:47 2011 +0100

force gbuild stage for CustomTargets

gb_SourceEnvAndRecurse_STAGE is unset in CustomTarget's make process
when the parent make has been started in sourced environment. This leads
to all sorts of interesting failures because the gbuild classes and
platform stuff are not loaded...

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 41b23b8..1e075af 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -31,6 +31,7 @@ define gb_CustomTarget__command
 +$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2))  \
O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' 
gb_AWK='$(gb_AWK)' \
+   gb_SourceEnvAndRecurse_STAGE=gbuild \
gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' 
SRCDIR='$(SRCDIR)' \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $  \
touch $(1))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Fridrich Strba]

 solenv/gbuild/gbuild.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 557bf7ae88901b0be44a6b5c139842bead3c3461
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 03:13:43 2011 +0100

Fix a typo?

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 256261c..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00d01a1ca7811f5589530c7992d91ff38042668b
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Dec 8 17:09:41 2011 +0100

Fix build on Linux.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c154a7a..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=\$(OUTDIR_FOR_BUILD)/lib\
+gb_Helper_set_ld_path := 
$(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/gbuild.mk |2 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c4d6da729a882f1e5ddfb48e2fad7495449ff0b
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Dec 8 23:55:45 2011 +0100

i18npool on Windows needed more fixes.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE)  $(subst 
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
 endef
 
-gb_Helper_set_ld_path := PATH=\$${PATH}:$(OUTDIR)/bin\
+gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Thorsten Behrens]

 solenv/gbuild/Pyuno.mk   |   26 ++
 solenv/gbuild/TargetLocations.mk |5 +++--
 2 files changed, 9 insertions(+), 22 deletions(-)

New commits:
commit 15c60429f8055747665b527b1a704c9297ace79d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 7 14:48:48 2011 +0100

reuse Zip Target for PyUno

diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index a18ef65..34b6caa 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -23,40 +23,26 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_Pyuno_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
-gb_Pyuno__get_outdir_path = $(patsubst 
$(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1)
-
 $(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
mkdir -p $(dir $@)  touch $@
 
-$(call gb_Pyuno_get_target_zip,%) : $(call gb_Package_get_target,%_pyuno)
-   $(call gb_Output_announce,$*,$(true),PZP,3)
-   cd $(gb_Helper_OUTDIRLIBDIR)/pyuno  \
-   $(gb_Pyuno_ZIPCOMMAND) -rX --filesync \
-   $(call gb_Pyuno_get_target_zip,$*) \
-   $(PYZFILES)
-
 .PHONY : $(call gb_Pyuno_get_clean_target,%)
 $(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
-   rm -f $@ $(gb_Pyuno_get_target_zip,$*)
+   rm -f $(call gb_Pyuno_get_target,$*) $(call 
gb_Pyuno_get_outdir_target,$*)
 
 define gb_Pyuno_Pyuno
-$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES :=
-$(call gb_Package_Package,$(1)_pyuno,$(2))
+$(call gb_Zip_Zip,Pyuno/$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call 
gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1
-$(call gb_Pyuno_get_target,$(1)) : \
-   $(call gb_Package_get_target,$(1)_pyuno) \
-   $(call gb_Pyuno_get_target_zip,$(1))
-$(call gb_Pyuno_get_clean_target,$(1)) : \
-   $(call gb_Package_get_clean_target,$(1)_pyuno)
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
+$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call 
gb_Zip_get_clean_target,Pyuno/$(1))
 
 endef
 
 define gb_Pyuno_add_file
-$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES += $(2)
-$(call gb_Package_add_file,$(1)_pyuno,$(call 
gb_Pyuno__get_outdir_path,$(2)),$(2))
+$(call gb_Zip_add_file,Pyuno/$(1),$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index d51b8ed..b7a4fde 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -103,8 +103,9 @@ gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
 gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
-gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1)
-gb_Pyuno_get_target_zip = $(OUTDIR)/bin/$(1).zip
+gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
+gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
+gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
 gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits