Sat Aug 25 18:09:42 UTC 2018

Module_ooo.mk                                             |    2 
 Repository.mk                                             |    4 
 cpputools/Executable_regcomp.mk                           |   51 +++
 cpputools/Executable_regsingleton.mk                      |   54 +++
 cpputools/Executable_sp2bv.mk                             |   36 ++
 cpputools/Executable_uno.mk                               |   63 ++++
 cpputools/Makefile                                        |   32 ++
 cpputools/Module_cpputools.mk                             |   42 ++
 cpputools/Package_bin.mk                                  |   27 +
 cpputools/prj/build.lst                                   |    7 
 cpputools/prj/d.lst                                       |   10 
 cpputools/prj/makefile.mk                                 |   26 -
 default_images/framework/res/backing.png                  |binary
 default_images/framework/res/backing_hc.png               |binary
 default_images/framework/res/backing_rtl_left.png         |binary
 default_images/framework/res/backing_rtl_left_hc.png      |binary
 default_images/framework/res/beta/backing.png             |binary
 default_images/framework/res/beta/backing_hc.png          |binary
 default_images/framework/res/beta/backing_rtl_left.png    |binary
 default_images/framework/res/beta/backing_rtl_left_hc.png |binary
 default_images/introabout/about.png                       |binary
 default_images/introabout/beta/about.png                  |binary
 default_images/introabout/beta/intro.png                  |binary
 default_images/introabout/intro.png                       |binary
 extensions.lst                                            |    2 
 ooo_custom_images/dev/introabout/intro.png                |binary
 ooo_custom_images/dev_nologo/introabout/intro.png         |binary
 ooo_custom_images/nologo/introabout/intro.png             |binary
 psprint_config/Makefile                                   |   32 ++
 psprint_config/Module_psprint_config.mk                   |   37 ++
 psprint_config/Zip_fontunxppds.mk                         |  213 ++++++++++++++
 psprint_config/Zip_fontunxpsprint.mk                      |   17 -
 psprint_config/prj/build.lst                              |    4 
 psprint_config/prj/d.lst                                  |    4 
 psprint_config/prj/makefile.mk                            |   44 ++
 solenv/gbuild/Executable.mk                               |    1 
 solenv/gbuild/LinkTarget.mk                               |   27 +
 37 files changed, 690 insertions(+), 45 deletions(-)

New commits:
commit ec06d126a58579d6dbb4a3389ecc15350bab2f3b
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Aug 25 17:57:31 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Aug 25 17:57:31 2018 +0000

    Logo repositioned to align it better with the text in About dialog

diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png
index 593af62084ce..9002a4996c2a 100755
Binary files a/default_images/introabout/about.png and b/default_images/introabout/about.png differ
diff --git a/default_images/introabout/beta/about.png b/default_images/introabout/beta/about.png
index e374e87a65a9..b9bf9cc38d02 100755
Binary files a/default_images/introabout/beta/about.png and b/default_images/introabout/beta/about.png differ
commit 24038c910b9783eb4649f92a29e7a48cc891d848
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Aug 25 07:43:05 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Aug 25 07:43:05 2018 +0000

    Windows needs abbreviate_dirs_native as cppumaker doesn't handle
    
    /cygdrive/c/... paths.
    
    Patch by: me

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index aa0c6621b76c..41d32e493f0a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -582,7 +582,7 @@ endif
 
 $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2)
 	$(call gb_Output_announce,$@,$(true),PVTUNOTYPES,2)
-	-$$(call gb_Helper_abbreviate_dirs,\
+	-$$(call gb_Helper_abbreviate_dirs_native,\
 		mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) && \
 		$(gb_UnoApiTarget_CPPUMAKERCOMMAND) \
 			-O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) \
commit 84db0bba9eecd83cccc5af733ec235c948d02251
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Aug 25 06:04:40 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Aug 25 06:04:40 2018 +0000

    Fix other cpputools/Module_cpputools.mk problems, such as
    
    the wrong if statement, and the wrong filename.
    
    Patch by: me

diff --git a/cpputools/Module_cputools.mk b/cpputools/Module_cpputools.mk
similarity index 97%
rename from cpputools/Module_cputools.mk
rename to cpputools/Module_cpputools.mk
index b524c821154c..ccde29c8d44e 100644
--- a/cpputools/Module_cputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,cpputools,\
 ))
 
 ifeq ($(GUIBASE),WIN)
-else if ($(GUIBASE),OS2)
+else ifeq ($(GUIBASE),OS2)
 else
 $(eval $(call gb_Module_add_targets,cpputools,\
 	Package_bin \
commit 65514d394354c381be03335fc27ad54af88808a6
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Aug 25 02:08:57 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Aug 25 02:08:57 2018 +0000

    GNU make uses "else if".
    
    Patch by: me

diff --git a/cpputools/Module_cputools.mk b/cpputools/Module_cputools.mk
index f59a447fa379..b524c821154c 100644
--- a/cpputools/Module_cputools.mk
+++ b/cpputools/Module_cputools.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,cpputools,\
 ))
 
 ifeq ($(GUIBASE),WIN)
-elif ($(GUIBASE),OS2)
+else if ($(GUIBASE),OS2)
 else
 $(eval $(call gb_Module_add_targets,cpputools,\
 	Package_bin \
commit 91851bb873cb171a506a8cde49e5fd8230fcd53b
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Aug 24 21:36:55 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Aug 24 21:36:55 2018 +0000

    Renewed logo on StartCenter based on the original artwork from Chris Rottensteiner.
    
    See:
    https://svn.apache.org/repos/asf/openoffice/branding/AOO4/Apache_OpenOffice_Logo_ChrisR_selected_2013-06_with_4.pdf

diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png
index 47825a6279f9..934d7d6e49bf 100644
Binary files a/default_images/framework/res/backing.png and b/default_images/framework/res/backing.png differ
diff --git a/default_images/framework/res/backing_hc.png b/default_images/framework/res/backing_hc.png
index ca00d3dc978d..d8e48732afc4 100644
Binary files a/default_images/framework/res/backing_hc.png and b/default_images/framework/res/backing_hc.png differ
diff --git a/default_images/framework/res/backing_rtl_left.png b/default_images/framework/res/backing_rtl_left.png
index cfc501b00af0..21ec380ea22b 100644
Binary files a/default_images/framework/res/backing_rtl_left.png and b/default_images/framework/res/backing_rtl_left.png differ
diff --git a/default_images/framework/res/backing_rtl_left_hc.png b/default_images/framework/res/backing_rtl_left_hc.png
index 5cbcbd3cfc6b..a706c37459bc 100644
Binary files a/default_images/framework/res/backing_rtl_left_hc.png and b/default_images/framework/res/backing_rtl_left_hc.png differ
diff --git a/default_images/framework/res/beta/backing.png b/default_images/framework/res/beta/backing.png
index 20f219e0fc64..df5fc87bc05b 100755
Binary files a/default_images/framework/res/beta/backing.png and b/default_images/framework/res/beta/backing.png differ
diff --git a/default_images/framework/res/beta/backing_hc.png b/default_images/framework/res/beta/backing_hc.png
index b733ab306e98..f612f4077b4a 100755
Binary files a/default_images/framework/res/beta/backing_hc.png and b/default_images/framework/res/beta/backing_hc.png differ
diff --git a/default_images/framework/res/beta/backing_rtl_left.png b/default_images/framework/res/beta/backing_rtl_left.png
index 37782a8e3ad5..cedac04aca10 100755
Binary files a/default_images/framework/res/beta/backing_rtl_left.png and b/default_images/framework/res/beta/backing_rtl_left.png differ
diff --git a/default_images/framework/res/beta/backing_rtl_left_hc.png b/default_images/framework/res/beta/backing_rtl_left_hc.png
index 79be7e1c1623..3ebe2b832dcb 100755
Binary files a/default_images/framework/res/beta/backing_rtl_left_hc.png and b/default_images/framework/res/beta/backing_rtl_left_hc.png differ
commit 8d906b3735f2910b4499ee0e644ab36735062659
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Aug 24 20:22:09 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Aug 24 20:22:09 2018 +0000

    Updated English dictionary

diff --git a/extensions.lst b/extensions.lst
index 7bb236e7a4b9..9ef3c50a5bec 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -73,7 +73,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-    a180736ccd1424dd5c7eee823f9f09ad https://sourceforge.net/projects/aoo-extensions/files/17102/42/dict-en-20180701.oxt/download "dict-en.oxt"
+    415776b805d9828db0980397bca72b60 https://sourceforge.net/projects/aoo-extensions/files/17102/43/dict-en-20180901.oxt/download "dict-en.oxt"
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
commit b0b4e8674eb39221aa20c552285d4697385b2b28
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Fri Aug 24 18:58:00 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Fri Aug 24 18:58:00 2018 +0000

    Port main/cpputools to gbuild.
    
    Patch by: me

diff --git a/Repository.mk b/Repository.mk
index a1bce69268cb..7e4d995f2216 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
+    regsingleton \
+    sp2bv \
     spadmin.bin \
 ))
 
@@ -54,8 +56,10 @@ $(eval $(call gb_Helper_register_executables,SDK, \
 
 $(eval $(call gb_Helper_register_executables,UREBIN, \
     javaldx \
+    regcomp \
     regmerge \
     regview \
+    uno \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
new file mode 100644
index 000000000000..3222f5d9cfd0
--- /dev/null
+++ b/cpputools/Executable_regcomp.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.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Executable_Executable,regcomp))
+
+$(eval $(call gb_Executable_add_linked_libs,regcomp,\
+	cppu \
+	cppuhelper \
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_set_private_extract_of_public_api,regcomp,$(OUTDIR)/bin/udkapi.rdb,\
+	com.sun.star.uno.TypeClass \
+	com.sun.star.lang.XMultiServiceFactory \
+	com.sun.star.lang.XSingleServiceFactory \
+	com.sun.star.lang.XMultiComponentFactory \
+	com.sun.star.lang.XSingleComponentFactory \
+	com.sun.star.lang.XComponent \
+	com.sun.star.container.XContentEnumerationAccess \
+	com.sun.star.container.XSet \
+	com.sun.star.loader.CannotActivateFactoryException \
+	com.sun.star.registry.XImplementationRegistration2 \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcomp,\
+	cpputools/source/registercomponent/registercomponent \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
new file mode 100644
index 000000000000..747a01a94ea5
--- /dev/null
+++ b/cpputools/Executable_regsingleton.mk
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  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,regsingleton))
+
+$(eval $(call gb_Executable_add_linked_libs,regsingleton,\
+	cppu \
+	cppuhelper \
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_set_private_extract_of_public_api,regsingleton,$(OUTDIR)/bin/udkapi.rdb,\
+ 	com.sun.star.uno.TypeClass \
+ 	com.sun.star.uno.XAggregation \
+ 	com.sun.star.uno.XWeak \
+ 	com.sun.star.uno.XComponentContext \
+ 	com.sun.star.lang.XTypeProvider \
+ 	com.sun.star.lang.XComponent \
+ 	com.sun.star.lang.XSingleServiceFactory \
+ 	com.sun.star.lang.XSingleComponentFactory \
+ 	com.sun.star.lang.XMultiServiceFactory \
+ 	com.sun.star.lang.XMultiComponentFactory \
+ 	com.sun.star.container.XHierarchicalNameAccess \
+	com.sun.star.registry.XSimpleRegistry \
+	com.sun.star.registry.XRegistryKey \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regsingleton,\
+	cpputools/source/regsingleton/regsingleton \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
new file mode 100644
index 000000000000..17f4294ce336
--- /dev/null
+++ b/cpputools/Executable_sp2bv.mk
@@ -0,0 +1,36 @@
+#**************************************************************
+#  
+#  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,sp2bv))
+
+$(eval $(call gb_Executable_add_linked_libs,sp2bv,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
+	cpputools/source/sp2bv/sp2bv \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
new file mode 100644
index 000000000000..ddf995bcac59
--- /dev/null
+++ b/cpputools/Executable_uno.mk
@@ -0,0 +1,63 @@
+#**************************************************************
+#  
+#  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,uno))
+
+$(eval $(call gb_Executable_add_linked_libs,uno,\
+	cppu \
+	cppuhelper \
+	sal \
+	salhelper \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_set_private_extract_of_public_api,uno,$(OUTDIR)/bin/udkapi.rdb,\
+ 	com.sun.star.uno.TypeClass \
+ 	com.sun.star.uno.XAggregation \
+ 	com.sun.star.uno.XWeak \
+ 	com.sun.star.uno.XComponentContext \
+ 	com.sun.star.lang.XTypeProvider \
+	com.sun.star.lang.XMain \
+ 	com.sun.star.lang.XInitialization \
+ 	com.sun.star.lang.XComponent \
+ 	com.sun.star.lang.XSingleServiceFactory \
+ 	com.sun.star.lang.XSingleComponentFactory \
+ 	com.sun.star.lang.XMultiServiceFactory \
+ 	com.sun.star.lang.XMultiComponentFactory \
+ 	com.sun.star.container.XSet \
+ 	com.sun.star.container.XHierarchicalNameAccess \
+	com.sun.star.loader.XImplementationLoader \
+	com.sun.star.registry.XSimpleRegistry \
+	com.sun.star.registry.XRegistryKey \
+	com.sun.star.connection.XAcceptor \
+	com.sun.star.connection.XConnection \
+	com.sun.star.bridge.XBridgeFactory \
+	com.sun.star.bridge.XBridge \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,uno,\
+	cpputools/source/unoexe/unoexe \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Makefile b/cpputools/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/cpputools/Makefile
@@ -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:
diff --git a/cpputools/Module_cputools.mk b/cpputools/Module_cputools.mk
new file mode 100644
index 000000000000..f59a447fa379
--- /dev/null
+++ b/cpputools/Module_cputools.mk
@@ -0,0 +1,42 @@
+#**************************************************************
+#  
+#  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,cpputools))
+
+$(eval $(call gb_Module_add_targets,cpputools,\
+	Executable_regcomp \
+	Executable_regsingleton \
+	Executable_sp2bv \
+	Executable_uno \
+))
+
+ifeq ($(GUIBASE),WIN)
+elif ($(GUIBASE),OS2)
+else
+$(eval $(call gb_Module_add_targets,cpputools,\
+	Package_bin \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
new file mode 100644
index 000000000000..ad5e6706313a
--- /dev/null
+++ b/cpputools/Package_bin.mk
@@ -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_Package_Package,cpputools_bin,$(WORKDIR)/LinkTarget/Executable))
+
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp))
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))
diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst
index 72aed9e6609e..f37ae4c749ef 100644
--- a/cpputools/prj/build.lst
+++ b/cpputools/prj/build.lst
@@ -1,7 +1,2 @@
 pt	cpputools	:	cppuhelper offapi LIBXML2:libxml2 NULL
-pt	cpputools								usr1	-	all	pt_mkout NULL
-pt	cpputools\prj							get		-	all	pt_prj NULL
-pt	cpputools\source\registercomponent		nmake	-	all	pt_regcomp NULL
-pt	cpputools\source\regsingleton				nmake	-	all	pt_regsingleton NULL
-pt	cpputools\source\unoexe					nmake	-	all	pt_unoexe NULL
-pt	cpputools\source\sp2bv					nmake	-	all	pt_sp2bv NULL
+pt	cpputools\prj							nmake		-	all	pt_prj NULL
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index 14de5e78af75..e69de29bb2d1 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
-..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp.bin
-..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno
-..\%__SRC%\bin\uno %_DEST%\bin%_EXT%\uno.bin
-..\%__SRC%\bin\regsingleton.exe %_DEST%\bin%_EXT%\regsingleton.exe
-..\%__SRC%\bin\regsingleton %_DEST%\bin%_EXT%\regsingleton
-..\%__SRC%\bin\sp2bv.exe %_DEST%\bin%_EXT%\sp2bv.exe
-..\%__SRC%\bin\sp2bv %_DEST%\bin%_EXT%\sp2bv
diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/cpputools/prj/makefile.mk
@@ -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
commit 91d639afcc107abe78b0839b8c0b7bbbd99a40b7
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Fri Aug 24 18:56:02 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Fri Aug 24 18:56:02 2018 +0000

    Add the solenv/gbuild changes I accidentally left out from my last commit,
    
    which allow extracting custom .hpp files from .rdb using cppumaker.
    
    Patch by: me

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index a276625a492f..bbc9d5c2c7bb 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -97,6 +97,7 @@ $(eval $(foreach method,\
 	add_package_headers \
 	add_sdi_headers \
 	add_precompiled_header \
+	set_private_extract_of_public_api \
 ,\
 	$(call gb_Executable_forward_to_Linktarget,$(method))\
 ))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 108b94dfd68c..aa0c6621b76c 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -571,6 +571,33 @@ $(foreach api,$(2),$(call gb_LinkTarget_add_private_api,$(1),$(api)))
 
 endef
 
+define gb_LinkTarget_set_private_extract_of_public_api
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc)
+endif
+
+$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2)
+	$(call gb_Output_announce,$@,$(true),PVTUNOTYPES,2)
+	-$$(call gb_Helper_abbreviate_dirs,\
+		mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) && \
+		$(gb_UnoApiTarget_CPPUMAKERCOMMAND) \
+			-O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) \
+			$(foreach unotype,$(3),-T$(unotype)) \
+			-BUCR \
+			-C \
+			$$(OUTDIR)/bin/udkapi.rdb && \
+		touch $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag))
+
+$(call gb_LinkTarget_get_clean_target,$(1)) :
+	rm -rf $(call gb_UnoPrivateApiTarget_get_target,$(1))
+
+
+endef
+
 define gb_LinkTarget_add_libs
 $(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
 endef
commit 18bd6093438f7d8e8f66cc452190f982bc4b8079
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Aug 24 16:16:44 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Aug 24 16:16:44 2018 +0000

    Redesigned intro/about graphics based on the original artwork from Chris Rottensteiner.
    
    See:
    https://svn.apache.org/repos/asf/openoffice/branding/AOO4/Apache_OpenOffice_Logo_ChrisR_selected_2013-06_with_4.pdf

diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png
index 2cd20dfb6e54..593af62084ce 100755
Binary files a/default_images/introabout/about.png and b/default_images/introabout/about.png differ
diff --git a/default_images/introabout/beta/about.png b/default_images/introabout/beta/about.png
index 83f0b358b739..e374e87a65a9 100755
Binary files a/default_images/introabout/beta/about.png and b/default_images/introabout/beta/about.png differ
diff --git a/default_images/introabout/beta/intro.png b/default_images/introabout/beta/intro.png
index 648dd13305e0..fd0909200a83 100755
Binary files a/default_images/introabout/beta/intro.png and b/default_images/introabout/beta/intro.png differ
diff --git a/default_images/introabout/intro.png b/default_images/introabout/intro.png
index a02b2692706a..17f93842f3a3 100755
Binary files a/default_images/introabout/intro.png and b/default_images/introabout/intro.png differ
diff --git a/ooo_custom_images/dev/introabout/intro.png b/ooo_custom_images/dev/introabout/intro.png
index 71059fa89b14..214bb79be211 100755
Binary files a/ooo_custom_images/dev/introabout/intro.png and b/ooo_custom_images/dev/introabout/intro.png differ
diff --git a/ooo_custom_images/dev_nologo/introabout/intro.png b/ooo_custom_images/dev_nologo/introabout/intro.png
index 75d749eb1333..4fef9405c575 100755
Binary files a/ooo_custom_images/dev_nologo/introabout/intro.png and b/ooo_custom_images/dev_nologo/introabout/intro.png differ
diff --git a/ooo_custom_images/nologo/introabout/intro.png b/ooo_custom_images/nologo/introabout/intro.png
index 6407dec59dbb..1d8ff0ed928b 100755
Binary files a/ooo_custom_images/nologo/introabout/intro.png and b/ooo_custom_images/nologo/introabout/intro.png differ
commit 82952c91e6ef63394cc297b8dd627493dc6b1aab
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Fri Aug 24 06:52:32 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Fri Aug 24 06:52:32 2018 +0000

    Port main/psprint_config to gbuild.
    
    Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 4ac3c74deac4..70391af9fd3f 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     configmgr \
     cosv \
     cppcanvas \
+    cpputools \
     cui \
     dbaccess \
     drawinglayer \
@@ -65,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     oox \
     package \
     padmin \
+    psprint_config \
     rdbmaker \
     registry \
     remotebridges \
diff --git a/psprint_config/Makefile b/psprint_config/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/psprint_config/Makefile
@@ -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:
diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk
new file mode 100644
index 000000000000..0f8032b71052
--- /dev/null
+++ b/psprint_config/Module_psprint_config.mk
@@ -0,0 +1,37 @@
+#**************************************************************
+#  
+#  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,psprint_config))
+
+$(eval $(call gb_Module_add_targets,psprint_config,\
+	Zip_fontunxpsprint \
+))
+
+ifneq ($(WITHOUT_PPDS),YES)
+$(eval $(call gb_Module_add_targets,psprint_config,\
+        Zip_fontunxppds \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Zip_fontunxppds.mk b/psprint_config/Zip_fontunxppds.mk
new file mode 100644
index 000000000000..8bfe4d8bec24
--- /dev/null
+++ b/psprint_config/Zip_fontunxppds.mk
@@ -0,0 +1,213 @@
+###############################################################
+#  
+#  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_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+
+ifneq ($(WITH_SYSTEM_PPD_DIR),)
+$(eval $(call gb_Zip_add_files,fontunxppds,\
+	SGENPRT.PS \
+	SGENT42.PS \
+	GENERIC.PS \
+))
+else
+$(eval $(call gb_Zip_add_files,fontunxppds,\
+        ADISTILL.PS \
+        APLW3101.PS \
+        APLW3201.PS \
+        APLW3601.PS \
+        APLW6101.PS \
+        APLW8101.PS \
+        APLW81F1.PS \
+        APLWBGR1.PS \
+        APLWCOB1.PS \
+        APLWCSB1.PS \
+        APLWGRF1.PS \
+        APLWGRI1.PS \
+        APLWGRJ1.PS \
+        APLWIIF2.PS \
+        APLWIIG2.PS \
+        APLWLOT1.PS \
+        APL_IIF1.PS \
+        APL_IIG1.PS \
+        APL_NTR1.PS \
+        APNT518_.PS \
+        APNTX501.PS \
+        APNTXJ1_.PS \
+        APPL_230.PS \
+        APPL_380.PS \
+        APPL_422.PS \
+        APTOLLD1.PS \
+        APTOLLW1.PS \
+        CAECOGR1.PS \
+        DC1152_1.PS \
+        EFAX3010.PS \
+        EFAX4010.PS \
+        EFAX5010.PS \
+        EFAX7010.PS \
+        EFMX3010.PS \
+        EFMX5010.PS \
+        EFMX7010.PS \
+        EFXJK1F3.PS \
+        EFXJK2F3.PS \
+        EFXJK303.PS \
+        EFXJK3F3.PS \
+        EP_08001.PS \
+        EP_15201.PS \
+        EP_30001.PS \
+        EP_50001.PS \
+        EP_82F21.PS \
+        EP_82F51.PS \
+        EP_P0701.PS \
+        EP_P1201.PS \
+        EP_STPH1.PS \
+        GENERIC.PS \
+        HP1200C1.PS \
+        HP2500C1.PS \
+        HP3SI52_.PS \
+        HP3SIL21.PS \
+        HP4M3_V1.PS \
+        HP4M6_V1.PS \
+        HP4ML_V1.PS \
+        HP4MP3_1.PS \
+        HP4MP6_1.PS \
+        HP4PLUS3.PS \
+        HP4PLUS6.PS \
+        HP4SI3_1.PS \
+        HP4SI6_1.PS \
+        HPIID52_.PS \
+        HPIII52_.PS \
+        HPIIP52_.PS \
+        HPLJ3D1_.PS \
+        HPLJ3P1_.PS \
+        HPLJ4MV1.PS \
+        HPLJ5M_4.PS \
+        HPLJ5P_1.PS \
+        HPLJ5SI1.PS \
+        HPLJ5SIM.PS \
+        HPLJ__31.PS \
+        HP_3D52_.PS \
+        HP_3P52_.PS \
+        HP__CLJ1.PS \
+        KD8650P1.PS \
+        KD92P001.PS \
+        KDH00001.PS \
+        KDH00002.PS \
+        L10__425.PS \
+        L20__471.PS \
+        L20__493.PS \
+        L30__471.PS \
+        L30__493.PS \
+        L333_523.PS \
+        L33__523.PS \
+        L50__493.PS \
+        L533_523.PS \
+        L53__523.PS \
+        LEX4039P.PS \
+        LEX4079P.PS \
+        LEXOPTR_.PS \
+        LHCFLRJ5.PS \
+        LHCOFLC5.PS \
+        LHCOFLR5.PS \
+        LHGUBEH3.PS \
+        LHGUBHJ4.PS \
+        LHHERHJ4.PS \
+        LHHERIJ4.PS \
+        LHHERKH3.PS \
+        LHHERKI4.PS \
+        LHHKPHJ7.PS \
+        LHHKPIJ7.PS \
+        LHHRKPH7.PS \
+        LHHRKPI7.PS \
+        LHQUSHJ4.PS \
+        LHQUSIJ4.PS \
+        LHQUSRH3.PS \
+        LHQUSRI3.PS \
+        LHSIGHJ4.PS \
+        LHSIGIJ4.PS \
+        LHSIGNH3.PS \
+        LHSIGNI3.PS \
+        LOPC1200.PS \
+        LOPC40.PS \
+        LOPC45.PS \
+        LOPE310.PS \
+        LOPM410.PS \
+        LOPS1255.PS \
+        LOPS1625.PS \
+        LOPS1855.PS \
+        LOPS2455.PS \
+        LOPS3455.PS \
+        LOPT610.PS \
+        LOPT612.PS \
+        LOPT614.PS \
+        LOPT616.PS \
+        LOPTRAC.PS \
+        LOPTRAEP.PS \
+        LOPTRAK.PS \
+        LOPTRAN.PS \
+        LOPTRAP.PS \
+        LOPTRAS.PS \
+        LOPTRASC.PS \
+        LOPW810.PS \
+        LOS1255P.PS \
+        LOS1625P.PS \
+        LOS1855P.PS \
+        LOS2455P.PS \
+        LOS3455P.PS \
+        LWNT_518.PS \
+        SGENPRT.PS \
+        SGENT42.PS \
+        SNSPREC1.PS \
+        TK300PJ1.PS \
+        TK300XJ1.PS \
+        TK350171.PS \
+        TK350172.PS \
+        TK350691.PS \
+        TK350692.PS \
+        TK350PJ2.PS \
+        TK360J21.PS \
+        TK360J51.PS \
+        TK360J71.PS \
+        TK450PJ1.PS \
+        TK550171.PS \
+        TK550391.PS \
+        TK550PJ1.PS \
+        TKP350J2.PS \
+        TKP360P1.PS \
+        TKP380J1.PS \
+        TKP380P1.PS \
+        TKP450J1.PS \
+        TKP450P1.PS \
+        TKP550J1.PS \
+        TKP600J1.PS \
+        TKPH3801.PS \
+        TKPH4501.PS \
+        TKPH6001.PS \
+        XRD61354.PS \
+        XRD61801.PS \
+        XRN17000.PS \
+        XRN24320.PS \
+        XR_DC230.PS \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/configuration/makefile.mk b/psprint_config/Zip_fontunxpsprint.mk
similarity index 72%
rename from psprint_config/configuration/makefile.mk
rename to psprint_config/Zip_fontunxpsprint.mk
index 6c83e6bf1a84..6ba5a91aad45 100644
--- a/psprint_config/configuration/makefile.mk
+++ b/psprint_config/Zip_fontunxpsprint.mk
@@ -1,4 +1,4 @@
-# *************************************************************
+###############################################################
 #  
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
@@ -17,15 +17,14 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #  
-# *************************************************************
-PRJ=..
-PRJNAME=psprint_config
-TARGET=unxfontspsprintgeneral
+###############################################################
 
-.INCLUDE : settings.mk
 
-ZIP1TARGET      = fontunxpsprint
-ZIP1LIST        = psprint.conf
 
-.INCLUDE : target.mk
+$(eval $(call gb_Zip_Zip,fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
 
+$(eval $(call gb_Zip_add_files,fontunxpsprint,\
+	psprint.conf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/prj/build.lst b/psprint_config/prj/build.lst
index 697fcf6062f0..3c321e8dfae9 100644
--- a/psprint_config/prj/build.lst
+++ b/psprint_config/prj/build.lst
@@ -1,4 +1,2 @@
 pc	psprint_config	: soltools AFMS:afms NULL
-pc	psprint_config							usr1	-	all	pc_mkout NULL
-pc	psprint_config\configuration			nmake   -   u	pc_conf NULL
-pc	psprint_config\configuration\ppds		nmake	-	u	pc_ppds NULL
+pc	psprint_config\prj							nmake	-	all	pc_prj NULL
diff --git a/psprint_config/prj/d.lst b/psprint_config/prj/d.lst
index b828f50a9561..e69de29bb2d1 100644
--- a/psprint_config/prj/d.lst
+++ b/psprint_config/prj/d.lst
@@ -1,4 +0,0 @@
-mkdir: %COMMON_DEST%\pck%_EXT%
-
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
-
diff --git a/psprint_config/configuration/ppds/makefile.mk b/psprint_config/prj/makefile.mk
similarity index 74%
rename from psprint_config/configuration/ppds/makefile.mk
rename to psprint_config/prj/makefile.mk
index 59156ff250d0..c62c6a657d16 100644
--- a/psprint_config/configuration/ppds/makefile.mk
+++ b/psprint_config/prj/makefile.mk
@@ -20,23 +20,25 @@
 #**************************************************************
 
 
-PRJ=..$/..
-PRJNAME=psp_config
-TARGET=unxfontsxp3ppds
+
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
 
-.IF "$(WITHOUT_PPDS)"=="YES"
-all:
-    @echo "Building without OOo postscript printer definition files."
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
 .ENDIF
 
-ZIP1TARGET      = fontunxppds
-.IF "$(WITH_SYSTEM_PPD_DIR)" != ""
-ZIP1LIST = SGENPRT.PS SGENT42.PS GENERIC.PS
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
 .ELSE
-ZIP1LIST        = * -x makefile.* -x delzip
+DEBUG_ARGUMENT=
 .ENDIF
 
-.INCLUDE : target.mk
-
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
