diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
commit | 07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d (patch) | |
tree | 5f80a6862e44b938c4e7f62f457d1b48f5a0195b /scp2 | |
parent | 007f16ef7ad40ae932df884ba04f0de71928b852 (diff) |
TDE integration
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/prj/build.lst | 3 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 41 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 7 | ||||
-rw-r--r-- | scp2/source/ooo/makefile.mk | 8 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 4 | ||||
-rw-r--r-- | scp2/source/tde/file_tde.scp | 33 | ||||
-rw-r--r-- | scp2/source/tde/makefile.mk | 56 | ||||
-rw-r--r-- | scp2/source/tde/module_tde.scp | 41 | ||||
-rw-r--r-- | scp2/source/tde/module_tde.ulf | 30 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 6 |
10 files changed, 225 insertions, 4 deletions
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index 9b8243240874..59ebecec1ecc 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -13,6 +13,7 @@ cp scp2\source\gnome nmake - all cp_gnome cp_langmacros cp cp scp2\source\graphicfilter nmake - all cp_graphicfilter cp_langmacros cp_langtemplates NULL cp scp2\source\impress nmake - all cp_impress cp_langmacros cp_langtemplates NULL cp scp2\source\javafilter nmake - all cp_javafilter cp_langmacros cp_langtemplates NULL +cp scp2\source\tde nmake - all cp_tde cp_langmacros cp_langtemplates NULL cp scp2\source\kde nmake - all cp_kde cp_langmacros cp_langtemplates NULL cp scp2\source\math nmake - all cp_math cp_langmacros cp_langtemplates NULL cp scp2\source\ooo nmake - all cp_ooo cp_langmacros cp_langtemplates NULL @@ -27,4 +28,4 @@ cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacr cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros cp_langtemplates NULL cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL cp scp2\source\accessories nmake - all cp_accessories cp_langmacros NULL -cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_stdlibs cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL +cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_tde cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_stdlibs cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index e3ae2390fc30..e46f50f11efd 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -432,6 +432,22 @@ End #ifdef UNX +#ifdef ENABLE_TDEAB +File gid_File_Lib_Tdeab_1 + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = STRING(CONCAT2(libtdeab1,UNXSUFFIX)); +End + +File gid_File_Lib_Tdeab_Drv_1 + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = STRING(CONCAT2(libtdeabdrv1,UNXSUFFIX)); +End +#endif + #ifdef ENABLE_KAB File gid_File_Lib_Kab_1 LIB_FILE_BODY; @@ -446,7 +462,6 @@ File gid_File_Lib_Kab_Drv_1 Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX)); End - #endif #ifdef MACOSX @@ -463,8 +478,7 @@ File gid_File_Lib_Macab_Drv_1 Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX)); End - -#endif // #ifdef ENABLE_KAB +#endif // #ifdef MACOSX #ifdef ENABLE_EVOAB2 @@ -502,6 +516,17 @@ File gid_File_Lib_Desktopbe Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX)); End +#ifdef ENABLE_TDE +#ifndef MACOSX +File gid_File_Bin_TdeFilePicker + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Brand_Dir_Program; + Name = "tdefilepicker"; +End +#endif +#endif + #ifdef ENABLE_KDE #ifndef MACOSX File gid_File_Bin_KdeFilePicker @@ -991,6 +1016,16 @@ File gid_File_Lib_Vclplug_Gtk3 Dir = SCP2_OOO_BIN_DIR; End #endif +#ifdef ENABLE_TDE +#ifndef MACOSX +File gid_File_Lib_Vclplug_Tde + Name = LIBNAME(vclplug_tde); + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; +End +#endif +#endif #ifdef ENABLE_KDE #ifndef MACOSX File gid_File_Lib_Vclplug_Kde diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 459d31e38ecc..450d9e64d5eb 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -181,6 +181,13 @@ File gid_File_Bin_Gnome_Open_Url_Bin Styles = (PACKED); End +File gid_File_Bin_Tde_Open_Url + BIN_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = "tde-open-url"; + Styles = (PACKED); +End + File gid_File_Bin_Kde_Open_Url BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index b385f8dd1548..a3bd31b4c918 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -70,6 +70,10 @@ SCPDEFS+=-DENABLE_NSPLUGIN SCPDEFS+=-DMERGELIBS .ENDIF +.IF "$(ENABLE_TDE)" != "" +SCPDEFS+=-DENABLE_TDE +.ENDIF + .IF "$(ENABLE_KDE)" != "" SCPDEFS+=-DENABLE_KDE .ENDIF @@ -78,6 +82,10 @@ SCPDEFS+=-DENABLE_KDE SCPDEFS+=-DENABLE_KDE4 .ENDIF +.IF "$(ENABLE_TDEAB)" != "" +SCPDEFS+=-DENABLE_TDEAB +.ENDIF + .IF "$(ENABLE_KAB)" != "" SCPDEFS+=-DENABLE_KAB .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index cdcd157ef52e..3308e20da374 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -83,6 +83,7 @@ Module gid_Module_Root_Files_2 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Bin_Cde_Open_Url, + gid_File_Bin_Tde_Open_Url, gid_File_Bin_Kde_Open_Url, gid_File_Bin_Open_Url, gid_File_Bin_Pagein, @@ -273,6 +274,7 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Odfflatxml, gid_File_Lib_Zip, gid_File_Lib_Vclplug_Gen, + gid_File_Lib_Vclplug_Tde, gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, gid_File_Lib_Vclplug_Svp, @@ -347,6 +349,8 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Dbpool, gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, + gid_File_Lib_Tdeab_1, + gid_File_Lib_Tdeab_Drv_1, gid_File_Lib_Kab_1, gid_File_Lib_Kab_Drv_1, gid_File_Lib_Macab_1, diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp new file mode 100644 index 000000000000..b4a7e1daf157 --- /dev/null +++ b/scp2/source/tde/file_tde.scp @@ -0,0 +1,33 @@ +/************************************************************************* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + * + ************************************************************************/ +#include "macros.inc" + +#ifdef ENABLE_TDE +File gid_File_Lib_Tdebe + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX)); +End +#endif diff --git a/scp2/source/tde/makefile.mk b/scp2/source/tde/makefile.mk new file mode 100644 index 000000000000..03bd0ba56dbe --- /dev/null +++ b/scp2/source/tde/makefile.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (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.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +# +#************************************************************************* + +PRJ=..$/.. + +PRJPCH= + +PRJNAME=scp2 +TARGET=tde +TARGETTYPE=CUI + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +SCP_PRODUCT_TYPE=osl + +.IF "$(ENABLE_TDE)" == "TRUE" + +.IF "$(ENABLE_TDE)" != "" +SCPDEFS+=-DENABLE_TDE +.ENDIF + +PARFILES = \ + module_tde.par \ + file_tde.par + +ULFFILES= \ + module_tde.ulf +.ENDIF + +# --- File --------------------------------------------------------- + +.INCLUDE : target.mk diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp new file mode 100644 index 000000000000..dcdd867cf3e8 --- /dev/null +++ b/scp2/source/tde/module_tde.scp @@ -0,0 +1,41 @@ +/************************************************************************* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + * + ************************************************************************/ + +#include "macros.inc" + +#if defined( ENABLE_TDE ) +Module gid_Module_Optional_Tde + ParentID = gid_Module_Optional; + Default = YES; + PackageInfo = "packinfo_office.txt"; + MOD_NAME_DESC(MODULE_OPTIONAL_TDE); + Styles = (DONTSHOWINUSERINSTALL); + Files = ( +#ifdef ENABLE_TDE + gid_File_Lib_Tdebe +#endif // ENABLE_TDE + ); +End +#endif + diff --git a/scp2/source/tde/module_tde.ulf b/scp2/source/tde/module_tde.ulf new file mode 100644 index 000000000000..65b03ba7ec99 --- /dev/null +++ b/scp2/source/tde/module_tde.ulf @@ -0,0 +1,30 @@ +/************************************************************************* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + * + ************************************************************************/ + +[STR_NAME_MODULE_OPTIONAL_TDE] +en-US = "TDE Integration" + +[STR_DESC_MODULE_OPTIONAL_TDE] +en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into TDE." + diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 4cd31f5872cc..daafb585ec7a 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -203,6 +203,12 @@ SCP1FILES += \ module_kde.par \ file_kde.par .ENDIF + +.IF "$(ENABLE_TDE)" == "TRUE" +SCP1FILES += \ + module_tde.par \ + file_tde.par +.ENDIF .ENDIF .IF "$(ENABLE_CRASHDUMP)" != "" |