From 9381025d4abb0a10fb458117542c2a063c7b1cfd Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 18 Jan 2011 18:44:14 +0100 Subject: vcl118: #i116501# migrated padmin module to gbuild system --- padmin/AllLangResTarget_spa.mk | 48 +++++++++++++++++++++++++ padmin/Executable_spadmin.bin.mk | 70 ++++++++++++++++++++++++++++++++++++ padmin/Library_spa.mk | 76 ++++++++++++++++++++++++++++++++++++++++ padmin/Makefile | 38 ++++++++++++++++++++ padmin/Module_padmin.mk | 41 ++++++++++++++++++++++ padmin/Package_inc.mk | 30 ++++++++++++++++ padmin/prj/build.lst | 2 +- padmin/prj/d.lst | 7 ---- padmin/prj/makefile.mk | 40 +++++++++++++++++++++ padmin/source/helper.hxx | 7 ++++ padmin/source/padialog.hxx | 2 +- padmin/source/prtsetup.cxx | 6 ++-- 12 files changed, 355 insertions(+), 12 deletions(-) create mode 100644 padmin/AllLangResTarget_spa.mk create mode 100644 padmin/Executable_spadmin.bin.mk create mode 100644 padmin/Library_spa.mk create mode 100644 padmin/Makefile create mode 100644 padmin/Module_padmin.mk create mode 100644 padmin/Package_inc.mk create mode 100644 padmin/prj/makefile.mk (limited to 'padmin') diff --git a/padmin/AllLangResTarget_spa.mk b/padmin/AllLangResTarget_spa.mk new file mode 100644 index 000000000000..b3acb92f81d5 --- /dev/null +++ b/padmin/AllLangResTarget_spa.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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_AllLangResTarget_AllLangResTarget,spa)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,spa,padmin/source)) + +$(eval $(call gb_AllLangResTarget_add_srs,spa,\ + padmin/source \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,padmin/source)) + +$(eval $(call gb_SrsTarget_set_include,padmin/source,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_SrsTarget_add_files,padmin/source,\ + padmin/source/padialog.src \ + padmin/source/rtsetup.src \ +)) + + +# vim: set noet sw=4 ts=4: diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk new file mode 100644 index 000000000000..ae677c1c86b4 --- /dev/null +++ b/padmin/Executable_spadmin.bin.mk @@ -0,0 +1,70 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,spadmin.bin)) + +$(eval $(call gb_Executable_set_include,spadmin.bin,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\ + $$(CXXFLAGS) \ +)) + +$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\ + vclmain \ +)) + +$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ + spa \ + svt \ + vcl \ + utl \ + ucbhelper \ + comphelper \ + tl \ + cppuhelper \ + cppu \ + sal \ + stl \ +)) + +$(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\ + padmin/source/desktopcontext \ + padmin/source/pamain \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\ + dl \ + pthread \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk new file mode 100644 index 000000000000..47618720d283 --- /dev/null +++ b/padmin/Library_spa.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,spa)) + +$(eval $(call gb_Library_set_include,spa,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ +)) + +$(eval $(call gb_Library_set_defs,spa,\ + $$(DEFS) \ + -DSPA_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,spa,\ + svt \ + vcl \ + utl \ + tl \ + basegfx \ + comphelper \ + i18nisolang1 \ + stl \ + cppu \ + sal \ + vos3 \ +)) + + +$(eval $(call gb_Library_add_exception_objects,spa,\ + padmin/source/adddlg \ + padmin/source/cmddlg \ + padmin/source/fontentry \ + padmin/source/helper \ + padmin/source/newppdlg \ + padmin/source/padialog \ + padmin/source/progress \ + padmin/source/prtsetup \ + padmin/source/titlectrl \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,spa,\ + dl \ + m \ + pthread \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/padmin/Makefile b/padmin/Makefile new file mode 100644 index 000000000000..a79aff831024 --- /dev/null +++ b/padmin/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +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/padmin/Module_padmin.mk b/padmin/Module_padmin.mk new file mode 100644 index 000000000000..01fd4c99af19 --- /dev/null +++ b/padmin/Module_padmin.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + + +$(eval $(call gb_Module_Module,padmin)) + +ifeq ($(GUIBASE),unx) + +$(eval $(call gb_Module_add_targets,padmin,\ + Executable_spadmin.bin \ + Library_spa \ + AllLangResTarget_spa \ + Package_inc \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/padmin/Package_inc.mk b/padmin/Package_inc.mk new file mode 100644 index 000000000000..3a2a3a3177e1 --- /dev/null +++ b/padmin/Package_inc.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,padmin_src,$(SRCDIR)/padmin/source)) +$(eval $(call gb_Package_add_file,padmin_src,bin/spadmin,spadmin.sh)) + diff --git a/padmin/prj/build.lst b/padmin/prj/build.lst index 9aaab83cf7de..0e505f92f2a2 100644 --- a/padmin/prj/build.lst +++ b/padmin/prj/build.lst @@ -1,3 +1,3 @@ pd padmin : vcl svtools NULL pd padmin usr1 - all pd_mkout NULL -pd padmin\source nmake - all pd_source NULL +pd padmin\prj nmake - all pd_prj NULL diff --git a/padmin/prj/d.lst b/padmin/prj/d.lst index 3b86822c24e8..8b137891791f 100644 --- a/padmin/prj/d.lst +++ b/padmin/prj/d.lst @@ -1,8 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res -..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\misc\spadmin.sh %_DEST%\bin%_EXT%\spadmin diff --git a/padmin/prj/makefile.mk b/padmin/prj/makefile.mk new file mode 100644 index 000000000000..c73a3d944bbf --- /dev/null +++ b/padmin/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) diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index 636241b826a6..4a9468c50725 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -46,6 +46,13 @@ #endif #include +#if defined SPA_DLLIMPLEMENTATION +#define SPA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SPA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + + class Config; #define PSPRINT_PPDDIR "driver" diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 2a8285f8af88..053d9501ee7e 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -50,7 +50,7 @@ class Printer; namespace padmin { - class PADialog : public ModalDialog + class SPA_DLLPUBLIC PADialog : public ModalDialog { private: DelListBox m_aDevicesLB; diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 8165b8015403..1d105618b648 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -802,7 +802,7 @@ OString RTSPWDialog::getPassword() const extern "C" { - int Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData ) + int SPA_DLLPUBLIC Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData ) { int nRet = 0; RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false ); @@ -816,14 +816,14 @@ extern "C" { return nRet; } - int Sal_queryFaxNumber( String& rNumber ) + int SPA_DLLPUBLIC Sal_queryFaxNumber( String& rNumber ) { String aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) ); QueryString aQuery( NULL, aTmpString, rNumber ); return aQuery.Execute(); } - bool Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) + bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) { bool bRet = false; -- cgit v1.2.3