openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1838757 [1/2] - in /openoffice/trunk/main: ./ codemaker/ codemaker/inc/ codemaker/inc/pch/ codemaker/prj/ codemaker/source/codemaker/ codemaker/source/commoncpp/ codemaker/source/commonjava/ codemaker/source/cppumaker/ codemaker/source/jav...
Date Thu, 23 Aug 2018 20:05:33 GMT
Author: damjan
Date: Thu Aug 23 20:05:32 2018
New Revision: 1838757

URL: http://svn.apache.org/viewvc?rev=1838757&view=rev
Log:
Port main/codemaker to gbuild.

Also ported the Java tests in codemaker to JUnit
instead of the internal test framework,
and enabled them during the subsequent test phase.

A gbuild API for building private UNO APIs using cppumaker was also added,
and used to run the C++ subsequent tests in codemaker.

Patch by: me


Added:
    openoffice/trunk/main/codemaker/Ant_codemaker_test.mk
    openoffice/trunk/main/codemaker/Executable_cppumaker.mk
    openoffice/trunk/main/codemaker/Executable_javamaker.mk
    openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk
    openoffice/trunk/main/codemaker/Makefile   (with props)
    openoffice/trunk/main/codemaker/Module_codemaker.mk
    openoffice/trunk/main/codemaker/Package_inc.mk
    openoffice/trunk/main/codemaker/StaticLibrary_codemaker.mk
    openoffice/trunk/main/codemaker/StaticLibrary_commoncpp.mk
    openoffice/trunk/main/codemaker/StaticLibrary_commonjava.mk
    openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.cxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.hxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.cxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.hxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.cxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.hxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.cxx
    openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.hxx
    openoffice/trunk/main/codemaker/prj/makefile.mk
    openoffice/trunk/main/codemaker/test/javamaker/build.xml   (with props)
    openoffice/trunk/main/codemaker/test/javamaker/src/
    openoffice/trunk/main/codemaker/test/javamaker/src/main/
    openoffice/trunk/main/codemaker/test/javamaker/src/main/java/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java
      - copied, changed from r1838756, openoffice/trunk/main/codemaker/test/javamaker/Test.java
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/
      - copied from r1838756, openoffice/trunk/main/codemaker/test/javamaker/java15/
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java
      - copied, changed from r1838746, openoffice/trunk/main/codemaker/test/javamaker/java15/Test.java
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types15.idl
      - copied unchanged from r1838746, openoffice/trunk/main/codemaker/test/javamaker/java15/types.idl
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/types.idl
      - copied unchanged from r1838756, openoffice/trunk/main/codemaker/test/javamaker/types.idl
Removed:
    openoffice/trunk/main/codemaker/codemaker.pmk
    openoffice/trunk/main/codemaker/inc/makefile.mk
    openoffice/trunk/main/codemaker/source/codemaker/makefile.mk
    openoffice/trunk/main/codemaker/source/commoncpp/makefile.mk
    openoffice/trunk/main/codemaker/source/commonjava/makefile.mk
    openoffice/trunk/main/codemaker/source/cppumaker/makefile.mk
    openoffice/trunk/main/codemaker/source/javamaker/makefile.mk
    openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk
    openoffice/trunk/main/codemaker/test/javamaker/Test.java
    openoffice/trunk/main/codemaker/test/javamaker/java15/
    openoffice/trunk/main/codemaker/test/javamaker/makefile.mk
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Test.java
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/makefile.mk
    openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/types.idl
    openoffice/trunk/main/codemaker/test/javamaker/types.idl
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/codemaker/prj/build.lst
    openoffice/trunk/main/codemaker/prj/d.lst
    openoffice/trunk/main/codemaker/source/commoncpp/commoncpp.cxx
    openoffice/trunk/main/codemaker/source/cppumaker/cppumaker.cxx
    openoffice/trunk/main/codemaker/source/cppumaker/cppuoptions.cxx
    openoffice/trunk/main/codemaker/source/cppumaker/cpputype.cxx
    openoffice/trunk/main/codemaker/source/cppumaker/dumputils.cxx
    openoffice/trunk/main/codemaker/source/cppumaker/includes.cxx
    openoffice/trunk/main/solenv/ant/idl.xml
    openoffice/trunk/main/solenv/gbuild/Executable.mk
    openoffice/trunk/main/solenv/gbuild/GoogleTest.mk
    openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
    openoffice/trunk/main/solenv/gbuild/TargetLocations.mk

Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Aug 23 20:05:32 2018
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	basegfx \
 	binaryurp \
 	canvas \
+	codemaker \
 	comphelper \
 	configmgr \
 	cosv \

Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Thu Aug 23 20:05:32 2018
@@ -46,6 +46,8 @@ $(eval $(call gb_Helper_register_executa
 
 $(eval $(call gb_Helper_register_executables,SDK, \
 	autodoc \
+	cppumaker \
+	javamaker \
 	regcompare \
 	uno-skeletonmaker \
 ))

Added: openoffice/trunk/main/codemaker/Ant_codemaker_test.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/Ant_codemaker_test.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/Ant_codemaker_test.mk (added)
+++ openoffice/trunk/main/codemaker/Ant_codemaker_test.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,27 @@
+#**************************************************************
+#  
+#  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_Ant_Ant,jurt,$(SRCDIR)/codemaker/test/javamaker/build.xml))
+
+# vim: set noet sw=4 ts=4:
+

Added: openoffice/trunk/main/codemaker/Executable_cppumaker.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/Executable_cppumaker.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/Executable_cppumaker.mk (added)
+++ openoffice/trunk/main/codemaker/Executable_cppumaker.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,71 @@
+#**************************************************************
+#  
+#  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_Executable_Executable,cppumaker))
+
+$(eval $(call gb_Executable_set_targettype_gui,cppumaker,NO))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,cppumaker,codemaker_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,cppumaker,$(SRCDIR)/commoncpp/inc/pch/precompiled_cppumaker))
+
+$(eval $(call gb_Executable_set_include,cppumaker,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/codemaker/inc/ \
+	-I$(SRCDIR)/codemaker/inc/pch \
+))
+
+#$(eval $(call gb_Executable_add_defs,cppumaker,\
+#	-D_TOOLS_STRINGLIST \
+#))
+
+$(eval $(call gb_Executable_add_linked_libs,cppumaker,\
+	reg \
+	sal \
+	salhelper \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,cppumaker,\
+	codemaker \
+	commoncpp \
+))
+
+#$(eval $(call gb_Executable_add_private_apis,cppumaker,\
+#	$(SRCDIR)/codemaker/test/cppumaker/types.idl \
+#))
+
+$(eval $(call gb_Executable_add_exception_objects,cppumaker,\
+	codemaker/source/cppumaker/cppumaker \
+	codemaker/source/cppumaker/cppuoptions \
+	codemaker/source/cppumaker/cpputype \
+	codemaker/source/cppumaker/dumputils \
+	codemaker/source/cppumaker/includes \
+))
+
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+	cppumaker/source/cppumaker/cpputype, $(gb_COMPILERNOOPTFLAGS) \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/Executable_javamaker.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/Executable_javamaker.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/Executable_javamaker.mk (added)
+++ openoffice/trunk/main/codemaker/Executable_javamaker.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,62 @@
+#**************************************************************
+#  
+#  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_Executable_Executable,javamaker))
+
+$(eval $(call gb_Executable_set_targettype_gui,javamaker,NO))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,javamaker,codemaker_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,javamaker,$(SRCDIR)/commoncpp/inc/pch/precompiled_javamaker))
+
+$(eval $(call gb_Executable_set_include,javamaker,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/codemaker/inc/ \
+	-I$(SRCDIR)/codemaker/inc/pch \
+))
+
+#$(eval $(call gb_Executable_add_defs,javamaker,\
+#	-D_TOOLS_STRINGLIST \
+#))
+
+$(eval $(call gb_Executable_add_linked_libs,javamaker,\
+	reg \
+	sal \
+	salhelper \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,javamaker,\
+	codemaker \
+	commonjava \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,javamaker,\
+	codemaker/source/javamaker/classfile \
+	codemaker/source/javamaker/javamaker \
+	codemaker/source/javamaker/javaoptions \
+	codemaker/source/javamaker/javatype \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk (added)
+++ openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,46 @@
+###############################################################
+#  
+#  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_GoogleTest_GoogleTest,cppumaker_test))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,cppumaker_test, \
+	codemaker/test/cppumaker/test_codemaker_cppumaker \
+))
+
+$(eval $(call gb_GoogleTest_set_include,cppumaker_test,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/codemaker/inc \
+	-I$(SRCDIR)/codemaker/inc/pch \
+))
+
+$(eval $(call gb_GoogleTest_set_private_api,cppumaker_test,\
+	$(SRCDIR)/codemaker/test/cppumaker/types.idl \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,cppumaker_test, \
+	cppu \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/Makefile?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/Makefile (added)
+++ openoffice/trunk/main/codemaker/Makefile Thu Aug 23 20:05:32 2018
@@ -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.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

Propchange: openoffice/trunk/main/codemaker/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/codemaker/Module_codemaker.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/Module_codemaker.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/Module_codemaker.mk (added)
+++ openoffice/trunk/main/codemaker/Module_codemaker.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  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_Module_Module,codemaker))
+
+$(eval $(call gb_Module_add_targets,codemaker,\
+	Executable_cppumaker \
+	Executable_javamaker \
+	StaticLibrary_codemaker \
+	StaticLibrary_commoncpp \
+	StaticLibrary_commonjava \
+	Package_inc \
+))
+
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
+$(eval $(call gb_Module_add_targets,codemaker,\
+	Ant_codemaker_test \
+	GoogleTest_cppumaker \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/Package_inc.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/Package_inc.mk (added)
+++ openoffice/trunk/main/codemaker/Package_inc.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,34 @@
+#**************************************************************
+#  
+#  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_Package_Package,codemaker_inc,$(SRCDIR)/codemaker/inc))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/codemaker.hxx,codemaker/codemaker.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commoncpp.hxx,codemaker/commoncpp.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commonjava.hxx,codemaker/commonjava.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/dependencies.hxx,codemaker/dependencies.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/exceptiontree.hxx,codemaker/exceptiontree.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/generatedtypeset.hxx,codemaker/generatedtypeset.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/global.hxx,codemaker/global.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/options.hxx,codemaker/options.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/typemanager.hxx,codemaker/typemanager.hxx))
+$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/unotype.hxx,codemaker/unotype.hxx))

Added: openoffice/trunk/main/codemaker/StaticLibrary_codemaker.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/StaticLibrary_codemaker.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/StaticLibrary_codemaker.mk (added)
+++ openoffice/trunk/main/codemaker/StaticLibrary_codemaker.mk Thu Aug 23 20:05:32 2018
@@ -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.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,codemaker,codemaker_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,codemaker,$(SRCDIR)/codemaker/inc/pch/precompiled_codemaker))
+
+#$(eval $(call gb_StaticLibrary_add_api,codemaker,\
+#	udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_StaticLibrary_set_include,codemaker,\
+	-I$(SRCDIR)/codemaker/inc \
+        -I$(SRCDIR)/codemaker/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\
+	codemaker/source/codemaker/codemaker \
+	codemaker/source/codemaker/dependencies \
+	codemaker/source/codemaker/exceptiontree \
+	codemaker/source/codemaker/global \
+	codemaker/source/codemaker/options \
+	codemaker/source/codemaker/typemanager \
+	codemaker/source/codemaker/unotype \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/StaticLibrary_commoncpp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/StaticLibrary_commoncpp.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/StaticLibrary_commoncpp.mk (added)
+++ openoffice/trunk/main/codemaker/StaticLibrary_commoncpp.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,45 @@
+###############################################################
+#  
+#  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_StaticLibrary_StaticLibrary,commoncpp))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,commoncpp,codemaker_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,commoncpp,$(SRCDIR)/commoncpp/inc/pch/precompiled_commoncpp))
+
+#$(eval $(call gb_StaticLibrary_add_api,commoncpp,\
+#	udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_StaticLibrary_set_include,commoncpp,\
+	-I$(SRCDIR)/codemaker/inc \
+        -I$(SRCDIR)/codemaker/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,commoncpp,\
+	codemaker/source/commoncpp/commoncpp \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/StaticLibrary_commonjava.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/StaticLibrary_commonjava.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/StaticLibrary_commonjava.mk (added)
+++ openoffice/trunk/main/codemaker/StaticLibrary_commonjava.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,45 @@
+###############################################################
+#  
+#  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_StaticLibrary_StaticLibrary,commonjava))
+
+$(eval $(call gb_StaticLibrary_add_package_headers,commonjava,codemaker_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,commonjava,$(SRCDIR)/commonjava/inc/pch/precompiled_commonjava))
+
+#$(eval $(call gb_StaticLibrary_add_api,commonjava,\
+#	udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_StaticLibrary_set_include,commonjava,\
+	-I$(SRCDIR)/codemaker/inc \
+        -I$(SRCDIR)/codemaker/inc/pch \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,commonjava,\
+	codemaker/source/commonjava/commonjava \
+))
+
+# vim: set noet sw=4 ts=4:

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.cxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.cxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.cxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,25 @@
+/**************************************************************
+ * 
+ * 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.
+ * 
+ *************************************************************/
+
+
+
+#include "precompiled_commoncpp.hxx"
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.hxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.hxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_commoncpp.hxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,28 @@
+/**************************************************************
+ * 
+ * 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): Generated on 2006-09-01 17:49:33.874150
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.cxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.cxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.cxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,25 @@
+/**************************************************************
+ * 
+ * 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.
+ * 
+ *************************************************************/
+
+
+
+#include "precompiled_commonjava.hxx"
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.hxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.hxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_commonjava.hxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,28 @@
+/**************************************************************
+ * 
+ * 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): Generated on 2006-09-01 17:49:33.874150
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.cxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.cxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.cxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,25 @@
+/**************************************************************
+ * 
+ * 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.
+ * 
+ *************************************************************/
+
+
+
+#include "precompiled_cppumaker.hxx"
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.hxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.hxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_cppumaker.hxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,28 @@
+/**************************************************************
+ * 
+ * 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): Generated on 2006-09-01 17:49:33.874150
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.cxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.cxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.cxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,25 @@
+/**************************************************************
+ * 
+ * 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.
+ * 
+ *************************************************************/
+
+
+
+#include "precompiled_javamaker.hxx"
+

Added: openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.hxx?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.hxx (added)
+++ openoffice/trunk/main/codemaker/inc/pch/precompiled_javamaker.hxx Thu Aug 23 20:05:32 2018
@@ -0,0 +1,28 @@
+/**************************************************************
+ * 
+ * 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): Generated on 2006-09-01 17:49:33.874150
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+

Modified: openoffice/trunk/main/codemaker/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/prj/build.lst?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/prj/build.lst (original)
+++ openoffice/trunk/main/codemaker/prj/build.lst Thu Aug 23 20:05:32 2018
@@ -1,10 +1,2 @@
 cm	codemaker	:	registry NULL
-cm	codemaker								usr1	-	all	cm_mkout NULL
-cm	codemaker\inc							nmake	-	all	cm_inc NULL
-cm	codemaker\prj							get		-	all	cm_prj NULL
-cm	codemaker\source\codemaker				nmake	-	all	cm_codemaker cm_inc NULL
-cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp cm_inc NULL
-cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp cm_inc NULL
-cm	codemaker\source\commonjava				nmake	-	all	cm_java cm_inc NULL
-cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java cm_inc NULL
-cm	codemaker\test\cppumaker				nmake	-	all	cm_cppumaker_test cm_cppumaker cm_codemaker cm_cpp cm_inc NULL
+cm	codemaker\prj								nmake	-	all	cm_mkout NULL

Modified: openoffice/trunk/main/codemaker/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/prj/d.lst?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/prj/d.lst (original)
+++ openoffice/trunk/main/codemaker/prj/d.lst Thu Aug 23 20:05:32 2018
@@ -1,14 +0,0 @@
-..\%__SRC%\bin\cppumaker.exe %_DEST%\bin%_EXT%\cppumaker.exe
-..\%__SRC%\bin\cppumaker.pdb %_DEST%\bin%_EXT%\cppumaker.pdb
-..\%__SRC%\bin\javamaker.exe %_DEST%\bin%_EXT%\javamaker.exe
-..\%__SRC%\bin\javamaker.pdb %_DEST%\bin%_EXT%\javamaker.pdb
-
-..\inc\codemaker\*.h %_DEST%\inc%_EXT%\codemaker\*.h
-..\inc\codemaker\*.hxx %_DEST%\inc%_EXT%\codemaker\*.hxx
-
-..\%__SRC%\bin\cppumaker %_DEST%\bin%_EXT%\cppumaker
-..\%__SRC%\bin\javamaker %_DEST%\bin%_EXT%\javamaker
-
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a

Added: openoffice/trunk/main/codemaker/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/prj/makefile.mk?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/prj/makefile.mk (added)
+++ openoffice/trunk/main/codemaker/prj/makefile.mk Thu Aug 23 20:05:32 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: openoffice/trunk/main/codemaker/source/commoncpp/commoncpp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/source/commoncpp/commoncpp.cxx?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/source/commoncpp/commoncpp.cxx (original)
+++ openoffice/trunk/main/codemaker/source/commoncpp/commoncpp.cxx Thu Aug 23 20:05:32 2018
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_commoncpp.hxx"
 #include "sal/config.h"
 
 #include "codemaker/commoncpp.hxx"

Modified: openoffice/trunk/main/codemaker/source/cppumaker/cppumaker.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/source/cppumaker/cppumaker.cxx?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/source/cppumaker/cppumaker.cxx (original)
+++ openoffice/trunk/main/codemaker/source/cppumaker/cppumaker.cxx Thu Aug 23 20:05:32 2018
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppumaker.hxx"
 
 #include <stdio.h>
 

Modified: openoffice/trunk/main/codemaker/source/cppumaker/cppuoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/source/cppumaker/cppuoptions.cxx?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/source/cppumaker/cppuoptions.cxx (original)
+++ openoffice/trunk/main/codemaker/source/cppumaker/cppuoptions.cxx Thu Aug 23 20:05:32 2018
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppumaker.hxx"
 #include <stdio.h> 
 #include <string.h>
 

Modified: openoffice/trunk/main/codemaker/source/cppumaker/cpputype.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/source/cppumaker/cpputype.cxx?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/source/cppumaker/cpputype.cxx (original)
+++ openoffice/trunk/main/codemaker/source/cppumaker/cpputype.cxx Thu Aug 23 20:05:32 2018
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppumaker.hxx"
 
 #include <algorithm>
 #include <map>

Modified: openoffice/trunk/main/codemaker/source/cppumaker/dumputils.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/source/cppumaker/dumputils.cxx?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/source/cppumaker/dumputils.cxx (original)
+++ openoffice/trunk/main/codemaker/source/cppumaker/dumputils.cxx Thu Aug 23 20:05:32 2018
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppumaker.hxx"
 
 #include "dumputils.hxx"
 

Modified: openoffice/trunk/main/codemaker/source/cppumaker/includes.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/source/cppumaker/includes.cxx?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/source/cppumaker/includes.cxx (original)
+++ openoffice/trunk/main/codemaker/source/cppumaker/includes.cxx Thu Aug 23 20:05:32 2018
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppumaker.hxx"
 
 #include "includes.hxx"
 

Added: openoffice/trunk/main/codemaker/test/javamaker/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/test/javamaker/build.xml?rev=1838757&view=auto
==============================================================================
--- openoffice/trunk/main/codemaker/test/javamaker/build.xml (added)
+++ openoffice/trunk/main/codemaker/test/javamaker/build.xml Thu Aug 23 20:05:32 2018
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ * 
+ * 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.
+ * 
+ ***********************************************************-->
+
+
+<project name="codemaker_test" default="main">
+
+    <property file="../../../ant.properties"/>
+    <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+    <target name="init-project">
+
+        <path id="main.classpath">
+            <pathelement location="${OUTDIR}/bin/juh.jar"/>
+            <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+            <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+        </path>
+
+        <filelist id="idl.files">
+            <file name="${test.src.dir}/test/codemaker/javamaker/types.idl"/>
+            <file name="${test.src.dir}/test/codemaker/javamaker/java15/types15.idl"/>
+        </filelist>
+
+    </target>
+
+</project>
+

Propchange: openoffice/trunk/main/codemaker/test/javamaker/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: openoffice/trunk/main/codemaker/test/javamaker/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java (from r1838756, openoffice/trunk/main/codemaker/test/javamaker/Test.java)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java?p2=openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java&p1=openoffice/trunk/main/codemaker/test/javamaker/Test.java&r1=1838756&r2=1838757&rev=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/test/javamaker/Test.java (original)
+++ openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/Javamaker_Test.java Thu Aug 23 20:05:32 2018
@@ -30,8 +30,9 @@ import com.sun.star.uno.DeploymentExcept
 import com.sun.star.uno.Type;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XNamingService;
-import complexlib.ComplexTestCase;
 import java.util.EventListener;
+import org.junit.Before;
+import org.junit.Test;
 import test.codemaker.javamaker.Enum1;
 import test.codemaker.javamaker.Enum2;
 import test.codemaker.javamaker.PolyStruct;
@@ -74,155 +75,156 @@ import test.codemaker.javamaker.services
 import test.codemaker.javamaker.services.service_while;
 import test.codemaker.javamaker.singleton_abstract;
 
-public final class Test extends ComplexTestCase {
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "testEnum1", "testEnum2", "testPolyStruct", "testEmptyStruct2",
-            "testFullStruct2", "testXEventListener", "testS1", "testS2",
-            "testKeywordServices", "testSingletons" };
-    }
+import static org.junit.Assert.*;
 
+public final class Javamaker_Test {
+    @Before
     public void before() throws Exception {
         context = Bootstrap.createInitialComponentContext(null);
     }
 
+    @Test
     public void testEnum1() {
-        assure(Enum1.VALUE1.getValue() == -100);
-        assure(Enum1.VALUE2.getValue() == 100);
-        assure(Enum1.VALUE1_value == -100);
-        assure(Enum1.VALUE2_value == 100);
-        assure(Enum1.getDefault() == Enum1.VALUE1);
-        assure(Enum1.fromInt(-101) == null);
-        assure(Enum1.fromInt(-100) == Enum1.VALUE1);
-        assure(Enum1.fromInt(-99) == null);
-        assure(Enum1.fromInt(0) == null);
-        assure(Enum1.fromInt(99) == null);
-        assure(Enum1.fromInt(100) == Enum1.VALUE2);
-        assure(Enum1.fromInt(101) == null);
+        assertTrue(Enum1.VALUE1.getValue() == -100);
+        assertTrue(Enum1.VALUE2.getValue() == 100);
+        assertTrue(Enum1.VALUE1_value == -100);
+        assertTrue(Enum1.VALUE2_value == 100);
+        assertTrue(Enum1.getDefault() == Enum1.VALUE1);
+        assertTrue(Enum1.fromInt(-101) == null);
+        assertTrue(Enum1.fromInt(-100) == Enum1.VALUE1);
+        assertTrue(Enum1.fromInt(-99) == null);
+        assertTrue(Enum1.fromInt(0) == null);
+        assertTrue(Enum1.fromInt(99) == null);
+        assertTrue(Enum1.fromInt(100) == Enum1.VALUE2);
+        assertTrue(Enum1.fromInt(101) == null);
     }
 
+    @Test
     public void testEnum2() {
-        assure(Enum2.VALUE0.getValue() == 0);
-        assure(Enum2.VALUE1.getValue() == 1);
-        assure(Enum2.VALUE2.getValue() == 2);
-        assure(Enum2.VALUE4.getValue() == 4);
-        assure(Enum2.VALUE0_value == 0);
-        assure(Enum2.VALUE1_value == 1);
-        assure(Enum2.VALUE2_value == 2);
-        assure(Enum2.VALUE4_value == 4);
-        assure(Enum2.getDefault() == Enum2.VALUE0);
-        assure(Enum2.fromInt(-1) == null);
-        assure(Enum2.fromInt(0) == Enum2.VALUE0);
-        assure(Enum2.fromInt(1) == Enum2.VALUE1);
-        assure(Enum2.fromInt(2) == Enum2.VALUE2);
-        assure(Enum2.fromInt(3) == null);
-        assure(Enum2.fromInt(4) == Enum2.VALUE4);
-        assure(Enum2.fromInt(5) == null);
+        assertTrue(Enum2.VALUE0.getValue() == 0);
+        assertTrue(Enum2.VALUE1.getValue() == 1);
+        assertTrue(Enum2.VALUE2.getValue() == 2);
+        assertTrue(Enum2.VALUE4.getValue() == 4);
+        assertTrue(Enum2.VALUE0_value == 0);
+        assertTrue(Enum2.VALUE1_value == 1);
+        assertTrue(Enum2.VALUE2_value == 2);
+        assertTrue(Enum2.VALUE4_value == 4);
+        assertTrue(Enum2.getDefault() == Enum2.VALUE0);
+        assertTrue(Enum2.fromInt(-1) == null);
+        assertTrue(Enum2.fromInt(0) == Enum2.VALUE0);
+        assertTrue(Enum2.fromInt(1) == Enum2.VALUE1);
+        assertTrue(Enum2.fromInt(2) == Enum2.VALUE2);
+        assertTrue(Enum2.fromInt(3) == null);
+        assertTrue(Enum2.fromInt(4) == Enum2.VALUE4);
+        assertTrue(Enum2.fromInt(5) == null);
     }
 
+    @Test
     public void testPolyStruct() {
         PolyStruct s = new PolyStruct();
-        assure(s.member1 == null);
-        assure(s.member2 == 0);
+        assertTrue(s.member1 == null);
+        assertTrue(s.member2 == 0);
         s = new PolyStruct("ABC", 5);
-        assure(s.member1.equals("ABC"));
-        assure(s.member2 == 5);
+        assertTrue(s.member1.equals("ABC"));
+        assertTrue(s.member2 == 5);
     }
 
+    @Test
     public void testEmptyStruct2() {
         Struct2 s = new Struct2();
-        assure(s.p1 == false);
-        assure(s.p2 == 0);
-        assure(s.p3 == 0);
-        assure(s.p4 == 0);
-        assure(s.p5 == 0);
-        assure(s.p6 == 0);
-        assure(s.p7 == 0L);
-        assure(s.p8 == 0L);
-        assure(s.p9 == 0.0f);
-        assure(s.p10 == 0.0);
-        assure(s.p11 == '\u0000');
-        assure(s.p12.equals(""));
-        assure(s.p13.equals(Type.VOID));
-        assure(s.p14.equals(Any.VOID));
-        assure(s.p15 == Enum2.VALUE0);
-        assure(s.p16.member1 == 0);
-        assure(s.p17 == null);
-        assure(s.p18 == null);
-        assure(s.t1 == false);
-        assure(s.t2 == 0);
-        assure(s.t3 == 0);
-        assure(s.t4 == 0);
-        assure(s.t5 == 0);
-        assure(s.t6 == 0);
-        assure(s.t7 == 0L);
-        assure(s.t8 == 0L);
-        assure(s.t9 == 0.0f);
-        assure(s.t10 == 0.0);
-        assure(s.t11 == '\u0000');
-        assure(s.t12.equals(""));
-        assure(s.t13.equals(Type.VOID));
-        assure(s.t14.equals(Any.VOID));
-        assure(s.t15 == Enum2.VALUE0);
-        assure(s.t16.member1 == 0);
-        assure(s.t17 == null);
-        assure(s.t18 == null);
-        assure(s.a1.length == 0);
-        assure(s.a2.length == 0);
-        assure(s.a3.length == 0);
-        assure(s.a4.length == 0);
-        assure(s.a5.length == 0);
-        assure(s.a6.length == 0);
-        assure(s.a7.length == 0);
-        assure(s.a8.length == 0);
-        assure(s.a9.length == 0);
-        assure(s.a10.length == 0);
-        assure(s.a11.length == 0);
-        assure(s.a12.length == 0);
-        assure(s.a13.length == 0);
-        assure(s.a14.length == 0);
-        assure(s.a15.length == 0);
-        assure(s.a16.length == 0);
-        assure(s.a17.length == 0);
-        assure(s.a18.length == 0);
-        assure(s.aa1.length == 0);
-        assure(s.aa2.length == 0);
-        assure(s.aa3.length == 0);
-        assure(s.aa4.length == 0);
-        assure(s.aa5.length == 0);
-        assure(s.aa6.length == 0);
-        assure(s.aa7.length == 0);
-        assure(s.aa8.length == 0);
-        assure(s.aa9.length == 0);
-        assure(s.aa10.length == 0);
-        assure(s.aa11.length == 0);
-        assure(s.aa12.length == 0);
-        assure(s.aa13.length == 0);
-        assure(s.aa14.length == 0);
-        assure(s.aa15.length == 0);
-        assure(s.aa16.length == 0);
-        assure(s.aa17.length == 0);
-        assure(s.aa18.length == 0);
-        assure(s.at1.length == 0);
-        assure(s.at2.length == 0);
-        assure(s.at3.length == 0);
-        assure(s.at4.length == 0);
-        assure(s.at5.length == 0);
-        assure(s.at6.length == 0);
-        assure(s.at7.length == 0);
-        assure(s.at8.length == 0);
-        assure(s.at9.length == 0);
-        assure(s.at10.length == 0);
-        assure(s.at11.length == 0);
-        assure(s.at12.length == 0);
-        assure(s.at13.length == 0);
-        assure(s.at14.length == 0);
-        assure(s.at15.length == 0);
-        assure(s.at16.length == 0);
-        assure(s.at17.length == 0);
-        assure(s.at18.length == 0);
+        assertTrue(s.p1 == false);
+        assertTrue(s.p2 == 0);
+        assertTrue(s.p3 == 0);
+        assertTrue(s.p4 == 0);
+        assertTrue(s.p5 == 0);
+        assertTrue(s.p6 == 0);
+        assertTrue(s.p7 == 0L);
+        assertTrue(s.p8 == 0L);
+        assertTrue(s.p9 == 0.0f);
+        assertTrue(s.p10 == 0.0);
+        assertTrue(s.p11 == '\u0000');
+        assertTrue(s.p12.equals(""));
+        assertTrue(s.p13.equals(Type.VOID));
+        assertTrue(s.p14.equals(Any.VOID));
+        assertTrue(s.p15 == Enum2.VALUE0);
+        assertTrue(s.p16.member1 == 0);
+        assertTrue(s.p17 == null);
+        assertTrue(s.p18 == null);
+        assertTrue(s.t1 == false);
+        assertTrue(s.t2 == 0);
+        assertTrue(s.t3 == 0);
+        assertTrue(s.t4 == 0);
+        assertTrue(s.t5 == 0);
+        assertTrue(s.t6 == 0);
+        assertTrue(s.t7 == 0L);
+        assertTrue(s.t8 == 0L);
+        assertTrue(s.t9 == 0.0f);
+        assertTrue(s.t10 == 0.0);
+        assertTrue(s.t11 == '\u0000');
+        assertTrue(s.t12.equals(""));
+        assertTrue(s.t13.equals(Type.VOID));
+        assertTrue(s.t14.equals(Any.VOID));
+        assertTrue(s.t15 == Enum2.VALUE0);
+        assertTrue(s.t16.member1 == 0);
+        assertTrue(s.t17 == null);
+        assertTrue(s.t18 == null);
+        assertTrue(s.a1.length == 0);
+        assertTrue(s.a2.length == 0);
+        assertTrue(s.a3.length == 0);
+        assertTrue(s.a4.length == 0);
+        assertTrue(s.a5.length == 0);
+        assertTrue(s.a6.length == 0);
+        assertTrue(s.a7.length == 0);
+        assertTrue(s.a8.length == 0);
+        assertTrue(s.a9.length == 0);
+        assertTrue(s.a10.length == 0);
+        assertTrue(s.a11.length == 0);
+        assertTrue(s.a12.length == 0);
+        assertTrue(s.a13.length == 0);
+        assertTrue(s.a14.length == 0);
+        assertTrue(s.a15.length == 0);
+        assertTrue(s.a16.length == 0);
+        assertTrue(s.a17.length == 0);
+        assertTrue(s.a18.length == 0);
+        assertTrue(s.aa1.length == 0);
+        assertTrue(s.aa2.length == 0);
+        assertTrue(s.aa3.length == 0);
+        assertTrue(s.aa4.length == 0);
+        assertTrue(s.aa5.length == 0);
+        assertTrue(s.aa6.length == 0);
+        assertTrue(s.aa7.length == 0);
+        assertTrue(s.aa8.length == 0);
+        assertTrue(s.aa9.length == 0);
+        assertTrue(s.aa10.length == 0);
+        assertTrue(s.aa11.length == 0);
+        assertTrue(s.aa12.length == 0);
+        assertTrue(s.aa13.length == 0);
+        assertTrue(s.aa14.length == 0);
+        assertTrue(s.aa15.length == 0);
+        assertTrue(s.aa16.length == 0);
+        assertTrue(s.aa17.length == 0);
+        assertTrue(s.aa18.length == 0);
+        assertTrue(s.at1.length == 0);
+        assertTrue(s.at2.length == 0);
+        assertTrue(s.at3.length == 0);
+        assertTrue(s.at4.length == 0);
+        assertTrue(s.at5.length == 0);
+        assertTrue(s.at6.length == 0);
+        assertTrue(s.at7.length == 0);
+        assertTrue(s.at8.length == 0);
+        assertTrue(s.at9.length == 0);
+        assertTrue(s.at10.length == 0);
+        assertTrue(s.at11.length == 0);
+        assertTrue(s.at12.length == 0);
+        assertTrue(s.at13.length == 0);
+        assertTrue(s.at14.length == 0);
+        assertTrue(s.at15.length == 0);
+        assertTrue(s.at16.length == 0);
+        assertTrue(s.at17.length == 0);
+        assertTrue(s.at18.length == 0);
     }
 
+    @Test
     public void testFullStruct2() {
         //TODO:
         Struct2 s = new Struct2(
@@ -247,125 +249,127 @@ public final class Test extends ComplexT
             new char[0][], new String[0][], new Type[0][], new Object[0][],
             new Enum2[0][], new Struct1[0][], new Object[0][],
             new XNamingService[0][]);
-        assure(s.p1 == true);
-        assure(s.p2 == 1);
-        assure(s.p3 == 2);
-        assure(s.p4 == 3);
-        assure(s.p5 == 4);
-        assure(s.p6 == 5);
-        assure(s.p7 == 6L);
-        assure(s.p8 == 7L);
-        assure(s.p9 == 0.8f);
-        assure(s.p10 == 0.9);
-        assure(s.p11 == 'A');
-        assure(s.p12.equals("BCD"));
-        assure(s.p13.equals(Type.UNSIGNED_HYPER));
-        assure(s.p14.equals(new Integer(22)));
-        assure(s.p15 == Enum2.VALUE4);
-        assure(s.p16.member1 == 1);
-        assure(s.p17 == null);
-        assure(s.p18 == null);
-        assure(s.t1 == false);
-        assure(s.t2 == 0);
-        assure(s.t3 == 0);
-        assure(s.t4 == 0);
-        assure(s.t5 == 0);
-        assure(s.t6 == 0);
-        assure(s.t7 == 0L);
-        assure(s.t8 == 0L);
-        assure(s.t9 == 0.0f);
-        assure(s.t10 == 0.0);
-        assure(s.t11 == '\u0000');
-        assure(s.t12.equals(""));
-        assure(s.t13.equals(Type.VOID));
-        assure(s.t14.equals(Any.VOID));
-        assure(s.t15 == Enum2.VALUE0);
-        assure(s.t16.member1 == 0);
-        assure(s.t17 == null);
-        assure(s.t18 == null);
-        assure(s.a1.length == 2);
-        assure(s.a1[0] == false);
-        assure(s.a1[1] == true);
-        assure(s.a2.length == 2);
-        assure(s.a2[0] == 1);
-        assure(s.a2[1] == 2);
-        assure(s.a3.length == 0);
-        assure(s.a4.length == 0);
-        assure(s.a5.length == 0);
-        assure(s.a6.length == 0);
-        assure(s.a7.length == 0);
-        assure(s.a8.length == 0);
-        assure(s.a9.length == 0);
-        assure(s.a10.length == 0);
-        assure(s.a11.length == 0);
-        assure(s.a12.length == 0);
-        assure(s.a13.length == 0);
-        assure(s.a14.length == 0);
-        assure(s.a15.length == 0);
-        assure(s.a16.length == 2);
-        assure(s.a16[0].member1 == 1);
-        assure(s.a16[1].member1 == 2);
-        assure(s.a17.length == 0);
-        assure(s.a18.length == 0);
-        assure(s.aa1.length == 0);
-        assure(s.aa2.length == 0);
-        assure(s.aa3.length == 0);
-        assure(s.aa4.length == 0);
-        assure(s.aa5.length == 0);
-        assure(s.aa6.length == 0);
-        assure(s.aa7.length == 0);
-        assure(s.aa8.length == 0);
-        assure(s.aa9.length == 0);
-        assure(s.aa10.length == 0);
-        assure(s.aa11.length == 0);
-        assure(s.aa12.length == 0);
-        assure(s.aa13.length == 0);
-        assure(s.aa14.length == 0);
-        assure(s.aa15.length == 0);
-        assure(s.aa16.length == 0);
-        assure(s.aa17.length == 0);
-        assure(s.aa18.length == 0);
-        assure(s.at1.length == 0);
-        assure(s.at2.length == 0);
-        assure(s.at3.length == 0);
-        assure(s.at4.length == 0);
-        assure(s.at5.length == 0);
-        assure(s.at6.length == 0);
-        assure(s.at7.length == 0);
-        assure(s.at8.length == 0);
-        assure(s.at9.length == 0);
-        assure(s.at10.length == 0);
-        assure(s.at11.length == 0);
-        assure(s.at12.length == 0);
-        assure(s.at13.length == 0);
-        assure(s.at14.length == 0);
-        assure(s.at15.length == 0);
-        assure(s.at16.length == 0);
-        assure(s.at17.length == 0);
-        assure(s.at18.length == 0);
+        assertTrue(s.p1 == true);
+        assertTrue(s.p2 == 1);
+        assertTrue(s.p3 == 2);
+        assertTrue(s.p4 == 3);
+        assertTrue(s.p5 == 4);
+        assertTrue(s.p6 == 5);
+        assertTrue(s.p7 == 6L);
+        assertTrue(s.p8 == 7L);
+        assertTrue(s.p9 == 0.8f);
+        assertTrue(s.p10 == 0.9);
+        assertTrue(s.p11 == 'A');
+        assertTrue(s.p12.equals("BCD"));
+        assertTrue(s.p13.equals(Type.UNSIGNED_HYPER));
+        assertTrue(s.p14.equals(new Integer(22)));
+        assertTrue(s.p15 == Enum2.VALUE4);
+        assertTrue(s.p16.member1 == 1);
+        assertTrue(s.p17 == null);
+        assertTrue(s.p18 == null);
+        assertTrue(s.t1 == false);
+        assertTrue(s.t2 == 0);
+        assertTrue(s.t3 == 0);
+        assertTrue(s.t4 == 0);
+        assertTrue(s.t5 == 0);
+        assertTrue(s.t6 == 0);
+        assertTrue(s.t7 == 0L);
+        assertTrue(s.t8 == 0L);
+        assertTrue(s.t9 == 0.0f);
+        assertTrue(s.t10 == 0.0);
+        assertTrue(s.t11 == '\u0000');
+        assertTrue(s.t12.equals(""));
+        assertTrue(s.t13.equals(Type.VOID));
+        assertTrue(s.t14.equals(Any.VOID));
+        assertTrue(s.t15 == Enum2.VALUE0);
+        assertTrue(s.t16.member1 == 0);
+        assertTrue(s.t17 == null);
+        assertTrue(s.t18 == null);
+        assertTrue(s.a1.length == 2);
+        assertTrue(s.a1[0] == false);
+        assertTrue(s.a1[1] == true);
+        assertTrue(s.a2.length == 2);
+        assertTrue(s.a2[0] == 1);
+        assertTrue(s.a2[1] == 2);
+        assertTrue(s.a3.length == 0);
+        assertTrue(s.a4.length == 0);
+        assertTrue(s.a5.length == 0);
+        assertTrue(s.a6.length == 0);
+        assertTrue(s.a7.length == 0);
+        assertTrue(s.a8.length == 0);
+        assertTrue(s.a9.length == 0);
+        assertTrue(s.a10.length == 0);
+        assertTrue(s.a11.length == 0);
+        assertTrue(s.a12.length == 0);
+        assertTrue(s.a13.length == 0);
+        assertTrue(s.a14.length == 0);
+        assertTrue(s.a15.length == 0);
+        assertTrue(s.a16.length == 2);
+        assertTrue(s.a16[0].member1 == 1);
+        assertTrue(s.a16[1].member1 == 2);
+        assertTrue(s.a17.length == 0);
+        assertTrue(s.a18.length == 0);
+        assertTrue(s.aa1.length == 0);
+        assertTrue(s.aa2.length == 0);
+        assertTrue(s.aa3.length == 0);
+        assertTrue(s.aa4.length == 0);
+        assertTrue(s.aa5.length == 0);
+        assertTrue(s.aa6.length == 0);
+        assertTrue(s.aa7.length == 0);
+        assertTrue(s.aa8.length == 0);
+        assertTrue(s.aa9.length == 0);
+        assertTrue(s.aa10.length == 0);
+        assertTrue(s.aa11.length == 0);
+        assertTrue(s.aa12.length == 0);
+        assertTrue(s.aa13.length == 0);
+        assertTrue(s.aa14.length == 0);
+        assertTrue(s.aa15.length == 0);
+        assertTrue(s.aa16.length == 0);
+        assertTrue(s.aa17.length == 0);
+        assertTrue(s.aa18.length == 0);
+        assertTrue(s.at1.length == 0);
+        assertTrue(s.at2.length == 0);
+        assertTrue(s.at3.length == 0);
+        assertTrue(s.at4.length == 0);
+        assertTrue(s.at5.length == 0);
+        assertTrue(s.at6.length == 0);
+        assertTrue(s.at7.length == 0);
+        assertTrue(s.at8.length == 0);
+        assertTrue(s.at9.length == 0);
+        assertTrue(s.at10.length == 0);
+        assertTrue(s.at11.length == 0);
+        assertTrue(s.at12.length == 0);
+        assertTrue(s.at13.length == 0);
+        assertTrue(s.at14.length == 0);
+        assertTrue(s.at15.length == 0);
+        assertTrue(s.at16.length == 0);
+        assertTrue(s.at17.length == 0);
+        assertTrue(s.at18.length == 0);
     }
 
+    @Test
     public void testXEventListener() {
-        assure(EventListener.class.isAssignableFrom(XEventListener.class));
+        assertTrue(EventListener.class.isAssignableFrom(XEventListener.class));
     }
 
+    @Test
     public void testS1() throws com.sun.star.uno.Exception {
         //TODO:
         try {
             S1.create1(context);
-            failed("S1.create1");
+            fail("S1.create1");
         } catch (DeploymentException e) {}
         try {
             S1.create2(context, new Any[0]);
-            failed("S1.create2");
+            fail("S1.create2");
         } catch (com.sun.star.uno.Exception e) {}
         try {
             S1.create3(context, new Any[0]);
-            failed("S1.create3");
+            fail("S1.create3");
         } catch (DeploymentException e) {}
         try {
             S1.create4(context, 0, 0, 0);
-            failed("S1.create4");
+            fail("S1.create4");
         } catch (DeploymentException e) {}
         try {
             S1.create5(
@@ -389,165 +393,168 @@ public final class Test extends ComplexT
                 new char[0][], new String[0][], new Type[0][], new Object[0][],
                 new Enum2[0][], new Struct1[0][], new Object[0][],
                 new XNamingService[0][]);
-            failed("S1.create4");
+            fail("S1.create4");
         } catch (DeploymentException e) {}
     }
 
+    @Test
     public void testS2() {
         //TODO
     }
 
+    @Test
     public void testKeywordServices() {
         try {
             service_abstract.method_abstract(context, 0);
-            failed("service_abstract.method_abstract");
+            fail("service_abstract.method_abstract");
         } catch (DeploymentException e) {}
         try {
             service_assert.method_assert(context, 0);
-            failed("service_assert.method_assert");
+            fail("service_assert.method_assert");
         } catch (DeploymentException e) {}
         try {
             service_break.method_break(context, 0);
-            failed("service_break.method_break");
+            fail("service_break.method_break");
         } catch (DeploymentException e) {}
         try {
             service_catch.method_catch(context, 0);
-            failed("service_catch.method_catch");
+            fail("service_catch.method_catch");
         } catch (DeploymentException e) {}
         try {
             service_class.method_class(context, 0);
-            failed("service_class.method_class");
+            fail("service_class.method_class");
         } catch (DeploymentException e) {}
         try {
             service_continue.method_continue(context, 0);
-            failed("service_continue.method_continue");
+            fail("service_continue.method_continue");
         } catch (DeploymentException e) {}
         try {
             service_do.method_do(context, 0);
-            failed("service_do.method_do");
+            fail("service_do.method_do");
         } catch (DeploymentException e) {}
         try {
             service_else.method_else(context, 0);
-            failed("service_else.method_else");
+            fail("service_else.method_else");
         } catch (DeploymentException e) {}
         try {
             service_extends.method_extends(context, 0);
-            failed("service_extends.method_extends");
+            fail("service_extends.method_extends");
         } catch (DeploymentException e) {}
         try {
             service_final.method_final(context, 0);
-            failed("service_final.method_final");
+            fail("service_final.method_final");
         } catch (DeploymentException e) {}
         try {
             service_finally.method_finally(context, 0);
-            failed("service_finally.method_finally");
+            fail("service_finally.method_finally");
         } catch (DeploymentException e) {}
         try {
             service_for.method_for(context, 0);
-            failed("service_for.method_for");
+            fail("service_for.method_for");
         } catch (DeploymentException e) {}
         try {
             service_goto.method_goto(context, 0);
-            failed("service_goto.method_goto");
+            fail("service_goto.method_goto");
         } catch (DeploymentException e) {}
         try {
             service_if.method_if(context, 0);
-            failed("service_if.method_if");
+            fail("service_if.method_if");
         } catch (DeploymentException e) {}
         try {
             service_implements.method_implements(context, 0);
-            failed("service_implements.method_implements");
+            fail("service_implements.method_implements");
         } catch (DeploymentException e) {}
         try {
             service_import.method_import(context, 0);
-            failed("service_import.method_import");
+            fail("service_import.method_import");
         } catch (DeploymentException e) {}
         try {
             service_instanceof.method_instanceof(context, 0);
-            failed("service_instanceof.method_instanceof");
+            fail("service_instanceof.method_instanceof");
         } catch (DeploymentException e) {}
         try {
             service_int.method_int(context, 0);
-            failed("service_int.method_int");
+            fail("service_int.method_int");
         } catch (DeploymentException e) {}
         try {
             service_native.method_native(context, 0);
-            failed("service_native.method_native");
+            fail("service_native.method_native");
         } catch (DeploymentException e) {}
         try {
             service_new.method_new(context, 0);
-            failed("service_new.method_new");
+            fail("service_new.method_new");
         } catch (DeploymentException e) {}
         try {
             service_package.method_package(context, 0);
-            failed("service_package.method_package");
+            fail("service_package.method_package");
         } catch (DeploymentException e) {}
         try {
             service_private.method_private(context, 0);
-            failed("service_private.method_private");
+            fail("service_private.method_private");
         } catch (DeploymentException e) {}
         try {
             service_protected.method_protected(context, 0);
-            failed("service_protected.method_protected");
+            fail("service_protected.method_protected");
         } catch (DeploymentException e) {}
         try {
             service_public.method_public(context, 0);
-            failed("service_public.method_public");
+            fail("service_public.method_public");
         } catch (DeploymentException e) {}
         try {
             service_return.method_return(context, 0);
-            failed("service_return.method_return");
+            fail("service_return.method_return");
         } catch (DeploymentException e) {}
         try {
             service_static.method_static(context, 0);
-            failed("service_static.method_static");
+            fail("service_static.method_static");
         } catch (DeploymentException e) {}
         try {
             service_strictfp.method_strictfp(context, 0);
-            failed("service_strictfp.method_strictfp");
+            fail("service_strictfp.method_strictfp");
         } catch (DeploymentException e) {}
         try {
             service_super.method_super(context, 0);
-            failed("service_super.method_super");
+            fail("service_super.method_super");
         } catch (DeploymentException e) {}
         try {
             service_synchronized.method_synchronized(context, 0);
-            failed("service_synchronized.method_synchronized");
+            fail("service_synchronized.method_synchronized");
         } catch (DeploymentException e) {}
         try {
             service_this.method_this(context, 0);
-            failed("service_this.method_this");
+            fail("service_this.method_this");
         } catch (DeploymentException e) {}
         try {
             service_throw.method_throw(context, 0);
-            failed("service_throw.method_throw");
+            fail("service_throw.method_throw");
         } catch (DeploymentException e) {}
         try {
             service_throws.method_throws(context, 0);
-            failed("service_throws.method_throws");
+            fail("service_throws.method_throws");
         } catch (DeploymentException e) {}
         try {
             service_try.method_try(context, 0);
-            failed("service_try.method_try");
+            fail("service_try.method_try");
         } catch (DeploymentException e) {}
         try {
             service_volatile.method_volatile(context, 0);
-            failed("service_volatile.method_volatile");
+            fail("service_volatile.method_volatile");
         } catch (DeploymentException e) {}
         try {
             service_while.method_while(context, 0);
-            failed("service_while.method_while");
+            fail("service_while.method_while");
         } catch (DeploymentException e) {}
     }
 
+    @Test
     public void testSingletons() {
         try {
             S4.get(context);
-            failed("S4");
+            fail("S4");
         } catch (DeploymentException e) {}
         try {
             singleton_abstract.get(context);
-            failed("singleton_abstract");
+            fail("singleton_abstract");
         } catch (DeploymentException e) {}
     }
 

Copied: openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java (from r1838746, openoffice/trunk/main/codemaker/test/javamaker/java15/Test.java)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java?p2=openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java&p1=openoffice/trunk/main/codemaker/test/javamaker/java15/Test.java&r1=1838746&r2=1838757&rev=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/test/javamaker/java15/Test.java (original)
+++ openoffice/trunk/main/codemaker/test/javamaker/src/test/java/test/codemaker/javamaker/java15/Java15Javamaker_Test.java Thu Aug 23 20:05:32 2018
@@ -26,47 +26,47 @@ package test.codemaker.javamaker.java15;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.DeploymentException;
 import com.sun.star.uno.XComponentContext;
-import complexlib.ComplexTestCase;
+import org.junit.Test;
 
-public final class Test extends ComplexTestCase {
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "testPlainPolyStruct", "testBooleanPolyStruct", "testStruct",
-            "testService" };
-    }
+import static org.junit.Assert.*;
 
+public final class Java15Javamaker_Test {
+    @Test
     public void testPlainPolyStruct() {
         PolyStruct s = new PolyStruct();
-        assure(s.member1 == null);
-        assure(s.member2 == 0);
+        assertTrue(s.member1 == null);
+        assertTrue(s.member2 == 0);
         s = new PolyStruct("ABC", 5);
-        assure(s.member1.equals("ABC"));
-        assure(s.member2 == 5);
+        assertTrue(s.member1.equals("ABC"));
+        assertTrue(s.member2 == 5);
     }
 
+    @Test
     public void testBooleanPolyStruct() {
         PolyStruct<Boolean,Object> s = new PolyStruct<Boolean,Object>();
-        assure(s.member1 == null);
-        assure(s.member2 == 0);
+        assertTrue(s.member1 == null);
+        assertTrue(s.member2 == 0);
         s = new PolyStruct<Boolean,Object>(true, 5);
-        assure(s.member1 == true);
-        assure(s.member2 == 5);
+        assertTrue(s.member1 == true);
+        assertTrue(s.member2 == 5);
     }
 
+    @Test
     public void testStruct() {
         Struct s = new Struct();
-        assure(s.member.member1 == null);
-        assure(s.member.member2 == 0);
+        assertTrue(s.member.member1 == null);
+        assertTrue(s.member.member2 == 0);
         s = new Struct(
             new PolyStruct<PolyStruct<boolean[], Object>, Integer>(
                 new PolyStruct<boolean[], Object>(new boolean[] { true }, 3),
                 4));
-        assure(s.member.member1.member1.length == 1);
-        assure(s.member.member1.member1[0] == true);
-        assure(s.member.member1.member2 == 3);
-        assure(s.member.member2 == 4);
+        assertTrue(s.member.member1.member1.length == 1);
+        assertTrue(s.member.member1.member1[0] == true);
+        assertTrue(s.member.member1.member2 == 3);
+        assertTrue(s.member.member2 == 4);
     }
 
+    @Test
     public void testService() {
         XComponentContext context = new XComponentContext() {
                 public Object getValueByName(String name) {
@@ -79,12 +79,12 @@ public final class Test extends ComplexT
             };
         try {
             Service.create(context);
-            failed();
+            fail();
         } catch (DeploymentException e) {}
         try {
             Service.create(
                 context, false, (byte) 1, (short) 2, Integer.valueOf(4));
-            failed();
+            fail();
         } catch (DeploymentException e) {}
     }
 

Modified: openoffice/trunk/main/solenv/ant/idl.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/ant/idl.xml?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/ant/idl.xml (original)
+++ openoffice/trunk/main/solenv/ant/idl.xml Thu Aug 23 20:05:32 2018
@@ -41,6 +41,12 @@
         <build-idl unless:set="idl.uptodate"/>
     </target>
 
+    <target name="unoprivateapi-cppumaker">
+        <property name="idl.cppumaker.flag" location="${unoprivateapi.outdir}/idl.cppumaker.flag"/>
+        <check-idl-cppumaker/>
+        <build-idl-cppumaker unless:set="idl.cppumaker.uptodate"/>
+    </target>
+
     <macrodef name="check-idl">
         <sequential>
             <local name="idl.files.exist"/>
@@ -48,21 +54,35 @@
                 <resourcecount refid="idl.files" when="greater" count="0"/>
             </condition>
 
-            <local name="idl.files.union"/>
-            <union id="idl.files.union" if:set="idl.files.exist">
-                <filelist refid="idl.files"/>
-            </union>
             <uptodate property="idl.uptodate" targetfile="${idl.javamaker.flag}" if:set="idl.files.exist">
-                <srcresources refid="idl.files.union"/>
+                <srcresources>
+                    <resources refid="idl.files"/>
+                </srcresources>
             </uptodate>
             <property name="idl.uptodate" value="true" unless:set="idl.files.exist"/>
         </sequential>
     </macrodef>
 
+    <macrodef name="check-idl-cppumaker">
+        <sequential>
+            <uptodate property="idl.cppumaker.uptodate" targetfile="${idl.cppumaker.flag}">
+                <srcresources>
+                    <file name="${unoprivateapi.idl}"/>
+                </srcresources>
+            </uptodate>
+        </sequential>
+    </macrodef>
+
     <macrodef name="build-idl">
         <sequential>
-            <idlc/>
-            <regmerge/>
+            <idlc urdDirectory="${idl.urd.build.dir}">
+                <idlFiles>
+                    <resources refid="idl.files"/>
+                </idlFiles>
+            </idlc>
+            <regmerge
+                urdDirectory="${idl.urd.build.dir}"
+                rdbDirectory="${idl.rdb.build.dir}"/>
             <javamaker
                 inputRdb="${idl.rdb.build.dir}/registry.rdb"
                 outputDirectory="${idl.classes.build.dir}"
@@ -72,33 +92,56 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="build-idl-cppumaker">
+        <sequential>
+            <idlc urdDirectory="${unoprivateapi.outdir}/urd">
+                <idlFiles>
+                    <file name="${unoprivateapi.idl}"/>
+                </idlFiles>
+            </idlc>
+            <regmerge
+                urdDirectory="${unoprivateapi.outdir}/urd"
+                rdbDirectory="${unoprivateapi.outdir}/rdb"/>
+            <cppumaker
+                inputRdb="${unoprivateapi.outdir}/rdb/registry.rdb"
+                outputDirectory="${unoprivateapi.outdir}/inc"/>
+            <touch file="${idl.cppumaker.flag}"/>
+        </sequential>
+    </macrodef>
+
     <macrodef name="idlc">
+        <element name="idlFiles"/>
+        <attribute name="urdDirectory"/>
         <sequential>
-            <mkdir dir="${idl.urd.build.dir}"/>
+            <mkdir dir="@{urdDirectory}"/>
             <apply executable="${OUTDIR}/bin/idlc" failonerror="true">
                 <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
                 <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
                 <arg value="-I${OUTDIR}/idl"/>
                 <arg value="-O"/>
-                <arg value="${idl.urd.build.dir}"/>
+                <arg value="@{urdDirectory}"/>
                 <arg value="-verbose"/>
                 <arg value="-cid"/>
                 <arg value="-we"/>
-                <filelist refid="idl.files"/>
+                <resources>
+                    <idlFiles/>
+                </resources>
             </apply>
         </sequential>
     </macrodef>
 
     <macrodef name="regmerge">
+        <attribute name="urdDirectory"/>
+        <attribute name="rdbDirectory"/>
         <sequential>
-            <mkdir dir="${idl.rdb.build.dir}"/>
-            <delete file="${idl.rdb.build.dir}/registry.rdb"/>
+            <mkdir dir="@{rdbDirectory}"/>
+            <delete file="@{rdbDirectory}/registry.rdb"/>
             <apply executable="${OUTDIR}/bin/regmerge" failonerror="true">
                 <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
                 <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
-                <arg value="${idl.rdb.build.dir}/registry.rdb"/>
+                <arg value="@{rdbDirectory}/registry.rdb"/>
                 <arg value="/UCR"/>
-                <fileset dir="${idl.urd.build.dir}" includes="**/*.urd"/>
+                <fileset dir="@{urdDirectory}" includes="**/*.urd"/>
             </apply>
         </sequential>
     </macrodef>
@@ -123,5 +166,22 @@
             </exec>
         </sequential>
     </macrodef>
+
+    <macrodef name="cppumaker">
+        <attribute name="inputRdb"/>
+        <attribute name="outputDirectory"/>
+        <sequential>
+            <mkdir dir="@{outputDirectory}"/>
+            <exec executable="${OUTDIR}/bin/cppumaker" failonerror="true">
+                <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+                <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+                <arg value="-O@{outputDirectory}"/>
+                <arg value="-BUCR"/>
+                <arg value="-C"/>
+                <arg value="@{inputRdb}"/>
+                <arg value="${OUTDIR}/bin/udkapi.rdb"/>
+            </exec>
+        </sequential>
+    </macrodef>
 </project>
 

Modified: openoffice/trunk/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Executable.mk?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Executable.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Executable.mk Thu Aug 23 20:05:32 2018
@@ -89,6 +89,7 @@ $(eval $(foreach method,\
 	add_libs \
 	set_library_path_flags \
 	add_api \
+	set_private_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \

Modified: openoffice/trunk/main/solenv/gbuild/GoogleTest.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/GoogleTest.mk?rev=1838757&r1=1838756&r2=1838757&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/GoogleTest.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/GoogleTest.mk Thu Aug 23 20:05:32 2018
@@ -97,6 +97,7 @@ $(eval $(foreach method,\
 	add_libs \
 	set_library_path_flags \
 	add_api \
+	set_private_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \



Mime
View raw message