ooo-build r14322 - in branches/ooo-build-3-0: . bin patches/dev300

[tml svn gnome org]

Author: tml
Date: Wed Oct 15 23:50:15 2008
New Revision: 14322
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14322&view=rev

Log:
2008-10-16  Tor Lillqvist  <tml novell com>

	* bin/unpack: For NovellWin32 and GoOoWin32 builds, create an
	extension dict-bundle.oxt that contains the prebuilt dictionaries
	based on the ones from SUSE instead of a writingaids.zip which
	isn't used any more.

	* patches/dev300/win32-prebuild-writingaids-zip.diff: Deliver
	dict-bundle.zip instead of writingaids.zip. So yeah, this diff
	file has a misleading name.

	* patches/dev300/win32-prebuild-writingaids-zip-scp2.diff: Add
	entry for the dict-bundle.oxt extension. Also this diff file has
	of course a misleading name.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/unpack
   branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
   branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip.diff

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Wed Oct 15 23:50:15 2008
@@ -482,13 +482,107 @@
 
 case "$DISTRO" in
     NovellWin32*|GoOoWin32*)
-    # Create prebuilt writingaids.zip
+
+    # Create prebuilt dict-bundle.oxt
+
     tmpdir=`mktemp -d`
     (cd $tmpdir
-    unzip $SRCDIR/writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
-    unzip $SRCDIR/writingaids-doc-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
-    mkdir $OOBUILDDIR/dictionaries/prebuilt
-    zip -r $OOBUILDDIR/dictionaries/prebuilt/writingaids.zip .)
+    unzip -q $SRCDIR/writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
+    unzip -q $SRCDIR/writingaids-doc-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
+
+    echo '<?xml version="1.0" encoding="UTF-8"?>
+<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="'$PREBUILT_WRITINGAIDS_TIMESTAMP.`date +%Y%m%d`'" />
+    <identifier value="org.go-oo.dictionaries.bundle" />
+    <display-name>
+        <name lang="en">Built-in spelling and hyphenation dictionaries and thesauri</name>
+    </display-name>
+    <platform value="all" />
+    <dependencies>
+        <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0" />
+    </dependencies>
+</description>' >description.xml
+
+    mkdir META-INF
+    echo '<?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="dictionaries.xcu"/>
+</manifest:manifest>' >META-INF/manifest.xml
+
+    # Read the dictionary.lst file and write a dictionaries.xcu file
+    # Note that unlike upstream's dictionaries.xcu files,
+    # we can't support several locales for one entry in the dictionary.lst
+    # file. (For instance the upstream af_ZA dictionairs.xcu supports
+    # both af-ZA and af-NA.)
+    (
+    echo '<?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="ServiceManager">
+    <node oor:name="Dictionaries">'
+    while read type lang country root; do
+	case "$type" in
+	    \#*)
+		;;
+	    '')
+		;;
+	    DICT)
+		echo '        <node oor:name="HunSpellDic_'$lang-$country'" oor:op="fuse">
+	    <prop oor:name="Locations" oor:type="oor:string-list">
+		<value>%origin%/'$root'.aff %origin%/'$root'.dic</value>
+	    </prop>
+	    <prop oor:name="Format" oor:type="xs:string">
+		<value>DICT_SPELL</value>
+	    </prop>
+	    <prop oor:name="Locales" oor:type="oor:string-list">
+		<value>'$lang-$country'</value>
+	    </prop>
+	</node>'
+		;;
+	    HYPH)
+		echo '        <node oor:name="HyphDic_'$lang-$country'" oor:op="fuse">
+	    <prop oor:name="Locations" oor:type="oor:string-list">
+		<value>%origin%/'$root'.dic</value>
+	    </prop>
+	    <prop oor:name="Format" oor:type="xs:string">
+		<value>DICT_HYPH</value>
+	    </prop>
+	    <prop oor:name="Locales" oor:type="oor:string-list">
+		<value>'$lang-$country'</value>
+	    </prop>
+	</node>'
+		;;
+	    THES)
+		echo '        <node oor:name="ThesDic_'$lang-$country'" oor:op="fuse">
+	    <prop oor:name="Locations" oor:type="oor:string-list">
+		<value>%origin%/'$root'.dat %origin%/'$root'.idx</value>
+	    </prop>
+	    <prop oor:name="Format" oor:type="xs:string">
+		<value>DICT_THES</value>
+	    </prop>
+	    <prop oor:name="Locales" oor:type="oor:string-list">
+		<value>'$lang-$country'</value>
+	    </prop>
+	</node>'
+		;;
+	    *)
+		echo "Unknown code '$type' in dictionary.lst in writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip" >&2
+		exit 1
+		;;
+	esac
+    done <dictionary.lst
+
+    echo '    </node>
+ </node>
+</oor:component-data>'
+    ) >dictionaries.xcu
+
+    rm dictionary.lst
+
+    mkdir -p $OOBUILDDIR/dictionaries/prebuilt
+    rm -f $OOBUILDDIR/dictionaries/prebuilt/dict-bundle.oxt
+    zip -qDr $OOBUILDDIR/dictionaries/prebuilt/dict-bundle.oxt .)
     rm -rf $tmpdir
     ;;
 esac

Modified: branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	Wed Oct 15 23:50:15 2008
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
 +++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
-@@ -2968,220 +2968,3 @@
+@@ -2968,220 +2968,14 @@
      Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
  End
  
@@ -221,3 +221,14 @@
 -	UnixRights = 444;
 -End
 -#endif
++
++#ifndef WITHOUT_MYSPELL_DICTS
++#ifdef WNT
++File gid_File_Extension_Dictionary_Bundle
++	Dir = gid_Brand_Dir_Share_Extension_Install;
++	Name = "dict-bundle.oxt";
++	Styles = (PACKED);
++	UnixRights = 444;
++End
++#endif
++#endif

Modified: branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/win32-prebuilt-writingaids-zip.diff	Wed Oct 15 23:50:15 2008
@@ -39,7 +39,7 @@
 @@ -1,2 +1,2 @@
  mkdir: %_DEST%\pck%_EXT%
 -..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*.oxt
-+..\prebuilt\writingaids.zip             %_DEST%\pck%_EXT%\writingaids.zip
++..\prebuilt\dict-bundle.oxt             %_DEST%\pck%_EXT%\dict-bundle.oxt
 --- dictionaries/prebuilt/makefile.mk
 +++ dictionaries/prebuilt/makefile.mk
 @@ -0,0 +1,31 @@
@@ -73,4 +73,4 @@
 +#*************************************************************************
 +PRJ=..
 +PRJNAME=dictionaries
-+ALLTAR : writingaids.zip
++ALLTAR : dict-bundle.zip