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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 23169c6bc9 Re-add makefiles
23169c6bc9 is described below

commit 23169c6bc9271e8609a70b80385a7d6fcb20e682
Author: mseidel <[email protected]>
AuthorDate: Tue Feb 4 20:03:32 2025 +0100

    Re-add makefiles
---
 .../filter/detection/typeDetection/makefile.mk     | 110 +++++++++++++++++++++
 main/jurt/test/com/sun/star/lib/util/makefile.mk   |  30 ++++++
 .../test/com/sun/star/lib/uno/typedesc/makefile.mk |  29 ++++++
 .../ridljar/test/com/sun/star/lib/util/makefile.mk |  32 ++++++
 main/ridljar/test/com/sun/star/uno/makefile.mk     |  32 ++++++
 main/test/source/cpp/makefile.mk                   |  70 +++++++++++++
 .../source/java/org/openoffice/test/makefile.mk    |  51 ++++++++++
 main/testtools/qa/cli/makefile.mk                  |  76 ++++++++++++++
 8 files changed, 430 insertions(+)

diff --git a/main/filter/qa/complex/filter/detection/typeDetection/makefile.mk 
b/main/filter/qa/complex/filter/detection/typeDetection/makefile.mk
new file mode 100644
index 0000000000..77bdfdf64d
--- /dev/null
+++ b/main/filter/qa/complex/filter/detection/typeDetection/makefile.mk
@@ -0,0 +1,110 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ = ..$/..$/..$/..$/..
+PRJNAME = filter
+TARGET = TypeDetection
+PACKAGE = complex$/filter$/detection$/typeDetection
+
+# --- Settings -----------------------------------------------------
+.INCLUDE: settings.mk
+
+
+#----- compile .java files -----------------------------------------
+
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar 
OOoRunner.jar
+JAVAFILES       = TypeDetection.java Helper.java
+JAVACLASSFILES = $(foreach,i,$(JAVAFILES) 
$(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+#----- make a jar from compiled files ------------------------------
+
+MAXLINELENGTH = 100000
+
+JARCLASSDIRS    = $(PACKAGE)
+JARTARGET       = $(TARGET).jar
+JARCOMPRESS    = TRUE
+
+# --- Parameters for the test --------------------------------------
+
+# start an office if the parameter is set for the makefile
+.IF "$(OFFICE)" == ""
+CT_APPEXECCOMMAND =
+.ELSE
+CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice 
-accept=socket,host=localhost,port=8100;urp;"
+.ENDIF
+
+# test base is java complex
+CT_TESTBASE = -TestBase java_complex
+
+# test looks something like the.full.package.TestName
+CT_TEST     = -o $(PACKAGE:s\$/\.\).TypeDetection
+
+# start the runner application
+CT_APP      = org.openoffice.Runner
+
+# --- Targets ------------------------------------------------------
+
+.IF "$(depend)" == ""
+               CHMOD $(CLASSDIR)$/$(PACKAGE)$/TypeDetection.props \
+               $(CLASSDIR)$/$(PACKAGE)$/preselectedFilter.csv \
+               $(CLASSDIR)$/$(PACKAGE)$/preselectedType.csv \
+               $(CLASSDIR)$/$(PACKAGE)$/serviceName.csv \
+               $(CLASSDIR)$/$(PACKAGE)$/files.csv : ALLTAR
+.ELSE
+               CHMOD $(CLASSDIR)$/$(PACKAGE)$/TypeDetection.props \
+               $(CLASSDIR)$/$(PACKAGE)$/preselectedFilter.csv \
+               $(CLASSDIR)$/$(PACKAGE)$/preselectedType.csv \
+               $(CLASSDIR)$/$(PACKAGE)$/serviceName.csv \
+               $(CLASSDIR)$/$(PACKAGE)$/files.csv : ALLDEP
+.ENDIF
+
+.INCLUDE :  target.mk
+
+$(CLASSDIR)$/$(PACKAGE)$/preselectedFilter.csv : preselectedFilter.csv
+       cp preselectedFilter.csv $(CLASSDIR)$/$(PACKAGE)$/preselectedFilter.csv
+       jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) 
$(PACKAGE)$/preselectedFilter.csv
+
+$(CLASSDIR)$/$(PACKAGE)$/preselectedType.csv : preselectedType.csv
+       cp preselectedType.csv $(CLASSDIR)$/$(PACKAGE)$/preselectedType.csv
+       jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) 
$(PACKAGE)$/preselectedType.csv
+
+$(CLASSDIR)$/$(PACKAGE)$/serviceName.csv : serviceName.csv
+       cp serviceName.csv $(CLASSDIR)$/$(PACKAGE)$/serviceName.csv
+       jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) 
$(PACKAGE)$/serviceName.csv
+
+$(CLASSDIR)$/$(PACKAGE)$/files.csv : files.csv
+       cp files.csv $(CLASSDIR)$/$(PACKAGE)$/files.csv
+       jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/files.csv
+
+$(CLASSDIR)$/$(PACKAGE)$/TypeDetection.props : TypeDetection.props
+       cp TypeDetection.props $(CLASSDIR)$/$(PACKAGE)$/TypeDetection.props
+       jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) 
$(PACKAGE)$/TypeDetection.props
+
+# --- chmod --------------------------------------------------------
+
+CHMOD :
+       chmod 444 $(CLASSDIR)$/$(PACKAGE)$/*.csv
+       chmod 666 $(CLASSDIR)$/$(PACKAGE)$/*.props
+
+RUN: run
+
+run:
+       java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) 
$(CT_TEST)
diff --git a/main/jurt/test/com/sun/star/lib/util/makefile.mk 
b/main/jurt/test/com/sun/star/lib/util/makefile.mk
new file mode 100644
index 0000000000..f03b694df3
--- /dev/null
+++ b/main/jurt/test/com/sun/star/lib/util/makefile.mk
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ := ..$/..$/..$/..$/..$/..
+PRJNAME := jurt
+TARGET := test_com_sun_star_lib_util
+
+PACKAGE := com$/sun$/star$/lib$/util
+JAVATESTFILES := \
+       NativeLibraryLoader_Test.java
+
+.INCLUDE: javaunittest.mk
diff --git a/main/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk 
b/main/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
new file mode 100644
index 0000000000..6bb799799e
--- /dev/null
+++ b/main/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
@@ -0,0 +1,29 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ := ..$/..$/..$/..$/..$/..$/..
+PRJNAME := ridljar
+TARGET := test_com_sun_star_lib_uno_typedesc
+
+PACKAGE := com$/sun$/star$/lib$/uno$/typedesc
+JAVATESTFILES := TypeDescription_Test.java
+
+.INCLUDE: javaunittest.mk
diff --git a/main/ridljar/test/com/sun/star/lib/util/makefile.mk 
b/main/ridljar/test/com/sun/star/lib/util/makefile.mk
new file mode 100644
index 0000000000..208ef66d79
--- /dev/null
+++ b/main/ridljar/test/com/sun/star/lib/util/makefile.mk
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+
+
+PRJ := ..$/..$/..$/..$/..$/..
+PRJNAME := ridljar
+TARGET := test_com_sun_star_lib_util
+
+PACKAGE := com$/sun$/star$/lib$/util
+JAVATESTFILES := \
+    WeakMap_Test.java
+
+.INCLUDE: javaunittest.mk
diff --git a/main/ridljar/test/com/sun/star/uno/makefile.mk 
b/main/ridljar/test/com/sun/star/uno/makefile.mk
new file mode 100644
index 0000000000..8906ca3545
--- /dev/null
+++ b/main/ridljar/test/com/sun/star/uno/makefile.mk
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ := ..$/..$/..$/..$/..
+PRJNAME := ridljar
+TARGET := test_com_sun_star_uno
+
+PACKAGE := com$/sun$/star$/uno
+JAVATESTFILES := \
+       Any_Test.java \
+       Type_Test.java \
+       UnoRuntime_Test.java
+
+.INCLUDE: javaunittest.mk
diff --git a/main/test/source/cpp/makefile.mk b/main/test/source/cpp/makefile.mk
new file mode 100644
index 0000000000..9e0aa82139
--- /dev/null
+++ b/main/test/source/cpp/makefile.mk
@@ -0,0 +1,70 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ = ../..
+PRJNAME = test
+TARGET = cpp
+
+ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
+
+.INCLUDE: settings.mk
+
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+
+@all:
+.IF "$(GUI)" == "OS2"
+       @echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+       @echo "cppunit disabled. nothing do do."
+.END
+
+.ELSE
+
+CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(SYSTEM_CPPUNIT)" == "YES"
+CFLAGSCXX += -DADAPT_EXT_STL
+.END
+
+SLOFILES = \
+       $(SLO)/getargument.obj \
+       $(SLO)/gettestargument.obj \
+       $(SLO)/officeconnection.obj \
+       $(SLO)/toabsolutefileurl.obj \
+       $(SLO)/uniquepipename.obj
+
+SHL1IMPLIB = i$(SHL1TARGET)
+SHL1OBJS = $(SLOFILES)
+SHL1RPATH = NONE
+SHL1STDLIBS = \
+       $(CPPUHELPERLIB) \
+       $(CPPULIB) \
+       $(CPPUNITLIB) \
+       $(SALLIB)
+SHL1TARGET = test
+SHL1USE_EXPORTS = name
+DEF1NAME = $(SHL1TARGET)
+
+.ENDIF
+
+.INCLUDE: target.mk
diff --git a/main/test/source/java/org/openoffice/test/makefile.mk 
b/main/test/source/java/org/openoffice/test/makefile.mk
new file mode 100644
index 0000000000..08b8d1f6aa
--- /dev/null
+++ b/main/test/source/java/org/openoffice/test/makefile.mk
@@ -0,0 +1,51 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ = ../../../../..
+PRJNAME = test
+TARGET = test
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+
+PACKAGE = org/openoffice/test
+JAVAFILES = \
+       Argument.java \
+       FileHelper.java \
+       OfficeConnection.java \
+       OfficeFileUrl.java \
+       TestArgument.java
+JARFILES = juh.jar ridl.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+
+JARTARGET        = $(TARGET).jar
+JARCLASSDIRS     = $(PACKAGE)
+JARCLASSEXCLUDES = $(PACKAGE)/tools/*
+JARCLASSPATH     = $(JARFILES)
+ # expect $(OOO_JUNIT_JAR) to be on CLASSPATH wherever test.jar is used (also,
+ # on Windows, $(OOO_JUNIT_JAR) could be an absolute pathname with drive letter
+ # like X:/path and some JVMs would refuse to load test.jar if its MANIFEST.MF
+ # Class-Path contained such a pathname that looks like an unknown URL with
+ # scheme X)
+
+.END
+
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
diff --git a/main/testtools/qa/cli/makefile.mk 
b/main/testtools/qa/cli/makefile.mk
new file mode 100644
index 0000000000..3548c75df4
--- /dev/null
+++ b/main/testtools/qa/cli/makefile.mk
@@ -0,0 +1,76 @@
+#**************************************************************
+#
+#  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.
+#
+#**************************************************************
+
+PRJ := ..$/..
+PRJNAME := testtools
+TARGET := test_cli
+PACKAGE = clitest
+
+.INCLUDE: settings.mk
+
+#----- compile .java files -----------------------------------------
+
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+JAVAFILES       = CLITest.java
+JAVACLASSFILES = $(foreach,i,$(JAVAFILES) 
$(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+#----- make a jar from compiled files ------------------------------
+
+MAXLINELENGTH = 100000
+
+JARCLASSDIRS    = $(PACKAGE)
+JARTARGET       = $(TARGET).jar
+JARCOMPRESS    = TRUE
+
+ALLTAR:
+
+EXETARGET = $(BIN)$/cli_bridgetest_inprocess.exe
+EXEARG_WIN= $(BIN)$/cli_bridgetest_inprocess.ini
+
+EXEARG= $(strip $(subst,$/,/ $(EXEARG_WIN)))
+
+.IF "$(depend)" == ""
+ALL: ALLTAR
+.ELSE
+ALL: ALLDEP
+.ENDIF
+
+.INCLUDE: target.mk
+
+# --- Parameters for the test --------------------------------------
+
+# test base is java complex
+CT_TESTBASE = -TestBase java_complex
+
+# test looks something like the.full.package.TestName
+CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+
+# start the runner application
+CT_APP      = org.openoffice.Runner
+
+CT_NOOFFICE = -NoOffice
+# --- Targets ------------------------------------------------------
+
+RUN:
+.IF "$(GUI)"=="WNT"
+       java -cp $(CLASSPATH) -Dcli_test=$(EXETARGET) -Dcli_test_arg=$(EXEARG) 
$(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
+.ENDIF
+run: RUN

Reply via email to