subject:"\[Libreoffice\-commits\] core.git\: basic\/Library

[Libreoffice-commits] core.git: basic/Library_sb.mk

2023-02-22 Thread Tor Lillqvist (via logerrit)

 basic/Library_sb.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d24b80c783746041b1ab838b2038aebc0c68a470
Author: Tor Lillqvist 
AuthorDate: Wed Feb 22 14:22:15 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Feb 22 18:40:08 2023 +

Fix --disable-scripting build (for example for WASM)

Was broken by ccd0ef98f76011f108f8ea1d282b96386dba0a6a.

Change-Id: I37f3cf14e14ca32919d54f3d0cddbc042c2a7056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147463
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 28effaaae0e1..f640e366a50c 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/classes/sb \
basic/source/classes/sbunoobj \
basic/source/classes/sbxmod \
-   basic/source/comp/basiccharclass \
basic/source/comp/buffer \
basic/source/comp/codegen \
basic/source/comp/dim \
@@ -107,6 +106,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/methods \
basic/source/runtime/methods1 \
basic/source/classes/sbintern \
+   basic/source/comp/basiccharclass \
basic/source/sbx/sbxarray \
basic/source/sbx/sbxbool \
basic/source/sbx/sbxbyte \

[Libreoffice-commits] core.git: basic/Library_sb.mk

2022-04-04 Thread Jan-Marek Glogowski (via logerrit)

 basic/Library_sb.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be7d84a3fbd47bf9a078ac7e6854bc4927e84933
Author: Jan-Marek Glogowski 
AuthorDate: Mon Apr 4 15:11:10 2022 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Apr 4 21:36:10 2022 +0200

Fix --disable-scripting build (WASM)

Simply include the global transliterator in all builds.

Regression from commit de81c2545aec06a1b269218b7d00656e97d8b66c
("Related: tdf#144245 Optimize case-insensitive handling").

Change-Id: Ica1c6e5d67c8458f9977f2ff87d9594a43b4cff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132517
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 17fbcbd1010e..28effaaae0e1 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/basmgr/vbahelper \
basic/source/classes/codecompletecache \
basic/source/classes/eventatt \
-   basic/source/classes/global \
basic/source/classes/image \
basic/source/classes/propacc \
basic/source/classes/sb \
@@ -104,6 +103,7 @@ endif
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/basrdll \
+   basic/source/classes/global \
basic/source/runtime/methods \
basic/source/runtime/methods1 \
basic/source/classes/sbintern \

[Libreoffice-commits] core.git: basic/Library_sb.mk config_host.mk.in configure.ac i18npool/Library_i18npool.mk i18npool/util Makefile.gbuild postprocess/CustomTarget_components.mk postprocess/Module_

2021-12-06 Thread Jan-Marek Glogowski (via logerrit)

 Makefile.gbuild|5 +
 basic/Library_sb.mk|4 
 config_host.mk.in  |1 
 configure.ac   |   20 +++-
 i18npool/Library_i18npool.mk   |4 
 i18npool/util/i18npool.en.component|  162 +
 postprocess/CustomTarget_components.mk |   49 +
 postprocess/Module_postprocess.mk  |1 
 postprocess/Rdb_services.mk|7 +
 solenv/bin/constructors.py |   27 +
 solenv/bin/native-code.py  |9 +
 solenv/gbuild/ComponentTarget.mk   |4 
 solenv/gbuild/Library.mk   |9 +
 solenv/gbuild/Rdb.mk   |3 
 svx/Library_svx.mk |5 -
 svx/util/crashreport.component |   26 +
 svx/util/svx.component |4 
 sw/Library_sw.mk   |5 -
 sw/util/sw.component   |8 -
 sw/util/sw_mm.component|   29 +
 20 files changed, 364 insertions(+), 18 deletions(-)

New commits:
commit 1c9a40299d328c78c035ca63ccdf22c5c669a03b
Author: Jan-Marek Glogowski 
AuthorDate: Wed May 19 07:55:40 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 6 19:38:29 2021 +0100

gbuild: create services.rdb from built components

... and introduce the --enable-services-rdb-from-build option.

Currently the build handles global build options redundant
in a few places:

* in Repository*mk + modules - the "real" build dependencies
* the full services.rdb generation
* the static UNO constructor map generation

Also the component files don't reflect the really built components
and so the RDB services generation must handle the whole options
to select the correct components.

So this optionally replaces the latter two by generating the list
of components and it's constructors from the build itself. As a
consequence, component files must now be split, so they reflect
the real components in the libraries, otherwise the static
constructor list will have missing symbols. IMHO this is more
natural, as it happens in the same place already handling these
build options for the sourcecode.

This also adds a convenience helper to add multiple component
files: gb_Library_set_componentfiles

This is WIP and currently just works for the stripped WASM build,
which introduces many more split component files in later patches.

It also explicitly filters the gb_Rdb__URECOMPONENTS and the
CppunitTest related components from the services.rdb. Maybe there
is a good way to do this properly.

Change-Id: I1b38a6f2c1e5221f18d7e5e756c30263b555d962
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126185
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/Makefile.gbuild b/Makefile.gbuild
index 9e7f205e22d4..db049264f65d 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -24,6 +24,11 @@ ifneq (,$(DISABLE_DYNLOADING))
 $(if $(gb_LinkTarget__Lock),$(shell rm -f $(gb_LinkTarget__Lock)))
 endif
 
+ifeq ($(ENABLE_SERVICES_RDB_FROM_BUILD),TRUE)
+$(foreach comp,$(filter-out 
$(gb_Rdb__URECOMPONENTS),$(gb_ComponentTarget__ALLCOMPONENTS)), \
+$(eval $(call gb_Rdb_add_components,services,$(comp
+endif
+
 upload-symbols:
bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) 
"$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)"
 
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 6a27b15ed54d..6bee8df435cb 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -19,8 +19,6 @@
 
 $(eval $(call gb_Library_Library,sb))
 
-$(eval $(call gb_Library_set_componentfile,sb,basic/util/sb))
-
 $(eval $(call gb_Library_set_include,sb,\
$$(INCLUDE) \
-I$(SRCDIR)/basic/inc \
@@ -60,6 +58,8 @@ $(eval $(call gb_Library_use_libraries,sb,\
 
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
+$(eval $(call gb_Library_set_componentfile,sb,basic/util/sb))
+
 $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/basmgr/basicmanagerrepository \
basic/source/basmgr/basmgr \
diff --git a/config_host.mk.in b/config_host.mk.in
index b8778cf7e509..59546a8f02e0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -201,6 +201,7 @@ export 
ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
 export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
+export ENABLE_SERVICES_RDB_FROM_BUILD=@ENABLE_SERVICES_RDB_FROM_BUILD@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
 export ENABLE_SKIA=@ENABLE_SKIA@
 export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
diff --git a/configure.ac b/configure.ac
index b236727456f5..bb51b6f76d16 100644
---

[Libreoffice-commits] core.git: basic/Library_sb.mk basic/source

2015-12-09 Thread Stephan Bergmann

 basic/Library_sb.mk   |5 
 basic/source/classes/sbxmod.cxx   |4 
 basic/source/comp/sbcomp.cxx  |  901 --
 basic/source/inc/rtlproto.hxx |5 
 basic/source/inc/sbtrace.hxx  |   51 --
 basic/source/runtime/methods1.cxx |7 
 basic/source/runtime/stdobj.cxx   |4 
 7 files changed, 977 deletions(-)

New commits:
commit c4c059beb39079c204dc35088edd587ce58eadc3
Author: Stephan Bergmann 
Date:   Thu Dec 10 08:18:15 2015 +0100

DBG_TRACE_BASIC/PROFILING had been rotting for quite some time now

...e.g., it still used the long-gone tools String class

Change-Id: I9d1930c72fbae3208a0f3da14c6991f30d89a9bc

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index b364190..0501c5d 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -134,11 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/sbx/sbxvar \
 ))
 
-# Uncomment the following line if DBG_TRACE_PROFILING is active in 
source/inc/sbtrace.hxx
-# $(eval $(call gb_Library_use_libraries,sb,\
-   canvastools \
-))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,sb,\
oleaut32 \
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 3809d10..0730273 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1227,10 +1227,6 @@ void SbModule::Run( SbMethod* pMeth )
 ::basic::vba::lockControllersOfAllDocuments( xModel, false 
);
 ::basic::vba::enableContainerWindowsOfAllDocuments( 
xModel, true );
 }
-
-#ifdef DBG_TRACE_BASIC
-dbg_DeInitTrace();
-#endif
 }
 }
 else
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index fad8e06..602099d 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -27,907 +27,6 @@
 #include 
 #include 
 
-// To activate tracing enable in sbtrace.hxx
-#ifdef DBG_TRACE_BASIC
-
-// Trace ini file (set NULL to ignore)
-// can be overridden with the environment variable OOO_BASICTRACEINI
-static char GpTraceIniFile[] = "~/BasicTrace.ini";
-//static char*  GpTraceIniFile = NULL;
-
-// Trace Settings, used if no ini file / not found in ini file
-static char GpTraceFileNameDefault[] = "~/BasicTrace.txt";
-static char*GpTraceFileName = GpTraceFileNameDefault;
-
-// GbTraceOn:
-// true = tracing is active, false = tracing is disabled, default = true
-// Set to false initially if you want to activate tracing on demand with
-// TraceCommand( "TraceOn" ), see below
-static bool GbTraceOn = true;
-
-// GbIncludePCodes:
-// true = PCodes are written to trace, default = false, correspondents
-// with TraceCommand( "PCodeOn" / "PCodeOff" ), see below
-static bool GbIncludePCodes = false;
-
-// GbInitOnlyAtOfficeStart:
-// true = Tracing is only intialized onces after Office start when
-// Basic runs the first time. Further calls to Basic, e.g. via events
-// use the same output file. The trace ini file is not read again.
-static bool GbInitOnlyAtOfficeStart = false;
-
-static int  GnIndentPerCallLevel = 4;
-static int  GnIndentForPCode = 2;
-
-/*
-With trace enabled the runtime function TraceCommand
-can be used to influence the trace functionality
-from within the running Basic macro.
-
-Format: TraceCommand( command as String [, param as Variant] )
-
-Supported commands (command is NOT case sensitive):
-TraceCommand "TraceOn"  sets GbTraceOn = true
-TraceCommand "TraceOff" sets GbTraceOn = false
-
-TraceCommand "PCodeOn"  sets GbIncludePCodes = true
-TraceCommand "PCodeOff" sets GbIncludePCodes = false
-
-TraceCommand "Print", aVal  writes aVal into the trace file as
-long as it can be converted to string
-*/
-
-#ifdef DBG_TRACE_PROFILING
-
-#include 
-#include 
-#include 
-
-//*** Profiling ***
-// GbTimerOn:
-// true = including time stamps
-static bool GbTimerOn = true;
-
-// GbTimeStampForEachStep:
-// true = prints time stamp after each command / pcode (very slow)
-static bool GbTimeStampForEachStep = false;
-
-// GbBlockAllAfterFirstFunctionUsage:
-// true = everything (commands, pcodes, functions) is only printed
-// for the first usage (improves performance when tracing / pro-
-// filing large macros)
-static bool GbBlockAllAfterFirstFunctionUsage = false;
-
-// GbBlockStepsAfterFirstFunctionUsage:
-// true = commands / pcodes are only printed for the first time
-// a function is executed. Afterwards only the entering/leaving
-// messages are logged (improves performance when tracing / pro-
-// filing large macros)
-static bool GbBlockStepsAfterFirstFunctionUsage = false;
-
-#endif
-
-
-static void lcl_skipWhites( char*& rpc )
-{
-while( *rpc == ' ' || *rpc == '\t' )
-++rpc;
-}
-
-inline void lcl_findNextLine( char*&

[Libreoffice-commits] core.git: basic/Library_sb.mk

2014-10-24 Thread Tor Lillqvist

 basic/Library_sb.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d477b4b4a9d80eeb42cb771cc009bd03d3022d8
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Oct 24 15:17:27 2014 +0300

Need basrdll now in the disable-scripting case (iOS)

Change-Id: I01efac10784b134a6016f017c42a3fa71a514a51

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 314b999..eefe8e0 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/uno/sbmodule \
basic/source/uno/sbservices \
basic/source/uno/scriptcont \
-   basic/source/runtime/basrdll \
basic/source/runtime/comenumwrapper \
basic/source/runtime/ddectrl \
basic/source/runtime/inputbox \
@@ -109,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
+   basic/source/runtime/basrdll \
basic/source/runtime/methods \
basic/source/runtime/methods1 \
basic/source/sbx/sbxarray \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/Library_sb.mk basic/source smoketest/data

2014-03-31 Thread Stephan Bergmann

 basic/Library_sb.mk  |1 
 basic/source/classes/sbxmod.cxx  |5 -
 basic/source/inc/sbdiagnose.hxx  |   29 ---
 basic/source/runtime/rtlproto.hxx|1 
 basic/source/runtime/sbdiagnose.cxx  |  126 ---
 basic/source/runtime/stdobj.cxx  |2 
 smoketest/data/Basic/Standard/Global.xml |6 -
 7 files changed, 170 deletions(-)

New commits:
commit 0015c9807f85fd8095e5f8e922b08f98ba5a9d6c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Mar 31 11:20:57 2014 +0200

Remove unused BASIC CaptureAssertions functionality

...that had originally been introduced to catch DBG_ASSERTs during 
smoketest,
but since made effectively unused when basing DBG_ASSERT on the sal/log.hxx
functionality, and obsoleted by the ongoing clean-up of using true assert 
where
appliable.

Change-Id: I2fb4f5d0873d29595b178057f83c1404c0085575

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 7c355f7..29fdd30 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/iosys \
basic/source/runtime/props \
basic/source/runtime/runtime \
-   basic/source/runtime/sbdiagnose \
basic/source/runtime/stdobj \
basic/source/runtime/stdobj1 \
 ))
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 8cd6588..03fc555 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -26,7 +26,6 @@
 #include tools/shl.hxx
 #include basic/sbx.hxx
 #include basic/sbuno.hxx
-#include sbdiagnose.hxx
 #include sb.hxx
 #include sbjsmeth.hxx
 #include sbjsmod.hxx
@@ -1244,10 +1243,6 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
 
 GlobalRunDeInit();
 
-#ifdef DBG_UTIL
-ResetCapturedAssertions();
-#endif
-
 if( xVBACompat.is() )
 {
 // notify all VBA script listeners about the stopped script
diff --git a/basic/source/inc/sbdiagnose.hxx b/basic/source/inc/sbdiagnose.hxx
deleted file mode 100644
index d530e59..000
--- a/basic/source/inc/sbdiagnose.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#ifndef INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
-#define INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
-
-#ifdef DBG_UTIL
-voidResetCapturedAssertions();
-#endif
-
-#endif // INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/rtlproto.hxx 
b/basic/source/runtime/rtlproto.hxx
index 90e7851..18d2a66 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -360,7 +360,6 @@ extern RTLFUNC(CDateToIso);
 extern RTLFUNC(CDateFromIso);
 extern RTLFUNC(CompatibilityMode);
 extern RTLFUNC(CDec);
-extern RTLFUNC(CaptureAssertions);
 
 extern RTLFUNC(Partition); // Fong
 
diff --git a/basic/source/runtime/sbdiagnose.cxx 
b/basic/source/runtime/sbdiagnose.cxx
deleted file mode 100644
index 4598d80..000
--- a/basic/source/runtime/sbdiagnose.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */

[Libreoffice-commits] core.git: basic/Library_sb.mk

[Libreoffice-commits] core.git: basic/Library_sb.mk

[Libreoffice-commits] core.git: basic/Library_sb.mk config_host.mk.in configure.ac i18npool/Library_i18npool.mk i18npool/util Makefile.gbuild postprocess/CustomTarget_components.mk postprocess/Module_

[Libreoffice-commits] core.git: basic/Library_sb.mk basic/source

[Libreoffice-commits] core.git: basic/Library_sb.mk

[Libreoffice-commits] core.git: basic/Library_sb.mk basic/source smoketest/data

6 matches

Site Navigation

Mail list logo

Footer information