[Libreoffice-commits] .: Branch 'feature/gnumake4' - 24 commits - configure.in distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin64.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf dmake/unix download Makefile.in ooo.lst.in scp2/source set_soenv.in solenv/gbuild solenv/inc unusedcode.easy
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:39:00 PDT 2011
Makefile.in | 4 -
configure.in | 15 -----
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/LibreOfficeMacOSX.conf | 1
distro-configs/LibreOfficeWin64.conf | 1
distro-configs/OxygenOfficeLinux.conf | 1
distro-configs/OxygenOfficeWin32.conf | 1
dmake/unix/runargv.c | 10 ++-
download | 2
ooo.lst.in | 2
scp2/source/ooo/makefile.mk | 3 -
set_soenv.in | 10 +--
solenv/gbuild/platform/unxgcc.mk | 6 --
solenv/inc/_tg_app.mk | 40 +++++++++++++++
solenv/inc/antsettings.mk | 2
solenv/inc/extension_post.mk | 2
solenv/inc/postmac.h | 18 ++----
solenv/inc/premac.h | 20 +++----
solenv/inc/tg_app.mk | 4 +
solenv/inc/unxgcc.mk | 3 -
solenv/inc/unxiosr.mk | 2
solenv/inc/wntgcci.mk | 12 ++--
unusedcode.easy | 90 +++++-----------------------------
23 files changed, 97 insertions(+), 153 deletions(-)
New commits:
commit d6c53ceb896f33623b348501676c6002b2777e4f
Merge: 6196897... d648978...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:58 2011 +0200
Merge branch 'master' into feature/gnumake4
commit d6489788535866705f283e043ec8061decd36578
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jul 24 06:45:41 2011 -0700
unusedcode.easy: Class SvtOptionsDrawinglayer cleanup
diff --git a/unusedcode.easy b/unusedcode.easy
index 235c579..fee3467 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1757,30 +1757,6 @@ SvtModuleOptions::GetFactoryWindowAttributes(SvtModuleOptions::EFactory) const
SvtModuleOptions::GetFeatures() const
SvtModuleOptions::GetModuleName(SvtModuleOptions::EFactory) const
SvtModuleOptions::SetFactoryWindowAttributes(SvtModuleOptions::EFactory, rtl::OUString const&)
-SvtOptionsDrawinglayer::SetMaximumPaperBottomMargin(unsigned int)
-SvtOptionsDrawinglayer::SetMaximumPaperHeight(unsigned int)
-SvtOptionsDrawinglayer::SetMaximumPaperLeftMargin(unsigned int)
-SvtOptionsDrawinglayer::SetMaximumPaperRightMargin(unsigned int)
-SvtOptionsDrawinglayer::SetMaximumPaperTopMargin(unsigned int)
-SvtOptionsDrawinglayer::SetMaximumPaperWidth(unsigned int)
-SvtOptionsDrawinglayer::SetOverlayBuffer(unsigned char)
-SvtOptionsDrawinglayer::SetOverlayBuffer_Calc(unsigned char)
-SvtOptionsDrawinglayer::SetOverlayBuffer_DrawImpress(unsigned char)
-SvtOptionsDrawinglayer::SetOverlayBuffer_Writer(unsigned char)
-SvtOptionsDrawinglayer::SetPaintBuffer(unsigned char)
-SvtOptionsDrawinglayer::SetPaintBuffer_Calc(unsigned char)
-SvtOptionsDrawinglayer::SetPaintBuffer_DrawImpress(unsigned char)
-SvtOptionsDrawinglayer::SetPaintBuffer_Writer(unsigned char)
-SvtOptionsDrawinglayer::SetQuadratic3DRenderLimit(unsigned int)
-SvtOptionsDrawinglayer::SetQuadraticFormControlRenderLimit(unsigned int)
-SvtOptionsDrawinglayer::SetRenderDecoratedTextDirect(unsigned char)
-SvtOptionsDrawinglayer::SetRenderSimpleTextDirect(unsigned char)
-SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent(unsigned short)
-SvtOptionsDrawinglayer::SetSnapHorVerLinesToDiscrete(unsigned char)
-SvtOptionsDrawinglayer::SetSolidDragCreate(unsigned char)
-SvtOptionsDrawinglayer::SetStripeColorA(Color)
-SvtOptionsDrawinglayer::SetStripeColorB(Color)
-SvtOptionsDrawinglayer::SetStripeLength(unsigned short)
SvtPathOptions::GetPath(SvtPathOptions::Pathes) const
SvtPathOptions::IsPathReadonly(SvtPathOptions::Pathes) const
SvtPathOptions::SetPath(SvtPathOptions::Pathes, String const&)
commit 6142f4fe918f7db074a2e2b663e05ebe1a2e131a
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jul 24 06:19:42 2011 -0700
unusedcode.easy: Class SvtDocumentTemplateDialog cleanup
diff --git a/unusedcode.easy b/unusedcode.easy
index b5a2011..235c579 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1659,9 +1659,6 @@ SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
SvtCommandOptions::AddCommand(SvtCommandOptions::CmdOption, rtl::OUString const&)
SvtCommandOptions::Clear(SvtCommandOptions::CmdOption)
SvtCommandOptions::GetList(SvtCommandOptions::CmdOption) const
-SvtDocumentTemplateDialog::GetSelectedFileURL() const
-SvtDocumentTemplateDialog::IsFileSelected() const
-SvtDocumentTemplateDialog::SvtDocumentTemplateDialog(Window*, SvtDocumentTemplateDialog::SelectOnly)
SvtDynamicMenuOptions::AppendItem(EDynamicMenuType, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
SvtDynamicMenuOptions::Clear(EDynamicMenuType)
SvtExtendedSecurityOptions::GetSecureExtensionList() const
commit e6319b6c8e5e544a48103dbb26e2aecb4cf7ffa2
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jul 24 13:32:19 2011 +0300
Add the CoreText framework
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 2d75d75..dad1177 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,7 +32,7 @@ CFLAGS=-c $(EXTRA_CFLAGS)
LINKC*=$(CC)
LINK*=$(CXX)
-STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
+STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
STDLIBGUIMT=$(STDLIBCUIMT)
STDSHLCUIMT=
STDSHLGUIMT=
commit 8daa0a9fffc4b773b50f128858f8ee4aea7c7506
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jul 23 08:02:24 2011 -0700
unusedcode.easy: AlphaMask
diff --git a/unusedcode.easy b/unusedcode.easy
index e65fa37..b5a2011 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,13 +1,5 @@
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
-AlphaMask::Crop(Rectangle const&)
-AlphaMask::Expand(unsigned long, unsigned long, unsigned char*)
-AlphaMask::Invert()
-AlphaMask::Mirror(unsigned long)
-AlphaMask::Replace(unsigned char*, unsigned char*, unsigned long, unsigned long*)
-AlphaMask::Rotate(long, unsigned char)
-AlphaMask::Scale(Size const&, unsigned long)
-AlphaMask::Scale(double const&, double const&, unsigned long)
Application::PostUserEvent(unsigned long, void*)
BasicError::BasicError()
BasicIDEDLL::Exit()
commit cd90c2e4eb6807c7914e955fc14c02ecaa516218
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jul 23 07:15:31 2011 -0700
unusedcode.easy: svxIconChoiceCtrl_Impl
Doing List cleanup, I ran into SaveSelection() and decided to delete it.
While I was in the class, I went ahead and cleanup them all up.
diff --git a/unusedcode.easy b/unusedcode.easy
index 2304c68..e65fa37 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1894,26 +1894,6 @@ SvxHyperlinkTabPageBase::FileExists(INetURLObject const&)
SvxIMapDlg::GetTargetList() const
SvxIconChoiceCtrlEntry::LockPos(unsigned char)
SvxIconChoiceCtrlEntry::SetMoved(unsigned char)
-SvxIconChoiceCtrl_Impl::GetEntryPredecessor(SvxIconChoiceCtrlEntry*, SvxIconChoiceCtrlEntry**)
-SvxIconChoiceCtrl_Impl::GetGridCount(Size const&, unsigned char, unsigned char) const
-SvxIconChoiceCtrl_Impl::GetItem(SvxIconChoiceCtrlEntry*, Point const&)
-SvxIconChoiceCtrl_Impl::GetItemColumn(unsigned short, long&) const
-SvxIconChoiceCtrl_Impl::GetPopupMenuPosPixel() const
-SvxIconChoiceCtrl_Impl::GetTextMode(SvxIconChoiceCtrlEntry const*) const
-SvxIconChoiceCtrl_Impl::GoLeftRight(SvxIconChoiceCtrlEntry*, unsigned char)
-SvxIconChoiceCtrl_Impl::GoUpDown(SvxIconChoiceCtrlEntry*, unsigned char)
-SvxIconChoiceCtrl_Impl::HideFocus()
-SvxIconChoiceCtrl_Impl::HideShowDDIcon(SvxIconChoiceCtrlEntry*, Point const&)
-SvxIconChoiceCtrl_Impl::InvalidateBoundingRect(SvxIconChoiceCtrlEntry*)
-SvxIconChoiceCtrl_Impl::LockEntryPos(SvxIconChoiceCtrlEntry*, unsigned char)
-SvxIconChoiceCtrl_Impl::PrepareCommandEvent(CommandEvent const&)
-SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects()
-SvxIconChoiceCtrl_Impl::SaveSelection(List**)
-SvxIconChoiceCtrl_Impl::SetEntryFlags(SvxIconChoiceCtrlEntry*, unsigned short)
-SvxIconChoiceCtrl_Impl::SetEntryListPos(SvxIconChoiceCtrlEntry*, unsigned long)
-SvxIconChoiceCtrl_Impl::ShowEntryFocusRect(SvxIconChoiceCtrlEntry const*)
-SvxIconChoiceCtrl_Impl::Tracking(TrackingEvent const&)
-SvxIconChoiceCtrl_Impl::UpdateBoundingRects()
SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long)
SvxImportMSVBasic::Import(String const&, String const&, unsigned char, unsigned char)
SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
commit 619689733c460836ac990487f0708c4325911b68
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:59:33 2011 +0200
bump workdir up a few levels
diff --git a/set_soenv.in b/set_soenv.in
index 99a4ffb..aa46b86 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -957,7 +957,7 @@ else
$SOLARVERSION = '$SOLARVER';
#Location of gnu make directories.
-$WORKDIR = '$SOLARVER/$INPATH/workdir';
+$WORKDIR = '$SRC_ROOT/workdir/$INPATH';
$OUTDIR = '$SOLARVER/$INPATH';
#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
$SOLARDEFIMG = PathFormat($SRC_ROOT.$DEFIMGS);
commit b275943a569add3d0794ab9f335e808fbfb4eb95
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jul 23 16:22:11 2011 +0300
Sort, make consistent, and drop commented-out lines
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
index 9b0a67c..4c722be 100644
--- a/solenv/inc/postmac.h
+++ b/solenv/inc/postmac.h
@@ -26,29 +26,25 @@
*
************************************************************************/
-//#undef Boolean
-//#undef BOOL
#undef Button
#undef Byte
#undef Control
#undef Cursor
+#undef DirInfo
#undef FontInfo
-#undef GetItem
+#undef LSize
+#undef Line
#undef MemoryBlock
+#undef ModalDialog
#undef Palette
-#undef Polygon
+#undef Pattern
#undef Point
+#undef Polygon
#undef Ptr
#undef Region
-#undef Size
-#undef LSize
-#undef ModalDialog
#undef SetCursor
+#undef Size
#undef StringPtr
-#undef DirInfo
-//#undef ULONG
-#undef Line
#undef TimeValue
-#undef Pattern
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index e59e7d9..b5650dc 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -26,29 +26,25 @@
*
************************************************************************/
-
-//#define Boolean MacOSBoolean
-//#define BOOL MacOSBOOL
#define Button MacOSButton
#define Byte MacOSByte
#define Control MacOSControl
#define Cursor MacOSCursor
+#define DirInfo MacOSDirInfo
#define FontInfo MacOSFontInfo
+#define LSize MacOSLSize
+#define Line MacOSLine
#define MemoryBlock MacOSMemoryBlock
+#define ModalDialog MacOSModalDialog
+#define Palette MacOSPalette
+#define Pattern MacOSPattern
#define Point MacOSPoint
-#define Size MacOSSize
-#define Region MacOSRegion
#define Polygon MacOSPolygon
#define Ptr MacOSPtr
-#define Palette MacOSPalette
-#define LSize MacOSLSize
-#define ModalDialog MacOSModalDialog
+#define Region MacOSRegion
#define SetCursor MacOSSetCursor
+#define Size MacOSSize
#define StringPtr MacOSStringPtr
-#define DirInfo MacOSDirInfo
-//#define ULONG MacOSULONG
-#define Line MacOSLine
#define TimeValue MacOSTimeValue
-#define Pattern MacOSPattern
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit efb12a877e375ab52780d5caa3c5493eb72f2831
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jul 23 14:31:35 2011 +0300
Add the CoreGraphics framework
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 2e7599e..2d75d75 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,7 +32,7 @@ CFLAGS=-c $(EXTRA_CFLAGS)
LINKC*=$(CC)
LINK*=$(CXX)
-STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
+STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
STDLIBGUIMT=$(STDLIBCUIMT)
STDSHLCUIMT=
STDSHLGUIMT=
commit 281fd42dc16d41b54e6913dcf5391d08c3e0f870
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jul 23 10:33:30 2011 +0300
Don't continue making cross-build-toolset if building one module fails
diff --git a/Makefile.in b/Makefile.in
index ded85bf..a7b887b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,9 +84,9 @@ cross-build-toolset:
xmlhelp \
shell; do \
if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \
- (cd $$D && make -sr -j at BUILD_MAX_JOBS@) \
+ (cd $$D && make -sr -j at BUILD_MAX_JOBS@) || exit 1; \
else \
- (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) \
+ (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) || exit 1; \
fi; \
done
endif
commit 8cac1f169e773ef8e721b20c8cc4dc9ca25fa942
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jul 23 00:43:03 2011 -0500
--enable-ext-scripting-pythin is not an option anymore
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 8cecb92..4fe3325 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -36,7 +36,6 @@
--enable-ext-pdfimport
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
---enable-ext-scripting-python
--enable-ext-nlpsolver
--enable-epm
--enable-cairo
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 1fb7e4e..5e654a9 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -9,6 +9,5 @@
--enable-ext-report-builder
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
---enable-ext-scripting-python
--enable-ext-nlpsolver
--with-extension-integration
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 889237f..3e22a28 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -6,4 +6,3 @@
--disable-activex-component
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
---enable-ext-scripting-python
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index eab1a60..7cb36c9 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -35,7 +35,6 @@
--enable-ext-pdfimport
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
---enable-ext-scripting-python
--enable-ext-google-docs
--enable-ext-hunart
--enable-ext-lightproof
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index ba6f999..2fba46c 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -21,7 +21,6 @@
--enable-ext-pdfimport
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
---enable-ext-scripting-python
--enable-ext-google-docs
--enable-ext-hunart
--enable-ext-lightproof
commit 9d2d6bc1b314f5df02ea43d7a3bf3e6acb2f7e5d
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jul 22 23:42:41 2011 +0300
Use OUTDIR_FOR_BUILD for rsc also in gb_SrsPartTarget_RSCTARGET
That is the rsc executable we are going to run when cross-compiling
anyway.
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5b8157f..9241796 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -415,7 +415,7 @@ gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/l
# SrsPartTarget class
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
define gb_SrsPartTarget__command_dep
commit b059c32356d434bec372d46d2b4377baf57e9189
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jul 22 17:43:05 2011 +0200
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index ff3be7a..2304c68 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -368,9 +368,6 @@ GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&)
GalleryTheme::ImplRead()
GlobalEventConfig::EstablishFrameCallback(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
GlobalEventConfig_Impl::getEvents()
-GlyphCache::CalcByteCount() const
-GlyphCache::ClearFontPath()
-GlyphCache::LoadFonts()
GradientLB::GradientLB(Window*, long, unsigned char)
GraphCtrl::GetStringFromDouble(double const&)
GraphCtrl::GraphCtrl(Window*, long)
commit fb7ff0b44c6f4f2f9c86be18c39864d830258526
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Jul 22 14:56:30 2011 +0200
Uploading new libvisio alpha version
diff --git a/ooo.lst.in b/ooo.lst.in
index 09f7366..9a5c408 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
-979a3f3da4dc176e80fe8c6b759cb7f4-libvisio-0.0.2.tar.bz2
+90882496f9ff4cd6d75d61dac2f62f66-libvisio-0.0.3.tar.bz2
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
commit f754fb700410407c1f27087cfaf9a799a11d44a9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jul 22 13:46:59 2011 +0300
Bin PROF_EDITION, not defined in configury, not tested anywhere
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 8fc9ad5..d24715f 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -56,9 +56,6 @@ SCPDEFS+=-DBUILD_X64
.IF "$(ENABLE_OPENGL)"=="TRUE"
SCPDEFS+=-DENABLE_OPENGL
.ENDIF
-.IF "$(PROF_EDITION)"!=""
-SCPDEFS+=-DPROF_EDITION
-.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(ENABLE_GTK)" != ""
commit 9754f9570abb3c07db22177d4336b80417476c86
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 22 11:27:13 2011 +0100
ENABLE_DEBUG_STL isn't working out for us, too easy to mix with and without
diff --git a/configure.in b/configure.in
index fa6ef65..0258e63 100755
--- a/configure.in
+++ b/configure.in
@@ -1876,16 +1876,13 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to do a debug build])
if test -n "$enable_debug" && test "$enable_debug" != "no"; then
ENABLE_DEBUG="TRUE"
- ENABLE_DEBUG_STL="TRUE"
enable_symbols="yes"
AC_MSG_RESULT([yes])
else
ENABLE_DEBUG="FALSE"
- ENABLE_DEBUG_STL="FALSE"
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_DEBUG)
-AC_SUBST(ENABLE_DEBUG_STL)
dnl Set the ENABLE_DBGUTIL variable
dnl ===================================================================
@@ -4238,17 +4235,7 @@ dnl ===================================================================
dnl Check for system cppunit
dnl ===================================================================
AC_MSG_CHECKING([which cppunit to use])
-if test -z "$ENABLE_DEBUG_STL"; then
- AC_MSG_ERROR([Internal error, debug build check needs to precede cppunit check])
-fi
-if test "$ENABLE_DEBUG_STL" = "TRUE"; then
- if test "$with_system_cppunit" = "yes"; then
- AC_MSG_ERROR([--with-system-cppunit conflicts with debug build])
- fi
- AC_MSG_RESULT([internal, needed by debug build])
- SYSTEM_CPPUNIT=NO
- BUILD_TYPE="$BUILD_TYPE CPPUNIT"
-elif test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
+if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
test "$with_system_cppunit" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_CPPUNIT=YES
diff --git a/set_soenv.in b/set_soenv.in
index ee92252..2cdf7f9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1516,7 +1516,6 @@ ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" );
if ("@ENABLE_DEBUG@" eq "TRUE") {
ToFile( "debug", "true", "e" );
}
-ToFile( "ENABLE_DEBUG_STL", "@ENABLE_DEBUG_STL@", "e" );
if ("@ENABLE_WERROR@" eq "FALSE") {
ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" );
}
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 19fbb67..5b8157f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,10 +120,6 @@ ifeq ($(HAVE_CXX0X),TRUE)
gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
endif
-ifeq ($(ENABLE_DEBUG_STL),TRUE)
-gb_CXXFLAGS += -D_GLIBCXX_DEBUG
-endif
-
ifneq ($(strip $(SYSBASE)),)
gb_CXXFLAGS += --sysroot=$(SYSBASE)
gb_CFLAGS += --sysroot=$(SYSBASE)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 79d10d2..752de80 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -90,9 +90,6 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
.IF "$(HAVE_CXX0X)" == "TRUE"
CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
-.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
-CFLAGSCXX += -D_GLIBCXX_DEBUG
-.ENDIF
CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
commit 735a19e5aada97a6aaebda9e295018846cfa1563
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Jul 22 10:58:00 2011 +0100
don't let our fprintf on a broken pipe pollute errno's ECHILD with EPIPE
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 4d18eff..8135e67 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -269,9 +269,10 @@ dmwaitnext( wid, status )
/* If ECHILD is set from waitpid/wait then no child was left. */
if( *wid == -1 ) {
- fprintf(stderr, "%s: Internal Error: wait() failed: %d - %s\n",
- Pname, errno, strerror(errno) );
- if(errno != ECHILD) {
+ int realErr = errno; // fprintf can pollute errno
+ fprintf(stderr, "%s: Internal Error: wait() failed: %d - %s\n",
+ Pname, errno, strerror(errno) );
+ if( realErr != ECHILD ) {
/* Wait was interrupted or a child was terminated (SIGCHLD) */
return -2;
} else {
@@ -369,9 +370,10 @@ dmwaitpid( pqid, wid, status )
}
/* If ECHILD is set from waitpid/wait then no child was left. */
if( *wid == -1 ) {
+ int realErr = errno; // fprintf can pollute errno
fprintf(stderr, "%s: Internal Error: waitpid() failed: %d - %s\n",
Pname, errno, strerror(errno) );
- if(errno != ECHILD) {
+ if(realErr != ECHILD) {
/* Wait was interrupted or a child was terminated (SIGCHLD) */
return -2;
} else {
commit 35182e7ddbdf51f32f7afc61f2cad9568d220ab2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 22 09:19:28 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index bdb3567..ff3be7a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -291,22 +291,16 @@ EditView::UnindentBlock()
ElementCollector::isAbleToNotify() const
ElementCollector::setSecurityId(int)
EnhWMFReader::ReadGDIComment()
-ErrorHandler::ForwCreateString(ErrorInfo const*, String&, unsigned short&) const
ExtraKernInfo::HasKernPairs() const
ExtraPortionInfo::DestroyOrgDXArray()
FieldEntry::GetBookmarkType()
FileControl::ResetButtonText()
FileControl::SetButtonText(String const&)
-FileCopier::FileCopier()
FileCopier::GetError() const
FileCopier::GetErrorHdl() const
FileCopier::GetErrorSource() const
FileCopier::GetErrorTarget() const
FileCopier::SetErrorHdl(Link const&)
-FileDialog::RemoveAllFilter()
-FileDialog::RemoveFilter(String const&)
-FileDialog::SetCancelButtonText(String const&)
-FileDialog::SetOkButtonText(String const&)
FileList::GetFormat()
FileStat::FileStat(void const*, void const*)
FileStat::SetDateTime(String const&, DateTime const&)
@@ -1280,19 +1274,14 @@ SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned cha
SfxMailModel::GetCount() const
SfxMailModel::MakeValueList(std::vector<String*, std::allocator<String*> >*, String&)
SfxMedium::Cancel_Impl()
-SfxMedium::DataAvailable_Impl()
SfxMedium::Exists(unsigned char)
SfxMedium::GetCharset()
SfxMedium::GetDataAvailableLink() const
SfxMedium::GetDoneLink() const
SfxMedium::GetHdl()
-SfxMedium::GetPreRedirectedURL() const
SfxMedium::GetReferer() const
-SfxMedium::IsDownloadDone_Impl()
SfxMedium::IsTemporary() const
-SfxMedium::RefreshName_Impl()
SfxMedium::SetItemSet(SfxItemSet*)
-SfxMedium::SetOrigFilter_Impl(SfxFilter const*)
SfxMedium::SetTemporary(unsigned char)
SfxMedium::SfxMedium(SfxMedium const&, unsigned char)
SfxMedium::StartDownload()
@@ -1324,7 +1313,6 @@ SfxObjectShell::IsSecure()
SfxObjectShell::LockAutoLoad(unsigned char)
SfxObjectShell::SetFlags(unsigned int)
SfxObjectShell::SetTemplate(unsigned char)
-SfxObjectShell_Impl::NeedsOfficeUpdateDialog()
SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
SfxOfficeDispatch::IsMasterUnoCommand() const
SfxOleString16Property::SfxOleString16Property(int, String const&)
@@ -1347,14 +1335,10 @@ SfxPopupWindow::LinkStubDelete(void*, void*)
SfxPopupWindow::RemoveStatusListener(rtl::OUString const&)
SfxPopupWindow::SfxPopupWindow(unsigned short, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, Window*, ResId const&)
SfxPopupWindow::UpdateStatus(rtl::OUString const&)
-SfxPreviewBase_Impl::SetGDIFile(boost::shared_ptr<GDIMetaFile>)
SfxPreviewWin::SfxPreviewWin(Window*, ResId const&, SfxObjectShellLock&)
-SfxPreviewWin_Impl::PreviewFactory(SfxFrame*, String const&)
-SfxProgress::GetStateText_Impl() const
SfxProgress::GetWaitMode() const
SfxProgress::Lock()
SfxProgress::SetWaitMode(unsigned char)
-SfxProgress::StatusBarManagerGone_Impl(SfxStatusBarManager*)
SfxPtrArr::Replace(void*, void*)
SfxRangeItem::SfxRangeItem(unsigned short, SvStream&)
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
@@ -2259,6 +2243,19 @@ WPXPropertyList::Iter::last()
WPXPropertyListVector::Iter::last()
WPXString::Iter::last()
WPXSubDocument::WPXSubDocument()
+WW8Bytes::Replace(unsigned char const&, unsigned short)
+WW8Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
+WW8Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
+WW8OleMaps::Insert(WW8OleMap* const&, unsigned short&)
+WW8OleMaps::Insert(WW8OleMap* const*, unsigned short)
+WW8OleMaps::Insert(WW8OleMaps const*, unsigned short, unsigned short)
+WW8OleMaps::Remove(WW8OleMap* const&, unsigned short)
+WW8OleMaps::Remove(unsigned short, unsigned short)
+WW8_WrSepInfoPtrs::Insert(WW8_WrSepInfoPtrs const*, unsigned short, unsigned short, unsigned short)
+WW8_WrSepInfoPtrs::Remove(unsigned short, unsigned short)
+WW8_WrSepInfoPtrs::Replace(WW8_SepInfo const&, unsigned short)
+WW8_WrSepInfoPtrs::Replace(WW8_SepInfo const*, unsigned short, unsigned short)
+WW8_WrSepInfoPtrs::_ForEach(unsigned short, unsigned short, unsigned char (*)(WW8_SepInfo const&, void*), void*)
WinMtfOutput::DrawLine(Point const&, Point const&)
WinMtfOutput::GetTextLayoutMode() const
WinMtfOutput::SetFont(Font const&)
@@ -4639,8 +4636,6 @@ vcl::PrinterOptionsHelper::setValue(rtl::OUString const&, com::sun::star::uno::A
vcl::RenderGraphic::RenderGraphic(boost::shared_array<unsigned char> const&, unsigned int, rtl::OUString const&)
vcl::RowOrColumn::remove(Window*)
vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::ThreadExecutor::ThreadExecutor()
-vcl::ThreadExecutor::execute()
vcl::WindowPropertySet::WindowPropertySet(Window*, bool)
vcl::WindowPropertySet::getPropertySet() const
vcl::WindowPropertySet::~WindowPropertySet()
@@ -4705,6 +4700,7 @@ writerfilter::dmapper::MeasureHandler::isAutoWidth() const
writerfilter::dmapper::SectionPropertyMap::GetPageStyleName(bool)
writerfilter::dmapper::SectionPropertyMap::SetPageStyleName(bool, rtl::OUString const&)
writerfilter::dmapper::StyleSheetTable::resolveSprmProps(writerfilter::Sprm&)
+writerfilter::doctok::WW8DocumentImpl::fc2cp(writerfilter::doctok::Fc const&) const
writerfilter::doctok::WW8StructBase::getBit(unsigned int, unsigned short) const
writerfilter::doctok::WW8StructBase::getNibble(unsigned int, unsigned short) const
writerfilter::doctok::WW8Sttbf::getExtraData(unsigned int)
commit fa07a2b41563184bbca4a7f0b061193031f87bac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jul 22 10:31:22 2011 +0300
Use correct solar.jar when cross-compiling
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index fda4a82..0137e33 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -82,7 +82,7 @@ JAVA_HOME=
ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
-Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
-Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
- -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ -Dsolar.jar=$(SOLARVER)/$(INPATH)/bin -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
-Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
-emacs $(ANT_VERBOSE)
commit 47b4ee01c88a58399ce510b68734072cf6d07bdb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jul 22 10:19:21 2011 +0300
Get license.txt from where it actually is when cross-compiling
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 5204af7..82421e2 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -159,7 +159,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
# may not fit...
.IF "$(CUSTOM_LICENSE)"==""
.IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt
+PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
.ELSE # "$(GUI)" == "WNT"
PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
.ENDIF # "$(GUI)" == "WNT"
commit 8f9a3c8e26c077e215d549b2e1e990a7f1263ebe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 23:56:06 2011 +0300
windres has no default output file
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index bb2dabe..4a98fae 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -125,7 +125,11 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
.ENDIF # "$(APP1VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP1LINKRES:b).res $(MISC)/$(APP1LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP1LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
@@ -331,7 +335,11 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
.ENDIF # "$(APP2VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP2LINKRES:b).res $(MISC)/$(APP2LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP2LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
@@ -537,7 +545,11 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
.ENDIF # "$(APP3VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP3LINKRES:b).res $(MISC)/$(APP3LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP3LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
@@ -743,7 +755,11 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
.ENDIF # "$(APP4VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP4LINKRES:b).res $(MISC)/$(APP4LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP4LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
@@ -949,7 +965,11 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
.ENDIF # "$(APP5VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP5LINKRES:b).res $(MISC)/$(APP5LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP5LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
@@ -1155,7 +1175,11 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
.ENDIF # "$(APP6VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP6LINKRES:b).res $(MISC)/$(APP6LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP6LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
@@ -1361,7 +1385,11 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
.ENDIF # "$(APP7VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP7LINKRES:b).res $(MISC)/$(APP7LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP7LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
@@ -1567,7 +1595,11 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
.ENDIF # "$(APP8VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP8LINKRES:b).res $(MISC)/$(APP8LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP8LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
@@ -1773,7 +1805,11 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
.ENDIF # "$(APP9VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP9LINKRES:b).res $(MISC)/$(APP9LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP9LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
@@ -1979,7 +2015,11 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
.ENDIF # "$(APP10VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP10LINKRES:b).res $(MISC)/$(APP10LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP10LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index a6fb32d..c49ee04 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -154,7 +154,11 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
@-echo $(EMQ)#include $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
.ENDIF # "$(APP$(TNR)VERINFO)" != ""
+.IF "$(COM)" == "GCC"
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP$(TNR)LINKRES:b).res $(MISC)/$(APP$(TNR)LINKRES:b).rc
+.ELSE
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
+.ENDIF
.ENDIF # "$(APP$(TNR)LINKRES)" != ""
.IF "$(COM)" == "GCC"
.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
commit 7b8fee704a218d89332018f7221b0b7e6476f769
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jul 21 23:22:58 2011 +0300
We create some import libraries ourselves from .def files from Wine
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 2622ca6..34faf32 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -199,15 +199,15 @@ OLDNAMESLIB=-lmoldname
MSIMG32LIB=-lmsimg32
PROPSYSLIB=-lpropsys
-# Libraries that neither mingw.org or mingw-w64 have.
-# Thus have to use the Windows SDK ones.
-GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib
-MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib
-URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib
+# Libraries for which we use an import library built
+# from Wine's .def file
+MSILIB=-lmsi
+GDIPLUSLIB=-lgdiplus
+URLMONLIB=-lurlmon
# Libraries that mingw-w64 has but mingw.org doesn't. At least the OBS MinGW
# cross-compiler is based on mingw-w64. When using MinGW natively on Windows
-# (which as such I don't think we want to support) let's use the Windows SDK
+# (which as such I don't think we want to support) we use the Windows SDK
# libraries.
.IF "$(CROSS_COMPILING)"=="YES"
DBGHELPLIB=-ldbghelp
commit 8dc7fe57785088daef10a3ae12a005cf31a58aeb
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jul 21 22:16:07 2011 +0300
Using -L/lib and -L/usr/lib on MacOSX builds is unnecessary and wrong
As we build against the MacOSX 10.4 SDK we should certainly not link
against any libraries of the build OS, which could well be 10.5, 10.6
or 10.7.
Norbert verified that this works fine.
diff --git a/set_soenv.in b/set_soenv.in
index 9ff4b03..ee92252 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1008,8 +1008,8 @@ elsif ($platform =~ m/linux|netbsd|freebsd|aix|openbsd|dragonfly/)
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
-{ $SOLAREXTRALIB = $L.$LIB.
- $L.$USR.$LIB;
+{
+ # Nothing should be needed
}
elsif ($platform !~ m/cygwin/ && $platform !~ m/mingw32/ && $platform !~ m/^arm-apple/)
{ AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
@@ -1292,9 +1292,6 @@ elsif ($platform =~ m/cygwin|mingw32/)
}
elsif ($platform =~ m/darwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
- if ($platform !~ m/^arm-apple/)
- { $SOLARLIB .= $L.$USR_LIB;
- }
# [ed] 6/15/02 Add in X11 libraries onto the library path
if ($GUIBASE eq "unx") {
$SOLARLIB .= $L.$XLIB;
commit 3f0ea8071584476c1de5b5123d21dcfaba8310a2
Author: Andras Timar <atimar at suse.com>
Date: Thu Jul 21 18:08:16 2011 +0200
download and distribute latest vcredist_x64.exe
Microsoft Visual C++ 2008 SP1 Redistributable Package ATL Security Update
ProductName = Microsoft Visual C++ 2008 Redistributable - x64 9.0.30729.4148
ProductCode = {4B6C7001-C7D6-3710-913E-5BC23FCE91E6}
diff --git a/download b/download
index 86a02ef..acdd999 100755
--- a/download
+++ b/download
@@ -181,7 +181,7 @@ if [ "$COM" = "MSC" ]; then
case "$msvcver" in
9.0)
downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x86.exe" "fd30acc7a696c32f661b33668e73bf7b"
- downloaditem "http://download.microsoft.com/download/d/2/4/d242c3fb-da5a-4542-ad66-f9661d0a8d19/" "vcredist_x64.exe" "a31dc1a74f1dee5caf63aec8ebb5fe20"
+ downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x64.exe" "3abb5efe9ad4d9728406a1a90a47575f"
;;
*)
;;
More information about the Libreoffice-commits
mailing list