[ooo-build-commit] extensions/tweakconfig

Thorsten Behrens thorsten at kemper.freedesktop.org
Tue Aug 4 01:31:16 PDT 2009


 extensions/tweakconfig/META-INF/manifest.xml |   12 ++++++++++++
 extensions/tweakconfig/Makefile.am           |    4 ++--
 extensions/tweakconfig/description.xml       |    3 +++
 extensions/tweakconfig/manifest.xml          |   12 ------------
 4 files changed, 17 insertions(+), 14 deletions(-)

New commits:
commit c0792817418b0ec9893867422abd64578ae0b73c
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Aug 4 01:50:42 2009 +0200

    Make tweakconfig actually work
    
    * extensions/tweakconfig/META-INF/manifest.xml: moved
    * extensions/tweakconfig/Makefile.am: recursive zipping
    * extensions/tweakconfig/description.xml: added title
    * extensions/tweakconfig/manifest.xml: removed

diff --git a/extensions/tweakconfig/META-INF/manifest.xml b/extensions/tweakconfig/META-INF/manifest.xml
new file mode 100644
index 0000000..9c90c46
--- /dev/null
+++ b/extensions/tweakconfig/META-INF/manifest.xml
@@ -0,0 +1,12 @@
+<?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.configuration-data" 
+					   manifest:full-path="Common.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+					   manifest:full-path="Linguistic.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+					   manifest:full-path="Paths.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+					   manifest:full-path="Recovery.xcu"/> 
+</manifest:manifest>
diff --git a/extensions/tweakconfig/Makefile.am b/extensions/tweakconfig/Makefile.am
index 90b28a2..6c861e3 100644
--- a/extensions/tweakconfig/Makefile.am
+++ b/extensions/tweakconfig/Makefile.am
@@ -3,9 +3,9 @@ EXTRA_DIST=${wildcard *.xcu} ${wildcard *.xml}
 tweakconfig : $(BUILDDIR)/bin/tweakconfig.oxt
 
 $(BUILDDIR)/bin/tweakconfig.oxt: *.xcu *.xml
-	mkdir -p $(BUILDDIR)/bin/tweakconfig && cp $(srcdir)/*.xcu $(srcdir)/*.xml $(BUILDDIR)/bin/tweakconfig/
+	mkdir -p $(BUILDDIR)/bin/tweakconfig && cp -r $(srcdir)/*.xcu $(srcdir)/*.xml META-INF $(BUILDDIR)/bin/tweakconfig/
 	sed -i '/WritePath/ a <value>file://$(top_srcdir)/test</value>' $(BUILDDIR)/bin/tweakconfig/Paths.xcu
-	zip $@ $(BUILDDIR)/bin/tweakconfig/*.xcu $(BUILDDIR)/bin/tweakconfig/*.xml 
+	cd $(BUILDDIR)/bin/tweakconfig/ && zip -r $@ .
 
 all: tweakconfig
 
diff --git a/extensions/tweakconfig/description.xml b/extensions/tweakconfig/description.xml
index 17edd72..86ace60 100644
--- a/extensions/tweakconfig/description.xml
+++ b/extensions/tweakconfig/description.xml
@@ -7,4 +7,7 @@
 	<dependencies>
 		<OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
 	</dependencies>
+	<display-name>
+    	<name>Tweak OOo config for proper hacking</name>
+	</display-name>
 </description>
diff --git a/extensions/tweakconfig/manifest.xml b/extensions/tweakconfig/manifest.xml
deleted file mode 100644
index 9c90c46..0000000
--- a/extensions/tweakconfig/manifest.xml
+++ /dev/null
@@ -1,12 +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.configuration-data" 
-					   manifest:full-path="Common.xcu"/> 
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
-					   manifest:full-path="Linguistic.xcu"/> 
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
-					   manifest:full-path="Paths.xcu"/> 
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
-					   manifest:full-path="Recovery.xcu"/> 
-</manifest:manifest>


More information about the ooo-build-commit mailing list