svn commit: r1591347 - in /openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols: Makefile description.xml

[ar...@apache.org]

Author: arielch
Date: Wed Apr 30 15:18:25 2014
New Revision: 1591347

URL: http://svn.apache.org/r1591347
Log:
Add extension description

Added:
    openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/description.xml   (with props)
Modified:
    openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/Makefile

Modified: openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/Makefile?rev=1591347&r1=1591346&r2=1591347&view=diff
==============================================================================
--- openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/Makefile (original)
+++ openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/Makefile Wed Apr 30 15:18:25 2014
@@ -27,6 +27,7 @@ SETTINGS=$(PRJ)/settings
 include $(SETTINGS)/settings.mk
 include $(SETTINGS)/std.mk
 include $(SETTINGS)/dk.mk
+include $(SETTINGS)/platform.mk
 
 # Define non-platform/compiler specific settings
 COMP_NAME=complextoolbarcontrols
@@ -37,6 +38,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_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map
 COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components
 COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag
@@ -49,11 +51,6 @@ CXXFILES = \
 
 SLOFILES = $(patsubst %.cxx,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES))
 
-# Add OSL_DEBUG_LEVEL to compiler the flags (for OSL_TRACE et. al.)
-ifeq "$(DEBUG)" "yes"
-CC_FLAGS += -DOSL_DEBUG_LEVEL=2
-endif
-
 # Targets
 .PHONY: ALL
 ALL : \
@@ -92,6 +89,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))
@@ -121,11 +123,11 @@ $(COMP_COMPONENTS) :
 	@echo $(OSEP)/components$(CSEP) >> $@
 
 # rule for component package file
-$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
+$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.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 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

Added: openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/description.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/description.xml?rev=1591347&view=auto
==============================================================================
--- openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/description.xml (added)
+++ openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/description.xml Wed Apr 30 15:18:25 2014
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+<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#"/>
+    <publisher>
+        <name xlink:href="https://api.openoffice.org" lang="en">Apache OpenOffice</name>
+    </publisher>
+    <display-name>
+        <name lang="en-US">Complex Toolbar Controls Demo for Apache OpenOffice</name>
+    </display-name>
+</description>

Propchange: openoffice/trunk/main/odk/examples/cpp/complextoolbarcontrols/description.xml
------------------------------------------------------------------------------
    svn:eol-style = native