[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 9 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/Module_sdext.mk sdext/Package_minimizer_manifest.mk sdext/Package_pdfimport_manifest.mk sdext/Package_presenter_manifest.mk sdext/platform.mk sdext/source solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Fri Feb 24 11:11:16 PST 2012
sdext/Extension_minimizer.mk | 6
sdext/Extension_pdfimport.mk | 5
sdext/Extension_presenter.mk | 5
sdext/Module_sdext.mk | 3
sdext/Package_minimizer_manifest.mk | 36 ----
sdext/Package_pdfimport_manifest.mk | 36 ----
sdext/Package_presenter_manifest.mk | 36 ----
sdext/platform.mk | 49 +++++
sdext/source/minimizer/Makefile | 40 ----
sdext/source/minimizer/description.xml | 4
sdext/source/minimizer/manifest.xml | 2
sdext/source/pdfimport/config/Makefile | 43 -----
sdext/source/pdfimport/config/manifest.xml | 14 -
sdext/source/pdfimport/description.xml | 4
sdext/source/pdfimport/manifest.xml | 14 +
sdext/source/presenter/Makefile | 40 ----
sdext/source/presenter/description.xml | 4
sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile | 4
sdext/source/presenter/manifest.xml | 2
solenv/gbuild/Extension.mk | 86 ++++------
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 5
solenv/gbuild/platform/com_GCC_defs.mk | 5
solenv/gbuild/platform/solaris.mk | 5
25 files changed, 144 insertions(+), 310 deletions(-)
New commits:
commit 6def461beb77a30f00e0f4cd88f791b8c434c38d
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 18:29:22 2012 +0100
set localize.sdf path separately for each file
It cannot be done at the main target, because there is no guarantee that
all help (or properties) files are in one directory.
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 449c74f..da06010 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -161,15 +161,15 @@ 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 += $(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)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
endif
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@) && \
cp -f $$< $$@ \
- $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2))
+ $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF))
endef
@@ -177,8 +177,6 @@ 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 := $(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
@@ -186,10 +184,12 @@ endef
define gb_Extension_localize_help_onelang
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@) && \
- $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
+ $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF)
endef
commit 7e107b68f8e7a2a92090291f7bb0b63596349afb
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 18:05:12 2012 +0100
fail if any previous command failed
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 1ecb021..449c74f 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -140,7 +140,7 @@ define gb_Extension_add_file
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
- mkdir -p $$(dir $$@)
+ mkdir -p $$(dir $$@) && \
cp -f $$< $$@
endef
@@ -167,11 +167,9 @@ endif
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(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
+ mkdir -p $$(dir $$@) && \
+ cp -f $$< $$@ \
+ $(if $(strip $(gb_WITH_LANG)),&& $(gb_Extension_PROPMERGECOMMAND) -i $$@ -m $$(SDF2))
endef
@@ -190,7 +188,7 @@ define gb_Extension_localize_help_onelang
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
- mkdir -p $$(dir $$@)
+ mkdir -p $$(dir $$@) && \
$(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
endef
commit d538f9cfe46367baf938ecf08b4b8a667d11ae3c
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 17:49:14 2012 +0100
fix platform ID
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
index 68f6dcd..ecef202 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
@@ -28,10 +28,10 @@
PARTIAL_BUILD := T
SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-include $(OUTDIR)/inc/rtlbootstrap.mk
+include $(SRCDIR)/sdext/platform.mk
presenter.xhp :
- sed "s/PLATFORMID/$(RTL_OS)_$(RTL_ARCH)/" < $(SOURCEDIR)/presenter.xhp > $@
+ sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $(SOURCEDIR)/presenter.xhp > $@
.DEFAULT_GOAL := all
.PHONY : all
commit 0b06a6a49b55fb7800f97fbbaf88849395265b03
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 16:52:31 2012 +0100
hardcode manifest source path again
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index f40fe0c..1ecb021 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -94,7 +94,7 @@ $(call gb_Extension_get_target,%) : \
mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \
$(call gb_Extension_get_rootdir,$*)/registration && \
$(call gb_Extension__subst_platform,$(call gb_Extension_get_workdir,$*)/description.xml,$(call gb_Extension_get_rootdir,$*)/description.xml) && \
- $(call gb_Extension__subst_platform,$(MANIFEST),$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
+ $(call gb_Extension__subst_platform,$(LOCATION)/manifest.xml,$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_rootdir,$*)/registration && \
cd $(call gb_Extension_get_rootdir,$*) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync \
@@ -112,8 +112,6 @@ $(call gb_Extension_get_target,%) : \
define gb_Extension_Extension
$(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registration
$(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
-$(call gb_Extension_get_target,$(1)) : MANIFEST := $(SRCDIR)/$(2)/manifest.xml
-$(call gb_Extension_get_target,$(1)) : $$(MANIFEST)
$(call gb_Extension_get_target,$(1)) : PLATFORM :=
$(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
@@ -128,12 +126,6 @@ $(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1
endef
-# Set custom manifest
-define gb_Extension_set_manifest
-$(call gb_Extension_get_target,$(1)) : MANIFEST := $(2)
-
-endef
-
# Set platform.
#
# Only use this if the extension is platform-dependent.
commit 096172d07c2a68cb2479b590c69881516316bd2d
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 17:10:26 2012 +0100
let gb_Extension do the necessary manifest updates
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 2954d46..547a63a 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -31,10 +31,6 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz
$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_add_package_dependencies,presentation-minimizer,\
- sdext_minimizer_manifest \
-))
-
$(eval $(call gb_Extension_add_file,presentation-minimizer,$(call gb_Library_get_dllname,SunPresentationMinimizer),$(call gb_Library_get_target,SunPresentationMinimizer)))
$(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 2cba816..724c00e 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -31,11 +31,8 @@ $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_set_manifest,pdfimport,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config/manifest.xml))
-
$(eval $(call gb_Extension_add_package_dependencies,pdfimport,\
sdext_pdfimport_keywords \
- sdext_pdfimport_manifest \
))
$(eval $(call gb_Extension_add_files,pdfimport,.,\
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 0f47585..ee31f44 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -31,11 +31,8 @@ $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
-$(eval $(call gb_Extension_set_manifest,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/manifest.xml))
-
$(eval $(call gb_Extension_add_package_dependencies,presenter-screen,\
sdext_presenter_help \
- sdext_presenter_manifest \
))
$(eval $(call gb_Extension_add_files,presenter-screen,,\
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 10a7643..a8fef26 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
Configuration_minimizer \
Extension_minimizer \
Library_minimizer \
- Package_minimizer_manifest \
Zip_minimizer \
))
endif
@@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
Extension_pdfimport \
Library_pdfimport \
Package_pdfimport_keywords \
- Package_pdfimport_manifest \
))
endif
@@ -55,7 +53,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
Extension_presenter \
Library_presenter \
Package_presenter_help \
- Package_presenter_manifest \
Zip_presenter \
))
endif
diff --git a/sdext/Package_minimizer_manifest.mk b/sdext/Package_minimizer_manifest.mk
deleted file mode 100644
index dd4fe59..0000000
--- a/sdext/Package_minimizer_manifest.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sdext_minimizer_manifest,$(WORKDIR)/CustomTarget/sdext/source/minimizer))
-
-$(eval $(call gb_Package_add_customtarget,sdext_minimizer_manifest,sdext/source/minimizer))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/minimizer,\
- sdext/source/minimizer/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_pdfimport_manifest.mk b/sdext/Package_pdfimport_manifest.mk
deleted file mode 100644
index 91e5644..0000000
--- a/sdext/Package_pdfimport_manifest.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sdext_pdfimport_manifest,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config))
-
-$(eval $(call gb_Package_add_customtarget,sdext_pdfimport_manifest,sdext/source/pdfimport/config))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/pdfimport/config,\
- sdext/source/pdfimport/config/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Package_presenter_manifest.mk b/sdext/Package_presenter_manifest.mk
deleted file mode 100644
index 43c1a5e..0000000
--- a/sdext/Package_presenter_manifest.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,sdext_presenter_manifest,$(WORKDIR)/CustomTarget/sdext/source/presenter))
-
-$(eval $(call gb_Package_add_customtarget,sdext_presenter_manifest,sdext/source/presenter))
-
-$(eval $(call gb_CustomTarget_add_dependencies,sdext/source/presenter,\
- sdext/source/presenter/manifest.xml \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/minimizer/Makefile b/sdext/source/minimizer/Makefile
deleted file mode 100644
index 2f7171a..0000000
--- a/sdext/source/minimizer/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
- sed "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" $(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml
index 5f86b4d..4b55ddd 100644
--- a/sdext/source/minimizer/manifest.xml
+++ b/sdext/source/minimizer/manifest.xml
@@ -2,7 +2,7 @@
<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
- manifest:full-path="SunPresentationMinimizer.unoSHARED_EXTENSION"/>
+ manifest:full-path="SunPresentationMinimizer.uno at SHARED_EXTENSION@"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
diff --git a/sdext/source/pdfimport/config/Makefile b/sdext/source/pdfimport/config/Makefile
deleted file mode 100644
index 8fa754b..0000000
--- a/sdext/source/pdfimport/config/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
- sed \
- -e "s/EXEC_EXTENSION/$(gb_Executable_EXT)/" \
- -e "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" \
- $(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/pdfimport/config/manifest.xml b/sdext/source/pdfimport/config/manifest.xml
deleted file mode 100644
index 834526d..0000000
--- a/sdext/source/pdfimport/config/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
- manifest:full-path="pdfimport.unoSHARED_EXTENSION"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.executable"
- manifest:full-path="xpdfimportEXEC_EXTENSION"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="pdf_import_filter.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="pdf_types.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.basic-library"
- manifest:full-path="basic/"/>
-</manifest:manifest>
diff --git a/sdext/source/pdfimport/manifest.xml b/sdext/source/pdfimport/manifest.xml
new file mode 100644
index 0000000..5a0aaa5
--- /dev/null
+++ b/sdext/source/pdfimport/manifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
+ manifest:full-path="pdfimport.uno at SHARED_EXTENSION@"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.executable"
+ manifest:full-path="xpdfimport at EXEC_EXTENSION@"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="pdf_import_filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="pdf_types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.basic-library"
+ manifest:full-path="basic/"/>
+</manifest:manifest>
diff --git a/sdext/source/presenter/Makefile b/sdext/source/presenter/Makefile
deleted file mode 100644
index 2f7171a..0000000
--- a/sdext/source/presenter/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-PARTIAL_BUILD := T
-SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include $(GBUILDDIR)/gbuild_simple.mk
-
-manifest.xml :
- sed "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" $(SOURCEDIR)manifest.xml > $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : manifest.xml
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml
index bb79f9e..e1d1e2b 100644
--- a/sdext/source/presenter/manifest.xml
+++ b/sdext/source/presenter/manifest.xml
@@ -2,7 +2,7 @@
<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
- manifest:full-path="PresenterScreen.unoSHARED_EXTENSION"/>
+ manifest:full-path="PresenterScreen.uno at SHARED_EXTENSION@"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
commit 9a02f40f6dc8b33a1a69ebaee7368326db4f6979
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 14:00:49 2012 +0100
set platform
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 1afc2c4..2954d46 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -25,8 +25,12 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
+
$(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimizer))
+$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
+
$(eval $(call gb_Extension_add_package_dependencies,presentation-minimizer,\
sdext_minimizer_manifest \
))
diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk
index 8c29d00..2cba816 100644
--- a/sdext/Extension_pdfimport.mk
+++ b/sdext/Extension_pdfimport.mk
@@ -25,8 +25,12 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
+
$(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
+$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
+
$(eval $(call gb_Extension_set_manifest,pdfimport,$(WORKDIR)/CustomTarget/sdext/source/pdfimport/config/manifest.xml))
$(eval $(call gb_Extension_add_package_dependencies,pdfimport,\
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 5378059..0f47585 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -25,8 +25,12 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))platform.mk
+
$(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
+$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
+
$(eval $(call gb_Extension_set_manifest,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/manifest.xml))
$(eval $(call gb_Extension_add_package_dependencies,presenter-screen,\
diff --git a/sdext/platform.mk b/sdext/platform.mk
new file mode 100644
index 0000000..bda30c2
--- /dev/null
+++ b/sdext/platform.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# TODO: the variables from rtlbootstrap.mk could (and should) be set by
+# configure
+# TODO: there should be their lowercase variants, too
+include $(OUTDIR)/inc/rtlbootstrap.mk
+
+sdext__LOWERCASE_TABLE := A-a B-b C-c D-d E-e F-f G-g H-h I-i J-j K-k L-l M-m N-n O-o P-p R-r S-s T-t U-u V-v W-w X-x Y-y Z-z
+
+define sdext__lcase_impl
+$(if $(3),$(call sdext__lcase,$(firstword $(3)),$(3),$(subst $(1),$(2),$(4))),$(subst $(1),$(2),$(4)))
+endef
+
+define sdext__lcase
+$(call sdext__lcase_impl,$(firstword $(subst -, ,$(1))),$(lastword $(subst -, ,$(1))),$(wordlist 2,$(words $(2)),$(2)),$(3))
+endef
+
+define sdext__lowercase
+$(call sdext__lcase,$(firstword $(sdext__LOWERCASE_TABLE)),$(sdext__LOWERCASE_TABLE),$(1))
+endef
+
+sdext_PLATFORM := $(call sdext__lowercase,$(RTL_OS)_$(RTL_ARCH))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index eef22a7..b204312 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -5,7 +5,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:dep="http://openoffice.org/extensions/description/2006">
- <identifier value="UPDATED_IDENTIFIER"/>
+ <identifier value="com.sun.star.PresentationMinimizer- at PLATFORM@"/>
<dependencies>
<OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
@@ -13,7 +13,7 @@
<version value="1.0.3"/>
- <platform value="UPDATED_SUPPORTED_PLATFORM"/>
+ <platform value="@PLATFORM@"/>
<publisher>
<name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml
index 503753a..b75aeb8 100644
--- a/sdext/source/pdfimport/description.xml
+++ b/sdext/source/pdfimport/description.xml
@@ -4,7 +4,7 @@
xmlns="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:dep="http://openoffice.org/extensions/description/2006">
- <identifier value="UPDATED_IDENTIFIER" />
+ <identifier value="com.sun.star.PDFImport- at PLATFORM@" />
<dependencies>
<OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
@@ -12,7 +12,7 @@
<version value="1.0.5" />
- <platform value="UPDATED_SUPPORTED_PLATFORM" />
+ <platform value="@PLATFORM@" />
<publisher>
<name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 22e5119..8c647d6 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -5,7 +5,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+ <identifier value="com.sun.PresenterScreen- at PLATFORM@" />
<dependencies>
<OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
@@ -13,7 +13,7 @@
<version value="1.1.0" />
- <platform value="UPDATED_PLATFORM" />
+ <platform value="@PLATFORM@" />
<publisher>
<name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
commit 1f8b52c5277f7bb6574ee081ec899edd752a5232
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 16:44:02 2012 +0100
add support for platform spec. data in manifest and description
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index e5a8c1a..f40fe0c 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -46,6 +46,17 @@ 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))
+# Substitute platform or copy if no platform has been set
+define gb_Extension__subst_platform
+$(if $(PLATFORM),\
+ sed \
+ -e 's/@PLATFORM@/$(PLATFORM)/' \
+ -e 's/@EXEC_EXTENSION@/$(gb_Executable_EXT)/' \
+ -e 's/@SHARED_EXTENSION@/$(gb_Library_DLLEXT)/' \
+ $(1) > $(2),\
+ cp -f $(1) $(2))
+endef
+
# remove extension directory in workdir and oxt file in workdir and outdir
$(call gb_Extension_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),OXT,3)
@@ -80,11 +91,12 @@ $(call gb_Extension_get_target,%) : \
$(call gb_Extension_get_workdir,%)/description.xml
$(call gb_Output_announce,$*,$(true),OXT,3)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(call gb_Extension_get_workdir,$*)/META-INF \
- $(call gb_Extension_get_workdir,$*)/registration && \
- cp -f $(MANIFEST) $(call gb_Extension_get_workdir,$*)/META-INF && \
- cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_workdir,$*)/registration && \
- cd $(call gb_Extension_get_workdir,$*) && \
+ mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \
+ $(call gb_Extension_get_rootdir,$*)/registration && \
+ $(call gb_Extension__subst_platform,$(call gb_Extension_get_workdir,$*)/description.xml,$(call gb_Extension_get_rootdir,$*)/description.xml) && \
+ $(call gb_Extension__subst_platform,$(MANIFEST),$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
+ cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_rootdir,$*)/registration && \
+ cd $(call gb_Extension_get_rootdir,$*) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync \
$(call gb_Extension_get_target,$*) \
$(FILES) \
@@ -102,6 +114,7 @@ $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registr
$(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
$(call gb_Extension_get_target,$(1)) : MANIFEST := $(SRCDIR)/$(2)/manifest.xml
$(call gb_Extension_get_target,$(1)) : $$(MANIFEST)
+$(call gb_Extension_get_target,$(1)) : PLATFORM :=
$(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
ifneq ($(strip $(gb_WITH_LANG)),)
@@ -121,12 +134,20 @@ $(call gb_Extension_get_target,$(1)) : MANIFEST := $(2)
endef
+# Set platform.
+#
+# Only use this if the extension is platform-dependent.
+define gb_Extension_set_platform
+$(call gb_Extension_get_target,$(1)) : PLATFORM := $(2)
+
+endef
+
# adding a file creates a dependency to it
# file is copied to $(WORKDIR)
define gb_Extension_add_file
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
-$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2)
-$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
+$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
mkdir -p $$(dir $$@)
cp -f $$< $$@
@@ -151,8 +172,8 @@ $(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_
$(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_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@)
cp -f $$< $$@
@@ -174,8 +195,8 @@ endif
endef
define gb_Extension_localize_help_onelang
-$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2)
-$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
+$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)
$(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 4dabdac..e55e2d7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -82,6 +82,7 @@ gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt
+gb_Extension_get_rootdir = $(WORKDIR)/Extension/$(1)/root
gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
gb_ExternalLib_get_workdir = $(WORKDIR)/ExternalLib/$(1)
gb_ExternalLib_get_builddir = $(WORKDIR)/ExternalLib/$(1)/build
commit b1ee87ba799307c422103e94e6ca7cee6d28d5c2
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 15:49:04 2012 +0100
simplify rule
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 2c787ac..e5a8c1a 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -64,25 +64,14 @@ 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 $@) \
+ -i $(call gb_Helper_native_path,$(filter %.xml,$^)) \
+ -o $(call gb_Helper_native_path,$@) \
-m $(SDF) \
-l all)
-else
- $(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(call gb_Extension_get_workdir,$*) && \
- $(gb_Extension_XRMEXCOMMAND) \
- -p $(PRJNAME) \
- -i $(filter %.xml,$^) \
- -o $@ \
- -m $(SDF) \
- -l all)
-endif
endif
# rule to create oxt package in workdir
@@ -189,11 +178,7 @@ $(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
+ $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$<) -o $$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
endef
commit d45257727b80c9c9cb9421e0e150b44d7f6727fe
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 24 15:46:21 2012 +0100
add helper function to convert path to native format
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index d681570..923d246 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -117,6 +117,11 @@ define gb_Helper_convert_native
$(1)
endef
+# Convert path to native notation
+define gb_Helper_native_path
+$(1)
+endef
+
# AsmObject class
gb_AsmObject_get_source = $(1)/$(2).s
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 284c2eb..4e4c61f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -261,6 +261,11 @@ $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
$(1))))))))
endef
+# Convert path to native notation
+define gb_Helper_native_path
+$(shell cygpath -m $(1))
+endef
+
# YaccTarget class
define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index f2bf866..a2e14ba 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -159,4 +159,9 @@ define gb_Helper_convert_native
$(1)
endef
+# Convert path to native notation
+define gb_Helper_native_path
+$(1)
+endef
+
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index c826bea..27301c1 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -153,6 +153,11 @@ define gb_Helper_convert_native
$(1)
endef
+# Convert path to native notation
+define gb_Helper_native_path
+$(1)
+endef
+
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
# CObject class
More information about the Libreoffice-commits
mailing list