You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/02/19 17:16:09 UTC
[openoffice] branch AOO42X updated (3452c2f1b8 -> 334b405c86)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 3452c2f1b8 Fixed typos, small translations
new ffa2202c16 Removed whitespace, added vim modeline
new 334b405c86 Cleanup Make files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/connectivity/source/sdbcx/makefile.mk | 2 +-
main/desktop/zipintro/makefile.mk | 2 +-
main/filter/source/docbook/makefile.mk | 4 +-
main/instsetoo_native/util/makefile.mk | 8 +--
main/odk/pack/copying/makefile.mk | 2 +-
.../data/org/openoffice/Office/UI/makefile.mk | 81 +++++++++++-----------
6 files changed, 50 insertions(+), 49 deletions(-)
[openoffice] 02/02: Cleanup Make files
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 334b405c862b33abe6340b3ab7233d27e2b1f0ab
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Feb 19 18:06:21 2023 +0100
Cleanup Make files
(cherry picked from commit 41deec9fbf385ebd2ff21199e9eb3301a269d33d)
---
main/connectivity/source/sdbcx/makefile.mk | 2 +-
main/desktop/zipintro/makefile.mk | 2 +-
main/filter/source/docbook/makefile.mk | 4 ++--
main/instsetoo_native/util/makefile.mk | 8 ++++----
main/odk/pack/copying/makefile.mk | 2 +-
main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk | 3 ++-
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/main/connectivity/source/sdbcx/makefile.mk b/main/connectivity/source/sdbcx/makefile.mk
index 2f9c3891a5..3410107478 100644
--- a/main/connectivity/source/sdbcx/makefile.mk
+++ b/main/connectivity/source/sdbcx/makefile.mk
@@ -56,4 +56,4 @@ SLOFILES=\
.INCLUDE : target.mk
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/desktop/zipintro/makefile.mk b/main/desktop/zipintro/makefile.mk
index 26240a6895..b45c20ba5c 100644
--- a/main/desktop/zipintro/makefile.mk
+++ b/main/desktop/zipintro/makefile.mk
@@ -104,4 +104,4 @@ $(MISC)$/%.png : $(SOLARSRC)$/%.png
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/filter/source/docbook/makefile.mk b/main/filter/source/docbook/makefile.mk
index c317aef691..6f014bde94 100644
--- a/main/filter/source/docbook/makefile.mk
+++ b/main/filter/source/docbook/makefile.mk
@@ -40,8 +40,8 @@ $(OUT)$/bin$/sofftodocbookheadings.xsl: sofftodocbookheadings.xsl
$(COPY) sofftodocbookheadings.xsl $(OUT)$/bin$/sofftodocbookheadings.xsl
$(OUT)$/bin$/DocBookTemplate.stw: DocBookTemplate.stw
- $(COPY) DocBookTemplate.stw $(OUT)$/bin$/DocBookTemplate.stw
+ $(COPY) DocBookTemplate.stw $(OUT)$/bin$/DocBookTemplate.stw
.INCLUDE: target.mk
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/instsetoo_native/util/makefile.mk b/main/instsetoo_native/util/makefile.mk
index e03c43723f..19e17478af 100644
--- a/main/instsetoo_native/util/makefile.mk
+++ b/main/instsetoo_native/util/makefile.mk
@@ -52,7 +52,7 @@ ENABLE_DOWNLOADSETS=TRUE
.IF "$(OS)"=="LINUX"
DONT_REMOVE_PACKAGE:=TRUE
.EXPORT: DONT_REMOVE_PACKAGE
-.ENDIF # "$(OS)"=="LINUX"
+.ENDIF # "$(OS)"=="LINUX"
.INCLUDE .IGNORE: $(SRC_ROOT)$/cwsname.mk
@@ -87,13 +87,13 @@ help .PHONY :
@echo " sdkoobeta like sdkoo but with 'Beta' appended to the product name"
@echo " sdkoodev builds the developer snapshot of the SDK"
@echo " openofficebeta like openoffice but with 'Beta' appended to product name"
- @echo
+ @echo
@echo "experimental targets:"
@echo " patch-create create a patch for updating an installed office (Windows only)"
@echo " patch-apply apply a previously created patch"
@echo " patch-update-releases-xml"
@echo " patch-check check if patch can be created (part of patch-create)"
- @echo
+ @echo
@echo "Most targets (all except aoo_srcrelease and updatepack) accept suffixes"
@echo " append _<language> to build a target for one language only"
@echo " the default set of languages is alllangiso=$(alllangiso)"
@@ -596,4 +596,4 @@ $(MSISDKOOTEMPLATEDIR) $(MSISDKOOTEMPLATEDIR)$/Binary :
$(MSISDKOOTEMPLATEDIR)/% : $(MSISDKOOTEMPLATESOURCE)$/%
$(GNUCOPY) $< $@
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/odk/pack/copying/makefile.mk b/main/odk/pack/copying/makefile.mk
index c18bd2f9ae..6a3801db37 100644
--- a/main/odk/pack/copying/makefile.mk
+++ b/main/odk/pack/copying/makefile.mk
@@ -251,4 +251,4 @@ $(MYZIPTARGET) : $(BIN)/unowinreg.dll $(DESTCLASSESLIST)
cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ../../../bin/$(MYZIPTARGET:b) $(MYZIPLIST)
.ENDIF
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index 58599066d0..b3ee3e0dd4 100644
--- a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -20,6 +20,7 @@
#**************************************************************
+
PRJ=..$/..$/..$/..$/..$/..
PRJNAME=officecfg
@@ -73,4 +74,4 @@ XCUFILES= \
.INCLUDE : target.mk
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
[openoffice] 01/02: Removed whitespace, added vim modeline
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ffa2202c165ac6f5e9d0adf1fd271ff29d7f745c
Author: mseidel <ms...@unknown>
AuthorDate: Tue Feb 12 10:40:56 2019 +0000
Removed whitespace, added vim modeline
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1853426 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 599b0412829149eb0ffd746342b1cd73624509cb)
---
.../data/org/openoffice/Office/UI/makefile.mk | 80 +++++++++++-----------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index 675db31463..58599066d0 100644
--- a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.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,16 +7,16 @@
# 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.
-#
+#
#**************************************************************
@@ -26,51 +26,51 @@ PRJNAME=officecfg
TARGET=data_ooOUI
PACKAGE=org.openoffice.Office.UI
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Targets ------------------------------------------------------
-
LOCALIZEDFILES= \
- BasicIDECommands.xcu \
- BibliographyCommands.xcu \
- CalcCommands.xcu \
- ChartCommands.xcu \
- ChartWindowState.xcu \
- DbuCommands.xcu \
- BaseWindowState.xcu \
- WriterFormWindowState.xcu \
- WriterReportWindowState.xcu \
- DbQueryWindowState.xcu \
- DbTableWindowState.xcu \
- DbRelationWindowState.xcu \
- DbBrowserWindowState.xcu \
- DbTableDataWindowState.xcu \
- DrawImpressCommands.xcu \
- Effects.xcu \
- GenericCommands.xcu \
- MathCommands.xcu \
- StartModuleCommands.xcu \
- BasicIDEWindowState.xcu \
- CalcWindowState.xcu \
- DrawWindowState.xcu \
- ImpressWindowState.xcu \
- MathWindowState.xcu \
- StartModuleWindowState.xcu \
- WriterWindowState.xcu \
- XFormsWindowState.xcu \
- WriterGlobalWindowState.xcu \
- WriterWebWindowState.xcu \
- WriterCommands.xcu\
- GenericCategories.xcu\
+ BasicIDECommands.xcu \
+ BibliographyCommands.xcu \
+ CalcCommands.xcu \
+ ChartCommands.xcu \
+ ChartWindowState.xcu \
+ DbuCommands.xcu \
+ BaseWindowState.xcu \
+ WriterFormWindowState.xcu \
+ WriterReportWindowState.xcu \
+ DbQueryWindowState.xcu \
+ DbTableWindowState.xcu \
+ DbRelationWindowState.xcu \
+ DbBrowserWindowState.xcu \
+ DbTableDataWindowState.xcu \
+ DrawImpressCommands.xcu \
+ Effects.xcu \
+ GenericCommands.xcu \
+ MathCommands.xcu \
+ StartModuleCommands.xcu \
+ BasicIDEWindowState.xcu \
+ CalcWindowState.xcu \
+ DrawWindowState.xcu \
+ ImpressWindowState.xcu \
+ MathWindowState.xcu \
+ StartModuleWindowState.xcu \
+ WriterWindowState.xcu \
+ XFormsWindowState.xcu \
+ WriterGlobalWindowState.xcu \
+ WriterWebWindowState.xcu \
+ WriterCommands.xcu\
+ GenericCategories.xcu\
Sidebar.xcu
XCUFILES= \
- $(LOCALIZEDFILES) \
+ $(LOCALIZEDFILES) \
Controller.xcu \
Factories.xcu \
GlobalSettings.xcu
-.INCLUDE : target.mk
+.INCLUDE : target.mk
+# vim: set noet ts=4 sw=4: