diff options
-rw-r--r-- | scp2/prj/build.lst | 3 | ||||
-rw-r--r-- | scp2/source/testtool/file_testtool.scp | 67 | ||||
-rw-r--r-- | scp2/source/testtool/makefile.mk | 46 | ||||
-rw-r--r-- | scp2/source/testtool/module_testtool.scp | 34 | ||||
-rw-r--r-- | scp2/source/testtool/module_testtool.ulf | 28 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 4 |
6 files changed, 1 insertions, 181 deletions
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index d5976e9284b3..11198b1ad249 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -19,10 +19,9 @@ cp scp2\source\ooo nmake - all cp_ooo cp_langmacros cp_l cp scp2\source\python nmake - all cp_python cp_langmacros cp_langtemplates NULL cp scp2\source\quickstart nmake - all cp_quickstart cp_langmacros cp_langtemplates NULL cp scp2\source\sdkoo nmake - all cp_sdkoo cp_langmacros cp_langtemplates NULL -cp scp2\source\testtool nmake - all cp_testtool cp_langmacros cp_langtemplates NULL cp scp2\source\writer nmake - all cp_writer cp_langmacros cp_langtemplates NULL cp scp2\source\base nmake - all cp_base cp_langmacros cp_langtemplates NULL cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros cp_langtemplates NULL 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\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL +cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp deleted file mode 100644 index ef0f5d6898a3..000000000000 --- a/scp2/source/testtool/file_testtool.scp +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************** - * - * 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 "macros.inc" - -STD_LIB_FILE( gid_File_Lib_Communi, communi ) -STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm ) - -#if defined WNT -File gid_File_Exe_Testtool - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - Name = "testtool.exe"; -End -#endif - -File gid_File_Bin_Testtool - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - Name = "testtool.bin"; -End - -File gid_File_Config_Testtool - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - #ifdef UNX - Name = "testtoolrc"; - #else - Name = "testtool.ini"; - #endif -End - -// On Mac OS X, testtool needs to find the Info.plist and needs to be located in -// the Content/MacOS directory; since the Mac OS X dmg contains all layers, -// anyway, this hack works for now: -#if defined MACOSX -Unixlink gid_Unixlink_Testtool - BIN_FILE_BODY; - Styles = (); - Name = "testtool"; - Dir = gid_Brand_Dir_Program; - Target = "../basis-link/program/testtool.bin"; -End -#endif diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk deleted file mode 100644 index 436d0e02ae36..000000000000 --- a/scp2/source/testtool/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************** -# -# 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=..$/.. - -PRJPCH= - -PRJNAME=scp2 -TARGET=testtool -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -SCP_PRODUCT_TYPE=osl - -PARFILES= \ - module_testtool.par \ - file_testtool.par - -ULFFILES= \ - module_testtool.ulf - -# --- File --------------------------------------------------------- -.INCLUDE : target.mk diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp deleted file mode 100644 index 580e44df49bf..000000000000 --- a/scp2/source/testtool/module_testtool.scp +++ /dev/null @@ -1,34 +0,0 @@ -/************************************************************** - * - * 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 "macros.inc" - -Module gid_Module_Optional_Testtool - PackageInfo = "packinfo_office.txt"; - MOD_NAME_DESC ( MODULE_OPTIONAL_TESTTOOL ); - Sortkey = "650"; - ParentID = gid_Module_Optional; - Default = NO; - Files = (gid_File_Exe_Testtool, gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool); - Unixlinks = (gid_Unixlink_Testtool); -End diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf deleted file mode 100644 index 55f40db3716c..000000000000 --- a/scp2/source/testtool/module_testtool.ulf +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************** - * - * 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. - * - *************************************************************/ - - - -[STR_NAME_MODULE_OPTIONAL_TESTTOOL] -en-US = "Testtool" - -[STR_DESC_MODULE_OPTIONAL_TESTTOOL] -en-US = "Testtool" diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 01a83896b44f..51ca6bd8597b 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -69,8 +69,6 @@ SCP1FILES = installation_ooo.par \ module_systemint.par \ module_graphicfilter.par \ file_graphicfilter.par \ - module_testtool.par \ - file_testtool.par \ module_xsltfilter.par \ file_xsltfilter.par \ module_python.par \ @@ -226,8 +224,6 @@ SCP2FILES = installation_ooo.par \ module_systemint.par \ module_graphicfilter.par \ file_graphicfilter.par \ - module_testtool.par \ - file_testtool.par \ module_xsltfilter.par \ file_xsltfilter.par \ module_python.par \ |