[Libreoffice-commits] .: 4 commits - clucene/Library_clucene.mk clucene/Package_source.mk clucene/patches clucene/source connectivity/source package/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Feb 17 08:36:36 PST 2012
clucene/Library_clucene.mk | 6 ++++++
clucene/Package_source.mk | 8 +++++++-
clucene/patches/clucene-internal-zlib.patch | 15 +++++++++++++++
clucene/source/Makefile | 16 +++++++++++++++-
connectivity/source/commontools/makefile.mk | 4 ++--
connectivity/source/drivers/file/makefile.mk | 6 +++---
package/source/zipapi/Deflater.cxx | 2 --
package/source/zipapi/Inflater.cxx | 2 --
package/source/zippackage/ZipPackageStream.cxx | 1 +
9 files changed, 49 insertions(+), 11 deletions(-)
New commits:
commit a818fa05c34bb2e969e2fe1972d9a52774538beb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 17 16:35:04 2012 +0000
get clucene building under windows-msvc
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 74e7dbc..bda5917 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -47,6 +47,12 @@ $(eval $(call gb_Library_add_defs,clucene,\
-Dclucene_contribs_lib_EXPORTS\
))
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_add_defs,clucene,\
+ -DSYSTEM_ZLIB \
+))
+endif
+
$(eval $(call gb_Library_add_linked_libs,clucene,\
$(gb_STDLIBS) \
))
diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk
index b8a774e..c51dbce 100644
--- a/clucene/Package_source.mk
+++ b/clucene/Package_source.mk
@@ -35,9 +35,15 @@ $(eval $(call gb_CustomTarget_add_dependencies,clucene/source,\
clucene/configs/clucene-config-generic.h \
))
+ifeq ($(OS),WNT)
+FIXED_TARFILE_LOCATION=$(shell cygpath -u $(TARFILE_LOCATION))
+else
+FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
+endif
+
# FIXME: do not hardcode the path here
$(eval $(call gb_CustomTarget_add_outdir_dependencies,clucene/source,\
- $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz \
+ $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz \
))
$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
diff --git a/clucene/patches/clucene-internal-zlib.patch b/clucene/patches/clucene-internal-zlib.patch
new file mode 100644
index 0000000..6667926
--- /dev/null
+++ b/clucene/patches/clucene-internal-zlib.patch
@@ -0,0 +1,15 @@
+--- src/shared/CLucene/util/Misc.cpp 2012-02-17 15:33:09.217891100 +0000
++++ src/shared/CLucene/util/Misc.cpp 2012-02-17 15:38:10.836597500 +0000
+@@ -34,7 +34,11 @@
+ #include "CLucene/util/dirent.h" //if we have dirent, then the native one will be used
+
+ //for zlib...
+-#include "zlib.h"
++#ifdef SYSTEM_ZLIB
++#include <zlib.h>
++#else
++#include <external/zlib/zlib.h>
++#endif
+ #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+ # include <fcntl.h>
+ # include <io.h>
diff --git a/clucene/source/Makefile b/clucene/source/Makefile
index 9a274c1..aa5bcfd 100644
--- a/clucene/source/Makefile
+++ b/clucene/source/Makefile
@@ -29,18 +29,32 @@
gb_PARTIALBUILD := T
include $(GBUILDDIR)/gbuild_simple.mk
+ifeq ($(OS),WNT)
+FIXED_TARFILE_LOCATION=$(shell cygpath -u $(TARFILE_LOCATION))
+else
+FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
+endif
+
done :
mkdir -p $(dir $@)
# FIXME: do not hardcode the path here
- $(GNUTAR) -x --strip-component=1 -f $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+ $(GNUTAR) -x --strip-component=1 -f $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch
#FIXME ?, our rules expect .cxx
for i in `find . -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done
+ifneq ($(OS),WNT)
#dirent.h is a problem, move it around
mkdir -p inc/internal/CLucene/util
mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util
+endif
#To generate these, run cmake for each sufficiently different platform, customize and stick into configs
+ifeq ($(COM),MSC)
+ cp $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h src/shared/CLucene/_clucene-config.h
+ cp $(SRCDIR)/clucene/configs/clucene-config-MSVC.h src/shared/CLucene/clucene-config.h
+else
cp $(SRCDIR)/clucene/configs/_clucene-config-generic.h src/shared/CLucene/_clucene-config.h
cp $(SRCDIR)/clucene/configs/clucene-config-generic.h src/shared/CLucene/clucene-config.h
+endif
.DEFAULT_GOAL := all
.PHONY : all
commit ecb1599ad00e71dfe05f3ae9a71bdce5f7540a40
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 17 16:32:02 2012 +0000
WaE: unused variable
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 5cb6720..b5c0731 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -542,6 +542,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
{
OSL_FAIL( "Exception is thrown during stream wrapping!\n" );
OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr());
+ (void)ex;
return uno::Reference < io::XInputStream > ();
}
}
commit ccdb4d5c2c4497d857f4bf4f8cf10d2b33901e6d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 17 15:44:19 2012 +0000
remove dodgy header-guards
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index 0b5a7fe..75d9d39 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -27,13 +27,11 @@
************************************************************************/
#include <package/Deflater.hxx>
-#ifndef _ZLIB_H
#ifdef SYSTEM_ZLIB
#include <zlib.h>
#else
#include <external/zlib/zlib.h>
#endif
-#endif
#include <com/sun/star/packages/zip/ZipConstants.hpp>
#include <string.h> // for memset
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 043c501..2149e59 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -27,13 +27,11 @@
************************************************************************/
#include <package/Inflater.hxx>
-#ifndef _ZLIB_H
#ifdef SYSTEM_ZLIB
#include <zlib.h>
#else
#include <external/zlib/zlib.h>
#endif
-#endif
#include <string.h> // for memset
using namespace com::sun::star::uno;
commit 1146a340468546cae7c2498fb24f47c67ab98feb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 17 14:30:02 2012 +0000
WaE: enable exceptions for these too
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index 2412538..686f6d6 100755
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -49,6 +49,7 @@ ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
# --- Files --------------------------------------------------------
EXCEPTIONSFILES=\
+ $(SLO)$/AutoRetrievingBase.obj \
$(SLO)$/predicateinput.obj \
$(SLO)$/ConnectionWrapper.obj \
$(SLO)$/TConnection.obj \
@@ -90,8 +91,7 @@ EXCEPTIONSFILES=\
$(SLO)$/dbconversion.obj
SLOFILES=\
- $(EXCEPTIONSFILES) \
- $(SLO)$/AutoRetrievingBase.obj \
+ $(EXCEPTIONSFILES)
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 41f061d..0b21336 100755
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -62,11 +62,11 @@ EXCEPTIONSFILES=\
$(SLO)$/FTables.obj \
$(SLO)$/fanalyzer.obj \
$(SLO)$/fcode.obj \
- $(SLO)$/fcomp.obj
+ $(SLO)$/fcomp.obj \
+ $(SLO)$/quotedstring.obj
SLOFILES=\
- $(EXCEPTIONSFILES) \
- $(SLO)$/quotedstring.obj
+ $(EXCEPTIONSFILES)
# --- Library -----------------------------------
More information about the Libreoffice-commits
mailing list