[Libreoffice-commits] .: 2 commits - libexttextcat/makefile.mk libexttextcat/prj libtextcat/libexttextcat-3.0.1.patch libtextcat/makefile.mk libtextcat/prj lingucomponent/prj lingucomponent/source
René Engelhard
rene at kemper.freedesktop.org
Tue Oct 4 12:04:43 PDT 2011
libexttextcat/makefile.mk | 87 ++++++++++++++++++++
libexttextcat/prj/build.lst | 3
libexttextcat/prj/d.lst | 10 ++
libtextcat/libexttextcat-3.0.1.patch | 20 ----
libtextcat/makefile.mk | 90 ---------------------
libtextcat/prj/build.lst | 3
libtextcat/prj/d.lst | 10 --
lingucomponent/prj/build.lst | 2
lingucomponent/source/languageguessing/makefile.mk | 8 +
9 files changed, 107 insertions(+), 126 deletions(-)
New commits:
commit d001fb170616df7b6068e66e9f9a573ed33b8445
Author: Rene Engelhard <rene at debian.org>
Date: Tue Oct 4 14:37:36 2011 +0000
update LIBTEXTCATLIB
diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
index 624ccba..b4e5bc9 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -39,9 +39,13 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)$(COM)"=="WNTGCC"
-LIBTEXTCATLIB=-ltextcat
+.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
+LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS)
+.ELSE
+LIBTEXTCATLIB=-lexttextcat
+.ENDIF
.ELSE # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-LIBTEXTCATLIB=ilibtextcat.lib
+LIBTEXTCATLIB=ilibexttextcat.lib
.ENDIF # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
SLOFILES = \
commit 816c7a28a0a8bf464111812c61ffda120d0f769b
Author: Rene Engelhard <rene at debian.org>
Date: Tue Oct 4 13:43:05 2011 +0000
update to libexttextcat 3.1.1
diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk
new file mode 100644
index 0000000..ce607a3
--- /dev/null
+++ b/libexttextcat/makefile.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=libexttextcat
+TARGET=libexttextcat
+
+.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
+all:
+ @echo "An already available installation of libexttextcat should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream
+# sources, far better to commit your changes in there
+TARFILE_NAME=libexttextcat-3.1.1
+TARFILE_MD5=33f01c57f92eb6f940b59015c35a4eea
+TARFILE_ROOTDIR=libexttextcat-3.1.1
+
+.IF "$(GUI)"=="UNX"
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
+CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+.IF "$(OS)"=="AIX"
+CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
+.ENDIF
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
+BUILD_ACTION=make
+
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat.a
+
+.ENDIF # "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+BUILD_ACTION=cd src && dmake $(MAKEMACROS)
+.ENDIF # "$(GUI)"=="WNT"
+
+ALLTAR: $(BIN)/fingerprint.zip
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
+
+$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+ @-rm -f $@
+ @echo creating ../../../../../$@
+ $(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf
+ $(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \
+ -name "*.lm" -print0 | \
+ xargs -0 zip -j $(ZIP_VERBOSITY) $@
diff --git a/libexttextcat/prj/build.lst b/libexttextcat/prj/build.lst
new file mode 100644
index 0000000..8516375
--- /dev/null
+++ b/libexttextcat/prj/build.lst
@@ -0,0 +1,3 @@
+ltc libtextcat : soltools solenv NULL
+ltc libtextcat usr1 - all ltc_mkout NULL
+ltc libtextcat nmake - all ltc_libtextcat NULL
diff --git a/libexttextcat/prj/d.lst b/libexttextcat/prj/d.lst
new file mode 100644
index 0000000..e52e342
--- /dev/null
+++ b/libexttextcat/prj/d.lst
@@ -0,0 +1,10 @@
+
+..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
+..\%__SRC%\lib\ilib*.* %_DEST%\lib\ilib*.*
+..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
+
+mkdir: %_DEST%\inc\external\libtextcat
+..\%__SRC%\misc\build\libexttextcat-3.1.0\src\*.h %_DEST%\inc\external\libtextcat\*.h
+
+# data for language guessing
+..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip
diff --git a/libtextcat/libexttextcat-3.0.1.patch b/libtextcat/libexttextcat-3.0.1.patch
deleted file mode 100644
index bed905c..0000000
--- a/libtextcat/libexttextcat-3.0.1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libexttextcat-3.1.0/config.sub 2011-09-20 17:14:22.000000000 +0200
-+++ misc/build/libexttextcat-3.1.0/config.sub 2011-09-26 16:05:16.000000000 +0200
-@@ -123,7 +123,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1294,7 +1294,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
deleted file mode 100644
index c7e4d1b..0000000
--- a/libtextcat/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=libtextcat
-TARGET=libtextcat
-
-.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
-all:
- @echo "An already available installation of libtextcat should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream
-# sources, far better to commit your changes in there
-TARFILE_NAME=libexttextcat-3.1.0
-TARFILE_MD5=8dc93ffd48cb80b738075ce37df8f915
-TARFILE_ROOTDIR=libexttextcat-3.1.0
-
-PATCH_FILES=\
- libexttextcat-3.0.1.patch
-
-.IF "$(GUI)"=="UNX"
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-.IF "$(OS)"=="AIX"
-CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
-.ENDIF
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=make
-
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat.a
-
-.ENDIF # "$(GUI)"=="UNX"
-
-
-.IF "$(GUI)"=="WNT"
-BUILD_ACTION=cd src && dmake $(MAKEMACROS)
-.ENDIF # "$(GUI)"=="WNT"
-
-ALLTAR: $(BIN)/fingerprint.zip
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : tg_ext.mk
-.INCLUDE : target.mk
-
-$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
- @-rm -f $@
- @echo creating ../../../../../$@
- $(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf
- $(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \
- -name "*.lm" -print0 | \
- xargs -0 zip -j $(ZIP_VERBOSITY) $@
diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst
deleted file mode 100644
index 8516375..0000000
--- a/libtextcat/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-ltc libtextcat : soltools solenv NULL
-ltc libtextcat usr1 - all ltc_mkout NULL
-ltc libtextcat nmake - all ltc_libtextcat NULL
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
deleted file mode 100644
index e52e342..0000000
--- a/libtextcat/prj/d.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-
-..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
-..\%__SRC%\lib\ilib*.* %_DEST%\lib\ilib*.*
-..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
-
-mkdir: %_DEST%\inc\external\libtextcat
-..\%__SRC%\misc\build\libexttextcat-3.1.0\src\*.h %_DEST%\inc\external\libtextcat\*.h
-
-# data for language guessing
-..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 23be2d4..07c9718 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc lingucomponent : linguistic LIBEXTTEXTCAT:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL
+lc lingucomponent : linguistic LIBEXTTEXTCAT:libexttextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL
lc lingucomponent usr1 - all lc_mkout NULL
lc lingucomponent\inc nmake - all lc_inc NULL
lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL
More information about the Libreoffice-commits
mailing list