INTEGRATION: CWS native156 (1.2.26); FILE MERGED

2008/06/18 12:51:23 mba 1.2.26.1: #i90657#: create dictionary extensions

3 files changed, 35 insertions, 17 deletions

diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 5f47e051e88a..7ad1b606dc56 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: extension_post.mk,v $
 #
-# $Revision: 1.2 $
+# $Revision: 1.3 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -29,31 +29,28 @@
 #
 #*************************************************************************
 
-.SOURCE.xcu : $(MISC)$/$(EXTNAME)$/merge $(MISC)$/$(EXTNAME)$/registry$/data .
+.SOURCE.xcu : $(MISC)$/$(EXTNAME)$/merge $(MISC)$/$(EXTNAME)$/registry$/data $(COMPONENT_CONFIGDIR) .
 
 fixme=$(MISC)$/$(EXTNAME)$/merge$/$(MISC)
 fixme2=$(fixme:n)
 
-$(EXTENSIONDIR)$/registry$/data$/%.xcu : %.xcu
+$(EXTENSIONDIR)$/$(COMPONENT_CONFIGDEST)$/%.xcu : %.xcu
 # ugly hacking to workaround prepended first source path
     @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
     $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@)
 
-.IF "$(COMPONENT_CONFIGDIR)"!=""
-$(EXTENSIONDIR)$/%.xcu : $(COMPONENT_CONFIGDIR)$/%.xcu
-# ugly hacking to workaround prepended first source path
-    @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
-    $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@)
-.ENDIF			# "$(COMPONENT__CONFIGDIR)"!=""
-
-$(EXTENSIONDIR)$/%.xcs : %.xcs
-    @@-$(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $< $@
-
 $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
 
+.IF "$(COMPONENT_FILES)"!=""
+# ugly hacking to workaround prepended first source path - also hits
+# here in case of "just copied" .xcu files
+$(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)$/|.$/|)
+    @@-$(MKDIRHIER) $(@:s|$(fixme2)|$(MISC)|:d)
+    $(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
+.ENDIF			# "$(COMPONENT_FILES)"!=""
+
 .IF "$(COMPONENT_JARFILES)"!=""
 $(COMPONENT_JARFILES) : $(CLASSDIR)$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
@@ -110,6 +107,7 @@ IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
 .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 PHONYDESC=.PHONY
 .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+.IF "$(DESCRIPTION)"!=""
 $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     @@-$(MKDIRHIER) $(@:d)
     $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
@@ -119,6 +117,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     $(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
     @@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
 
+.ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
 # may not fit...
 .IF "$(CUSTOM_LICENSE)"==""
@@ -130,10 +129,13 @@ PACKLICDEPS=$(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
 .ELSE			# "$(CUSTOM_LICENSE)" == ""
 PACKLICDEPS=$(CUSTOM_LICENSE)
 .ENDIF			# "$(CUSTOM_LICENSE)" == ""
+.IF "$(PACKLICS)"!=""
 $(PACKLICS) : $(PACKLICDEPS)
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
+.ENDIF			# "$(PACKLICS)"!=""
 
+.IF "$(COMPONENT_MANIFEST)"!=""
 #$(COMPONENT_MANIFEST) : $$(@:f)
 $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
     @@-$(MKDIRHIER) $(@:d)
@@ -142,4 +144,5 @@ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
 .ELSE			# "$(COMPONENT_MANIFEST_GENERIC)" != ""
     $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d)
 .ENDIF			# "$(COMPONENT_MANIFEST_GENERIC)" != ""
+.ENDIF			# "$(COMPONENT_MANIFEST)"!=""
 
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index b41602fadf4b..d814b7de6ff9 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: extension_pre.mk,v $
 #
-# $Revision: 1.2 $
+# $Revision: 1.3 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -31,6 +31,10 @@
 
 EXTENSIONDIR*:=$(MISC)$/$(EXTENSIONNAME)
 
+COMPONENT_CONFIGDIR*:=.
+COMPONENT_CONFIGDEST*:=registry$/data
+
+.IF "$(COMPONENT_COPYONLY)"==""
 DESCRIPTION:=$(EXTENSIONDIR)$/description.xml
 DESCRIPTION_SRC*:=description.xml
 
@@ -48,10 +52,11 @@ COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx
 #TODO:  check ZIP9TARGET for previous use!
 common_build_zip=
 MANIFEST_DEPS=	$(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
-ZIP9DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_MANIFEST) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
+ZIP9DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_XCU) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_MANIFEST) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
 ZIP9TARGET=		$(EXTENSION_ZIPNAME)
 ZIP9DIR=		$(EXTENSIONDIR)
 ZIP9EXT=		.oxt
 ZIP9FLAGS=-r
 ZIP9LIST=		*
+.ENDIF			# "$(COMPONNENT_COPYONLY)"==""
 
diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk
index 49390b82831b..4aad2adb3614 100644
--- a/solenv/inc/templates/extension_tmpl.mk
+++ b/solenv/inc/templates/extension_tmpl.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: extension_tmpl.mk,v $
 #
-# $Revision: 1.2 $
+# $Revision: 1.3 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -96,6 +96,14 @@ COMPONENT_MERGED_XCU= \
     $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \
     $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/extension$/MyExtension.xcu
 
+# other configuration files
+COMPONENT_XCU= \
+    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Data.xcu
+
+# location of configurationfiles inside extension,
+# "." for flat .xcu files
+#COMPONENT_CONFIGDEST=.
+
 # native libraries
 COMPONENT_LIBRARIES= \
     $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
@@ -106,6 +114,8 @@ COMPONENT_JARFILES = \
 
 # disable fetching default OOo license text
 #CUSTOM_LICENSE=my_license.txt
+# override default license destination
+#PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
 
 # -------------------------------
 #  variables for own targets specific to this extension; no common