[ooo-build-commit] configure.in extensions/Makefile.am extensions/tweakconfig Makefile.am Makefile.shared
Thorsten Behrens
thorsten at kemper.freedesktop.org
Thu Jun 11 02:56:42 PDT 2009
Makefile.am | 2 -
Makefile.shared | 2 +
configure.in | 2 +
extensions/Makefile.am | 1
extensions/tweakconfig/Common.xcu | 48 +++++++++++++++++++++++++++++++++
extensions/tweakconfig/Linguistic.xcu | 13 ++++++++
extensions/tweakconfig/Makefile.am | 10 ++++++
extensions/tweakconfig/Paths.xcu | 11 +++++++
extensions/tweakconfig/Recovery.xcu | 10 ++++++
extensions/tweakconfig/description.xml | 10 ++++++
extensions/tweakconfig/manifest.xml | 12 ++++++++
11 files changed, 120 insertions(+), 1 deletion(-)
New commits:
commit bc685bd2135e90c85893bad5586cc16a237e38df
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Jun 11 11:03:29 2009 +0200
dev-install target now with tweaked config and local config dir
Now, dev-install no longer uses the user's config from ~/.ooo3,
but an installation-local one. Additionally, a tweakconfig extension
is installed, that changes some config items to hacker-friendly
values (i.e. enabling pretty-printing of odf)
* Makefile.am:
* Makefile.shared:
* configure.in:
* extensions/Makefile.am:
* extensions/tweakconfig/Common.xcu:
* extensions/tweakconfig/Linguistic.xcu:
* extensions/tweakconfig/Makefile.am:
* extensions/tweakconfig/Paths.xcu:
* extensions/tweakconfig/Recovery.xcu:
* extensions/tweakconfig/description.xml:
* extensions/tweakconfig/manifest.xml:
diff --git a/Makefile.am b/Makefile.am
index 36d9da8..58723f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
# MAYBE_BONOBO = bonobo
# endif
-SUBDIRS = po desktop distro-configs bin etc patches man doc src stamp templates # $(MAYBE_BONOBO)
+SUBDIRS = po desktop distro-configs bin etc patches man doc src stamp templates extensions # $(MAYBE_BONOBO)
include $(top_srcdir)/Makefile.shared
diff --git a/Makefile.shared b/Makefile.shared
index afcf8e7..e412bd0 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -109,6 +109,8 @@ endif
dev-install: $(BUILDDIR)/install/program/ooenv
$(BUILDDIR)/install/program/ooenv: $(STAMP_DIR)/build
cd bin; ./ooinstall -l $(BUILDDIR)/install
+ sed -i 's/UserInstallation=$$SYSUSERCONFIG\/.ooo3/UserInstallation=$$ORIGIN\/..\/.ooo3/g' $(BUILDDIR)/install/program/bootstraprc
+ $(BUILDDIR)/install/program/unopkg add -v --shared $(BUILDDIR)/bin/tweakconfig.oxt
smoketest: $(BUILDDIR)/install/program/ooenv
echo framework/required/f_topten.bas | $(OOBUILDDIR)/testautomation/tools/run_tests/run_tests.sh -p $(BUILDDIR)/install/basis*/program/testtool.bin
diff --git a/configure.in b/configure.in
index 3b68b81..9ce0145 100644
--- a/configure.in
+++ b/configure.in
@@ -1469,6 +1469,8 @@ distro-configs/Solaris.conf
distro-configs/GoOoLinux.conf
distro-configs/GoOoMacOSX.conf
etc/Makefile
+extensions/Makefile
+extensions/tweakconfig/Makefile
patches/apply.pl
patches/Makefile
patches/cairo/Makefile
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
new file mode 100644
index 0000000..0bdccb1
--- /dev/null
+++ b/extensions/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=tweakconfig
diff --git a/extensions/tweakconfig/Common.xcu b/extensions/tweakconfig/Common.xcu
new file mode 100644
index 0000000..39f6543
--- /dev/null
+++ b/extensions/tweakconfig/Common.xcu
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ oor:name="Common" oor:package="org.openoffice.Office">
+ <node oor:name="I18N">
+ <node oor:name="CJK">
+ <prop oor:name="AsianTypography" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="CJKFont" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="ChangeCaseMap" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="DoubleLines" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="EmphasisMarks" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="JapaneseFind" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="Ruby" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="VerticalCallOut" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ <prop oor:name="VerticalText" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="CTL">
+ <prop oor:name="CTLFont" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+ <node oor:name="Save">
+ <node oor:name="Document">
+ <prop oor:name="PrettyPrinting" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ </node>
+</oor:component-data>
\ No newline at end of file
diff --git a/extensions/tweakconfig/Linguistic.xcu b/extensions/tweakconfig/Linguistic.xcu
new file mode 100644
index 0000000..cc15020
--- /dev/null
+++ b/extensions/tweakconfig/Linguistic.xcu
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ oor:name="Linguistic" oor:package="org.openoffice.Office">
+ <node oor:name="General">
+ <prop oor:name="DefaultLocale_CJK" oor:type="xs:string">
+ <value>zh-HK</value>
+ </prop>
+ <prop oor:name="DefaultLocale_CTL" oor:type="xs:string">
+ <value>ar-EG</value>
+ </prop>
+ </node>
+</oor:component-data>
\ No newline at end of file
diff --git a/extensions/tweakconfig/Makefile.am b/extensions/tweakconfig/Makefile.am
new file mode 100644
index 0000000..7a99c63
--- /dev/null
+++ b/extensions/tweakconfig/Makefile.am
@@ -0,0 +1,10 @@
+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/
+ sed -i '/WritePath/ a <value>file://$(top_srcdir)/test</value>' $(BUILDDIR)/bin/tweakconfig/Paths.xcu
+ zip $@ $(BUILDDIR)/bin/tweakconfig/*.xcu $(BUILDDIR)/bin/tweakconfig/*.xml
+
+all: tweakconfig
diff --git a/extensions/tweakconfig/Paths.xcu b/extensions/tweakconfig/Paths.xcu
new file mode 100644
index 0000000..183007b
--- /dev/null
+++ b/extensions/tweakconfig/Paths.xcu
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ oor:name="Paths" oor:package="org.openoffice.Office">
+ <node oor:name="Paths">
+ <node oor:name="Work">
+ <prop oor:name="WritePath" oor:type="xs:string">
+ </prop>
+ </node>
+ </node>
+</oor:component-data>
\ No newline at end of file
diff --git a/extensions/tweakconfig/Recovery.xcu b/extensions/tweakconfig/Recovery.xcu
new file mode 100644
index 0000000..19d1f18
--- /dev/null
+++ b/extensions/tweakconfig/Recovery.xcu
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ oor:name="Recovery" oor:package="org.openoffice.Office">
+ <node oor:name="AutoSave">
+ <prop oor:name="Enabled" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
+</oor:component-data>
\ No newline at end of file
diff --git a/extensions/tweakconfig/description.xml b/extensions/tweakconfig/description.xml
new file mode 100644
index 0000000..17edd72
--- /dev/null
+++ b/extensions/tweakconfig/description.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description xmlns="http://openoffice.org/extensions/description/2006"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:d="http://openoffice.org/extensions/description/2006">
+ <version value="0.0.1" />
+ <identifier value="org.openoffice.comp.tweakconfig"/>
+ <dependencies>
+ <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
+ </dependencies>
+</description>
diff --git a/extensions/tweakconfig/manifest.xml b/extensions/tweakconfig/manifest.xml
new file mode 100644
index 0000000..9c90c46
--- /dev/null
+++ b/extensions/tweakconfig/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>
More information about the ooo-build-commit
mailing list