[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - dtrans/Library_dnd_os2.mk dtrans/Library_sysdtrans_os2.mk dtrans/Module_dtrans.mk dtrans/source postprocess/packcomponents scp2/source
dtrans/Library_dnd_os2.mk | 56 +++ dtrans/Library_sysdtrans_os2.mk |7 dtrans/Module_dtrans.mk |1 dtrans/source/os2/clipb/Os2Clipboard.hxx|3 dtrans/source/os2/clipb/Os2Transferable.hxx |4 dtrans/source/os2/dnd/DragSource.cxx| 404 ++ dtrans/source/os2/dnd/DragSource.hxx| 108 + dtrans/source/os2/dnd/DropTarget.cxx| 511 dtrans/source/os2/dnd/DropTarget.hxx| 137 +++ dtrans/source/os2/dnd/OTransferable.cxx | 452 dtrans/source/os2/dnd/OTransferable.hxx | 98 + dtrans/source/os2/dnd/dndentry.cxx | 117 ++ dtrans/source/os2/dnd/globals.cxx | 200 ++ dtrans/source/os2/dnd/globals.hxx | 63 +++ postprocess/packcomponents/makefile.mk |1 scp2/source/ooo/file_library_ooo.scp|2 vcl/inc/os2/saldata.hxx | 11 vcl/source/window/syschild.cxx |2 vcl/source/window/window.cxx|2 19 files changed, 2169 insertions(+), 10 deletions(-) New commits: commit ad88c94f4ecb7e5876ff481164276403000993e6 Author: Yuri Dario <yda...@apache.org> Date: Wed Mar 28 17:00:13 2018 + #i127729# Add full drag support for the OS/2 platform. diff --git a/dtrans/Library_dnd_os2.mk b/dtrans/Library_dnd_os2.mk new file mode 100644 index ..4aa30f541c38 --- /dev/null +++ b/dtrans/Library_dnd_os2.mk @@ -0,0 +1,56 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Library_Library,dnd)) + +$(eval $(call gb_Library_add_precompiled_header,dnd,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) + +$(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd)) + +$(eval $(call gb_Library_set_include,dnd,\ +$$(INCLUDE) \ +-I$(SRCDIR)/dtrans/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,dnd,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,dnd,\ +cppuhelper \ +cppu \ +sal \ +stl \ +$(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,dnd,\ +dtrans/source/os2/dnd/dndentry \ +dtrans/source/os2/dnd/globals \ +dtrans/source/os2/dnd/OTransferable \ +dtrans/source/os2/dnd/DragSource \ +dtrans/source/os2/dnd/DropTarget \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk index e2826ac331f1..bf1820b4ac88 100644 --- a/dtrans/Module_dtrans.mk +++ b/dtrans/Module_dtrans.mk @@ -39,6 +39,7 @@ endif ifeq ($(OS),OS2) $(eval $(call gb_Module_add_targets,dtrans,\ + Library_dnd_os2 \ Library_sysdtrans_os2 \ )) endif diff --git a/dtrans/source/os2/dnd/DragSource.cxx b/dtrans/source/os2/dnd/DragSource.cxx new file mode 100644 index ..9a6cfc5bb626 --- /dev/null +++ b/dtrans/source/os2/dnd/DragSource.cxx @@ -0,0 +1,404 @@ +/** +* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +* +*/ + + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dtrans.hxx" +#include +
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - canvas/source
canvas/source/cairo/cairo_os2_cairo.cxx |6 +-
canvas/source/cairo/cairo_textlayout.cxx |9 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 8b8df380310b2ba0c92ddff97361b0c4989d659f
Author: Yuri Dario <yda...@apache.org>
Date: Wed Mar 7 14:46:14 2018 +
#i127723# Fix StarSymbol to OpenSymbol mapping when using cairo on OS/2.
diff --git a/canvas/source/cairo/cairo_os2_cairo.cxx
b/canvas/source/cairo/cairo_os2_cairo.cxx
index 788b51e3897f..e9b4912be7a6 100644
--- a/canvas/source/cairo/cairo_os2_cairo.cxx
+++ b/canvas/source/cairo/cairo_os2_cairo.cxx
@@ -327,7 +327,11 @@ namespace cairo
fontAttrs.usCodePage = 850;
fontAttrs.fsType = FATTR_TYPE_MBCS;
fontAttrs.fsFontUse = FATTR_FONTUSE_NOMIX;
-strcpy( fontAttrs.szFacename, font);
+// map StarSymbol to OpenSymbol
+if (strcmp( font, "StarSymbol") == 0)
+strcpy( fontAttrs.szFacename, "OpenSymbol");
+else
+strcpy( fontAttrs.szFacename, font);
rc = Ft2CreateLogFont( hps, NULL, 1L, );
rc = Ft2SetCharSet( hps, 1L);
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 4fb559ec8a0a..b8eff6393c16 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -546,8 +546,13 @@ namespace cairocanvas
CAIRO_FONT_SLANT_NORMAL :
CAIRO_FONT_SLANT_ITALIC);
cairo_font_weight_t weight = (rOutDev.GetFont().GetWeight() ==
WEIGHT_NORMAL ?
CAIRO_FONT_WEIGHT_NORMAL :
CAIRO_FONT_WEIGHT_BOLD);
-cairo_select_font_face( pSCairo.get(), aFontName,
-slant, weight);
+// map StarSymbol to OpenSymbol
+if (aFontName.equals("StarSymbol"))
+cairo_select_font_face( pSCairo.get(), "OpenSymbol",
+slant, weight);
+else
+cairo_select_font_face( pSCairo.get(), aFontName,
+slant, weight);
#endif
if (font_face)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - canvas/Library_cairocanvas.mk canvas/source scp2/source vcl/os2
canvas/Library_cairocanvas.mk |7
canvas/source/cairo/cairo_cairo.cxx|4
canvas/source/cairo/cairo_canvas.cxx |4
canvas/source/cairo/cairo_canvasbitmap.cxx |5
canvas/source/cairo/cairo_os2_cairo.cxx| 348 +
canvas/source/cairo/cairo_os2_cairo.hxx| 62 +
canvas/source/cairo/cairo_textlayout.cxx | 34 ++
scp2/source/canvas/cairocanvas.scp |2
vcl/os2/source/gdi/salvd.cxx |7
9 files changed, 469 insertions(+), 4 deletions(-)
New commits:
commit 72e77eb1bf361865f05ba4664406381cbc24af31
Author: Yuri Dario <yda...@apache.org>
Date: Fri Mar 2 15:50:41 2018 +
#i127723# add cairo graphics support also on OS/2.
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 5d2c09e48dfc..3715db898003 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -87,6 +87,13 @@ $(eval $(call gb_Library_add_linked_libs,cairocanvas,\
user32 \
))
+else ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+ canvas/source/cairo/cairo_os2_cairo \
+))
+$(eval $(call gb_Library_add_libs,cairocanvas,\
+-lft2lib \
+))
else
ifeq ($(OS),MACOSX)
diff --git a/canvas/source/cairo/cairo_cairo.cxx
b/canvas/source/cairo/cairo_cairo.cxx
index 9e65da700f05..d86fb1f03cbc 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -33,6 +33,10 @@
# include
#endif
+#ifdef OS2
+# include
+#endif
+
#include
#include
diff --git a/canvas/source/cairo/cairo_canvas.cxx
b/canvas/source/cairo/cairo_canvas.cxx
index cdbec4c73af5..a6361eed4e76 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -49,6 +49,10 @@
# include
#endif
+#ifdef OS2
+# include
+#endif
+
#include
#include "cairo_canvas.hxx"
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 02200d0a6583..068e82cdb488 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -37,6 +37,7 @@
#elif defined CAIRO_HAS_WIN32_SURFACE
# include "cairo_win32_cairo.hxx"
# include
+#elif defined OS2
#else
# error Native API needed.
#endif
@@ -179,6 +180,8 @@ namespace cairocanvas
aRV = uno::Any( args );
// caller frees the bitmap
+#elif defined CAIRO_HAS_OS2_SURFACE
+OSL_TRACE( "CanvasBitmap::getFastPropertyValue case 1");
#else
# error Please define fast prop retrieval for your platform!
#endif
@@ -248,6 +251,8 @@ namespace cairocanvas
aRV = uno::Any( args );
// caller frees the bitmap
+#elif defined CAIRO_HAS_OS2_SURFACE
+OSL_TRACE( "CanvasBitmap::getFastPropertyValue case 2");
#else
# error Please define fast prop retrieval for your platform!
#endif
diff --git a/canvas/source/cairo/cairo_os2_cairo.cxx
b/canvas/source/cairo/cairo_os2_cairo.cxx
new file mode 100644
index ..788b51e3897f
--- /dev/null
+++ b/canvas/source/cairo/cairo_os2_cairo.cxx
@@ -0,0 +1,348 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_canvas.hxx"
+
+#ifdef OS2
+/
+ * OS/2 surface backend for Apache OpenOffice Cairo Canvas *
+ /
+
+#define INCL_WIN
+#include
+
+#include
+#include
+#include
+#include
+
+#include "cairo_os2_cairo.hxx"
+
+namespace cairo
+{
+
+#include
+
+// workaround for svpm.h definitions
+#define sal_Bool BOOL
+#define PM_FIXED FIXED
+#define LPGLYPHMETRICS void*
+#define MAT2 void
+#include
+
+bool IsCairoWorking( OutputDevice* )
+{
+// trivially true for OS/2
+return true;
+}
+
+/**
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc sal/osl solenv/gbuild solenv/inc
sal/inc/sal/main.h| 20
sal/osl/os2/salinit.cxx | 10 +-
sal/osl/os2/thread.c |6 --
solenv/gbuild/platform/os2.mk |1 +
solenv/inc/os2gcci.mk |1 +
5 files changed, 7 insertions(+), 31 deletions(-)
New commits:
commit 1e98fcbdb657980a5af9370972789c9be71794dc
Author: Yuri Dario <yda...@apache.org>
Date: Thu Dec 28 15:35:35 2017 +
#i126518# OS/2 link with system libcx0 to use new exception and memory
mapping handling.
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 8180d11e640b..0f2ca84ae920 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -33,26 +33,6 @@ extern "C" {
void SAL_CALL sal_detail_initialize(int argc, char ** argv);
void SAL_CALL sal_detail_deinitialize();
-#ifdef SAL_OS2
-#include
-
-#define INCL_DOSPROCESS
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSMODULEMGR
-#include
-#define INCL_LOADEXCEPTQ
-#include
-
-#include
-
-#define sal_detail_initialize(a,b) \
-EXCEPTIONREGISTRATIONRECORD exRegRec = {0}; \
-LoadExceptq(, NULL, NULL); \
-osl_setCommandArgs(argc, argv);
-#define sal_detail_deinitialize() \
-UninstallExceptq();
-#endif // SAL_OS2
-
#define SAL_MAIN_WITH_ARGS_IMPL \
int SAL_CALL main(int argc, char ** argv) \
{ \
diff --git a/sal/osl/os2/salinit.cxx b/sal/osl/os2/salinit.cxx
index ebafddba0171..511acbcc35ec 100644
--- a/sal/osl/os2/salinit.cxx
+++ b/sal/osl/os2/salinit.cxx
@@ -19,8 +19,11 @@
*
*/
-#include
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+#include "osl/process.h"
+#include "sal/main.h"
#include "sal/types.h"
#ifdef __cplusplus
@@ -32,14 +35,11 @@ extern "C" {
// replaced by macros in sal/main.h
void SAL_CALL sal_detail_initialize(int argc, char ** argv)
{
-printf("Dead code\n");
-exit(1);
+osl_setCommandArgs(argc, argv);
}
void SAL_CALL sal_detail_deinitialize()
{
-printf("Dead code\n");
-exit(1);
}
#ifdef __cplusplus
diff --git a/sal/osl/os2/thread.c b/sal/osl/os2/thread.c
index d89d19fb3add..0789df653ff1 100644
--- a/sal/osl/os2/thread.c
+++ b/sal/osl/os2/thread.c
@@ -34,8 +34,6 @@
#define INCL_DOSEXCEPTIONS
#define INCL_DOSMODULEMGR
#include
-#define INCL_LOADEXCEPTQ
-#include
/*
Thread-data structure hidden behind oslThread:
@@ -100,8 +98,6 @@ static void oslWorkerWrapperFunction(void* pData)
{
BOOL rc;
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)pData;
-EXCEPTIONREGISTRATIONRECORD exRegRec = {0};
-LoadExceptq(, NULL, NULL);
#if OSL_DEBUG_LEVEL>0
printf("oslWorkerWrapperFunction pThreadImpl %x, pThreadImpl->m_ThreadId
%d\n", pThreadImpl, pThreadImpl->m_ThreadId);
@@ -132,8 +128,6 @@ printf("pThreadImpl->m_ThreadId %d, about to terminate
hab\n", pThreadImpl->m_Th
#if OSL_DEBUG_LEVEL>0
printf("pThreadImpl->m_ThreadId %d, WinTerminate rc=%d (should be 1)\n",
pThreadImpl->m_ThreadId, rc);
-UninstallExceptq();
-
#endif
}
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index edc4d14f5402..706e443702a7 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -130,6 +130,7 @@ gb_LinkTarget_LDFLAGS := \
-Zhigh-mem \
-Zlinker "DISABLE 1121" \
-Zmap \
+ -lcx \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst
\,/,$(ILIB) \
$(subst -L../lib , ,$(SOLARLIB)) \
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index 0c078a414e61..b27b863e0fdf 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -187,6 +187,7 @@ LINK*=gcc
LINKFLAGS= -Zbin-files -Zmap
#27/01/06 bin-files confuses transex/rsc work, removed.
LINKFLAGS= -Zno-fork -Zhigh-mem -Zmap
+LINKFLAGS+=-lcx
.IF "$(OS2_ARGS_WILD)" != ""
LINKFLAGS+=-Zargs-wild -Zargs-resp
.ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.cmd dtrans/Library_sysdtrans_os2.mk embeddedobj/Library_emboleobj.mk RepositoryExternal.mk RepositoryFixes.mk scp2/source set
RepositoryExternal.mk |2 ++ RepositoryFixes.mk| 28 configure.cmd |1 + dtrans/Library_sysdtrans_os2.mk | 14 +++--- embeddedobj/Library_emboleobj.mk |5 - scp2/source/ooo/file_library_ooo.scp | 10 +- set_soenv.in |2 +- slideshow/Library_slideshow.mk| 16 +--- solenv/inc/libs.mk|2 +- vcl/Library_vcl.mk|2 +- xmlsecurity/source/xmlsec/nss/makefile.mk |2 +- 11 files changed, 48 insertions(+), 36 deletions(-) New commits: commit a94441cb5b5147804fc7f1e7487e6b1c24920188 Author: Yuri Dario <yda...@apache.org> Date: Thu Dec 14 14:35:59 2017 + #i126518# OS/2 build with system expat. diff --git a/configure.cmd b/configure.cmd index 91201fe85cc3..f5eabe900356 100755 --- a/configure.cmd +++ b/configure.cmd @@ -39,6 +39,7 @@ SET CFG_OPT=%CFG_OPT% --with-system-apr --with-system-apr-util --with-system-ser SET CFG_OPT=%CFG_OPT% --enable-bundled-dictionaries --enable-category-b --with-system-nss SET CFG_OPT=%CFG_OPT% --disable-unit-tests SET CFG_OPT=%CFG_OPT% --disable-online-update +SET CFG_OPT=%CFG_OPT% --with-system-expat SET CFG_OPT=%CFG_OPT% --with-lang="de es fr it nl ru" sh ./configure %CFG_OPT% | tee configure.log commit 612633c96398a91795331b248625cac8dc98fd55 Author: Yuri Dario <yda...@apache.org> Date: Thu Dec 14 13:50:08 2017 + #i126518# OS/2 build system updates: use full names for slideshow and sysdtrans, remove unneeded libraries, use standard toolkit path, fix DLL short names, disable libs for coin-or. diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 40bcd9abf728..486da512f384 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -535,6 +535,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_linked_libs,$(1),CoinMP) ifneq ($(OS),WNT) +ifneq ($(OS),OS2) $(call gb_LinkTarget_add_linked_libs,$(1),\ CoinUtils \ Clp \ @@ -545,6 +546,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ CbcSolver \ ) endif +endif endef endif # SYSTEM_COINMP diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 3b2295e133cc..09fc2044c10f 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -188,7 +188,7 @@ gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES)) @@ -207,15 +207,35 @@ gb_Library_FILENAMES := $(patsubst stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES)) gb_Library_DLLFILENAMES := $(patsubst sw:sw%,sw:swoo%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst hatchwindowfactory:hatchwindowfactory.uno%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst fsstorage:fsstorage%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst hatchwindowfactory:hatchwindowfactory%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst msforms:msforms.uno%,msforms:msforms%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst passwordcontainer:passwordcontainer.uno%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst passwordcontainer:passwordcontainer%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst productregistration:productregistration.uno%,productregistration:productr%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst textconversiondlgs:textconversiondlgs%,textconversiondlgs:txcnvdlg%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst vbahelper:vbahelper%,vbahelper:vbahelp%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - redland/raptor redland/rasqal redland/redland solenv/gbuild
redland/raptor/makefile.mk | 13 ++---
redland/raptor/raptor-1.4.18.patch.os2 | 11 ---
redland/raptor/raptor2-2.0.15.patch.os2 | 15 ++
redland/rasqal/makefile.mk | 13 +
redland/rasqal/rasqal-0.9.16.patch.os2 |5 ---
redland/redland/makefile.mk | 12 +---
redland/redland/redland-1.0.17.patch.os2 | 44 +++
redland/redland/redland-1.0.8.patch.os2 | 12
solenv/gbuild/BuildDirs.mk |5 +++
solenv/gbuild/Output.mk | 14 -
10 files changed, 101 insertions(+), 43 deletions(-)
New commits:
commit 21dad5bff119504c4a389c925951ba9593a730ea
Author: Yuri Dario <yda...@apache.org>
Date: Thu Dec 14 09:48:54 2017 +
#i126518# OS/2 environment vars are uppercase, breaks gnu make rules.
Ignore escape sequence.
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index eb0a91aa99fb..db8e459ec130 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -32,6 +32,11 @@ ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard
$(gb_LOCALBUILDDIR)/SetupLocal.mk)),
include $(gb_LOCALBUILDDIR)/SetupLocal.mk
endif
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_REPOS = $(GB_REPOS)
+endif
+
ifeq ($(strip $(gb_REPOS)),)
gb_REPOS := $(SOLARSRC)
endif
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 8db587733c55..62acd486201c 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -49,8 +49,18 @@ define gb_Output_warn
$(warning $(NEWLINE)[ WARN $(2) ] !!!$(NEWLINE)[ WARN $(2) ] !!!
$(1)$(NEWLINE)[ WARN $(2) ] !!!)
endef
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+# env variables names are uppercase only
+ifeq ($(OS),OS2)
+gb_COLOR = $(GB_COLOR)
+gb_TITLES = $(GB_TITLES)
+endif
+
+# disable for OS/2
+ifneq ($(OS),OS2)
+gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+endif
+
# only enable colorized output if
# - gb_COLOR is set
commit e7141775b1bc46f65f7d60291d4f326ebecab608
Author: Yuri Dario <yda...@apache.org>
Date: Thu Dec 14 09:39:35 2017 +
#i126518# build redland using autotools chain also on OS/2.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index ed221e7d5ea5..a9b42427181f 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -54,10 +54,14 @@ PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="OS2"
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)/src
-ADDITIONAL_FILES+=src/windows.h
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
+CONFIGURE_DIR=
+CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure
+# do not enable grddl parser (#i93768#)
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb
--without-sqlite --without-mysql --without-postgresql --without-threestore
--with-regex-library=posix --with-decimal=none --with-www=xml
--prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB)
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
@@ -149,7 +153,8 @@ OUT2BIN+=src$/.libs$/*.dll
# if we use dmake, this is done automagically
.ENDIF
.ELIF "$(GUI)"=="OS2"
-# if we use dmake, this is done automagically
+OUT2LIB+=src$/.libs$/*.a
+OUT2BIN+=src$/.libs$/*.dll
.ELSE
OUT2LIB+=src$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor2.so
.ENDIF
diff --git a/redland/raptor/raptor-1.4.18.patch.os2
b/redland/raptor/raptor-1.4.18.patch.os2
deleted file mode 100644
index c424810674b4..
--- a/redland/raptor/raptor-1.4.18.patch.os2
+++ /dev/null
@@ -1,11 +0,0 @@
misc/raptor-1.4.18/src/windos.hThu Nov 6 15:25:51 2008
-+++ misc/build/raptor-1.4.18/src/windows.h Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,7 @@
--dummy
-+#define BOOL
-+#define APIENTRY
-+#define HANDLE int
-+#define DWORD int
-+#define LPVOID void*
-+#define TRUE 1
-+#define FALSE 0
diff --git a/redland/raptor/raptor2-2.0.15.patch.os2
b/redland/raptor/raptor2-2.0.15.patch.os2
new file mode 100644
index ..27dc716c6e26
--- /dev/null
+++ b/redland/raptor/raptor2-2.0.15.patch.os2
@@ -0,0 +1,15 @@
+--- misc/raptor2-2.0.15/docs/version.xml 2014-11-02 07:24:32.0
+0100
misc/build/raptor2-2.0.15/docs/version.xml 2016-12-03 16:22:28.0
+0100
+@@ -1 +1 @@
+-2.0.15
++2.0.15
+--- misc/raptor2-2.0.15/src/sort_r.h 2014-10-10 01:00:44.0 +0200
misc/build/raptor2-2.0.15/src/s
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.cmd
configure.cmd | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) New commits: commit b350a9c5ba78b5c8354ce68074e5c22bec1b76dd Author: Yuri Dario <yda...@apache.org> Date: Sat Dec 2 13:16:33 2017 + #i127524# disable building and distribution of automatic online updater on OS/2. diff --git a/configure.cmd b/configure.cmd index 416442b93c69..91201fe85cc3 100755 --- a/configure.cmd +++ b/configure.cmd @@ -38,6 +38,7 @@ SET CFG_OPT=%CFG_OPT% --with-ant-home=%MY_ANT_HOME% --without-junit SET CFG_OPT=%CFG_OPT% --with-system-apr --with-system-apr-util --with-system-serf SET CFG_OPT=%CFG_OPT% --enable-bundled-dictionaries --enable-category-b --with-system-nss SET CFG_OPT=%CFG_OPT% --disable-unit-tests +SET CFG_OPT=%CFG_OPT% --disable-online-update SET CFG_OPT=%CFG_OPT% --with-lang="de es fr it nl ru" sh ./configure %CFG_OPT% | tee configure.log commit 1c118421c135a001cbf196e513b187ce5d350f0c Author: Yuri Dario <yda...@apache.org> Date: Sat Dec 2 13:14:51 2017 + #i126518# rework list of build options for OS/2 configure. diff --git a/configure.cmd b/configure.cmd index 192166c9b55c..416442b93c69 100755 --- a/configure.cmd +++ b/configure.cmd @@ -20,12 +20,29 @@ rem under the License. rem rem * setlocal -SET JAVA_HOME=d:\os2\java160 -SET MY_ANT_HOME=d:/os2/java160/apache-ant-1.7.0 +SET JAVA_HOME=e:\os2\java160 +SET MY_ANT_HOME=e:/os2/java160/apache-ant-1.7.0 SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin; set config_shell=sh set perl_sh_dir=%UNIXROOT%/usr/bin -sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit --with-system-apr --with-system-apr-util --with-system-serf --with-system-nss --enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl ru" | tee configure.log +SET CFG_OPT= +SET CFG_OPT=%CFG_OPT% --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg +SET CFG_OPT=%CFG_OPT% --without-stlport --with-system-icu --with-system-curl +SET CFG_OPT=%CFG_OPT% --with-system-python --with-system-openssl --with-system-libxml +SET CFG_OPT=%CFG_OPT% --with-system-libxslt --disable-werror +SET CFG_OPT=%CFG_OPT% --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs +SET CFG_OPT=%CFG_OPT% --disable-gtk --with-java=yes --disable-gcjaot --without-fonts +SET CFG_OPT=%CFG_OPT% --with-ant-home=%MY_ANT_HOME% --without-junit +SET CFG_OPT=%CFG_OPT% --with-system-apr --with-system-apr-util --with-system-serf +SET CFG_OPT=%CFG_OPT% --enable-bundled-dictionaries --enable-category-b --with-system-nss +SET CFG_OPT=%CFG_OPT% --disable-unit-tests +SET CFG_OPT=%CFG_OPT% --with-lang="de es fr it nl ru" + +sh ./configure %CFG_OPT% | tee configure.log + +REM auto* breaks PATH for perl, workaround +perl set_soenv + endlocal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - configure.cmd libxmlsec/makefile.mk libxmlsec/xmlsec1-os2.patch scp2/source xmlsecurity/prj xmlsecurity/source xmlsecurity/util
configure.cmd|2 libxmlsec/makefile.mk|6 + libxmlsec/xmlsec1-os2.patch | 94 +++ scp2/source/ooo/file_library_ooo.scp | 14 ++- xmlsecurity/prj/d.lst|2 xmlsecurity/source/xmlsec/nss/makefile.mk|3 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |5 - xmlsecurity/util/makefile.mk |3 8 files changed, 124 insertions(+), 5 deletions(-) New commits: commit 22505eea37e7b470219f3a4e7d277ae1effd1d6d Author: Yuri Dario yda...@apache.org Date: Fri Nov 28 14:02:37 2014 + #i125592# enable NSS modules also on OS/2 port. diff --git a/configure.cmd b/configure.cmd index d43cc93..89ffec8 100755 --- a/configure.cmd +++ b/configure.cmd @@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin; set config_shell=sh set perl_sh_dir=%UNIXROOT%/usr/bin -sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit --with-system-apr --with-system-apr-util --with-system-serf --enable-bundled-dictionaries --enable-category-b --disable-nss-module --with-lang=de es fr it nl ru | tee configure.log +sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit --with-system-apr --with-system-apr-util --with-system-serf --enable-bundled-dictionaries --enable-category-b --with-lang=de es fr it nl ru | tee configure.log endlocal diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 37c280b..9050ff9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -63,6 +63,9 @@ PATCH_FILES=\ xmlsec1-mingw32.patch \ xmlsec1-mingw-keymgr-mscrypto.patch +.IF $(GUI)==OS2 +PATCH_FILES+=xmlsec1-os2.patch +.ENDIF ADDITIONAL_FILES= \ include$/xmlsec$/mscrypto$/akmngr.h \ @@ -175,6 +178,9 @@ OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll src$/msc OUT2LIB+=win32$/binaries$/*.lib OUT2BIN+=win32$/binaries$/*.dll .ENDIF +.ELIF $(OS)==OS2 +OUT2LIB+=src$/.libs$/xmlsec1.lib src$/nss$/.libs$/xmlsec1-nss.lib +OUT2BIN+=src$/xmlsec1.dll src$/nss$/xmlsec1n.dll .ELSE OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a .ENDIF diff --git a/libxmlsec/xmlsec1-os2.patch b/libxmlsec/xmlsec1-os2.patch new file mode 100644 index 000..9703bc3 --- /dev/null +++ b/libxmlsec/xmlsec1-os2.patch @@ -0,0 +1,94 @@ +--- misc/xmlsec1-1.2.14/src/Makefile.in2009-12-05 22:19:34.0 +0100 misc/build/xmlsec1-1.2.14/src/Makefile.in 2014-11-26 22:02:00.0 +0100 +@@ -12,6 +12,11 @@ + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. ++ ++OS2_LA_NAME=xmlsec1 ++OS2_DLL_NAME=xmlsec1 ++OS2_DLL_OBJ=$(libxmlsec1_la_OBJECTS:%.lo=%.o) ++OS2_DLL_LIBS=-lxml2 -lz -lm -lurpo -lmmap -lpthread $(LIBS) + + @SET_MAKE@ + +@@ -736,7 +741,7 @@ + done + check-am: all-am + check: check-recursive +-all-am: Makefile $(LTLIBRARIES) ++all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll + installdirs: installdirs-recursive + installdirs-am: + for dir in $(DESTDIR)$(libdir); do \ +@@ -861,3 +866,13 @@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la ++ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a ++ echo LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE $(OS2_DLL_NAME).def ++ echo DATA MULTIPLE $(OS2_DLL_NAME).def ++ echo EXPORTS $(OS2_DLL_NAME).def ++ emxexp $(OS2_DLL_OBJ) $(OS2_DLL_NAME).def ++ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) ++ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def ++ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def +--- misc/xmlsec1-1.2.14/src/nss/Makefile.in2014-11-26 22:02:36.0 +0100 misc/build/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26 22:02:28.0 +0100 +@@ -12,6 +12,11 @@ + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin solenv/inc
solenv/bin/modules/installer/globals.pm |2 +-
solenv/bin/modules/installer/parameter.pm | 10 +-
solenv/bin/modules/pre2par/parameter.pm |9 +
solenv/inc/libs.mk|5 -
4 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 13fcc38291a3d30d4610492e527e2f30c906e30a
Author: Yuri Dario yda...@apache.org
Date: Tue Sep 9 15:35:43 2014 +
#i118923# OS/2 port, use forward slashes for paths in installer scripts.
diff --git a/solenv/bin/modules/pre2par/parameter.pm
b/solenv/bin/modules/pre2par/parameter.pm
index 92fe984..adae8e8 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -152,6 +152,15 @@ sub make_path_absolute
}
}
+if ( $pre2par::globals::isos2 )
+{
+if (!($$pathref =~ /^\s*\w\:/)) # this is a relative os2 path
+{
+$$pathref = cwd() . $pre2par::globals::separator . $$pathref;
+$$pathref =~ s/\\/\//g;
+}
+}
+
$$pathref =~ s/\Q$pre2par::globals::separator\E\s*$//; # removing ending
slashes
}
commit 0eda64e2bb03cda98844ffcf16bfc0215d9b706f
Author: Yuri Dario yda...@apache.org
Date: Tue Sep 9 15:34:20 2014 +
#i118923# OS/2 port, use forward slashes for paths in installer scripts.
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index e55bfcd..a3b2851 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -499,7 +499,7 @@ BEGIN
$checksumfile = so_checksum;
$unopkgfile = unopkg.bin;
$separator = /;
-$pathseparator = \:;
+$pathseparator = \;;
$libextension = \.dll;
$isunix = 0;
$iswin = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 122abf5..526866c 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -246,8 +246,15 @@ sub make_path_absolute
if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path
(no dos drive)
{
$$pathref = cwd() . $installer::globals::separator . $$pathref;
+if ( $installer::globals::isos2 )
+{
+$$pathref =~ s/\\/\//g;
+}
+else
+{
+$$pathref =~ s/\//\\/g;
+}
-$$pathref =~ s/\//\\/g;
}
}
}
@@ -376,6 +383,7 @@ sub setglobalvariables
{
$installer::globals::unpackpath = cwd();
if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~
s/\//\\/g; }
+if ( $installer::globals::isos2 ) { $installer::globals::unpackpath =~
s/\\/\//g; }
}
if ( $installer::globals::localunpackdir ne ) {
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
commit c2063d3da2916dc0f6f81b81232ce9d6407d697d
Author: Yuri Dario yda...@apache.org
Date: Tue Sep 9 15:27:00 2014 +
#i125501# build fixes for enabling Category B also in OS/2 port.
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index d8d70a9..361d9ce 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -326,6 +326,8 @@ UDMLIB=-ludm
ULINGULIB=-lulingu
.IF $(SYSTEM_HUNSPELL) == YES
HUNSPELLLIB=$(HUNSPELL_LIBS)
+.ELIF $(GUI) == OS2
+HUNSPELLLIB=-lhunspell
.ELSE
HUNSPELLLIB=-lhunspell-1.3
.ENDIF
@@ -333,11 +335,12 @@ HUNSPELLLIB=-lhunspell-1.3
MYTHESLIB=$(MYTHES_LIBS)
.ELIF $(GUI) == OS2
MYTHESLIB=-lmythes
+COINMPLIBS=-lCoinMP
.ELSE
MYTHESLIB=-lmythes-1.2
+COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
.ENDIF
PYUNOLIB=-lpyuno
-COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
INTERNAL_APR_LIBS=-lapr-1
INTERNAL_APR_UTIL_LIBS=-laprutil-1
INTERNAL_SERF_LIBS=-lserf-1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/source scp2/source
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk |6 +- lingucomponent/source/spellcheck/spell/makefile.mk |4 scp2/source/calc/makefile.mk |2 +- scp2/source/ooo/file_library_ooo.scp |8 4 files changed, 18 insertions(+), 2 deletions(-) New commits: commit 252a23821c46bc6f80996213b2cc48d8f96dbe6e Author: Yuri Dario yda...@apache.org Date: Thu Aug 28 11:34:52 2014 + #i125501# build fixes for enabling Category B also in OS/2 port. diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk index d37cfac9..67f9a44 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk @@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE .IF $(GUI)==OS2 -HNJLIB=hyphen.lib +HNJLIB=-lhyphen .ELIF $(GUI)==UNX || $(COM)==GCC HNJLIB=-lhyphen .ELSE @@ -54,7 +54,11 @@ SLOFILES=\ $(SLO)$/hreg.obj\ $(SLO)$/hyphenimp.obj +.IF $(GUI) == OS2 +REALNAME:=hyphen_u +.ELSE REALNAME:=hyphen.uno +.ENDIF SHL1TARGET= $(REALNAME)$(DLLPOSTFIX) SHL1STDLIBS= \ diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk index 049733b..24baa45 100644 --- a/lingucomponent/source/spellcheck/spell/makefile.mk +++ b/lingucomponent/source/spellcheck/spell/makefile.mk @@ -51,7 +51,11 @@ SLOFILES=\ $(SLO)$/sreg.obj\ $(SLO)$/sspellimp.obj +.IF $(GUI) == OS2 +REALNAME:=$(TARGET) +.ELSE REALNAME:=$(TARGET).uno +.ENDIF SHL1TARGET= $(REALNAME)$(DLLPOSTFIX) SHL1STDLIBS= \ diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk index 780cc65..72a50ec 100644 --- a/scp2/source/calc/makefile.mk +++ b/scp2/source/calc/makefile.mk @@ -36,7 +36,7 @@ TARGETTYPE=CUI .IF $(ENABLE_COINMP) == YES SCPDEFS+=-DENABLE_COINMP .IF $(SYSTEM_COINMP) == NO -.IF $(GUI)!=WNT +.IF $(GUI)!=WNT $(GUI)!=OS2 # For the non-Windows platforms all libraries related to CoinMP have to be # added explicitly. SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a80f767..44ceca1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1384,7 +1384,11 @@ End File gid_File_Lib_Spell TXT_FILE_BODY; Styles = (PACKED); +#ifdef OS2 +Name = LIBNAME(spell); +#else Name = LIBNAME(spell.uno); +#endif Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1535,7 +1539,11 @@ End File gid_File_Lib_Hyph TXT_FILE_BODY; Styles = (PACKED); +#ifdef OS2 +Name = LIBNAME(hyphen_u); +#else Name = LIBNAME(hyphen.uno); +#endif Dir = SCP2_OOO_BIN_DIR; End #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2
vcl/os2/source/gdi/salprn.cxx | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
New commits:
commit 034ca8fdc5b4c90aa3047682c06187cfc6757a29
Author: Yuri Dario yda...@apache.org
Date: Sun Feb 23 16:44:37 2014 +
#i124294# use rAppName to fill pszComment field when opening the printer
device.
diff --git a/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index b98694e..a71bf0a 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.cxx
@@ -1671,25 +1671,9 @@ sal_Bool Os2SalPrinter::StartJob( const XubString*
pFileName,
lType = OD_QUEUED;
}
-#if 0 // YD FIXME
-// Set comment (AppName nur bis zum 1. Space-Zeichen nehmen)
-const xub_Unicode* pComment = rAppName;
-USHORT nCommentLen = 0;
-memset( maCommentBuf, 0, sizeof( maCommentBuf ) );
-while ( (nCommentLen 32)
-(((*pComment = 'a') (*pComment = 'z')) ||
- ((*pComment = 'A') (*pComment = 'Z')) ||
- ((*pComment = '0') (*pComment = '9')) ||
- (*pComment == '-')))
-{
-maCommentBuf[nCommentLen] = (char)(*pComment);
-nCommentLen++;
-pComment++;
-}
-aDevOpenStruc.pszComment = (PSZ)maCommentBuf;
-#endif
-ByteString jobName( rJobName, gsl_getSystemTextEncoding());
-aDevOpenStruc.pszComment = (PSZ)jobName.GetBuffer();
+// Set comment using application name
+ByteString appName( rAppName, gsl_getSystemTextEncoding());
+aDevOpenStruc.pszComment = (PSZ)appName.GetBuffer();
// Kopien
if ( nCopies 1 )
@@ -1740,6 +1724,7 @@ sal_Bool Os2SalPrinter::StartJob( const XubString*
pFileName,
#endif
// JobName ermitteln und Job starten
+ByteString jobName( rJobName, gsl_getSystemTextEncoding());
PSZ pszJobName = NULL;
int nJobNameLen = 0;
if ( jobName.Len() 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl
sal/osl/os2/module.c | 187 +++
1 file changed, 100 insertions(+), 87 deletions(-)
New commits:
commit 48eb121f9925583304f59cee2a1f217257f970d5
Author: Yuri Dario yda...@apache.org
Date: Sat Feb 22 15:17:20 2014 +
#i118923# OS/2 port, ignore ENOENT errors on dlopen() failure.
diff --git a/sal/osl/os2/module.c b/sal/osl/os2/module.c
index efd6719..ee6dd26 100644
--- a/sal/osl/os2/module.c
+++ b/sal/osl/os2/module.c
@@ -73,7 +73,6 @@ oslModule SAL_CALL osl_loadAsciiModule(const sal_Char
*pszModuleName, sal_Int32
char buffer[PATH_MAX];
char* dot;
void* hModule;
-oslModule pModule = NULL;
if (!pszModuleName)
return NULL;
@@ -102,25 +101,32 @@ oslModule SAL_CALL osl_loadAsciiModule(const sal_Char
*pszModuleName, sal_Int32
hModule = dlopen( buffer, RTLD_LOCAL);
if (hModule != NULL)
-pModule = (oslModule)hModule;
-else
-{
-sal_Char szError[ PATH_MAX*2 ];
-sprintf( szError, Module: %s;\n error: %s;\n\n
- Please contact technical support and report above
informations.\n\n,
- buffer, dlerror() );
+return (oslModule)hModule;
+
+// do not show in case rc=2 ENOENT, we must parse dlerror
+// string to detect it
+char* err = dlerror();
+if (!err)
+return NULL;
+
+if (strstr( err, rc=2) != NULL)
+return NULL;
+
+sal_Char szError[ PATH_MAX*2 ];
+sprintf( szError, Module: %s;\n error: %s;\n\n
+ Please contact technical support and report above
informations.\n\n,
+ buffer, err);
#if OSL_DEBUG_LEVEL0
-debug_printf(osl_loadModule error %s, szError);
+debug_printf(osl_loadModule error %s, szError);
#endif
#if (OSL_DEBUG_LEVEL==0) || !defined(OSL_DEBUG_LEVEL)
-WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
- szError, Critical error: DosLoadModule failed,
- 0, MB_ERROR | MB_OK | MB_MOVEABLE);
+WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
+ szError, Critical error: DosLoadModule failed,
+ 0, MB_ERROR | MB_OK | MB_MOVEABLE);
#endif
-}
-return pModule;
+return NULL;
}
/*/
commit 28f97ab153a3226a5206a53937849bcc287682da
Author: Yuri Dario yda...@apache.org
Date: Sat Feb 22 14:29:08 2014 +
#i118923# OS/2 port, report correct error string in case of dlopen()
failure, rewrote code to use more dl* functions.
diff --git a/sal/osl/os2/module.c b/sal/osl/os2/module.c
index d383db8..efd6719 100644
--- a/sal/osl/os2/module.c
+++ b/sal/osl/os2/module.c
@@ -22,8 +22,6 @@
-#include system.h
-
#include osl/module.h
#include osl/diagnose.h
#include osl/file.h
@@ -32,105 +30,96 @@
#include stdlib.h
#include dlfcn.h
-int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
+#include system.h
-// static data for holding SAL dll module and full path
-static HMODULE hModSal;
-static char szSalDir[ _MAX_PATH];
-static char szSalDrive[ _MAX_PATH];
+/* implemented in file.cxx */
+int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32);
/*/
/* osl_loadModule */
/*/
-ULONG APIENTRY _DosLoadModule (PSZ pszObject, ULONG uObjectLen, PCSZ pszModule,
-PHMODULE phmod)
-{
-APIRET rc;
-rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
-// YD 22/05/06 issue again if first call fails (why?)
-if (rc == ERROR_INVALID_PARAMETER)
-rc = DosLoadModule( pszObject, uObjectLen, pszModule, phmod);
-return rc;
-}
-
-oslModule SAL_CALL osl_loadAsciiModule( const sal_Char* pModuleName, sal_Int32
nRtldMode )
-{
-rtl_uString* pUniName = NULL;
-rtl_uString_newFromAscii( pUniName, pModuleName );
-oslModule aModule = osl_loadModule( pUniName, nRtldMode );
-rtl_uString_release( pUniName );
-return aModule;
-}
-
oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32
nRtldMode)
{
-HMODULE hModule;
-BYTE szErrorMessage[256];
-APIRET rc;
oslModule pModule=0;
rtl_uString* ustrTmp = NULL;
OSL_ENSURE(ustrModuleName,osl_loadModule : string is not valid);
/* ensure ustrTmp hold valid string */
-if( osl_File_E_None != osl_getSystemPathFromFileURL( ustrModuleName,
ustrTmp ) )
-rtl_uString_assign( ustrTmp, ustrModuleName );
+if (osl_File_E_None != osl_getSystemPathFromFileURL(ustrModuleName,
ustrTmp))
+rtl_uString_assign(ustrTmp, ustrModuleName);
-if( ustrTmp )
+if (ustrTmp)
{
char buffer[PATH_MAX];
-if( UnicodeToText( buffer, PATH_MAX, ustrTmp-buffer, ustrTmp-length
) )
-{
-char drive[_MAX_DRIVE], dir[_MAX_DIR];
-char fname[_MAX_FNAME], ext
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav/SerfCallbacks.hxx|2 +-
ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx|2 +-
ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx |2 +-
ucb/source/ucp/webdav/SerfRequestProcessor.hxx |2 +-
ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx |2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit d280756b12cf30112901633f827d6509ce00c7f2
Author: Yuri Dario yda...@apache.org
Date: Mon Feb 17 16:32:25 2014 +
Resolves: #i123744# use only one way to include serf headers
(cherry picked from commit bc34afebf4562ad3a8c48484f3fb9841ab4809b0)
Change-Id: I0ef0d1a8b35ed6eb30db3d116bb102a911006ca0
diff --git a/ucb/source/ucp/webdav/SerfCallbacks.hxx
b/ucb/source/ucp/webdav/SerfCallbacks.hxx
index af3be03..78b0d06 100644
--- a/ucb/source/ucp/webdav/SerfCallbacks.hxx
+++ b/ucb/source/ucp/webdav/SerfCallbacks.hxx
@@ -21,7 +21,7 @@
#ifndef INCLUDED_CALLBACKS_HXX
#define INCLUDED_CALLBACKS_HXX
-#include serf.h
+#include serf/serf.h
extern C apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
serf_bucket_t **read_bkt,
diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
index 1bc2098..f098b80 100644
--- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
@@ -19,7 +19,7 @@
#include SerfCopyReqProcImpl.hxx
-#include serf.h
+#include serf/serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
index 9287408..893c407 100644
--- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
@@ -19,7 +19,7 @@
#include SerfDeleteReqProcImpl.hxx
-#include serf.h
+#include serf/serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
index 07c6725..b7b2105 100644
--- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
@@ -19,7 +19,7 @@
#include SerfMkColReqProcImpl.hxx
-#include serf.h
+#include serf/serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
index b0cb2cc..4518fcd 100644
--- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
@@ -19,7 +19,7 @@
#include SerfMoveReqProcImpl.hxx
-#include serf.h
+#include serf/serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 86e2f36..5bf1ce9 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -19,7 +19,7 @@
#include SerfPostReqProcImpl.hxx
-#include serf.h
+#include serf/serf.h
using namespace com::sun::star;
diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
index 78b454a..e3617f9 100644
--- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
@@ -21,7 +21,7 @@
#include SerfPutReqProcImpl.hxx
-#include serf.h
+#include serf/serf.h
namespace http_dav_ucp
{
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
index 9addb34..d1bfe97 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
@@ -24,7 +24,7 @@
#include apr_errno.h
#include apr_pools.h
-#include serf.h
+#include serf/serf.h
#include DAVTypes.hxx
#include DAVResource.hxx
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
index cea80bd..1c15621 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
#define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
-#include serf.h
+#include serf/serf.h
#include sal/types.h
#include DAVRequestEnvironment.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - boost/boost-os2.patch boost/makefile.mk framework/source sd/source svtools/source svx/source sw/inc sw/source ucb/source
boost/boost-os2.patch | 22 ++ boost/makefile.mk |3 framework/source/layoutmanager/layoutmanager.cxx |3 sd/source/ui/func/fuinsert.cxx |8 ++ svtools/source/misc/langtab.src|2 svx/source/svdraw/svdedtv.cxx | 21 ++ sw/inc/docsh.hxx |6 - sw/inc/swwait.hxx | 19 - sw/source/core/doc/docdesc.cxx |2 sw/source/core/edit/autofmt.cxx|2 sw/source/core/edit/edtab.cxx |4 - sw/source/core/frmedt/fetab.cxx|4 - sw/source/core/layout/layact.cxx |2 sw/source/core/view/viewsh.cxx | 26 +++ sw/source/ui/app/appenv.cxx|2 sw/source/ui/app/applab.cxx|2 sw/source/ui/app/docsh.cxx |8 +- sw/source/ui/app/docsh2.cxx| 24 ++- sw/source/ui/app/docshini.cxx |4 - sw/source/ui/app/swwait.cxx| 69 + sw/source/ui/dbui/dbinsdlg.cxx |4 - sw/source/ui/dbui/dbmgr.cxx|2 sw/source/ui/dialog/docstdlg.cxx |2 sw/source/ui/dochdl/swdtflvr.cxx | 11 +-- sw/source/ui/envelp/envlop1.cxx|2 sw/source/ui/index/toxmgr.cxx |2 sw/source/ui/lingu/hyp.cxx |2 sw/source/ui/misc/glossary.cxx |4 - sw/source/ui/misc/redlndlg.cxx | 10 +-- sw/source/ui/misc/srtdlg.cxx |2 sw/source/ui/shells/annotsh.cxx|2 sw/source/ui/shells/basesh.cxx |4 - sw/source/ui/shells/drawsh.cxx |2 sw/source/ui/shells/drwtxtex.cxx |2 sw/source/ui/shells/frmsh.cxx |2 sw/source/ui/shells/grfsh.cxx |2 sw/source/ui/shells/textsh1.cxx|2 sw/source/ui/uiview/view2.cxx |6 - sw/source/ui/uiview/viewling.cxx |2 sw/source/ui/uiview/viewsrch.cxx | 10 +-- ucb/source/ucp/webdav/SerfCallbacks.hxx|2 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx|2 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx |2 ucb/source/ucp/webdav/SerfRequestProcessor.hxx |2 ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx |2 49 files changed, 199 insertions(+), 127 deletions(-) New commits: commit 60f06b770338e6c4f9da8e9d9322f969a2742bd0 Author: Yuri Dario yda...@apache.org Date: Mon Feb 17 18:08:12 2014 + #i123817# restored OS/2 boost patches. diff --git a/boost/boost-os2.patch b/boost/boost-os2.patch new file mode 100644 index 000..2c23a87 --- /dev/null +++ b/boost/boost-os2.patch @@ -0,0 +1,22 @@ +--- misc/boost_1_55_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.0 +0200 misc/build/boost_1_55_0/boost/tr1/detail/config.hpp2013-07-04 12:49:12.0 +0200 +@@ -9,6 +9,7 @@ + #include cstddef + + #if (defined(__GNUC__) !(defined(linux) || defined(__linux) || defined(__linux__))) \ ++!defined(__OS2__) \ +|| (!defined(_AIX) defined(__IBMCPP__) (__IBMCPP__ = 800)) +// Disable use of #include_next on Linux as typically we are installed in a +// directory that is searched *after* the std lib include path. +--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.0 +0200 misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp2013-07-04 12:50:44.0 +0200 +@@ -107,7 +107,7 @@ + #endif + + # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) !defined(__ICC) \ +- (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) ++ (defined(__OS2__) || defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) + // Disable use of #include_next on Linux as typically we are installed in a directory that is searched + // *after* the std lib include path: + #define BOOST_TR1_DISABLE_INCLUDE_NEXT +Binary files misc/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf differ diff --git a/boost/makefile.mk b/boost/makefile.mk index a63ed37..141de16 100644 --- a/boost/makefile.mk +++ b
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/app/svapp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c8dbca600bcb32f2d9888e1a15f7d415ac5526d
Author: Yuri Dario yda...@apache.org
Date: Sat Feb 15 12:26:49 2014 +
#i107914# also OS/2 is a non-Windows platform, fix build break.
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 3d4f1bf..e8eb02f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2060,8 +2060,8 @@ sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool
rCancelled )
{
sal_Bool bRet = true;
-// Disable Java bridge on UNIX
-#if defined UNX
+// Disable Java bridge on UNIX and OS/2
+#ifndef WNT
(void) bShowCancel; // unsued
(void) rCancelled; // unused
#else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/osl sal/rtl scp2/source solenv/bin
sal/osl/w32/signal.cxx | 11 ++-
sal/rtl/source/alloc_arena.c | 15 +---
scp2/source/ooo/registryitem_ooo.scp | 72 ---
solenv/bin/modules/installer/windows/registry.pm | 11 ---
4 files changed, 11 insertions(+), 98 deletions(-)
New commits:
commit 883e5a34129cae10e063ed9adce431af4f3f1519
Author: Yuri Dario yda...@apache.org
Date: Mon Nov 25 15:00:24 2013 +
i118923 - OS/2 port: use libc memory allocator to reduce fragmentation.
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c
index 790220d..571926c 100644
--- a/sal/rtl/source/alloc_arena.c
+++ b/sal/rtl/source/alloc_arena.c
@@ -1212,16 +1212,9 @@ SAL_CALL rtl_machdep_alloc (
#elif defined(SAL_W32)
addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE);
#elif defined(SAL_OS2)
-{
-APIRET rc;
-addr = 0;
-// Use DosAlloc* to get a 4KB page aligned address.
-rc = DosAllocMem( addr, size, PAG_COMMIT | PAG_READ | PAG_WRITE |
OBJ_ANY);
-if (rc) {
-fprintf( stderr, sal3::DosAllocMem failed rc=%d\n, rc);
-addr = 0;
-}
-}
+/* Use valloc() to use libc 16MB chunks when allocating high memory, to
reduce
+ virtual address fragmentation. */
+addr = valloc( size);
#endif /* (SAL_UNX || SAL_W32 || SAL_OS2) */
if (addr != MAP_FAILED)
@@ -1256,7 +1249,7 @@ SAL_CALL rtl_machdep_free (
#elif defined(SAL_W32)
(void) VirtualFree ((LPVOID)(pAddr), (SIZE_T)(0), MEM_RELEASE);
#elif defined(SAL_OS2)
-(void) DosFreeMem( pAddr);
+free(pAddr);
#endif /* (SAL_UNX || SAL_W32) */
}
commit 2a0a1e41bcca97caaf3fdfb375f5cebb330a0fcc
Author: Herbert Dürr h...@apache.org
Date: Mon Nov 25 14:38:26 2013 +
#i123747# ignore single step and breakpoint SEH events
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 5e3c3ec..57031ce 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -429,11 +429,12 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32
UserSignal, void* UserData)
void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs)
{
const char* pSEHName = NULL;
-switch( nSEHCode) {
+switch( nSEHCode)
+{
case EXCEPTION_ACCESS_VIOLATION: pSEHName = SEH Exception:
ACCESS VIOLATION; break;
case EXCEPTION_DATATYPE_MISALIGNMENT:pSEHName = SEH Exception:
DATATYPE MISALIGNMENT; break;
-// case EXCEPTION_BREAKPOINT: pSEHName = SEH Exception:
BREAKPOINT; break;
-// case EXCEPTION_SINGLE_STEP: pSEHName = SEH Exception:
SINGLE STEP; break;
+case EXCEPTION_BREAKPOINT: /*pSEHName = SEH Exception:
BREAKPOINT;*/ break;
+case EXCEPTION_SINGLE_STEP: /*pSEHName = SEH Exception:
SINGLE STEP;*/ break;
case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:pSEHName = SEH Exception:
ARRAY BOUNDS EXCEEDED; break;
case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = SEH Exception:
DENORMAL FLOAT OPERAND; break;
case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = SEH Exception:
FLOAT DIVIDE_BY_ZERO; break;
@@ -455,7 +456,9 @@ void win_seh_translator( unsigned nSEHCode,
_EXCEPTION_POINTERS* pExcPtrs)
// case EXCEPTION_POSSIBLE_DEADLOCK:pSEHName = SEH Exception:
POSSIBLE DEADLOCK; break;
default: pSEHName = Unknown SEH
Exception; break;
}
-throw std::runtime_error( pSEHName);
+
+if( pSEHName)
+throw std::runtime_error( pSEHName);
}
sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )
commit 31693b557864139a32e5297423c1245ac5002e7c
Author: Andre Fischer a...@apache.org
Date: Mon Nov 25 14:32:18 2013 +
123729: Removed support for unused scp style LAYERE_REGISTRY and last uses
(already commented out).
diff --git a/scp2/source/ooo/registryitem_ooo.scp
b/scp2/source/ooo/registryitem_ooo.scp
index b36c6b9..67c2a49 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -325,78 +325,6 @@ RegistryItem
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
Styles = (ALWAYS_REQUIRED);
End
-//RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE;
-// ModuleID = gid_Module_Root;
-// Name = BASISINSTALLLOCATION;
-// Value = [INSTALLLOCATION]Basis\\;
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE;
-// ModuleID = gid_Module_Root;
-// Name = BASISINSTALLLOCATION
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/inc sal/rtl
sal/inc/sal/main.h |2 +
sal/rtl/source/alloc_cache.c | 75 ---
2 files changed, 73 insertions(+), 4 deletions(-)
New commits:
commit b3173c16043dd8469f3f94939a32ad1697cd7550
Author: Yuri Dario yda...@apache.org
Date: Fri Nov 8 10:22:55 2013 +
i123001 - force destructor to be called before libc calls DosExit().
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index 390955f..dccbb20 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -39,6 +39,10 @@
#ifdef OS2
#undef OSL_TRACE
#define OSL_TRACE 1 ? ((void)0) : _OSL_GLOBAL osl_trace
+
+#define INCL_DOS
+#include os2.h
+
#endif
/* = *
@@ -55,9 +59,12 @@ struct rtl_cache_list_st
rtl_memory_lock_type m_lock;
rtl_cache_type m_cache_head;
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
pthread_tm_update_thread;
pthread_cond_t m_update_cond;
+#elif defined(SAL_OS2)
+TID m_update_thread;
+HEV m_update_cond;
#elif defined(SAL_W32)
HANDLE m_update_thread;
HANDLE m_update_cond;
@@ -1376,7 +1383,7 @@ rtl_cache_wsupdate_fini (void);
/* = */
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
#include sys/time.h
@@ -1431,6 +1438,62 @@ rtl_cache_wsupdate_fini (void)
/* = */
+#elif defined(SAL_OS2)
+
+static void
+rtl_cache_wsupdate_all (void * arg);
+
+static void rtl_cache_fini (void);
+
+static void
+rtl_cache_wsupdate_init (void)
+{
+ULONG ulThreadId;
+APIRET rc;
+
+RTL_MEMORY_LOCK_ACQUIRE((g_cache_list.m_lock));
+g_cache_list.m_update_done = 0;
+
+// we use atexit() because this allows CRT exit to process handler before
+// threads are killed. Otherwise with __attribute__(destructor) this
+// function is called when DosExit starts processing DLL destruction
+// which happens after ALL threads have been killed...
+atexit( rtl_cache_fini);
+
+//g_cache_list.m_update_cond = CreateEvent (0, TRUE, FALSE, 0);
+/* Warp3 FP29 or Warp4 FP4 or better required */
+rc = DosCreateEventSem( NULL, g_cache_list.m_update_cond, 0x0800, 0);
+
+g_cache_list.m_update_thread = (ULONG) _beginthread(
rtl_cache_wsupdate_all, NULL,
+65*1024, (void*) 10);
+RTL_MEMORY_LOCK_RELEASE((g_cache_list.m_lock));
+}
+
+static void
+rtl_cache_wsupdate_wait (unsigned int seconds)
+{
+APIRET rc;
+if (seconds 0)
+{
+RTL_MEMORY_LOCK_RELEASE((g_cache_list.m_lock));
+rc = DosWaitEventSem(g_cache_list.m_update_cond, seconds*1000);
+RTL_MEMORY_LOCK_ACQUIRE((g_cache_list.m_lock));
+}
+}
+
+static void
+rtl_cache_wsupdate_fini (void)
+{
+APIRET rc;
+RTL_MEMORY_LOCK_ACQUIRE((g_cache_list.m_lock));
+g_cache_list.m_update_done = 1;
+rc = DosPostEventSem(g_cache_list.m_update_cond);
+RTL_MEMORY_LOCK_RELEASE((g_cache_list.m_lock));
+rc = DosWaitThread(g_cache_list.m_update_thread, DCWW_WAIT);
+}
+
+/* = */
+
#elif defined(SAL_W32)
static DWORD WINAPI
@@ -1542,8 +1605,10 @@ rtl_cache_wsupdate (
/** rtl_cache_wsupdate_all()
*
*/
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
static void *
+#elif defined(SAL_OS2)
+static void
#elif defined(SAL_W32)
static DWORD WINAPI
#endif /* SAL_UNX || SAL_W32 */
@@ -1570,7 +1635,9 @@ rtl_cache_wsupdate_all (void * arg)
}
RTL_MEMORY_LOCK_RELEASE((g_cache_list.m_lock));
+#if !defined(SAL_OS2)
return (0);
+#endif
}
/* = *
@@ -1699,7 +1766,7 @@ rtl_cache_init (void)
Delegated the call to rtl_cache_fini() into a dummy C++ object,
see alloc_fini.cxx .
*/
-#if defined(__GNUC__) !defined(MACOSX)
+#if defined(__GNUC__) !defined(MACOSX) !defined(SAL_OS2)
static void rtl_cache_fini (void) __attribute__((destructor));
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#pragma fini(rtl_cache_fini)
commit fbf79fc9db3ca426ed4b98fd3251742159f24b1b
Author: Yuri Dario yda...@apache.org
Date: Fri Nov 8 10:22:35 2013 +
i123001 - force destructor to be called before libc calls DosExit().
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 51ceea5..9051b68 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -43,6 +43,8 @@ void SAL_CALL sal_detail_deinitialize();
#define INCL_LOADEXCEPTQ
#include exceptq.h
+#include osl/process.h
+
#define sal_detail_initialize(a,b) \
EXCEPTIONREGISTRATIONRECORD exRegRec = {0}; \
LoadExceptq(exRegRec, NULL, NULL); \
___
Libreoffice-commits mailing list
libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/os2 set_soenv.in solenv/gbuild solenv/inc tools/source vcl/os2
desktop/os2/source/applauncher/launcher.cxx | 16
set_soenv.in|7 +++
solenv/gbuild/platform/os2.mk |6 +-
solenv/inc/os2gcci.mk |4 ++--
tools/source/generic/toolsin.cxx|2 +-
vcl/os2/source/gdi/salgdi3.cxx |2 +-
6 files changed, 16 insertions(+), 21 deletions(-)
New commits:
commit 051d1cb209bfe64b2f32400d88898c8ee2cde213
Author: Yuri Dario yda...@apache.org
Date: Sun Oct 27 11:04:32 2013 +
i118923 - OS/2 port: remove three layer LIBPATH layout.
diff --git a/desktop/os2/source/applauncher/launcher.cxx
b/desktop/os2/source/applauncher/launcher.cxx
index 3a41ed1..bb3fe02 100644
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.cxx
@@ -42,12 +42,7 @@ int main( int argc, char* argv[])
erridErrorCode = WinGetLastError(hab);
// Calculate application name
-CHARszLibpath[_MAX_PATH*2];
CHARszApplicationName[_MAX_PATH];
-CHARszDrive[_MAX_PATH];
-CHARszDir[_MAX_PATH];
-CHARszFileName[_MAX_PATH];
-CHARszExt[_MAX_PATH];
// get executable fullpath
DosGetInfoBlocks(NULL, pib);
@@ -55,15 +50,13 @@ int main( int argc, char* argv[])
// adjust libpath
#if OSL_DEBUG_LEVEL 0
+CHARszLibpath[_MAX_PATH*2];
rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
fprintf( stderr, 1 BeginLibPath: %s\n, szLibpath);
#endif
-_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
-char* basedir = strstr( szDir, \\PROGRAM\\);
+char* basedir = strrchr( szApplicationName, '\\');
if (basedir) *basedir = 0;
- sprintf( szLibpath,
\%s%s\\URE\\BIN\;\%s%s\\BASIS\\PROGRAM\;%%BeginLIBPATH%%;,
- szDrive, szDir, szDrive, szDir);
-DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
+DosSetExtLIBPATH( (PCSZ)szApplicationName, BEGIN_LIBPATH);
// make sure we load DLL from our path only, so multiple instances/versions
// can be loaded.
@@ -75,8 +68,7 @@ int main( int argc, char* argv[])
#endif
// adjust exe name
-_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
-_makepath( szApplicationName, szDrive, szDir, OFFICE_IMAGE_NAME, (.bin)
);
+strcat( szApplicationName, \\ OFFICE_IMAGE_NAME .bin);
// copy command line parameters
int i, len;
commit ed2aea97b8244dc57b3a699882ef4a6fef2600ab
Author: Yuri Dario yda...@apache.org
Date: Sun Oct 27 10:33:57 2013 +
i118923 - OS/2 port: build system updates.
diff --git a/set_soenv.in b/set_soenv.in
index ef96c7d..a0a351d 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -991,6 +991,12 @@ $PERL_PATH= dirname('@PERL@'); # Perl Path
$XLIB = PathFormat('@XLIB@'); # X11 libraries
$XINC = PathFormat('@XINC@'); # X11 includes
+# YD disable autodetection, use PATH
+if ( $platform =~ m/os2/ )
+{
+ $PERL = 'perl';
+ $PERL_PATH = '';
+}
# Mac OS X/Darwin only variables.
if ( $platform =~ m/darwin/ )
@@ -2080,6 +2086,7 @@ if ( $platform =~ m/os2/ )
ToFile( LS,ls.exe, e );
ToFile( GNUCOPY, cp.exe, e );
ToFile( TOUCH, touch,e );
+ ToFile( CONFIG_SITE, /@unixroot/usr/share/config.site, e );
}
# $perlpre is only used for the following three variables
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 565f511..692f98a 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -87,10 +87,6 @@ gb_CFLAGS := \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/os2
-
-# -fvisibility=hidden \
-#
-
gb_CXXFLAGS := \
-Zomf \
-Wall \
@@ -108,7 +104,7 @@ gb_CXXFLAGS := \
gb_STDLIBS = \
z \
- stdc++ \
+ stdc++
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
gb_CFLAGS_WERROR := -Werror
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index 28d7453..1c400c6 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -259,8 +259,8 @@ STDLIBGUIST=$(STDLIBCPP)
STDSHLGUIMT=$(STDLIBCPP)
STDSHLCUIMT=$(STDLIBCPP)
-LIBSTLPORT=stlp45.lib $(DYNAMIC)
-LIBSTLPORTST=stlp45.lib $(STATIC) $(DYNAMIC)
+LIBSTLPORT=$(DYNAMIC)
+LIBSTLPORTST=$(STATIC) $(DYNAMIC)
# name of library manager
diff --git a/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx
index 0f8ba2d..632db62 100644
--- a/tools/source/generic/toolsin.cxx
+++ b/tools/source/generic/toolsin.cxx
@@ -31,7 +31,7 @@
#include tools/debug.hxx
#include toolsin.hxx
-#if defined WNT || defined OS2
+#if defined WNT
#include dll.hxx
#endif
diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx
index e9152bd..8e06945 100644
--- a/vcl/os2/source/gdi/salgdi3.cxx
+++ b/vcl/os2/source/gdi/salgdi3.cxx
@@ -837,7 +837,7 @@ USHORT Os2SalGraphics::SetFont( ImplFontSelectData
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/os2
vcl/os2/source/gdi/salprn.cxx | 136 +-
1 file changed, 94 insertions(+), 42 deletions(-)
New commits:
commit 950dbaff38ff81ea3ddf5157e83c7391774f34ab
Author: Yuri Dario yda...@apache.org
Date: Sat Aug 10 09:41:32 2013 +
i122990 - implemented missing InitPaperFormats and GetLandscapeAngle
methods.
diff --git a/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index 6294579..b98694e 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.cxx
@@ -57,32 +57,8 @@
#include print.h
#include jobset.h
-/*
-#include com/sun/star/ui/dialogs/TemplateDescription.hpp
-#include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
-#include com/sun/star/ui/dialogs/XFilePicker.hpp
-#include com/sun/star/ui/dialogs/XFilterManager.hpp
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-#include com/sun/star/lang/XInitialization.hpp
-#include comphelper/processfactory.hxx
-*/
-
#include malloc.h
-/*
-#define _SV_SALPRN_CXX
-#include tools/debug.hxx
-#include saldata.hxx
-#include salinst.h
-#include salgdi.h
-#include salframe.h
-#include vcl/salptype.hxx
-#include salprn.h
-#include vcl/print.h
-#include vcl/jobset.h
-
-*/
-
#ifndef __H_FT2LIB
#include os2/wingdi.h
#include ft2lib.h
@@ -583,11 +559,15 @@ static void ImplFreeFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter )
static void ImplGetFormAndTrayList( Os2SalInfoPrinter* pOs2SalInfoPrinter,
const ImplJobSetup* pSetupData )
{
+// if not defined, suppose default orientation is portrait
+Orientation orientation = ORIENTATION_PORTRAIT;
+
ImplFreeFormAndTrayList( pOs2SalInfoPrinter );
LONG alQuery[] =
{
0, 0, // First two members of QUERYSIZE
+DJP_SJ_ORIENTATION, DJP_CURRENT,
DJP_CJ_FORM,DJP_ALL,
DJP_CJ_TRAYNAME,DJP_ALL,
DJP_NONE, DJP_NONE// EOL marker
@@ -638,7 +618,18 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter, const
PQUERYTUPLE pTuple = pQuerySize-aTuples;
while ( DJP_NONE != pTuple-ulProperty )
{
-if ( pDJP-ulProperty == DJP_CJ_FORM )
+if ( pDJP-ulProperty == DJP_SJ_ORIENTATION )
+{
+if ( pDJP-ulNumReturned )
+{
+PDJPT_ORIENTATION pElm = DJP_ELEMENTP( *pDJP,
DJPT_ORIENTATION );
+if ( (DJP_ORI_PORTRAIT == *pElm) || (DJP_ORI_REV_PORTRAIT
== *pElm) )
+orientation = ORIENTATION_PORTRAIT;
+else
+orientation = ORIENTATION_LANDSCAPE;
+}
+}
+else if ( pDJP-ulProperty == DJP_CJ_FORM )
{
if ( pDJP-ulNumReturned )
{
@@ -649,11 +640,20 @@ static void ImplGetFormAndTrayList( Os2SalInfoPrinter*
pOs2SalInfoPrinter, const
for( int i = 0; i pDJP-ulNumReturned; i++, pElm++ )
{
ImplFormInfo* pInfo = new ImplFormInfo;
-pInfo-mnPaperWidth = pElm-hcInfo.cx;
-pInfo-mnPaperHeight= pElm-hcInfo.cy;
+// AOO expects form size always in portrait mode
+if (orientation == ORIENTATION_PORTRAIT)
+{
+pInfo-mnPaperWidth = pElm-hcInfo.cx;
+pInfo-mnPaperHeight= pElm-hcInfo.cy;
+}
+else
+{
+pInfo-mnPaperWidth = pElm-hcInfo.cy;
+pInfo-mnPaperHeight= pElm-hcInfo.cx;
+}
#if OSL_DEBUG_LEVEL0
-printf(ImplGetFormAndTrayList mnPaperWidth %d\n,
pInfo-mnPaperWidth);
-printf(ImplGetFormAndTrayList mnPaperHeight %d\n,
pInfo-mnPaperHeight);
+debug_printf(ImplGetFormAndTrayList #%d: %d x %d,
+ i, pInfo-mnPaperWidth,
pInfo-mnPaperHeight);
#endif
pInfo-mnId = pElm-djppsFormID;
pOs2SalInfoPrinter-mpFormArray[i] = pInfo;
@@ -865,6 +865,9 @@ static sal_Bool ImplSetOrientation( HDC hPrinterDC,
PDRIVDATA pDriverData,
DJP_SJ_ORIENTATION, DJP_CURRENT,
DJP_NONE, DJP_NONE// EOL marker
};
+#if OSL_DEBUG_LEVEL0
+debug_printf( ImplSetOrientation mhDC %x, %d, hPrinterDC, eOrientation);
+#endif
APIRET rc;
PQUERYSIZE pQuerySize = (PQUERYSIZE)alQuery;
@@ -1164,6 +1167,7 @@ Os2SalInfoPrinter::Os2SalInfoPrinter()
mpFormArray = NULL;
mnTrayCount = 0;
mpTrayArray = NULL;
+m_bPapersInit = FALSE;
}
// ---
@@ -1181,6 +1185,42
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - boost/boost-os2.patch boost/makefile.mk
boost/boost-os2.patch | 22 ++ boost/makefile.mk |3 +++ 2 files changed, 25 insertions(+) New commits: commit 74b5b7cd1a42e08a1195c3e225d2a224a7102d3a Author: Yuri Dario yda...@apache.org Date: Sat Jul 6 07:45:59 2013 + i122692 i118923 - OS/2 port: boost build fixes. diff --git a/boost/boost-os2.patch b/boost/boost-os2.patch new file mode 100644 index 000..ccba8b0 --- /dev/null +++ b/boost/boost-os2.patch @@ -0,0 +1,22 @@ +--- misc/boost_1_48_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.0 +0200 misc/build/boost_1_48_0/boost/tr1/detail/config.hpp2013-07-04 12:49:12.0 +0200 +@@ -9,6 +9,7 @@ + #include cstddef + + #if (defined(__GNUC__) !(defined(linux) || defined(__linux) || defined(__linux__))) \ ++!defined(__OS2__) \ +|| (!defined(_AIX) defined(__IBMCPP__) (__IBMCPP__ = 800)) +// Disable use of #include_next on Linux as typically we are installed in a +// directory that is searched *after* the std lib include path. +--- misc/boost_1_48_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.0 +0200 misc/build/boost_1_48_0/boost/tr1/detail/config_all.hpp2013-07-04 12:50:44.0 +0200 +@@ -107,7 +107,7 @@ + #endif + + # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) !defined(__ICC) \ +- (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) ++ (defined(__OS2__) || defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) + // Disable use of #include_next on Linux as typically we are installed in a directory that is searched + // *after* the std lib include path: + #define BOOST_TR1_DISABLE_INCLUDE_NEXT +Binary files misc/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf differ diff --git a/boost/makefile.mk b/boost/makefile.mk index 18e988d..f77f15a 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -49,6 +49,9 @@ TARFILE_MD5=d1e9a7a7f532bb031a3c175d86688d95 PATCH_FILES=\ $(TARFILE_NAME).patch \ boost_freebsd.patch +.IF $(GUI)==OS2 +PATCH_FILES+=boost-os2.patch +.ENDIF CONFIGURE_DIR= CONFIGURE_ACTION= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basctl/source scp2/source sc/util sdext/prj sdext/source
basctl/source/dlged/dlged.cxx| 15 --- sc/util/makefile.mk |2 -- scp2/source/ooo/file_library_ooo.scp |4 ++-- sdext/prj/d.lst |2 ++ sdext/source/minimizer/makefile.mk |4 sdext/source/presenter/makefile.mk |4 6 files changed, 12 insertions(+), 19 deletions(-) New commits: commit a0b26e586c25e5819ffb1eef78a5d7271d1273f5 Author: Yuri Dario yda...@apache.org Date: Mon May 20 08:29:17 2013 + i118923 - OS/2 port: cleanup of old and unusable code. diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 7c47ac3..0623039 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -1299,9 +1299,6 @@ void DlgEditor::Print( Printer* pPrinter, const String rTitle )// not worki MapMode aMap( MAP_100TH_MM ); pPrinter-SetMapMode( aMap ); Font aFont; -#ifdef OS2 -//aFont.SetName( System::GetStandardFont( STDFONT_SWISS ).GetName() ); -#endif aFont.SetAlign( ALIGN_BOTTOM ); aFont.SetSize( Size( 0, 360 )); pPrinter-SetFont( aFont ); @@ -1313,18 +1310,6 @@ void DlgEditor::Print( Printer* pPrinter, const String rTitle )// not worki lcl_PrintHeader( pPrinter, rTitle ); Bitmap aDlg; -#ifdef OS2 -Bitmap* pDlg = new Bitmap; -//pSbxForm-SnapShot( *pDlg ); -SvMemoryStream* pStrm = new SvMemoryStream; -*pStrm *pDlg; -delete pDlg; -pStrm-Seek(0); -*pStrm aDlg; -delete pStrm; -#else -//pSbxForm-SnapShot( aDlg ); -#endif Size aBmpSz( pPrinter-PixelToLogic( aDlg.GetSizePixel() ) ); double nPaperSzWidth = aPaperSz.Width(); double nPaperSzHeight = aPaperSz.Height(); commit 739aa74697c7e6bd2954d80dce5dda99c6da40e5 Author: Yuri Dario yda...@apache.org Date: Mon May 20 08:26:26 2013 + i118923 - OS/2 port: enable named exports also for os2. diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 06919ed..072fd4f 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -63,9 +63,7 @@ RESLIB1SRSFILES=\ # --- StarClac DLL SHL1TARGET= sc$(DLLPOSTFIX) -.IF $(GUI) != OS2 SHL1USE_EXPORTS=name -.ENDIF SHL1IMPLIB= sci # dynamic libraries commit f543dc75e285523c8da486d5462c1fa46ab66bb3 Author: Yuri Dario yda...@apache.org Date: Mon May 20 08:24:41 2013 + i118923 - OS/2 port: use short names for dynamic libraries. diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4b22096..759ecab 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1356,7 +1356,7 @@ File gid_File_Lib_PresentationMinimizer #ifdef UNX Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX)); #elif defined OS2 -Name = PresentationMinimizer.dll; +Name = PreMin.dll; #else Name = PresentationMinimizer.uno.dll; #endif @@ -1369,7 +1369,7 @@ File gid_File_Lib_PresenterScreen #ifdef UNX Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); #elif defined OS2 -Name = PresenterScreen.dll; +Name = PreScr.dll; #else Name = PresenterScreen.uno.dll; #endif diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst index bd865bf..7e8c587 100644 --- a/sdext/prj/d.lst +++ b/sdext/prj/d.lst @@ -25,7 +25,9 @@ mkdir: %_DEST%\xml%_EXT% ..\%__SRC%\misc\PresenterScreen.component %_DEST%\xml%_EXT%\PresenterScreen.component ..\%__SRC%\bin\PresentationMinimizer*.dll %_DEST%\bin%_EXT%\PresentationMinimizer*.dll +..\%__SRC%\bin\PreMin*.dll %_DEST%\bin%_EXT%\PreMin*.dll ..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT% ..\%__SRC%\bin\PresenterScreen*.dll %_DEST%\bin%_EXT%\PresenterScreen*.dll +..\%__SRC%\bin\PreScr*.dll %_DEST%\bin%_EXT%\PreScr*.dll ..\%__SRC%\lib\PresenterScreen*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index da8b494..8d6ff37 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -55,7 +55,11 @@ SLOFILES=\ # --- Library --- +.IF $(GUI)==OS2 +SHL1TARGET=PreMin +.ELSE SHL1TARGET= $(TARGET).uno +.ENDIF SHL1STDLIBS=\ $(CPPUHELPERLIB)\ diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index b1541c8..54c435a 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -95,7 +95,11 @@ SLOFILES=\ # --- Library --- +.IF $(GUI)==OS2 +SHL1TARGET=PreScr +.ELSE SHL1TARGET=$(TARGET).uno +.ENDIF SHL1STDLIBS= \ $(CPPUHELPERLIB) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source default_images/framework default_images/introabout odk/docs ooo_custom_images/dev ooo_custom_images/dev_nologo ooo_
connectivity/source/drivers/mysql/makefile.mk |4 connectivity/source/drivers/odbc/makefile.mk |4 default_images/framework/res/backing.png |binary default_images/framework/res/backing_hc.png|binary default_images/introabout/about.png|binary default_images/introabout/intro.png|binary odk/docs/images/sdk_head-1.png |binary ooo_custom_images/dev/introabout/intro.png |binary ooo_custom_images/dev_nologo/introabout/intro.png |binary ooo_custom_images/nologo/introabout/intro.png |binary scp2/source/ooo/file_library_ooo.scp |5 + scp2/source/sdkoo/sdkoo.scp|2 +- setup_native/source/mac/ooo/DS_Store |binary setup_native/source/mac/ooo/DS_Store_Dev |binary setup_native/source/mac/ooo/DS_Store_Langpack |binary setup_native/source/mac/ooo/osxdndinstall.png |binary setup_native/source/mac/ooo/osxdndinstall_lang.png |binary setup_native/source/mac/sdk/DS_Store_SDK |binary setup_native/source/mac/sdk/osxdndinstall_sdk.png |binary setup_native/source/win32/nsis/ooobitmap.bmp |binary 20 files changed, 14 insertions(+), 1 deletion(-) New commits: commit 94d5f922c421c4def290dbdbcc16cc842ac510f0 Author: Yuri Dario yda...@apache.org Date: Fri Feb 22 17:12:01 2013 + i118923 - OS/2 port: use short names for mysqlodbc libraries. diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index e6509b9..1664bbb 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -55,7 +55,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library --- +.IF $(GUI) == OS2 +REALNAME:=$(MYSQL_TARGET) +.ELSE REALNAME:=$(MYSQL_TARGET).uno +.ENDIF SHL1TARGET=$(REALNAME)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk index dca329e..b03859b 100644 --- a/connectivity/source/drivers/odbc/makefile.mk +++ b/connectivity/source/drivers/odbc/makefile.mk @@ -55,7 +55,11 @@ SLOFILES=\ # --- ODBC Library --- +.IF $(GUI) == OS2 +REALNAME:=$(ODBC_TARGET) +.ELSE REALNAME:=$(ODBC_TARGET).uno +.ENDIF SHL1TARGET=$(REALNAME)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 97374ee..0299e35 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1058,8 +1058,13 @@ End #endif #endif +#if defined(OS2) +STD_LIB_FILE(gid_File_Lib_Mysql,mysql) +STD_LIB_FILE(gid_File_Lib_Odbc,odbc) +#else STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno) STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno) +#endif // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) commit b2980674b683a426a019ba475276f1fa4f52aa15 Author: Jürgen Schmidt j...@apache.org Date: Fri Feb 22 15:24:18 2013 + #121388# add temporary adapted images for installer, intro, about diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png index 44b6490..0f118ba 100644 Binary files a/default_images/framework/res/backing.png and b/default_images/framework/res/backing.png differ diff --git a/default_images/framework/res/backing_hc.png b/default_images/framework/res/backing_hc.png index cff04e5..1a4b8d0 100644 Binary files a/default_images/framework/res/backing_hc.png and b/default_images/framework/res/backing_hc.png differ diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png index 12f9582..fb8f41c 100755 Binary files a/default_images/introabout/about.png and b/default_images/introabout/about.png differ diff --git a/default_images/introabout/intro.png b/default_images/introabout/intro.png index b635cc8..db31876 100755 Binary files a/default_images/introabout/intro.png and b/default_images/introabout/intro.png differ diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png index 91f65b5..3dd9b1d 100644 Binary files a/odk/docs/images/sdk_head-1.png and b/odk/docs/images/sdk_head-1.png differ diff --git a/ooo_custom_images/dev/introabout/intro.png b/ooo_custom_images/dev/introabout/intro.png index 33c8ccb..c2975f0 100755 Binary files a/ooo_custom_images/dev/introabout/intro.png and b/ooo_custom_images/dev/introabout/intro.png differ diff --git a/ooo_custom_images/dev_nologo/introabout/intro.png b/ooo_custom_images/dev_nologo/introabout/intro.png index 33c8ccb..5b5 100755 Binary files a/ooo_custom_images/dev_nologo/introabout/intro.png and b/ooo_custom_images/dev_nologo/introabout/intro.png differ diff --git a/ooo_custom_images/nologo/introabout/intro.png b/ooo_custom_images/nologo/introabout/intro.png index b635cc8..36f34bb 100755 Binary files
