[Libreoffice-commits] core.git: 9 commits - desktop/win32 icu/ExternalPackage_icu.mk jvmfwk/plugins jvmfwk/source Makefile.in nss/ExternalProject_nss.mk nss/nsinstall.py redland/ExternalProject_redland.mk xpdf/ExternalProject_xpdf.mk
David Tardon
dtardon at redhat.com
Wed Mar 27 09:08:51 PDT 2013
Makefile.in | 2 +-
desktop/win32/source/officeloader/officeloader.cxx | 10 +++++-----
icu/ExternalPackage_icu.mk | 15 ++++++++++-----
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 ++--
jvmfwk/source/fwkutil.cxx | 2 +-
nss/ExternalProject_nss.mk | 18 +++++++++++-------
nss/nsinstall.py | 8 ++++----
redland/ExternalProject_redland.mk | 4 +++-
xpdf/ExternalProject_xpdf.mk | 2 +-
10 files changed, 40 insertions(+), 29 deletions(-)
New commits:
commit ed3fe31d882477d3ef06e164e61dcfe12d1f8247
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 15:17:24 2013 +0100
fix build of redland on mingw
Change-Id: Ied6afb6f9240d29f75e97ab3cb536fd5524cc5d9
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index f71beba..6b796fc 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -25,8 +25,10 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,redland,build):
$(call gb_ExternalProject_run,build,\
+ PATH="$(OUTDIR)/bin:$$PATH" \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
+ CPPFLAGS="-I$(OUTDIR)/inc/external" \
+ LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
commit 35ee0188cb85a56c7ea287cc979006d2d01d439b
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 12:27:12 2013 +0100
WaE: "UNX" is not defined
Change-Id: I3b72efae6c3ae929eb4f26400a7c73406371c1a2
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index d9751ac..f3ee1e3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -40,7 +40,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size)
#if defined(WNT)
"bin/java.exe",
"jre/bin/java.exe"
-#elif UNX
+#elif defined UNX
"bin/java",
"jre/bin/java"
#endif
@@ -57,7 +57,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll",
"/bin/jrockit/jvm.dll"
-#elif UNX
+#elif defined UNX
#ifdef MACOSX
"/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
#else
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index a4ff38c..d45555d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -40,7 +40,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
"java.exe",
"bin/java.exe",
"jre/bin/java.exe"
-#elif UNX
+#elif defined UNX
"java",
"bin/java",
"jre/bin/java"
@@ -59,7 +59,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/bin/classic/jvm.dll",
// The 64-bit JRE has the jvm in bin/server
"/bin/server/jvm.dll"
-#elif UNX
+#elif defined UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
commit 6190296113a88e57e15242829a4211f811eeec02
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 12:12:41 2013 +0100
fix mingw build of xpdf
Change-Id: Ic6cbe741b9d8ec1081833039f3982eb68a10b38b
diff --git a/xpdf/ExternalProject_xpdf.mk b/xpdf/ExternalProject_xpdf.mk
index a81cb15..181128c 100644
--- a/xpdf/ExternalProject_xpdf.mk
+++ b/xpdf/ExternalProject_xpdf.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,xpdf,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
LIBS="-lgdi32" \
- && $(MAKE) \
+ && MAKEFLAGS="$(subst r,,$(MAKEFLAGS))" $(MAKE) \
)
else # COM=MSC
$(call gb_ExternalProject_get_state_target,xpdf,build):
commit 97272121d514b613965e7da1f8d138440b25444b
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 11:54:39 2013 +0100
WaE: declaration shadows a previous local
Change-Id: I675c76206eefa447084454f345fbdeb11760cd08
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 69ec7f8..63cc0cc 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -304,13 +304,13 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
fSuccess = WriteFile( hPipe, "", 1, &dwBytesWritten, NULL );
if ( fSuccess )
{
- DWORD dwBytesRead = 0;
- char *pBuffer = (char *)_alloca( sizeof(PIPE_TERMINATION_SEQUENCE) );
- fSuccess = ReadFile( hPipe, pBuffer, sizeof(PIPE_TERMINATION_SEQUENCE) - 1, &dwBytesRead, NULL );
+ DWORD dwBytesRead2 = 0;
+ char *pBuffer2 = (char *)_alloca( sizeof(PIPE_TERMINATION_SEQUENCE) );
+ fSuccess = ReadFile( hPipe, pBuffer2, sizeof(PIPE_TERMINATION_SEQUENCE) - 1, &dwBytesRead2, NULL );
if ( fSuccess )
{
- pBuffer[dwBytesRead] = 0;
- if ( 0 != strcmp( PIPE_TERMINATION_SEQUENCE, pBuffer ) )
+ pBuffer2[dwBytesRead2] = 0;
+ if ( 0 != strcmp( PIPE_TERMINATION_SEQUENCE, pBuffer2 ) )
fSuccess = FALSE;
}
}
commit ede96bce22d7394f14cd9d5674e8a5cc63e5c473
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 10:45:46 2013 +0100
fix mingw build of nss
Change-Id: I61ae51ef53321ed507dfc2974dc5bbfb72d3505e
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 6e9b363..e37b6ba 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -52,14 +52,18 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
else
$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
- CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- CXX="$(CXX) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- OS_LIBS="-ladvapi32 -lws2_32 -lmwsock -lwinm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
- OS_TARGET=WINNT RC="$(WINDRES)" OS_RELEASE="5.0" \
- IMPORT_LIB_SUFFIX=dll.a \
- NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \
- NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py" \
$(MAKE) -j1 nss_build_all \
+ NS_USE_GCC=1 \
+ CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ CXX="$(CXX) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+ LDFLAGS="" \
+ PATH="$(PATH)" \
+ RANLIB="$(RANLIB)" \
+ OS_TARGET=WINNT RC="$(WINDRES)" OS_RELEASE="5.0" \
+ IMPORT_LIB_SUFFIX=dll.a \
+ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \
+ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py" \
,mozilla/security/nss)
endif
commit 3a7d870d721d39c239ccc9d7873f34e04c7914d3
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 11:34:08 2013 +0100
file modes are octal
Change-Id: I5aa118db8100be8945425ad195bfb72819953c73
diff --git a/nss/nsinstall.py b/nss/nsinstall.py
index 67d696b..7be4197 100644
--- a/nss/nsinstall.py
+++ b/nss/nsinstall.py
@@ -86,11 +86,11 @@ def nsinstall(argv):
if options.m:
# mode is specified
try:
+ options.m = int(options.m, 8)
# I have no idea why nss insists on using this mode for installed headers.
# It causes problems with updating the files during a rebuild.
- if options.m == 444:
- options.m = 644
- options.m = int(options.m)
+ if options.m == 0444:
+ options.m = 0644
except:
sys.stderr.write('nsinstall: ' + options.m + ' is not a valid mode\n')
return 1
@@ -147,7 +147,7 @@ def nsinstall(argv):
shutil.copy2(srcpath, targetpath)
else:
if os.path.exists(targetpath):
- os.chmod(targetpath, 755)
+ os.chmod(targetpath, 0755)
os.remove(targetpath)
shutil.copy(srcpath, targetpath)
commit 1ef1695b6b7a2981220c9b7c3c4329bf983a5e54
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 10:07:04 2013 +0100
do not run unit tests when cross-compiling
We already do this for full build (see solenv/gbuild/Module.mk).
Change-Id: Icdb6f0e91d8e6674868926e79f63130942295353
diff --git a/Makefile.in b/Makefile.in
index 626c726..3b392e3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ $(1).subsequentcheck:
cd $(SRCDIR)/$(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
$(1).all: bootstrap fetch
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1))
endef
commit 769831b9588889e29b882fc65b6021f6ff73dfea
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 09:39:15 2013 +0100
WaE: "UNX" is not defined
Change-Id: Ie1a98500fa4f3965872b3fc92a303df84556fd7a
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index ce827ba..8caf06d 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -105,7 +105,7 @@ bool isAccessibilitySupportDesired()
}
RegCloseKey(hKey);
-#elif UNX
+#elif defined UNX
char buf[16];
// use 2 shells to suppress the eventual "gcontool-2 not found" message
// of the shell trying to execute the command
commit 1174fbee3a5af72f2a79f11d4d4aabb04c195ec4
Author: David Tardon <dtardon at redhat.com>
Date: Wed Mar 27 09:38:54 2013 +0100
fix icu lib names on mingw
Change-Id: I7b54e45b058a95783374e64cc0f628d336e579cd
diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk
index fbb9ee0..bfd8f8a 100644
--- a/icu/ExternalPackage_icu.mk
+++ b/icu/ExternalPackage_icu.mk
@@ -187,12 +187,17 @@ $(eval $(call gb_ExternalPackage_use_external_project,icu,icu))
ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
+$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata.dll.a,source/data/lib.lib))
+$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc.dll.a,source/lib/libicuuc.lib))
+$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n.dll.a,source/lib/libicuin.lib))
+$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule.dll.a,source/lib/libicule.lib))
+$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu.dll.a,source/lib/libicutu.lib))
+$(eval $(call gb_ExternalPackage_add_file,icu,lib/icudt$(ICU_MAJOR).dll,source/lib/libicudt$(ICU_MAJOR).dll))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
- source/lib/libicudt$(ICU_MAJOR)$(ICU_MINOR).dll \
- source/lib/libicuuc$(ICU_MAJOR)$(ICU_MINOR).dll \
- source/lib/libicuin$(ICU_MAJOR)$(ICU_MINOR).dll \
- source/lib/libicule$(ICU_MAJOR)$(ICU_MINOR).dll \
- source/lib/libicutu$(ICU_MAJOR)$(ICU_MINOR).dll \
+ source/lib/icuuc$(ICU_MAJOR).dll \
+ source/lib/icuin$(ICU_MAJOR).dll \
+ source/lib/icule$(ICU_MAJOR).dll \
+ source/lib/icutu$(ICU_MAJOR).dll \
source/bin/genccode.exe \
source/bin/genbrk.exe \
source/bin/gencmn.exe \
More information about the Libreoffice-commits
mailing list