[Libreoffice-commits] core.git: 2 commits - odk/examples odk/settings
Ariel Constenla-Haile
arielch at apache.org
Tue May 6 02:23:49 PDT 2014
odk/examples/cpp/complextoolbarcontrols/Makefile | 11 +++++-
odk/examples/cpp/complextoolbarcontrols/description.xml | 26 ++++++++++++++++
odk/settings/platform.mk | 13 ++------
3 files changed, 39 insertions(+), 11 deletions(-)
New commits:
commit f03d98a999d08e21a6d1774090e58fa6d928f013
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Wed Apr 30 15:18:25 2014 +0000
Add extension description
(cherry picked from commit a738920303e77022fa89740c16cb832ee3477fa2)
Conflicts:
odk/examples/cpp/complextoolbarcontrols/Makefile
Change-Id: I28af30dc04068c670d31be7494b7ce9a7a25c3a3
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile
index a8f1a18..1199e63 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -39,6 +39,7 @@ SETTINGS=$(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
+include $(SETTINGS)/platform.mk
# Define non-platform/compiler specific settings
COMP_NAME=complextoolbarcontrols
@@ -49,6 +50,7 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMP_NAME)
COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT)
COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)")
COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml
+COMP_UNOPKG_DESCRIPTION = $(OUT_COMP_GEN)/$(COMPONENT_NAME)/description.xml
COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components
COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag
COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_types.flag
@@ -95,6 +97,11 @@ ifeq "$(OS)" "MACOSX"
endif
endif
+# rule for extension description.xml
+$(COMP_UNOPKG_DESCRIPTION) : description.xml
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ $(SDK_CAT) $< | $(SDK_SED) -e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" > $@
+
# rule for component package manifest
$(OUT_COMP_GEN)/%/manifest.xml :
-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -131,11 +138,11 @@ $(COMP_COMPONENTS) :
@echo $(OSEP)/components$(CSEP) >> $@
# rule for component package file
-$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
+$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) $(COMP_UNOPKG_DESCRIPTION)
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
- cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components
+ cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components description.xml
cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png
cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
diff --git a/odk/examples/cpp/complextoolbarcontrols/description.xml b/odk/examples/cpp/complextoolbarcontrols/description.xml
new file mode 100644
index 0000000..4053938
--- /dev/null
+++ b/odk/examples/cpp/complextoolbarcontrols/description.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <version value="0.0.1"/>
+ <identifier value="org.apache.openoffice.framework.complextoolbarcontrols"/>
+ <platform value="#EXTENSION_PLATFORM#"/>
+ <display-name>
+ <name lang="en-US">Complex Toolbar Controls Demo</name>
+ </display-name>
+</description>
commit d1f6b72e3781336ab5ff2a40f84354271cb75a34
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Wed Apr 30 15:18:17 2014 +0000
Add support for MacOSX x86_64
(cherry picked from commit 1307f0949c9b6e1ef2e8a3128c2113bbd7f17a58)
diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index 526333a..7e3b86c 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -44,6 +44,9 @@ else
ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86"
EXTENSION_PLATFORM=macosx_x86
else
+ ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86_64"
+ EXTENSION_PLATFORM=macosx_x86_64
+ else
ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC"
EXTENSION_PLATFORM=solaris_sparc
else
@@ -61,13 +64,5 @@ else
endif
endif
endif
+ endif
endif
-
-#ifeq "$(UNOPKG_PLATFORM)" "Linux_SPARC"
-# EXTENSION_PLATFORM=
-#ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC64"
-# EXTENSION_PLATFORM=
-#ifeq "$(UNOPKG_PLATFORM)" "kFreeBSD_x86"
-# EXTENSION_PLATFORM=
-#ifeq "$(UNOPKG_PLATFORM)" "kFreeBSD_x86_64"
-# EXTENSION_PLATFORM=
More information about the Libreoffice-commits
mailing list