]>
Commit | Line | Data |
---|---|---|
1c6fec54 AM |
1 | Index: bin/setup.in |
2 | =================================================================== | |
3 | RCS file: /cvs/gnome/ooo-build/bin/setup.in,v | |
4 | retrieving revision 1.66 | |
e443c73b AM |
5 | retrieving revision 1.68 |
6 | diff -u -u -r1.66 -r1.68 | |
1c6fec54 | 7 | --- openoffice/bin/setup.in 3 Jul 2004 02:14:36 -0000 1.66 |
e443c73b AM |
8 | +++ openoffice/bin/setup.in 7 Jul 2004 17:26:23 -0000 1.68 |
9 | @@ -72,13 +72,19 @@ | |
10 | ||
11 | else | |
12 | if test "z$CONFIGURE_OPTIONS" = "z"; then | |
13 | - CONFIGURE_OPTIONS="--with-lang=$LANGS \ | |
14 | - --enable-libart --enable-libsn --enable-crashdump=no \ | |
15 | - --without-fonts --disable-rpath \ | |
16 | - --with-system-zlib --enable-fontconfig \ | |
17 | - --with-system-freetype --disable-mozilla \ | |
18 | - --with-widget-sets=original,kde,gtk"; | |
1c6fec54 AM |
19 | + if [ -s ./setup.configure ]; then |
20 | + . ./setup.configure | |
21 | + echo "Using configure options from the ./setup.configure file"; | |
22 | + else | |
e443c73b AM |
23 | + CONFIGURE_OPTIONS="--with-lang=$LANGS \ |
24 | + --enable-libart --enable-libsn --enable-crashdump=no \ | |
25 | + --without-fonts --disable-rpath \ | |
26 | + --with-system-zlib --enable-fontconfig \ | |
27 | + --with-system-freetype --disable-mozilla \ | |
28 | + --with-widget-sets=original,kde,gtk"; | |
1c6fec54 | 29 | + fi |
e443c73b | 30 | else |
dc7f1933 | 31 | + echo "CONFIGURE_OPTIONS=\"`echo \"$CONFIGURE_OPTIONS\" | xargs`\"" > ./setup.configure |
e443c73b | 32 | echo "Using configure options from the environment"; |
1c6fec54 AM |
33 | fi |
34 | fi | |
8f955fc0 AM |
35 | diff -u -u -r1.30 -r1.31 |
36 | --- openoffice/bin/package-ooo 6 Jul 2004 13:37:53 -0000 1.30 | |
37 | +++ openoffice/bin/package-ooo 7 Jul 2004 23:24:25 -0000 1.31 | |
38 | @@ -155,7 +155,7 @@ | |
39 | echo "Done"; | |
40 | ||
41 | # install vcl module for more widget sets if needed | |
42 | -if test "${OOO_WIDGET_SETS/*,*/comma}" = "comma" ; then | |
43 | +if (echo "${OOO_WIDGET_SETS}" | grep -q ",") ; then | |
44 | # Must remove the ./instsetoo/$ARCHITECTURE/*/normal/install scripts | |
45 | # as they conflict with the normal system install binary | |
46 | rm -f $OOBUILDDIR/instsetoo/$ARCHITECTURE/*/normal/install | |
c9421e52 AM |
47 | --- openoffice/dev/null 1970-01-01 01:00:00.000000000 +0100 |
48 | +++ openoffice/bin/install-dictionaries 2004-07-06 02:28:20.471312936 +0200 | |
49 | @@ -0,0 +1,88 @@ | |
50 | +#!/bin/sh | |
51 | + | |
52 | + | |
53 | +DICTDIR=$OOINSTDIR/share/dict/ooo | |
54 | + | |
55 | +if (! test -d $DICTDIR); then | |
56 | + echo "Cannot find $DICTDIR; make sure you installed OOo first" | |
57 | + exit 1; | |
58 | +fi | |
59 | + | |
60 | + | |
61 | +# the available dictionaries | |
62 | +DICTS="hyph_cs_CZ | |
63 | + hyph_es_ES | |
64 | + hyph_fi_FI | |
65 | + hyph_fr_FR | |
66 | + hyph_ga_IE | |
67 | + hyph_hu_HU | |
68 | + hyph_is_IS | |
69 | + hyph_it_IT | |
70 | + hyph_lt_LT | |
71 | + hyph_nl_NL | |
72 | + hyph_pl_PL | |
73 | + hyph_pt_PT | |
74 | + hyph_sk_SK | |
75 | + hyph_sv_SE | |
76 | + hyph_uk_UA | |
77 | + thes_de_DE" | |
78 | + | |
79 | +for DICT in $DICTS ; do | |
80 | + if test -f $SRCDIR/$DICT.tar.bz2 ; then | |
81 | + echo "Unpacking $DICT dictionary..." | |
82 | + mkdir -m 755 -p $DOCDIR/dictionaries | |
83 | + TMPDIR=`mktemp -d /tmp/ooo-build.dict.XXXXXX` | |
84 | + tar -xjf $SRCDIR/$DICT.tar.bz2 -C $TMPDIR || exit 1; | |
85 | + chmod 644 $TMPDIR/*.* || exit 1; | |
86 | + | |
87 | + DICTNAME=${DICT/thes/th} | |
88 | + | |
89 | + test -f $TMPDIR/$DICTNAME.dic && mv $TMPDIR/$DICTNAME.dic $DICTDIR/ | |
90 | + test -f $TMPDIR/$DICTNAME.dat && mv $TMPDIR/$DICTNAME.dat $DICTDIR/ | |
91 | + test -f $TMPDIR/$DICTNAME.idx && mv $TMPDIR/$DICTNAME.idx $DICTDIR/ | |
92 | + mv $TMPDIR/*.* $DOCDIR/dictionaries || exit 1; | |
93 | + rmdir $TMPDIR || exit 1; | |
94 | + else | |
95 | + echo "Warning: $DICT dictionary is not available..." | |
96 | + fi | |
97 | +done | |
98 | + | |
99 | +echo "Creating dictionary.lst..." | |
100 | +cd $DICTDIR | |
101 | +> dictionary.lst | |
102 | + | |
103 | +# Dictionaries | |
104 | +for i in *.aff; do | |
105 | + # does any exist? | |
106 | + if test "z$i" != 'z*.aff' ; then | |
107 | + LANGUAGE=`echo $i | cut -b1-2` | |
108 | + COUNTRY=`echo $i | cut -b4-5` | |
109 | + FULL=`echo $i | cut -b1-5` | |
110 | + | |
111 | + echo "DICT $LANGUAGE $COUNTRY $FULL" >> dictionary.lst | |
112 | + fi | |
113 | +done | |
114 | + | |
115 | +# Hyphenation tables | |
116 | +for i in hyph*.dic; do | |
117 | + # does any exist? | |
118 | + if test "z$i" != 'zhyph*.dic' ; then | |
119 | + LANGUAGE=`echo $i | cut -b6-7` | |
120 | + COUNTRY=`echo $i | cut -b9-10` | |
121 | + FULL=`echo $i | cut -b6-10` | |
122 | + | |
123 | + echo "HYPH $LANGUAGE $COUNTRY $FULL" >> dictionary.lst | |
124 | + fi | |
125 | +done | |
126 | + | |
127 | +# Thesauruses | |
128 | +for i in th*.dat; do | |
129 | + # does any exist? | |
130 | + if test "z$i" != 'zth*.dat' ; then | |
131 | + LANGUAGE=`echo $i | cut -b4-5` | |
132 | + COUNTRY=`echo $i | cut -b7-8` | |
133 | + FULL=`echo $i | cut -b1-8` | |
134 | + | |
135 | + echo "THES $LANGUAGE $COUNTRY $FULL" >> dictionary.lst | |
136 | + fi | |
137 | +done |