scp2/InstallModule_binfilter.mk | 3 +++
scp2/InstallModule_javafilter.mk | 3 +++
scp2/InstallModule_ure.mk | 5 +++++
scp2/InstallModule_windows.mk | 2 --
solenv/gbuild/TargetLocations.mk | 4 ++--
solenv/gbuild/platform/IOS_ARM_GCC.mk | 4 ++++
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4 ++++
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 4 ++++
solenv/gbuild/platform/macosx.mk | 4 ++++
solenv/gbuild/platform/solaris.mk | 4 ++++
solenv/gbuild/platform/unxgcc.mk | 4 ++++
11 files changed, 37 insertions(+), 4 deletions(-)
New commits:
commit 54bcfd771be932103bee352bd0f3415622c97e77
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 13 07:33:33 2012 +0200
add missing defs
Change-Id: I800303b2f434e319fe9c9e6ce16ad9cb740290c6
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
index af93acb..99594c1 100644
--- a/scp2/InstallModule_ure.mk
+++ b/scp2/InstallModule_ure.mk
@@ -36,6 +36,11 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
SYSTEM_LIBXML \
))
+$(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\
+ MINGW_GCCDLL \
+ MINGW_GXXDLL \
+))
+
$(eval $(call gb_InstallModule_add_scpfiles,scp2/ure,\
scp2/source/ooo/ure \
))
commit 68736a13c7370d3ce33e5bf5c9428b58ef420d21
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 13 07:27:40 2012 +0200
install script suffix is different on windows
Change-Id: Ieeb30d98e0d8bcc2b93f1196025b30db09abdde2
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b414f22..ffd60b4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -44,7 +44,7 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/unittest \
$(OUTDIR)/xml \
-gb_InstallScript_get_target = $(OUTDIR)/bin/$(1).ins
+gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
gb_InternalUnoApi_get_target = $(OUTDIR)/rdb/$(1).rdb
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
@@ -98,7 +98,7 @@ gb_InstallModule_get_target =
$(WORKDIR)/InstallModule/$(1).done
gb_InstallModuleTarget_get_external_target =
$(WORKDIR)/InstallModuleTarget/$(1).external
gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).done
gb_InstallModuleTarget_get_workdir = $(WORKDIR)/InstallModuleTarget/$(1)
-gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1).ins
+gb_InstallScriptTarget_get_target =
$(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 5e76a29..15bda2f 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -318,6 +318,10 @@ endef
gb_ScpConvertTarget_ScpConvertTarget_platform :=
+# InstallScript class
+
+gb_InstallScript_EXT := .ins
+
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 42cf067..210db85 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -452,6 +452,10 @@ $(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS :=
-t $(OUTDIR)/bin/msi-
endef
+# InstallScript class
+
+gb_InstallScript_EXT := .inf
+
# Python
gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin"
PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python"
PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 24f81ef..0a7fe13 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -726,6 +726,10 @@ $(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS :=
-t $(OUTDIR)/bin/msi-
endef
+# InstallScript class
+
+gb_InstallScript_EXT := .inf
+
# Python
gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(shell cygpath -m
$(OUTDIR_FOR_BUILD)/bin)" PYTHONHOME="$(shell cygpath -m
$(OUTDIR_FOR_BUILD))/lib/python" PYTHONPATH="$(shell cygpath -m
$(OUTDIR_FOR_BUILD))/lib/python;$(shell cygpath -m
$(OUTDIR_FOR_BUILD))/lib/python/lib-dynload"
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 93ea547..23c630b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -418,6 +418,10 @@ endef
gb_ScpConvertTarget_ScpConvertTarget_platform :=
+# InstallScript class
+
+gb_InstallScript_EXT := .ins
+
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 77ca614..f106faa 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -418,6 +418,10 @@ endef
gb_ScpConvertTarget_ScpConvertTarget_platform :=
+# InstallScript class
+
+gb_InstallScript_EXT := .ins
+
# Python
gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path)
PYTHONHOME=$(OUTDIR)/lib/python
PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 8fc2325..ca57945 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -422,6 +422,10 @@ endef
gb_ScpConvertTarget_ScpConvertTarget_platform :=
+# InstallScript class
+
+gb_InstallScript_EXT := .ins
+
# Python
gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path)
PYTHONHOME=$(OUTDIR)/lib/python
PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
commit 0f9316feba6e57ed559212e5b8e9457bc5ce3e5f
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 13 07:06:11 2012 +0200
pull files from optional modules out of windows module
Change-Id: I399ef719a87b4170ff4ca2472738b691d8b1674c
diff --git a/scp2/InstallModule_binfilter.mk b/scp2/InstallModule_binfilter.mk
index 907fa83..432ab46 100644
--- a/scp2/InstallModule_binfilter.mk
+++ b/scp2/InstallModule_binfilter.mk
@@ -38,6 +38,9 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/binfilter,\
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/binfilter,\
scp2/source/binfilter/module_binfilter \
+ $(if $(filter WNT,$(GUI)),\
+ scp2/source/binfilter/registryitem_binfilter \
+ ) \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk
index bfdb315..1e7f541 100644
--- a/scp2/InstallModule_javafilter.mk
+++ b/scp2/InstallModule_javafilter.mk
@@ -38,6 +38,9 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/javafilter,\
scp2/source/javafilter/module_javafilter \
+ $(if $(filter WNT,$(GUI)),\
+ scp2/source/javafilter/registryitem_javafilter \
+ ) \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk
index 5dc8d25..e81a209 100644
--- a/scp2/InstallModule_windows.mk
+++ b/scp2/InstallModule_windows.mk
@@ -51,14 +51,12 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/windows,\
scp2/source/base/folderitem_base \
scp2/source/base/registryitem_base \
- scp2/source/binfilter/registryitem_binfilter \
scp2/source/calc/folderitem_calc \
scp2/source/calc/registryitem_calc \
scp2/source/draw/folderitem_draw \
scp2/source/draw/registryitem_draw \
scp2/source/impress/folderitem_impress \
scp2/source/impress/registryitem_impress \
- scp2/source/javafilter/registryitem_javafilter \
scp2/source/math/folderitem_math \
scp2/source/math/registryitem_math \
scp2/source/ooo/folderitem_ooo \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
