Firefox Extensions

Merge lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-0.9.5-1ubuntu2_to_1.0-1ubuntu2 into lp:~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu

  1. mozvoikko.ubuntu-0.9.5-1ubuntu2_to_1.0-1ubuntu2
  2. Merge into mozvoikko.ubuntu
Proposed by Heikki Mäntysaari
Status: Merged
Approved by: Alexander Sack
Approved revision: 14
Merged at revision: not available
Proposed branch: lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-0.9.5-1ubuntu2_to_1.0-1ubuntu2
Merge into: lp:~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-0.9.5-1ubuntu2_to_1.0-1ubuntu2
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2008-12-16 16:26:09 +0000
+++ ChangeLog 2009-05-15 19:01:12 +0000
@@ -1,3 +1,35 @@
12009-04-18 Harri Pitkänen <hatapitk@iki.fi>
2
3 * Increase version to 1.0.
4
52009-02-20 Harri Pitkänen <hatapitk@iki.fi>
6
7 * Increase version to 0.9.7.
8
92009-02-19 Andris Pavenis <andris.pavenis@iki.fi>
10
11 * Add support of Darwin_x86-gcc3 from
12 http://verteksi.net/soks/2009/01/12/firefoxin-mozvoikko-lisaosa-ja-mac-os-x/
13 * Do not use non-frozen interface nsIXULRuntime for getting target name.
14 Generate source with needed constants instead while build.
15 * Exclude some unneeded code when building with Xulrunner SDK.
16
172009-02-19 Harri Pitkänen <hatapitk@iki.fi>
18
19 * Tag version 0.9.6.
20
212009-01-28 Harri Pitkänen <hatapitk@iki.fi>
22
23 * Link with --as-needed.
24
252009-01-28 Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
26
27 * Makefile cleanup.
28
292009-01-27 Heikki Mäntysaari <heikki.mantysaari@linux.fi>
30
31 * Build fix from Ubuntu.
32
12008-06-16 Harri Pitkänen <hatapitk@iki.fi>332008-06-16 Harri Pitkänen <hatapitk@iki.fi>
234
3 * Remove maximum application version restrictions35 * Remove maximum application version restrictions
436
=== modified file 'Makefile.in'
--- Makefile.in 2008-12-16 16:26:09 +0000
+++ Makefile.in 2009-05-15 19:01:12 +0000
@@ -28,7 +28,7 @@
28MODULE = mozvoikko28MODULE = mozvoikko
29XPI_NAME = mozvoikko29XPI_NAME = mozvoikko
30INSTALL_EXTENSION_ID = mozvoikko@mozilla.fi30INSTALL_EXTENSION_ID = mozvoikko@mozilla.fi
31XPI_PKGNAME = mozvoikko-$(MOZVOIKKO_VERSION)-$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)31XPI_PKGNAME = mozvoikko-$(MOZVOIKKO_VERSION)-$(OS_ARCH)_$(TARGET_XPCOM_ABI)
3232
33DIST_FILES = README COPYING33DIST_FILES = README COPYING
3434
3535
=== modified file 'README'
--- README 2008-12-16 16:26:09 +0000
+++ README 2009-05-15 19:01:12 +0000
@@ -11,6 +11,7 @@
11- 32-bit Windows (WINNT_x86-msvc)11- 32-bit Windows (WINNT_x86-msvc)
12- 32-bit Linux (Linux_ix86-gcc3)12- 32-bit Linux (Linux_ix86-gcc3)
13- 64-bit Linux (Linux_x86_64-gcc3)13- 64-bit Linux (Linux_x86_64-gcc3)
14- 32-bit OS X 10.5 (Darwin_x86-gcc3)
1415
15Binary extension package may contain support one or more of these targets.16Binary extension package may contain support one or more of these targets.
16When building against xulrunner on Linux, more platforms may be supported.17When building against xulrunner on Linux, more platforms may be supported.
@@ -19,6 +20,6 @@
19separate installation of Voikko: all needed files are included. Builds20separate installation of Voikko: all needed files are included. Builds
20against xulrunner will only work with system libvoikko.21against xulrunner will only work with system libvoikko.
2122
22FIXME: add homepage and similar related info.23For more information, see http://voikko.sourceforge.net
2324
24Andris Pavenis <andris.pavenis@iki.fi>25Andris Pavenis <andris.pavenis@iki.fi>
2526
=== modified file 'README.BUILD'
--- README.BUILD 2008-12-16 16:26:09 +0000
+++ README.BUILD 2009-05-15 19:01:12 +0000
@@ -8,15 +8,15 @@
8Supported versions:8Supported versions:
9==================9==================
1010
11Firefox: 3.0b1 or newer (one can really use firefox-a9pre newer than 11Firefox: 3.0b1 or newer. Released versions of Firefox-3.0.X are OK. So
12 20.09.2007, but why to use version earlier than 3.0b1 any more)12 should also alpha versions of next Firefox-3.1 (I have tested
13 that extension works with them, but not that it builds in
14 that case).
1315
14Thunderbird: 3.0a1pre newer than 20.09.200716Thunderbird: 3.0 versions beginning with 3.0a1pre of than 20.09.2007.
1517
16SeaMonkey: 2.0a1pre newer than 20.09.2007 (for these versions install.js18SeaMonkey: 2.0a1pre newer than 20.09.2007 (for these versions install.js
17 script is no more needed, install.rdf is enough). I only verified19 script is no more needed, install.rdf is enough).
18 that Voikko spell-check works with SeaMonkey nightly builds
19 under Windows XP.
2020
21I wanted also to try Sunbird nightly builds, but there seems to be no way21I wanted also to try Sunbird nightly builds, but there seems to be no way
22using of using spell-check. So Sunbird is not supported.22using of using spell-check. So Sunbird is not supported.
@@ -87,14 +87,8 @@
87What I used for building mozvoikko87What I used for building mozvoikko
88==================================88==================================
8989
90I built Linux 32 bit version of mozvoikko under Slackware-11 Linux distribution (running in90I built both Linux 32 and 64-bit versions of mozvoikko in CentOS-5.1 Linux distribution
91KVM (http://kvm.qumranet.com/kvmwiki) virtual machine under Fedora Core x86_64 version and91running in chroot on Fedora 9 x86_64 version.
92tested built extension in following Linux distributions: Slackware-11, Debian 4r1, Fedora 8.
93
9464 bit Linux version were built under Debian 4r1 Etch amd64 version running in KVM virtual
95machine under Fedora 8 and tested built extension in Debian 4r1 and Fedora 8.
96
97
9892
99Andris Pavenis <andris.pavenis@iki.fi>93Andris Pavenis <andris.pavenis@iki.fi>
10094
10195
=== modified file 'README.xulrunner'
--- README.xulrunner 2008-12-16 16:26:09 +0000
+++ README.xulrunner 2009-05-15 19:01:12 +0000
@@ -4,7 +4,8 @@
4There are two build systems and two source packages4There are two build systems and two source packages
5for mozvoikko. The original system is designed to be used5for mozvoikko. The original system is designed to be used
6within Mozilla source tree and the second build system6within Mozilla source tree and the second build system
7uses Xulrunner SDK.7uses Xulrunner SDK on Linux distributions. Using binary packages
8of Xulrunner from Mozilla may not work.
89
9To build using Xulrunner SDK, install it and libvoikko10To build using Xulrunner SDK, install it and libvoikko
10(preferably version 1.7 or later). Check the11(preferably version 1.7 or later). Check the
1112
=== modified file 'debian/changelog'
--- debian/changelog 2009-01-26 13:07:13 +0000
+++ debian/changelog 2009-08-10 17:22:42 +0000
@@ -1,3 +1,44 @@
1mozvoikko (1.0-1ubuntu2) karmic; urgency=low
2
3 * drop firefox-3.0 and firefox-3.1 from Depends; add 3.0 to Breaks instead.
4
5 -- Alexander Sack <asac@ubuntu.com> Fri, 07 Aug 2009 10:43:15 +0200
6
7mozvoikko (1.0-1ubuntu1.xul191) karmic; urgency=low
8
9 * xulrunner-1.9.1 by default transition
10 + see: https://blueprints.launchpad.net/ubuntu/+spec/desktop-karmic-firefox-3.5
11 - bump minimal xulrunner-dev version
12
13 -- Alexander Sack <asac@ubuntu.com> Fri, 07 Aug 2009 10:42:03 +0200
14
15mozvoikko (1.0-1ubuntu1) karmic; urgency=low
16
17 * Merge new upstream release from Debian. Closes LP: #377049
18 * Keep Ubuntu changes in debian/control
19 * Add optional dependency to firefox-3.5.
20 * Change conflict to abrowser (>= 3.6)
21
22 -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Fri, 15 May 2009 21:59:04 +0300
23
24mozvoikko (1.0-1) unstable; urgency=low
25
26 * New upstream release.
27 * Change conflict to iceweasel (>= 3.6).
28 * Change Standards-Version to 3.8.1
29
30 -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Mon, 11 May 2009 18:45:48 +0300
31
32mozvoikko (0.9.6-1) unstable; urgency=low
33
34 * New upstream release. Closes: #515505
35 * debian/control:
36 - Improve description (thanks to Teemu Likonen)
37 - Add conflict to iceweasel (>= 3.2)
38 * debian/rules: Remove useless LDFLAGS setting (thanks to Harri Pitkänen)
39
40 -- Heikki Mäntysaari <heikki.mantysaari@linux.fi> Wed, 18 Feb 2009 21:12:20 +0200
41
1mozvoikko (0.9.5-1ubuntu2) jaunty; urgency=low42mozvoikko (0.9.5-1ubuntu2) jaunty; urgency=low
243
3 * debian/patches/90_modify-makefile-to-use-pkg-config.patch:44 * debian/patches/90_modify-makefile-to-use-pkg-config.patch:
445
=== modified file 'debian/control'
--- debian/control 2009-01-13 10:39:15 +0000
+++ debian/control 2009-08-10 17:22:42 +0000
@@ -3,14 +3,15 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>4Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
5XSBC-Original-Maintainer: Heikki Mäntysaari <heikki.mantysaari@linux.fi>5XSBC-Original-Maintainer: Heikki Mäntysaari <heikki.mantysaari@linux.fi>
6Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9~rc2), libvoikko-dev6Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9.1~), libvoikko-dev
7Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu7Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu
8Standards-Version: 3.8.08Standards-Version: 3.8.1
99
10Package: mozvoikko10Package: mozvoikko
11Architecture: any 11Architecture: any
12Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.0 | firefox-3.1 | abrowser (>= 3) | iceweasel (>= 3)12Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.5 | abrowser (>= 3) | iceweasel (>= 3)
13Conflicts: iceweasel (>= 3.2), abrowser (>= 3.2)13Breaks: firefox-3.0
14Conflicts: iceweasel (>= 3.6), abrowser (>= 3.6)
14Description: Finnish spell-checker extension for Firefox 15Description: Finnish spell-checker extension for Firefox
15 Finnish spell-checker extension for Firefox 3. Spell-checking 16 Finnish spell-checker extension for Firefox 3. Spell-checking
16 functionality is provided by Voikko - a free spellchecker 17 functionality is provided by Voikko - a free spellchecker
1718
=== removed directory 'debian/patches'
=== removed file 'debian/patches/90_modify-makefile-to-use-pkg-config.patch'
--- debian/patches/90_modify-makefile-to-use-pkg-config.patch 2009-01-13 19:30:44 +0000
+++ debian/patches/90_modify-makefile-to-use-pkg-config.patch 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
1--- mozvoikko-0.9.5/src/Makefile.xulrunner 2009-01-13 20:18:49.000000000 +0200
2+++ mozvoikko-0.9.5/src/Makefile.xulrunner 2009-01-13 20:20:19.000000000 +0200
3@@ -14,23 +14,14 @@
4 # along with this program; if not, write to the Free Software
5 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
6
7-XULRUNNER_SDK=$(shell pkg-config --variable=sdkdir libxul)
8-XULRUNNER_INCDIR=$(shell pkg-config --variable=includedir libxul)
9 NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
10 DESTDIR=/usr/lib/firefox
11 CC=g++ -c
12 CC_LINK=g++ -shared -Wl,--no-undefined
13 include ../mozvoikko.config
14
15-XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \
16--I$(XULRUNNER_INCDIR)/xpcom \
17--I$(XULRUNNER_INCDIR)/spellchecker \
18--I$(XULRUNNER_INCDIR)/uconv \
19--I$(XULRUNNER_INCDIR)/unicharutil \
20--I$(XULRUNNER_INCDIR)/xulapp \
21--I$(XULRUNNER_INCDIR)/unstable
22-XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
23--Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4
24+XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
25+XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
26
27 HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
28 OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory
290
=== modified file 'debian/rules'
--- debian/rules 2009-01-13 19:30:44 +0000
+++ debian/rules 2009-05-15 19:01:12 +0000
@@ -22,17 +22,17 @@
22 touch configure-stamp22 touch configure-stamp
2323
2424
25build: patch build-stamp25build: build-stamp
2626
27build-stamp: configure-stamp 27build-stamp: configure-stamp
28 dh_testdir28 dh_testdir
2929
30 # Add here commands to compile the package.30 # Add here commands to compile the package.
31 LDFLAGS="-Wl, --as-needed" $(MAKE) -f Makefile.xulrunner extension-files31 $(MAKE) -f Makefile.xulrunner extension-files
3232
33 touch $@33 touch $@
3434
35clean: unpatch35clean:
36 dh_testdir36 dh_testdir
37 dh_testroot37 dh_testroot
38 rm -f build-stamp configure-stamp38 rm -f build-stamp configure-stamp
@@ -81,32 +81,4 @@
81 dh_builddeb81 dh_builddeb
8282
83binary: binary-indep binary-arch83binary: binary-indep binary-arch
84
85# Apply patches to the package
86patch: patch-stamp
87patch-stamp:
88 dh_testdir
89 @patches=debian/patches/*.patch; for patch in $$patches; do \
90 test -f $$patch || continue; \
91 echo "Applying $$patch"; \
92 patch -stuN -p1 < $$patch || exit 1; \
93 done
94 touch $@
95
96# Remove patches from the package
97unpatch:
98 dh_testdir
99 @if test -f patch-stamp; then \
100 patches=debian/patches/*.patch; \
101 for patch in $$patches; do \
102 reversepatches="$$patch $$reversepatches"; \
103 done; \
104 for patch in $$reversepatches; do \
105 test -f $$patch || continue; \
106 echo "Reversing $$patch"; \
107 patch -suRf -p1 < $$patch || exit 1; \
108 done; \
109 rm -f patch-stamp; \
110 fi
111
112.PHONY: build clean binary-indep binary-arch binary install configure84.PHONY: build clean binary-indep binary-arch binary install configure
11385
=== modified file 'mozvoikko.config'
--- mozvoikko.config 2008-12-16 16:26:09 +0000
+++ mozvoikko.config 2009-05-15 19:01:12 +0000
@@ -17,16 +17,20 @@
17#17#
18# ***** END LICENSE BLOCK *****18# ***** END LICENSE BLOCK *****
1919
20MOZVOIKKO_VERSION = 0.9.520MOZVOIKKO_VERSION = 1.0
2121
22# Supported Firefox versions22# Supported application versions.
23# For official list see:
24# https://addons.mozilla.org/en-US/firefox/pages/appversions
25
26# Supported Firefox versions.
23MOZVOIKKO_FF_MIN = 3.0a9pre27MOZVOIKKO_FF_MIN = 3.0a9pre
24MOZVOIKKO_FF_MAX = 3.028MOZVOIKKO_FF_MAX = 3.6a1pre
2529
26# Supported Thunderbird versions30# Supported Thunderbird versions
27MOZVOIKKO_TB_MIN = 3.0a1pre31MOZVOIKKO_TB_MIN = 3.0a1pre
28MOZVOIKKO_TB_MAX = 3.0a132MOZVOIKKO_TB_MAX = 3.1a1pre
2933
30# Supported SeaMonkey versions34# Supported SeaMonkey versions
31MOZVOIKKO_SM_MIN = 2.0a1pre35MOZVOIKKO_SM_MIN = 2.0a1pre
32MOZVOIKKO_SM_MAX = 2.0a136MOZVOIKKO_SM_MAX = 2.0b1pre
3337
=== modified file 'src/Makefile.in'
--- src/Makefile.in 2008-12-16 16:26:09 +0000
+++ src/Makefile.in 2009-05-15 19:01:12 +0000
@@ -50,6 +50,7 @@
50 mozVoikkoSpellFactory.cpp \50 mozVoikkoSpellFactory.cpp \
51 mozVoikko.cpp \51 mozVoikko.cpp \
52 mozVoikkoUtils.cpp \52 mozVoikkoUtils.cpp \
53 mozvoikko-target.cpp \
53 $(NULL)54 $(NULL)
5455
55include $(topsrcdir)/config/rules.mk56include $(topsrcdir)/config/rules.mk
@@ -58,10 +59,12 @@
5859
59WINNT_EXTRA_LIBS = intl.dll iconv.dll libglib-2.0-0.dll malaga.dll libvoikko-1.dll60WINNT_EXTRA_LIBS = intl.dll iconv.dll libglib-2.0-0.dll malaga.dll libvoikko-1.dll
60LINUX_EXTRA_LIBS = libmalaga.so.7 libvoikko.so.1 61LINUX_EXTRA_LIBS = libmalaga.so.7 libvoikko.so.1
62DARWIN_EXTRA_LIBS = libmalaga.7.0.0.dylib libvoikko.1.7.0.dylib
6163
62MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS = $(patsubst %.dll, $(srcdir)/voikko-libs/WINNT_x86-msvc/%.dll, $(WINNT_EXTRA_LIBS))64MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS = $(patsubst %.dll, $(srcdir)/voikko-libs/WINNT_x86-msvc/%.dll, $(WINNT_EXTRA_LIBS))
63MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86-gcc3/lib%, $(LINUX_EXTRA_LIBS))65MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86-gcc3/lib%, $(LINUX_EXTRA_LIBS))
64MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86_64-gcc3/lib%, $(LINUX_EXTRA_LIBS))66MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86_64-gcc3/lib%, $(LINUX_EXTRA_LIBS))
67MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Darwin_x86-gcc3/lib%, $(DARWIN_EXTRA_LIBS))
65SUOMI_MALAGA_FILES = $(srcdir)/voikko-data/voikko-fi_FI.pro $(wildcard $(srcdir)/voikko-data/voikko-fi_FI.*_l)68SUOMI_MALAGA_FILES = $(srcdir)/voikko-data/voikko-fi_FI.pro $(wildcard $(srcdir)/voikko-data/voikko-fi_FI.*_l)
6669
67ifeq ($(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI),WINNT_x86-msvc)70ifeq ($(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI),WINNT_x86-msvc)
@@ -76,6 +79,10 @@
76MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS)79MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS)
77endif80endif
7881
82ifeq ($(OS_ARCH)_$(TARGET_XPCOM_ABI),Darwin_x86-gcc3)
83MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS)
84endif
85
79install.rdf: $(srcdir)/install.rdf.in86install.rdf: $(srcdir)/install.rdf.in
80 sed -e "s:@VERSION@:$(MOZVOIKKO_VERSION):g" \87 sed -e "s:@VERSION@:$(MOZVOIKKO_VERSION):g" \
81 -e "s:@FF_MIN@:$(MOZVOIKKO_FF_MIN):g" \88 -e "s:@FF_MIN@:$(MOZVOIKKO_FF_MIN):g" \
@@ -84,9 +91,16 @@
84 -e "s:@TB_MAX@:$(MOZVOIKKO_TB_MAX):g" \91 -e "s:@TB_MAX@:$(MOZVOIKKO_TB_MAX):g" \
85 -e "s:@SM_MIN@:$(MOZVOIKKO_SM_MIN):g" \92 -e "s:@SM_MIN@:$(MOZVOIKKO_SM_MIN):g" \
86 -e "s:@SM_MAX@:$(MOZVOIKKO_SM_MAX):g" \93 -e "s:@SM_MAX@:$(MOZVOIKKO_SM_MAX):g" \
87 -e "s:@TARGET_PLATFORM@:$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI):g" \94 -e "s:@TARGET_PLATFORM@:$(OS_ARCH)_$(TARGET_XPCOM_ABI):g" \
88 $(srcdir)/install.rdf.in >install.rdf95 $(srcdir)/install.rdf.in >install.rdf
8996
97mozvoikko-target.cpp: Makefile
98 echo "#include \"mozVoikkoUtils.hxx\"" >$@
99 echo "" >>$@
100 echo "const char *mozvoikko_target_short = \"$(OS_ARCH)\";" >>$@
101 echo "const char *mozvoikko_target_long = \"$(OS_ARCH)_$(TARGET_XPCOM_ABI)\";" >>$@
102 echo "" >>$@
103
90libs::104libs::
91 echo "EXTRA_LIBS=$(MOZVOIKKO_EXTRA_LIBS)"105 echo "EXTRA_LIBS=$(MOZVOIKKO_EXTRA_LIBS)"
92106
@@ -97,9 +111,9 @@
97 $(NSINSTALL) install.rdf $(FINAL_TARGET)/111 $(NSINSTALL) install.rdf $(FINAL_TARGET)/
98112
99install-ext-libs:113install-ext-libs:
100 mkdir -p $(FINAL_TARGET)/voikko/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)114 mkdir -p $(FINAL_TARGET)/voikko/$(OS_ARCH)_$(TARGET_XPCOM_ABI)
101 for file in $(MOZVOIKKO_EXTRA_LIBS); do \115 for file in $(MOZVOIKKO_EXTRA_LIBS); do \
102 $(NSINSTALL) $$file $(FINAL_TARGET)/voikko/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI); \116 $(NSINSTALL) $$file $(FINAL_TARGET)/voikko/$(OS_ARCH)_$(TARGET_XPCOM_ABI); \
103 done117 done
104118
105install-voikko-data:119install-voikko-data:
@@ -109,15 +123,15 @@
109 done123 done
110124
111install-move:125install-move:
112 rm -rf $(FINAL_TARGET)/platform/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)126 rm -rf $(FINAL_TARGET)/platform/$(OS_ARCH)_$(TARGET_XPCOM_ABI)
113 mkdir -p $(FINAL_TARGET)/platform/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)127 mkdir -p $(FINAL_TARGET)/platform/$(OS_ARCH)_$(TARGET_XPCOM_ABI)
114 cp -rvL $(FINAL_TARGET)/components $(FINAL_TARGET)/platform/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)/128 cp -RvL $(FINAL_TARGET)/components $(FINAL_TARGET)/platform/$(OS_ARCH)_$(TARGET_XPCOM_ABI)/
115 rm -rf $(FINAL_TARGET)/components129 rm -rf $(FINAL_TARGET)/components
116130
117check-extra-files: $(MOZVOIKKO_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)131check-extra-files: $(MOZVOIKKO_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
118132
119check-all-extra-files: $(MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS) $(MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS) \133check-all-extra-files: $(MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS) $(MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS) \
120 $(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)134 $(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
121135
122clean::136clean::
123 rm -f install.rdf s-extra-libs137 rm -f install.rdf s-extra-libs
124138
=== modified file 'src/Makefile.xulrunner'
--- src/Makefile.xulrunner 2008-12-16 16:26:09 +0000
+++ src/Makefile.xulrunner 2009-05-15 19:01:12 +0000
@@ -1,4 +1,4 @@
1# Copyright (C) 2008 Harri Pitkänen <hatapitk@iki.fi>1# Copyright (C) 2008 - 2009 Harri Pitkänen <hatapitk@iki.fi>
2#2#
3# This program is free software; you can redistribute it and/or3# This program is free software; you can redistribute it and/or
4# modify it under the terms of the GNU General Public License4# modify it under the terms of the GNU General Public License
@@ -14,23 +14,13 @@
14# along with this program; if not, write to the Free Software14# along with this program; if not, write to the Free Software
15# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.15# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1616
17XULRUNNER_SDK=$(shell pkg-config --variable=sdkdir libxul)
18XULRUNNER_INCDIR=$(shell pkg-config --variable=includedir libxul)
19NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
20DESTDIR=/usr/lib/firefox17DESTDIR=/usr/lib/firefox
21CC=g++ -c18CC=g++ -c
22CC_LINK=g++ -shared -Wl,--no-undefined19CC_LINK=g++ -shared -Wl,--no-undefined
23include ../mozvoikko.config20include ../mozvoikko.config
2421
25XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \22XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
26-I$(XULRUNNER_INCDIR)/xpcom \23XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
27-I$(XULRUNNER_INCDIR)/spellchecker \
28-I$(XULRUNNER_INCDIR)/uconv \
29-I$(XULRUNNER_INCDIR)/unicharutil \
30-I$(XULRUNNER_INCDIR)/xulapp \
31-I$(XULRUNNER_INCDIR)/unstable
32XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
33-Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4
3424
35HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx25HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
36OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory26OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory
@@ -41,11 +31,10 @@
41ifndef CFLAGS31ifndef CFLAGS
42 CFLAGS=-O232 CFLAGS=-O2
43endif33endif
44CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fshort-wchar -fPIC34CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fPIC
45CC_INCLUDES=$(NSPR_INCLUDES) $(XULRUNNER_INCLUDES) \35CC_INCLUDES=$(XULRUNNER_INCLUDES) -include mozilla-config.h -include xpcom-config.h
46-include mozilla-config.h -include xpcom-config.h
47CC_DEFINES=-DSYSTEM_LIBVOIKKO36CC_DEFINES=-DSYSTEM_LIBVOIKKO
48CC_LIBS=$(XULRUNNER_LIBS)37CC_LIBS=-Wl,--as-needed $(XULRUNNER_LIBS)
4938
50.PHONY: all clean xpi extension-files install-unpacked39.PHONY: all clean xpi extension-files install-unpacked
5140
5241
=== modified file 'src/mozVoikkoUtils.cpp'
--- src/mozVoikkoUtils.cpp 2008-12-16 16:26:09 +0000
+++ src/mozVoikkoUtils.cpp 2009-05-15 19:01:12 +0000
@@ -40,10 +40,18 @@
40 "libvoikko.so.1"40 "libvoikko.so.1"
41};41};
4242
43const unsigned numPreloadedLibs = sizeof(preloadLibNames)/sizeof(*preloadLibNames);
44
45const char * libvoikkoName = "libvoikko.so.1";43const char * libvoikkoName = "libvoikko.so.1";
4644
45#elif defined(XP_MACOSX)
46
47const char *preloadLibNames[] =
48{
49 "libmalaga.7.0.0.dylib",
50 "libvoikko.1.7.0.dylib"
51};
52
53const char * libvoikkoName = "libvoikko.1.7.0.dylib";
54
47#elif defined(_WIN32)55#elif defined(_WIN32)
4856
4957
@@ -56,8 +64,6 @@
56 "libvoikko-1.dll"64 "libvoikko-1.dll"
57};65};
5866
59const unsigned numPreloadedLibs = sizeof(preloadLibNames)/sizeof(*preloadLibNames);
60
61const char * libvoikkoName = "libvoikko-1.dll";67const char * libvoikkoName = "libvoikko-1.dll";
6268
63#else69#else
@@ -66,6 +72,8 @@
6672
67#endif73#endif
6874
75const unsigned numPreloadedLibs = sizeof(preloadLibNames)/sizeof(*preloadLibNames);
76
69#define CH(statement, errRetVal) do \77#define CH(statement, errRetVal) do \
70 { \78 { \
71 nsresult rv = statement; \79 nsresult rv = statement; \
@@ -243,42 +251,30 @@
243 return NS_OK;251 return NS_OK;
244}252}
245253
254#ifndef SYSTEM_LIBVOIKKO
255
246nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir)256nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir)
247{257{
248 nsresult rv;258 nsresult rv;
249 nsCOMPtr<nsIFile> mozVoikkoLibName;259 nsCOMPtr<nsIFile> mozVoikkoLibName;
250 nsCOMPtr<nsIFile> currDir, parentDir;260 nsCOMPtr<nsIFile> currDir, parentDir;
251 nsCOMPtr<nsIFile> tmpDir, tmpFile;261 nsCOMPtr<nsIFile> tmpDir, tmpFile;
252 nsCString leafName, tmp;262 nsCString leafName;
253 nsCString shortTargetName;263 nsCString shortTargetName;
254 nsCString fullTargetName;264 nsCString fullTargetName;
255265
256 // Get platform name (eg. WINNT_x86-msvc or Linux_x86_64-gcc3).266 shortTargetName = mozvoikko_target_short;
257 // WARNING: not frozen interface nsIXULRuntime is being used.267 fullTargetName = mozvoikko_target_long;
258 // String shortTargetName will contain only target OS name (like WINNT)268
259 // String fullTargetName will contain additionally XPCOMAPI_NAME
260
261 nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/app-info;1", &rv);
262
263 NS_ENSURE_SUCCESS(rv, rv);
264
265 rv = runtime->GetOS(shortTargetName);
266 NS_ENSURE_SUCCESS(rv, rv);
267
268 fullTargetName = shortTargetName;
269
270 rv = runtime->GetXPCOMABI(tmp);
271 if (NS_SUCCEEDED(rv))
272 {
273 fullTargetName.Append("_");
274 fullTargetName.Append(tmp);
275 }
276
277 // Get path of mozvoikko shared library.269 // Get path of mozvoikko shared library.
278 // mozVoikkoSpell::registerExtension() has saved it using nsICategory manager270 // mozVoikkoSpell::registerExtension() has saved it using nsICategory manager
279 // when registrating the extension271 // when registrating the extension
280 rv = getMozVoikkoLibrary(getter_AddRefs(mozVoikkoLibName));272 rv = getMozVoikkoLibrary(getter_AddRefs(mozVoikkoLibName));
281 NS_ENSURE_SUCCESS(rv, rv);273 if (NS_FAILED(rv))
274 {
275 logMessage("mozvoikko: Failed to get nsICategoryManager entry");
276 return rv;
277 }
282278
283 // Extract directory part279 // Extract directory part
284 rv = mozVoikkoLibName->GetParent(getter_AddRefs(currDir));280 rv = mozVoikkoLibName->GetParent(getter_AddRefs(currDir));
@@ -374,6 +370,8 @@
374 return NS_OK;370 return NS_OK;
375}371}
376372
373#endif
374
377PreloadedLibraries::PreloadedLibraries(nsIFile *libDir, const char **names, unsigned numLibs) :375PreloadedLibraries::PreloadedLibraries(nsIFile *libDir, const char **names, unsigned numLibs) :
378 ok(false), numLibs(numLibs), libraries(NULL)376 ok(false), numLibs(numLibs), libraries(NULL)
379{377{
380378
=== modified file 'src/mozVoikkoUtils.hxx'
--- src/mozVoikkoUtils.hxx 2008-12-16 16:26:09 +0000
+++ src/mozVoikkoUtils.hxx 2009-05-15 19:01:12 +0000
@@ -74,10 +74,6 @@
74 const nsACString &subDirName,74 const nsACString &subDirName,
75 const nsACString &fileName);75 const nsACString &fileName);
7676
77nsresult loadExtraLibraries(int numLibs, const char **names);
78
79nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir);
80
81class PreloadedLibraries77class PreloadedLibraries
82{78{
83 bool ok;79 bool ok;
@@ -91,4 +87,20 @@
91 operator bool() const { return ok; }87 operator bool() const { return ok; }
92};88};
9389
90#ifndef SYSTEM_LIBVOIKKO
91
92nsresult loadExtraLibraries(int numLibs, const char **names);
93
94nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir);
95
96// 2 string constants provided by autogenerated file mozvoikko-target.cpp
97//
98// They contains extension target string for example
99// "Linux" and "Linux_x86_64-gcc3" for Linux on x86_64.
100//
101extern const char *mozvoikko_target_short;
102extern const char *mozvoikko_target_long;
103
104#endif /* SYSTEM_LIBVOIKKO */
105
94#endif106#endif

Subscribers

People subscribed via source and target branches