This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new bfd7831e9a Cleanup
bfd7831e9a is described below
commit bfd7831e9a68b01da2f34eb4ca8b84a04fa8419c
Author: mseidel <[email protected]>
AuthorDate: Tue Jun 24 21:59:41 2025 +0200
Cleanup
---
main/solenv/inc/settings.mk | 49 +++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 26 deletions(-)
diff --git a/main/solenv/inc/settings.mk b/main/solenv/inc/settings.mk
index 43c945c6a0..7f1e751a57 100644
--- a/main/solenv/inc/settings.mk
+++ b/main/solenv/inc/settings.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# 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
@@ -7,22 +7,21 @@
# 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.
-#
+#
#**************************************************************
-
MKFILENAME:=SETTINGS.MK
-# smaller/greater arithmetic's like ".IF 400<=200" are an OOo extension to
+# smaller/greater arithmetic's like ".IF 400<=200" are an AOO extension to
# the initial dmake 4.1PL0 (unfortunately called 4.10) version and are
# tested implicitly by the construction below.
.IF $(MAKEVERSION:s/-cvs//:s/.//)<=410
@@ -32,7 +31,7 @@ force_dmake_to_error
.INCLUDE .IGNORE : ooo_vendor.mk
-# --- common tool makros --------------------------------------
+# --- common tool macros --------------------------------------
.IF "$(USE_PCH)"!=""
ENABLE_PCH=TRUE
@@ -62,7 +61,7 @@ WRONG_SOURCEVERSION
.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
# Force creation of $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/
-# $(UPD)minor.mk could be empty as it's contents were already included from
minor.mk
+# $(UPD)minor.mk could be empty as its contents were already included from
minor.mk
.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk
.IF "$(BSCLIENT)"=="TRUE"
@@ -279,7 +278,7 @@ PROFILE=
# can be set on the command line. we shouldn't delete them!
#profile=
-# reset as setting those manually is no lonjger supported
+# reset as setting those manually is no longer supported
DBGUTIL=
dbgutil=
@@ -451,7 +450,7 @@ ENVRCLINKFLAGS*=$(envrclinkflags)
L10N-framework=$(L10N_framework)
-# --- Parameter Einstellungen ueberpruefen und umsetzen ------------
+# --- Parameter Einstellungen überpruefen und umsetzen ------------
# profile immer mit product
.IF "$(profile)"!=""
@@ -503,9 +502,7 @@ OPTIMIZE=
.ENDIF
######################################################
-#
-# sprachabh. einstellungen
-#
+# sprachabhängige Einstellungen
######################################################
.INCLUDE : lang.mk
@@ -622,7 +619,7 @@ $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk :
.INCLUDE .IGNORE : office.mk
-# Misc-Pfad
+# Misc Path
.IF "$(UNR)"!=""
MISCX=$(OUT)/umisc
MISC=$(OUT)/umisc
@@ -642,7 +639,7 @@ IDLPACKAGE=$(PRJNAME)
IDLPACKAGENAME=$(PRJNAME)
.ENDIF
-# Objekt-Pfad
+# Object Path
OBJ=$(OUT)/obj
SLO=$(OUT)/slo
ROBJ=$(ROUT)/obj
@@ -655,10 +652,10 @@ PAR=$(OUT)/par
LB=$(OUT)/lib
SLB=$(OUT)/slb
-# wir haben ein ucr verzeichnis
+# wir haben ein ucr Verzeichnis
UCR=$(OUT)/ucr
-# $(L) nur noch pfad ins solver\upd\...\lib
+# $(L) nur noch Pfad ins solver\upd\...\lib
#L:={$(LB);$(SLB);$(ILIB)}
L=$(SOLARLIBDIR)
@@ -668,8 +665,8 @@ ENVPRJ:=$(PRJ)
.EXPORT : PRJ ENVPRJ
# Class-Path for java-classes
-# obwohl der generierte Bytecode plattformunabhg. sein sollte
-# generieren wir ihn ersteinmal ins abhaengige Verzeichnis
+# obwohl der generierte Bytecode plattformunabhängig sein sollte
+# generieren wir ihn ersteinmal ins abhängige Verzeichnis
CLASSDIR=$(OUT)/class
CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH)
STARJAR=java -classpath
$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)/bin/jtools.jar
com.sun.star.tool.starjar.StarJar
@@ -689,7 +686,7 @@ CLASSPATH!:=$(CLASSPATH:s/tkt/no/)
# configuration files
PROCESSOUT*:=$(MISC)
-# Makros fuer die Librarynamen des Solar
+# Makros für die Librarynamen des Solar
.INCLUDE : libs.mk
.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
@@ -712,7 +709,7 @@ SHELLLIB=gdi32.lib shell32.lib advapi32.lib comdlg32.lib
.ENDIF
.ENDIF
-# BIN-Pfad
+# BIN Path
.IF "$(UNR)"!=""
BIN=$(OUT)/ubin
.ELSE
@@ -721,7 +718,7 @@ BIN=$(OUT)/bin
# pointing to misc in common output tree if exists
COMMONBIN=$(LOCAL_COMMON_OUT)/bin
-# Include-Pfad
+# Include Path
# still without -I here s.a. target.mk INCLUDE
INC=$(PRJ)/inc
INCPCH=$(PRJ)/inc/pch
@@ -758,7 +755,7 @@ RES=$(OUT)/res
BIN=$(PRJ)/$(OUTPATH).xl/bin
.ENDIF
-# damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
+# damit gezielt Abhängigkeiten auf s: angegeben werden können
.IF "$(common_build)"!=""
SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT)
@@ -810,7 +807,7 @@ ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
.INCLUDE .IGNORE:
$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
.INCLUDE .IGNORE:
$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-# check for localizations not hosted in l10n module. if a file exists there
+# check for localization not hosted in l10n module. if a file exists there
# it won't in l10n
.IF "$(ALT_LOCALIZATION_FOUND)"!=""
TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
@@ -996,9 +993,9 @@ RSCDEFS+= -DDEBUG
XPIDL=xpidl
XPIDL_LINK=xpt_link
-# alle bisher verwendeten Linker benutzen + um LIBs auf der naechsten Zeile
+# alle bisher verwendeten Linker benutzen + um LIBs auf der nächsten Zeile
# weiter zu schreiben, wenn es da eine Ausnahme geben sollte, muss
-# LINKEXTENDLINE compilerabhaengig definiert werden
+# LINKEXTENDLINE compilerabhängig definiert werden
LINKEXTENDLINE=+
LNT=$(DEVROOT)/lint/lint
