From 84fb7420a69205ed187d1debd600304eacde9a34 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 30 Jul 2011 23:45:11 +0200 Subject: convert psprint_config to gbuild --- psprint_config/Makefile | 38 ++++++++++++++++++++++ psprint_config/Module_psprint_config.mk | 35 ++++++++++++++++++++ psprint_config/Zip_fontunxppds.mk | 35 ++++++++++++++++++++ psprint_config/Zip_fontunxpsprint.mk | 34 ++++++++++++++++++++ psprint_config/configuration/delzip | 0 psprint_config/configuration/makefile.mk | 11 ------- psprint_config/configuration/ppds/delzip | 0 psprint_config/configuration/ppds/makefile.mk | 46 --------------------------- psprint_config/prj/build.lst | 3 +- psprint_config/prj/d.lst | 4 --- psprint_config/prj/makefile.mk | 40 +++++++++++++++++++++++ 11 files changed, 183 insertions(+), 63 deletions(-) create mode 100644 psprint_config/Makefile create mode 100644 psprint_config/Module_psprint_config.mk create mode 100644 psprint_config/Zip_fontunxppds.mk create mode 100644 psprint_config/Zip_fontunxpsprint.mk delete mode 100644 psprint_config/configuration/delzip delete mode 100644 psprint_config/configuration/makefile.mk delete mode 100644 psprint_config/configuration/ppds/delzip delete mode 100644 psprint_config/configuration/ppds/makefile.mk create mode 100644 psprint_config/prj/makefile.mk diff --git a/psprint_config/Makefile b/psprint_config/Makefile new file mode 100644 index 000000000000..5bedaf0b9dcf --- /dev/null +++ b/psprint_config/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 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..5c30c9fceed5 --- /dev/null +++ b/psprint_config/Module_psprint_config.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,psprint_config)) + +$(eval $(call gb_Module_add_targets,psprint_config,\ + Zip_fontunxppds \ + Zip_fontunxpsprint \ +)) + +# vim: set noet sw=4: diff --git a/psprint_config/Zip_fontunxppds.mk b/psprint_config/Zip_fontunxppds.mk new file mode 100644 index 000000000000..3714f11a3550 --- /dev/null +++ b/psprint_config/Zip_fontunxppds.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds)) + +$(eval $(call gb_Zip_add_files,fontunxppds,\ + SGENPRT.PS \ + SGENT42.PS \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/psprint_config/Zip_fontunxpsprint.mk b/psprint_config/Zip_fontunxpsprint.mk new file mode 100644 index 000000000000..ec0a351e5ac5 --- /dev/null +++ b/psprint_config/Zip_fontunxpsprint.mk @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(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/configuration/delzip b/psprint_config/configuration/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/psprint_config/configuration/makefile.mk b/psprint_config/configuration/makefile.mk deleted file mode 100644 index 6f8e7615570e..000000000000 --- a/psprint_config/configuration/makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ -PRJ=.. -PRJNAME=psprint_config -TARGET=unxfontspsprintgeneral - -.INCLUDE : settings.mk - -ZIP1TARGET = fontunxpsprint -ZIP1LIST = psprint.conf - -.INCLUDE : target.mk - diff --git a/psprint_config/configuration/ppds/delzip b/psprint_config/configuration/ppds/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/psprint_config/configuration/ppds/makefile.mk b/psprint_config/configuration/ppds/makefile.mk deleted file mode 100644 index eab740a4bef0..000000000000 --- a/psprint_config/configuration/ppds/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. -PRJNAME=psp_config -TARGET=unxfontsxp3ppds - -.INCLUDE : settings.mk - -.IF "$(WITHOUT_PPDS)"=="YES" -all: - @echo "Building without OOo postscript printer definition files." -.ENDIF - -ZIP1TARGET = fontunxppds -.IF "$(WITH_SYSTEM_PPD_DIR)" != "" -ZIP1LIST = SGENPRT.PS SGENT42.PS GENERIC.PS -.ELSE -ZIP1LIST = * -x makefile.* -x delzip -x *.orig -.ENDIF - -.INCLUDE : target.mk - diff --git a/psprint_config/prj/build.lst b/psprint_config/prj/build.lst index 697fcf6062f0..ee89990b2a9a 100644 --- a/psprint_config/prj/build.lst +++ b/psprint_config/prj/build.lst @@ -1,4 +1,3 @@ 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 f3886a148fdd..e69de29bb2d1 100644 --- a/psprint_config/prj/d.lst +++ b/psprint_config/prj/d.lst @@ -1,4 +0,0 @@ -mkdir: %COMMON_DEST%\pck - -..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip - diff --git a/psprint_config/prj/makefile.mk b/psprint_config/prj/makefile.mk new file mode 100644 index 000000000000..d30ff8a47e6b --- /dev/null +++ b/psprint_config/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit