[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 8 commits - automation/source configure.in connectivity/prj connectivity/source connectivity/version.mk connectivity/workben external_deps.lst external/msvcp70 external/msvcp71 external/msvcp80 external/prj libxmlsec/prj moz/extractfiles.mk moz/makefile.mk moz/patches moz/prj moz/README moz/seamonkey-source-1.1.14.patch moz/zipped nss/makefile.mk nss/prj postprocess/packcomponents postprocess/packregistry postprocess/rebase qadevOOo/objdsc qadevOOo/runner qadevOOo/tests scp2/source set_soenv.in solenv/bin solenv/inc xmlsecurity/prj xmlsecurity/source xmlsecurity/tools xmlsecurity/util
Herbert Dürr
hdu at apache.org
Wed Nov 6 11:08:16 CET 2013
automation/source/mozillaserver/makefile.mk | 149
automation/source/mozillaserver/mozillatesttoolserver.idl | 48
automation/source/mozillaserver/xmozillatesttoolserver.idl | 153
configure.in | 58
connectivity/prj/build.lst | 5
connectivity/prj/d.lst | 3
connectivity/source/drivers/evoab/LCatalog.cxx | 68
connectivity/source/drivers/evoab/LCatalog.hxx | 45
connectivity/source/drivers/evoab/LColumnAlias.cxx | 228
connectivity/source/drivers/evoab/LColumnAlias.hxx | 109
connectivity/source/drivers/evoab/LColumns.cxx | 53
connectivity/source/drivers/evoab/LColumns.hxx | 48
connectivity/source/drivers/evoab/LConfigAccess.cxx | 157
connectivity/source/drivers/evoab/LConfigAccess.hxx | 42
connectivity/source/drivers/evoab/LConnection.cxx | 263
connectivity/source/drivers/evoab/LConnection.hxx | 74
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx | 387
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx | 52
connectivity/source/drivers/evoab/LDebug.cxx | 38
connectivity/source/drivers/evoab/LDebug.hxx | 38
connectivity/source/drivers/evoab/LDriver.cxx | 501
connectivity/source/drivers/evoab/LDriver.hxx | 111
connectivity/source/drivers/evoab/LFolderList.cxx | 559
connectivity/source/drivers/evoab/LFolderList.hxx | 88
connectivity/source/drivers/evoab/LNoException.cxx | 320
connectivity/source/drivers/evoab/LPreparedStatement.cxx | 39
connectivity/source/drivers/evoab/LPreparedStatement.hxx | 46
connectivity/source/drivers/evoab/LResultSet.cxx | 186
connectivity/source/drivers/evoab/LResultSet.hxx | 77
connectivity/source/drivers/evoab/LServices.cxx | 119
connectivity/source/drivers/evoab/LStatement.cxx | 39
connectivity/source/drivers/evoab/LStatement.hxx | 45
connectivity/source/drivers/evoab/LTable.cxx | 866 -
connectivity/source/drivers/evoab/LTable.hxx | 96
connectivity/source/drivers/evoab/LTables.cxx | 58
connectivity/source/drivers/evoab/LTables.hxx | 48
connectivity/source/drivers/evoab/evoab.xcu | 57
connectivity/source/drivers/evoab/evoab.xml | 53
connectivity/source/drivers/evoab/exports.dxp | 2
connectivity/source/drivers/evoab/makefile.mk | 100
connectivity/source/drivers/evoab2/NCatalog.hxx | 2
connectivity/source/drivers/mozab/MCatalog.cxx | 123
connectivity/source/drivers/mozab/MCatalog.hxx | 62
connectivity/source/drivers/mozab/MColumnAlias.cxx | 187
connectivity/source/drivers/mozab/MColumnAlias.hxx | 81
connectivity/source/drivers/mozab/MColumns.cxx | 96
connectivity/source/drivers/mozab/MColumns.hxx | 54
connectivity/source/drivers/mozab/MConfigAccess.cxx | 269
connectivity/source/drivers/mozab/MConfigAccess.hxx | 35
connectivity/source/drivers/mozab/MConnection.cxx | 599
connectivity/source/drivers/mozab/MConnection.hxx | 227
connectivity/source/drivers/mozab/MDatabaseMetaData.cxx | 1027 -
connectivity/source/drivers/mozab/MDatabaseMetaData.hxx | 200
connectivity/source/drivers/mozab/MDriver.cxx | 325
connectivity/source/drivers/mozab/MDriver.hxx | 106
connectivity/source/drivers/mozab/MExtConfigAccess.hxx | 42
connectivity/source/drivers/mozab/MPreparedStatement.cxx | 540
connectivity/source/drivers/mozab/MPreparedStatement.hxx | 165
connectivity/source/drivers/mozab/MResultSet.cxx | 1976 ---
connectivity/source/drivers/mozab/MResultSet.hxx | 362
connectivity/source/drivers/mozab/MResultSetMetaData.cxx | 208
connectivity/source/drivers/mozab/MResultSetMetaData.hxx | 94
connectivity/source/drivers/mozab/MServices.cxx | 164
connectivity/source/drivers/mozab/MStatement.cxx | 557
connectivity/source/drivers/mozab/MStatement.hxx | 209
connectivity/source/drivers/mozab/MTable.cxx | 91
connectivity/source/drivers/mozab/MTable.hxx | 68
connectivity/source/drivers/mozab/MTables.cxx | 100
connectivity/source/drivers/mozab/MTables.hxx | 51
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 323
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 97
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 149
connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx | 39
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx | 135
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx | 79
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 337
connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx | 41
connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx | 627
connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx | 70
connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx | 236
connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx | 79
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 417
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 127
connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx | 109
connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx | 76
connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx | 94
connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx | 64
connectivity/source/drivers/mozab/bootstrap/makefile.mk | 96
connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component | 30
connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h | 50
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h | 85
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h | 37
connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h | 42
connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h | 80
connectivity/source/drivers/mozab/bootstrap/post_include_windows.h | 26
connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h | 27
connectivity/source/drivers/mozab/exports.dxp | 2
connectivity/source/drivers/mozab/makefile.mk | 93
connectivity/source/drivers/mozab/makefile_mozab.mk | 124
connectivity/source/drivers/mozab/mozab.component | 33
connectivity/source/drivers/mozab/mozab.xcu | 150
connectivity/source/drivers/mozab/mozab.xml | 102
connectivity/source/drivers/mozab/mozab2.xcu | 114
connectivity/source/drivers/mozab/mozabdrv.map | 28
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 802 -
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx | 76
connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx | 73
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx | 447
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx | 72
connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx | 48
connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx | 77
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 405
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx | 115
connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx | 82
connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx | 53
connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx | 138
connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx | 79
connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx | 819 -
connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx | 278
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx | 631
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 138
connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx | 134
connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx | 62
connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 73
connectivity/source/drivers/mozab/post_include_mozilla.h | 54
connectivity/source/drivers/mozab/pre_include_mozilla.h | 59
connectivity/version.mk | 13
connectivity/workben/testmoz/initUNO.cxx | 41
connectivity/workben/testmoz/main.cxx | 720 -
connectivity/workben/testmoz/makefile.mk | 66
connectivity/workben/testmoz/mozthread.cxx | 473
external/msvcp70/README_msvcp70.dll | 4
external/msvcp71/README_msvcX71.dll | 6
external/msvcp80/README_msvcX80.dll | 2
external/prj/d.lst | 12
external_deps.lst | 2
libxmlsec/prj/build.lst | 4
moz/README | 4
moz/extractfiles.mk | 455
moz/makefile.mk | 438
moz/patches/arm_build_fix.patch | 189
moz/patches/brokenmakefile.patch | 13
moz/patches/consecutive_ldap_queries.patch | 13
moz/patches/cygwin_paths_in_ldap_sdk.patch | 12
moz/patches/dtoa.patch | 237
moz/patches/embed_manifest.patch | 142
moz/patches/gcc46.patch | 10
moz/patches/gcc47.patch | 107
moz/patches/index.txt | 86
moz/patches/link_fontconfig.patch | 11
moz/patches/no_core_abspath_in_nss.patch | 52
moz/patches/nss_linux.patch | 35
moz/patches/respect_disable_pango.patch | 54
moz/patches/wchart_on_msvc8.patch | 20
moz/prj/build.lst | 4
moz/prj/d.lst | 257
moz/seamonkey-source-1.1.14.patch | 6346 ----------
moz/zipped/makefile.mk | 212
nss/makefile.mk | 4
nss/prj/d.lst | 4
postprocess/packcomponents/makefile.mk | 10
postprocess/packregistry/makefile.mk | 9
postprocess/rebase/no_rebase.txt | 14
qadevOOo/objdsc/mozab/com.sun.star.comp.sdbc.MozabDriver.csv | 5
qadevOOo/runner/basicrunner/BasicTestCase.java | 2
qadevOOo/tests/java/mod/_mozab/MozabDriver.java | 100
scp2/source/ooo/common_brand.scp | 85
scp2/source/ooo/file_library_ooo.scp | 145
scp2/source/ooo/file_ooo.scp | 11
scp2/source/ooo/file_resource_ooo.scp | 2
scp2/source/ooo/makefile.mk | 13
scp2/source/ooo/module_hidden_ooo.scp | 10
scp2/source/ooo/ure.scp | 106
scp2/source/winexplorerext/file_winexplorerext.scp | 9
scp2/source/winexplorerext/module_winexplorerext.scp | 1
set_soenv.in | 2
solenv/bin/modules/installer/control.pm | 14
solenv/inc/extension_post.mk | 28
solenv/inc/tg_moz.mk | 85
xmlsecurity/prj/build.lst | 2
xmlsecurity/source/xmlsec/makefile.mk | 6
xmlsecurity/source/xmlsec/nss/makefile.mk | 17
xmlsecurity/tools/demo/makefile.mk | 11
xmlsecurity/tools/demo/mozprofile.cxx | 1
xmlsecurity/util/makefile.mk | 10
185 files changed, 89 insertions(+), 33038 deletions(-)
New commits:
commit e8739b2f2d7ec5119f63fe108840a645948d65dd
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Nov 6 09:16:19 2013 +0000
#i123647# RmMoz 9/9: with the moz-module gone the ancient msvc* dlls are no longer needed
diff --git a/external/msvcp70/README_msvcp70.dll b/external/msvcp70/README_msvcp70.dll
deleted file mode 100644
index ebc854b..0000000
--- a/external/msvcp70/README_msvcp70.dll
+++ /dev/null
@@ -1,4 +0,0 @@
-Put the msvcp70.dll and msvcr70.dll in this directory for Windows builds using a .NET compiler.
-The dll is part of the .NET installation and can be found in a directory similar
-to:
-"c:\Program Files\Microsoft Visual Studio .NET\Visual C++ .NET Professional - English\"
diff --git a/external/msvcp71/README_msvcX71.dll b/external/msvcp71/README_msvcX71.dll
deleted file mode 100644
index 54197f4..0000000
--- a/external/msvcp71/README_msvcX71.dll
+++ /dev/null
@@ -1,6 +0,0 @@
-Put the msvcp71.dll and msvcr71.dll in this directory for Windows builds using
-a .NET compiler. The dlls are part of the .NET2003 installation and can be found
-in a directory similar to:
-"c:\Program Files\Microsoft Visual Studio .NET 2003\Visual C++ .NET Professional - English\"
-If you use the --enable-dbgutil switch during configure, copy the appropriate msvcp71d.dll and
-msvcr71d.dll into this directory.
diff --git a/external/msvcp80/README_msvcX80.dll b/external/msvcp80/README_msvcX80.dll
deleted file mode 100644
index 364f172..0000000
--- a/external/msvcp80/README_msvcX80.dll
+++ /dev/null
@@ -1,2 +0,0 @@
-Put the msvcp80.dll and msvcr80.dll in this directory for Windows builds using
-a VS 2005 compiler.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 8e277fa..28d8e36 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -17,18 +17,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll
-..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll
-..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll
-
-..\msvcp71\msvcp71*.dll %_DEST%\bin%_EXT%
-..\msvcp71\msvcr71*.dll %_DEST%\bin%_EXT%
-
-..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
-
..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcr90*.dll %_DEST%\bin%_EXT%
diff --git a/postprocess/rebase/no_rebase.txt b/postprocess/rebase/no_rebase.txt
index a1462c9..0d00b69 100644
--- a/postprocess/rebase/no_rebase.txt
+++ b/postprocess/rebase/no_rebase.txt
@@ -10,24 +10,10 @@ policy.1.0.cli_cppuhelper.dll
policy.1.0.cli_basetypes.dll
gdiplus.dll
mingwm10.dll
-msvcm80d.dll
-msvcm80.dll
msvcm90d.dll
msvcm90.dll
-msvcp70d.dll
-msvcp70.dll
-msvcp71d.dll
-msvcp71.dll
-msvcp80d.dll
-msvcp80.dll
msvcp90d.dll
msvcp90.dll
-msvcr70d.dll
-msvcr70.dll
-msvcr71d.dll
-msvcr71.dll
-msvcr80d.dll
-msvcr80.dll
msvcr90d.dll
msvcr90.dll
msvcr100.dll
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index fd14700..4276914 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -57,7 +57,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Unopkgcom,
gid_Brand_File_Bin_Unopkgexe,
gid_Brand_File_Bin_Unopkg,
- gid_Brand_File_Bin_Msvcr71,
// gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAbout,
gid_Brand_File_Desktophelper_Txt,
@@ -66,12 +65,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Mingw_GccS,
gid_Brand_File_Lib_Mingw_Stdcpp,
gid_Brand_File_Lib_Mingwm10,
- gid_Brand_File_Lib_Msvcr80,
- gid_Brand_File_Lib_Msvcp80,
- gid_Brand_File_Lib_Msvcm80,
gid_Brand_File_Lib_Oirm,
gid_Brand_File_Lib_Oirm2,
- gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
// gid_Brand_File_ServicesRdb,
// gid_Brand_File_Share_Registry_Brand_Xcd,
@@ -425,18 +420,6 @@ File gid_Brand_File_Bin_Unopkg
End
#endif
-#if defined WNT && \
- (defined M1310 || \
- ((defined M1400 || defined M1500) && \
- !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_Brand_File_Bin_Msvcr71
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
- Styles = (PACKED);
-End
-#endif
-
// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
// from a Windows system directory instead of the one from the URE; to avoid
// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
@@ -602,23 +585,6 @@ File gid_Brand_File_Lib_Mingwm10
End
#endif
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcr80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcr80.dll";
-#else
- Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
#if defined(WNT) && defined( _gcc3 )
#if defined(MINGW_GCCDLL)
@@ -645,57 +611,6 @@ End
#endif
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcp80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcm80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcm80.dll";
-#else
- Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Msvcm80crt_Manifest
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "Microsoft.VC80.CRT.manifest";
-#else
- Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
// Profiles
Profile gid_Brand_Profile_Bootstrap_Ini
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2a52923..726783b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -947,60 +947,6 @@ End
#endif
#endif
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Common_Ure;
-// Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcr80.dll";
-#else
- Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Common_Ure;
-// Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Common_Ure;
-// Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcm80.dll";
-#else
- Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
#if defined(WNT) && defined( _gcc3 )
#if defined(MINGW_GCCDLL)
@@ -1029,24 +975,6 @@ End
#endif
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Common_Ure;
-// Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "Microsoft.VC80.CRT.manifest";
-#else
- Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
#if defined(OS2)
STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
@@ -1857,24 +1785,6 @@ STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimpc)
STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
#endif
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
- !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
- // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
- // gid_Brand_File_Lib_Msvcr80
-File gid_File_Moz_Msvcp80
- TXT_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("msvcp80");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-File gid_File_Moz_Msvcr80
- TXT_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("msvcr80");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
#if defined(WNT)
File gid_File_Lib_Msvcr100
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a3b2897..d014a3a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -404,8 +404,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Mingw_GccS,
gid_File_Lib_Mingw_Stdcpp,
gid_File_Lib_Mingwm10,
- gid_File_Lib_Msvcp70,
- gid_File_Lib_Msvcr70,
gid_File_Lib_Ole,
gid_File_Lib_Patchmsi,
gid_File_Lib_Reg4allmsdoc,
@@ -416,8 +414,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Gconfebe,
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
- gid_File_Lib_Msvcp70_So,
- gid_File_Lib_Msvcr70_So,
gid_File_Lib_Gdiplus,
gid_File_Lib_Stlport_Vc6,
gid_File_Lib_Stlport_Vc7,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a908126..5545ab8 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -195,74 +195,6 @@ End
// Public Dynamic Libraries:
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "msvcr80.dll";
-#else
- Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "msvcm80.dll";
-#else
- Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest_Ure
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
- Name = "Microsoft.VC80.CRT.manifest";
-#else
- Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
File gid_File_Dl_Cppu
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -1042,38 +974,6 @@ End
#endif
-#ifdef WNT
-#if defined(M1310)
-File gid_File_Dl_Msvcr71
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("msvcr71d");
-#else
- Name = SCP2_URE_DL_NORMAL("msvcr71");
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "074DE395-C6EB-47F7-A587-6311F89C14B4";
-End
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1310)
-File gid_File_Dl_Msvcp71
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("msvcp71d");
-#else
- Name = SCP2_URE_DL_NORMAL("msvcp71");
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "1AF2708A-AAE2-4F25-ADF5-E61A549A51C2";
-End
-#endif
-#endif
-
#if defined WNT
File gid_File_Dl_Uwinapi
TXT_FILE_BODY;
@@ -1249,13 +1149,7 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
gid_File_Lib_Mingwm10_Ure,
- gid_File_Dl_Msvcr71,
- gid_File_Dl_Msvcp71,
gid_File_Dl_Uwinapi,
- gid_File_Lib_Msvcr80_Ure,
- gid_File_Lib_Msvcp80_Ure,
- gid_File_Lib_Msvcm80_Ure,
- gid_File_Msvcm80crt_Manifest_Ure,
gid_File_Java_UnoloaderJar,
gid_File_Java_JuhJar,
gid_File_Java_JurtJar,
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index e359291..d19996d 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -89,15 +89,6 @@ End
#endif
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
- TXT_FILE_BODY;
- Dir = gid_Dir_Shlxthdl;
- Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
- Styles = (PACKED);
-End
-#endif
-
File gid_File_Lib_Shlxtmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 1dec158..aae0aff 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -34,7 +34,6 @@ Module gid_Module_Optional_Winexplorerext
gid_File_Lib_Shlxthdl64,
gid_File_Lib_OOoFilt,
gid_File_Lib_OOoFilt64,
- gid_File_Lib_Shlxthdl_Msvcr71,
gid_File_Lib_Shlxtmsi,
gid_File_Lib_Reg64,
gid_File_Tmp_Userinstall_Winexplorerext_Inf);
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index f48e6c1..2974b94 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -76,7 +76,6 @@ sub check_system_path
{
# The following files have to be found in the environment variable PATH
# All platforms: zip
- # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
# Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
my $onefile;
@@ -104,19 +103,6 @@ sub check_system_path
if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
{
@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
-
- if ( $installer::globals::compiler eq "wntmsci8" )
- {
- push(@needed_files_in_path, "msvcp70.dll");
- push(@needed_files_in_path, "msvcr70.dll");
- }
-
- if ( $installer::globals::compiler eq "wntmsci10" )
- {
- push(@needed_files_in_path, "msvcp71.dll");
- push(@needed_files_in_path, "msvcr71.dll");
- }
-
}
elsif ($installer::globals::iswin || $installer::globals::isos2)
{
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 0c7c963..ba10b2d 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -92,39 +92,19 @@ $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
.ENDIF
.ELSE
.IF "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001499999999"
+.IF "$(CCNUMVER)" > "001499999999"
$(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF # "$(CCNUMVER)" <= "001499999999"
-.ENDIF # "$(CCNUMVER)" <= "001399999999"
+.ENDIF # "$(CCNUMVER)" > "001499999999"
.ELSE # "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001499999999"
+.IF "$(CCNUMVER)" > "001499999999"
$(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR)
$(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF # "$(CCNUMVER)" <= "001499999999"
-.ENDIF # "$(CCNUMVER)" <= "001399999999"
+.ENDIF # "$(CCNUMVER)" > "001499999999"
.ENDIF # "$(PACKMS)"!=""
.ENDIF #"$(COM)"=="GCC"
.ENDIF # "$(OS)$(CPU)"=="WNTI"
commit c81c999eeccc3657c712e50b39dc783c9cde0152
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Nov 6 08:32:13 2013 +0000
#i123623# RmMoz 8/9: remove the obsoleted seamonkey 1.1.14 module
That module was used for its security libs and its address book support.
With #i122365# the dependency on its security libs was replaced with plain NSS.
With #i123575# the already quite bit-rotten seamonkey address books were removed.
Now there is nothing left for it to do and so that huge and complex module can
finally be retired after all these years.
diff --git a/automation/source/mozillaserver/makefile.mk b/automation/source/mozillaserver/makefile.mk
deleted file mode 100644
index 1ad74c4..0000000
--- a/automation/source/mozillaserver/makefile.mk
+++ /dev/null
@@ -1,149 +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=..$/..
-
-PRJNAME=automation
-TARGET=xxx
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-PACKAGE := com$/sun$/star$/testtool
-TARGET := com_sun_star_testtool
-
-
-#RDB=$(SOLARBINDIR)$/applicat.rdb
-RDB=$(BIN)$/mozillatesttool.rdb
-
-
-GENJAVACLASSFILES = \
- $(CLASSDIR)$/$(PACKAGE)$/XAction.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionControl.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionCommand.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionControl.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionFlow.class \
- $(CLASSDIR)$/$(PACKAGE)$/XResult.class \
- $(CLASSDIR)$/$(PACKAGE)$/ResultType.class \
- $(CLASSDIR)$/$(PACKAGE)$/XMozillaTesttoolServer.class
-
-
-TYPES={$(subst,.class, $(subst,$/,. $(subst,$(CLASSDIR)$/,-T $(GENJAVACLASSFILES))))}
-GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))}
-#JAVAFILES= $(GENJAVAFILES)
-
-
-
-UNOUCRDEP=$(RDB)
-UNOUCRRDB=$(RDB)
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(OUT)$/inc
-
-UNOTYPES= \
- com.sun.star.uno.TypeClass \
- com.sun.star.uno.XAggregation \
- com.sun.star.uno.XWeak \
- com.sun.star.lang.XTypeProvider \
- com.sun.star.lang.XServiceInfo \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XComponent \
- com.sun.star.lang.XMain \
- com.sun.star.loader.XImplementationLoader \
- com.sun.star.registry.XRegistryKey \
- com.sun.star.bridge.XUnoUrlResolver \
- com.sun.star.container.XSet \
- com.sun.star.testtool.XAction \
- com.sun.star.testtool.XActionControl \
- com.sun.star.testtool.XActionCommand \
- com.sun.star.testtool.XActionControl \
- com.sun.star.testtool.XActionFlow \
- com.sun.star.testtool.XResult \
- com.sun.star.testtool.ResultType \
- com.sun.star.testtool.XMozillaTesttoolServer
-
-
-
-#SLOFILES= \
-# $(SLO)$/iserverproxy.obj \
-# $(SLO)$/broadcastclient.obj \
-# $(SLO)$/genericinformation.obj \
-# $(SLO)$/informationclient.obj
-
-# ---- test ----
-
-#LIB1TARGET=$(SLB)$/iserverproxy.lib
-#LIB1OBJFILES=$(SLOFILES)
-
-#SHL1TARGET=iserverproxy
-#SHL1STDLIBS= \
-# $(VOSLIB) $(OSLLIB) $(RTLLIB) $(TOOLSLIB) \
-# $(CPPULIB) \
-# $(CPPUHELPERLIB) \
-# $(UNOLIB) \
-# $(SVTOOLLIB) \
-# $(SALLIB) \
-# $(BOOTSTRP)
-
-#SHL1LIBS= $(LIB1TARGET) $(LB)$/ico.lib
-#SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-#DEF1NAME= $(SHL1TARGET)
-#DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(GENJAVAFILES)
-
-ALLIDLFILES= \
- mozillatesttoolserver.idl \
- xmozillatesttoolserver.idl
-
-$(RDB): $(ALLIDLFILES)
- $(TOUCH) $@
- $(RM) $@
- unoidl -I$(PRJ) -I$(SOLARIDLDIR) -Burd -OH$(BIN) $?
- $(REGMERGE) $@ /UCR $(BIN)$/{$(ALLIDLFILES:f:s/.idl/.urd/)}
- $(REGMERGE) $@ / $(SOLARBINDIR)$/applicat.rdb
- $(REGCOMP) -register -r $@ -c $(DLLPRE)connectr$(DLLPOST)
- $(REGCOMP) -register -r $@ -c $(DLLPRE)acceptor$(DLLPOST)
- $(REGCOMP) -register -r $@ -c $(DLLPRE)brdgfctr$(DLLPOST)
- $(REGCOMP) -register -r $@ -c $(DLLPRE)remotebridge$(DLLPOST)
- $(TOUCH) $@
-
-
-$(GENJAVAFILES): $(RDB)
- @echo Types: $(TYPES)
- @echo Javafiles: $(GENJAVAFILES)
- $(JAVAMAKER) -BUCR -O$(OUT) $(TYPES) $(RDB)
-
-
diff --git a/automation/source/mozillaserver/mozillatesttoolserver.idl b/automation/source/mozillaserver/mozillatesttoolserver.idl
deleted file mode 100644
index 84b62b7..0000000
--- a/automation/source/mozillaserver/mozillatesttoolserver.idl
+++ /dev/null
@@ -1,48 +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.
- *
- *************************************************************/
-
-
-#ifndef __com_sun_star_testtool_MozillaTesttoolServer_idl__
-#define __com_sun_star_testtool_MozillaTesttoolServer_idl__
-
-#include <xmozillatesttoolserver.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-//=============================================================================
-/**
- * This service provides the ability to control Mozilla
- *<BR>
- */
-service MozillaTesttoolServer
-{
- /** resolve objects via this interface.
- */
- interface com::sun::star::testtool::XMozillaTesttoolServer;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/automation/source/mozillaserver/xmozillatesttoolserver.idl b/automation/source/mozillaserver/xmozillatesttoolserver.idl
deleted file mode 100644
index 43ad5a4..0000000
--- a/automation/source/mozillaserver/xmozillatesttoolserver.idl
+++ /dev/null
@@ -1,153 +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.
- *
- *************************************************************/
-
-
-#ifndef __com_sun_star_testtool_XMozillaTesttoolServer_idl__
-#define __com_sun_star_testtool_XMozillaTesttoolServer_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/connection/NoConnectException.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423753-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XAction : com::sun::star::uno::XInterface
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423753-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XActionControl : XAction
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423753-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XActionCommand : XAction
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423743-33D6-11D1-AABE00A0-259D5623), ident( "XActionFlow", 1.0 ) ]
-interface XActionFlow : XAction
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-
-enum ResultType
- {
- SEQUENCE, /// command with SEQUENCE has been executed
- ERROR, /// An error has ocured
- RESULT, /// Result of a request
- ASSERTION, /// An Assertion has been captured
- UI_INFO /// Info about the UserInterfaace
- };
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2426453-33D6-11D1-AABE00A0-259D5623), ident( "XResult", 1.0 ) ]
-interface XResult : com::sun::star::uno::XInterface
-{
- /** execute one command
- <BR>
- */
- void SetResultType( [in] ResultType aType );
- ResultType GetResultType();
-
- void SetValue( [in] any Value );
- any GetValue();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2446735-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XMozillaTesttoolServer : com::sun::star::uno::XInterface
-{
- /** Control the Mozilla Browser
- <BR>
- */
- [oneway] void execute( [in] XAction aAction );
-// sequence < XResult > getResults( [in] boolean bBlock ); /// bBoch = TRUE means to wait for at least 1 result
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
diff --git a/configure.in b/configure.in
index 032bc29..dbdf400 100644
--- a/configure.in
+++ b/configure.in
@@ -603,10 +603,6 @@ AC_ARG_WITH(system-mdds,
AC_ARG_WITH(system-vigra,
[ --with-system-vigra Use vigra already on system
],,)
-AC_ARG_ENABLE(Xaw,
-[ --disable-Xaw Disables the use of Xaw for the Netscape/Mozilla
- plugin
-],,)
AC_ARG_ENABLE(hunspell,
[ --enable-hunspell Determines whether to enable the Hunspell library.
If enabled, the library will be built unless you
@@ -5003,28 +4999,6 @@ fi
AC_SUBST(XLIB)
AC_SUBST(XAU_LIBS)
-if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
- dnl ===================================================================
- dnl Check for using Xaw
- dnl ===================================================================
- AC_MSG_CHECKING([whether to use Xaw])
- if test "$enable_Xaw" = "no"; then
- DISABLE_XAW=TRUE
- AC_MSG_RESULT([no])
- AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])],
- [#include <X11/Intrinsic.h>])
- else
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
- [#include <X11/Intrinsic.h>])
- AC_CHECK_LIB(Xaw, main, [],
- [AC_MSG_ERROR(Xaw library not found or functional)], [])
- fi
-fi
-AC_SUBST(DISABLE_XAW)
-
-
-
dnl ===================================================================
dnl Check if fontconfig/fontconfig.h is available
dnl ===================================================================
diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx
deleted file mode 100644
index 97517b9..0000000
--- a/connectivity/workben/testmoz/initUNO.cxx
+++ /dev/null
@@ -1,41 +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.
- *
- *************************************************************/
-
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-
-#include "rtl/bootstrap.hxx"
-#include "cppuhelper/bootstrap.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-using namespace cppu;
-using namespace com::sun::star::lang;
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-
-Reference< XMultiServiceFactory > InitializeFac( void )
-{
- Reference<XComponentContext> xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
- Reference<XMultiServiceFactory> xMS(xComponentContext->getServiceManager(), UNO_QUERY);
- return xMS;
-}
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
deleted file mode 100644
index 30c79df..0000000
--- a/connectivity/workben/testmoz/main.cxx
+++ /dev/null
@@ -1,720 +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.
- *
- *************************************************************/
-
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-#include <connectivity/sqlparse.hxx>
-#include "connectivity/sqliterator.hxx"
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <unotools/processfactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XDriver.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/sdbcx/XRowLocate.hpp>
-#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <com/sun/star/sdbc/XCloseable.hpp>
-#include <com/sun/star/sdb/XDatabaseEnvironment.hpp>
-#include <com/sun/star/uno/Any.hxx>
-
-#include "connectivity/sqlnode.hxx"
-#include <ucbhelper/contentbroker.hxx>
-#include <comphelper/regpathhelper.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/process.h>
-
-#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/registry/XImplementationRegistration.hpp>
-#include <com/sun/star/ucb/XContentProviderManager.hpp>
-
-#include <ucbhelper/content.hxx>
-#include <osl/module.h>
-#include <tools/config.hxx>
-
-#include <stdio.h>
-
-using namespace comphelper;
-using namespace cppu;
-using namespace rtl;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::registry;
-using namespace com::sun::star::ucb;
-using namespace com::sun::star::beans;
-
-//using namespace com::sun::star;
-using namespace connectivity;
-using namespace com::sun::star::sdb;
-using namespace com::sun::star::sdbc;
-using namespace com::sun::star::sdbcx;
-using namespace ::com::sun::star::container;
-using namespace com::sun::star::registry;
-
-#define OUtoCStr( x ) (OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US ).getStr())
-Reference< XContentProviderManager > globalUcb;
-#define PRINTSTR(x) printf("%s",x);
-
-int autoTest(Reference<XResultSet> &xRes);
-
-void printColumns( Reference<XResultSet> &xRes )
-{
- if(xRes.is()) {
- char* aPat = " %-22s ";
- char* aPat_Short = " %-12s ";
- Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
- printf( "ColumnCount = %d\n", xMeta->getColumnCount());
- for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i)
- {
- // printf(aPat.getStr(), xMeta->getColumnName(i).getStr());
- const char *str = OUtoCStr(xMeta->getColumnName(i));
-// if ( i < 3 ) {
-// printf( aPat_Short, str );
-// } else {
- printf( aPat, str );
-// }
- }
- printf("\n");
- printf("------------------------------------------------------------------------------------------\n");
- } else {
- printf(": FAILED to get a ResultSet \n");
- }
-}
-void printXResultSet( Reference<XResultSet> &xRes )
-{
- if(xRes.is()) {
- char* aPat = " %-22s ";
- char* aPat_Short = " %-12s ";
- Reference<XRow> xRow(xRes,UNO_QUERY);
- Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
- for(sal_Int32 j=1;j<=xMeta->getColumnCount();++j)
- {
- try {
- const char *str = OUtoCStr(xRow->getString(j));
-// if ( j < 3 ) {
-// printf( aPat_Short, str );
-// } else {
- printf( aPat_Short, str );
-// }
- } catch (...) {
- printf(" Ex ");
- }
- }
- printf("\n");
- } else {
- printf(": FAILED to get a ResultSet \n");
- }
-}
-
-void printXResultSets( Reference<XResultSet> &xRes )
-{
- if(xRes.is()) {
- printColumns(xRes);
- sal_Int32 nRows = 0;
- while( xRes.is() && xRes->next())
- {
- printXResultSet(xRes);
- nRows++;
- }
- printf( "%d Row(s)\n", nRows);
- } else {
- printf(": FAILED to get a ResultSet \n");
- }
-}
-
-//#define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
-static const char * const components[] =
-{
- SAL_MODULENAME( "ucb1" ) // KSO, ABI
- , SAL_MODULENAME( "ucpfile1" )
- , SAL_MODULENAME( "cfgmgr2" )
- , "sax.uno" SAL_DLLEXTENSION
- , "stocservices.uno" SAL_DLLEXTENSION
- , SAL_MODULENAME( "fileacc" )
- , SAL_MODULENAME( "mcnttype" ) //Clipboard Ask Oliver Braun
- , "i18npool.uno" SAL_DLLEXTENSION
- // Reading of files in specific encodings like UTF-8 using
- // createUnoService( "com.sun.star.io.TextInputStream" ) and such
- , "textinstream.uno" SAL_DLLEXTENSION
- , "textoutstream.uno" SAL_DLLEXTENSION
- , "introspection.uno" SAL_DLLEXTENSION
- , "corereflection.uno" SAL_DLLEXTENSION
- // RemoteUno
- , "connector.uno" SAL_DLLEXTENSION
- , "bridgefac.uno" SAL_DLLEXTENSION
- , "remotebridge.uno" SAL_DLLEXTENSION
- , "dbtools2" SAL_DLLEXTENSION
- , "mozab2" SAL_DLLEXTENSION
- , "mozabdrv2" SAL_DLLEXTENSION
- , "sdbc2" SAL_DLLEXTENSION
- , "dbpool2" SAL_DLLEXTENSION
-#ifdef SAL_UNX
- , SVLIBRARY( "dtransX11" ) // OBR
-#endif
-#ifdef SAL_W32
- , SAL_MODULENAME( "sysdtrans" )
- , SAL_MODULENAME( "ftransl" )
- , SAL_MODULENAME( "dnd" )
-#endif
- , 0
-};
-
-Reference< XMultiServiceFactory > InitializeFac( void )
-{
- OUString path;
- if( osl_Process_E_None != osl_getExecutableFile( (rtl_uString**)&path ) )
- {
- printf("Exit.\n");
- exit( 1 );
- }
- OSL_ASSERT( path.lastIndexOf( '/' ) >= 0 );
-
-
- ::rtl::OUStringBuffer bufServices( path.copy( 0, path.lastIndexOf( '/' )+1 ) );
- bufServices.appendAscii("services.rdb");
- OUString services = bufServices.makeStringAndClear();
-
- ::rtl::OUStringBuffer bufTypes( path.copy( 0, path.lastIndexOf( '/' )+1 ) );
- bufTypes.appendAscii("types.rdb");
- OUString types = bufTypes.makeStringAndClear();
-
- printf("Create Registry.\n");
-
- Reference< XMultiServiceFactory > xSMgr;
- try
- {
- xSMgr = createRegistryServiceFactory( types, services, sal_True );
- }
- catch( com::sun::star::uno::Exception & )
- {
- try
- {
- {
- Reference< XMultiServiceFactory > interimSmgr =
- createRegistryServiceFactory( types, sal_True );
- Reference< XImplementationRegistration > xIR(
- interimSmgr->createInstance(
- OUString::createFromAscii(
- "com.sun.star.registry.ImplementationRegistration" ) ), UNO_QUERY );
-
- Reference< XSimpleRegistry > xReg(
- interimSmgr->createInstance(
- OUString::createFromAscii(
- "com.sun.star.registry.SimpleRegistry" ) ), UNO_QUERY );
- if ( xReg.is() )
- {
- xReg->open(services, sal_False, sal_True);
- if ( xReg->isValid() )
- {
- OUString loader( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" ));
- for( sal_Int32 i = 0; components[i] ; i ++ )
- {
- printf("Registering %s ... ", components[i]);
- xIR->registerImplementation(
- loader, OUString::createFromAscii(components[i]),xReg);
- printf("done\n");
- }
- xReg->close();
- } else
- {
- printf("Cannot open Registry. Terminating Program\n");
- exit (1);
- }
- }
-
- Reference< XComponent > xComp( interimSmgr, UNO_QUERY );
- if( xComp.is() )
- xComp->dispose();
- }
-
- // now try it again readonly
- printf("Opening Registry readonly\n");
- xSMgr = createRegistryServiceFactory( types, services, sal_True );
- }
- catch( com::sun::star::uno::Exception & exc )
- {
- fprintf( stderr, "Couldn't bootstrap uno servicemanager for reason : %s\n" ,
- OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
- }
- }
-
- printf("set global factory.\n");
-
- //////////////////////////////////////////////////////////////////////
- // set global factory
- setProcessServiceFactory( xSMgr );
-
-/* // Create simple ConfigManager
- Sequence< Any > aConfArgs(3);
- aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
- aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
- aConfArgs[2] <<= PropertyValue( OUString::createFromAscii("updatepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-
- Reference< XContentProvider > xConfProvider
- ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY );
-*/
-
-
-// Create unconfigured Ucb:
-/* Sequence< Any > aArgs(1);
- aArgs[1] = makeAny ( xConfProvider );*/
- Sequence< Any > aArgs;
- ::ucb::ContentBroker::initialize( xSMgr, aArgs );
- Reference< XContentProviderManager > xUcb =
- ucb::ContentBroker::get()->getContentProviderManagerInterface();
-
- Reference< XContentProvider > xFileProvider
- ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY );
- xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True );
-
-
-/* Reference< XContentProvider > xPackageProvider
- ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY );
- xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True );
- */
- globalUcb = xUcb;
- return xSMgr;
-}
-
-int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
-{
- // Test some metadata
- Reference< XDatabaseMetaData > xDmd = pConnection->getMetaData();
- if ( xDmd.is() ) {
- printf(": got DatabaseMetaData \n");
-
- OUString sQuoteStr = xDmd->getIdentifierQuoteString();
- printf( "Quote String : '%s'\n", OUtoCStr( sQuoteStr ) );
-
- OUString sSQLCmds = xDmd->getSQLKeywords();
- printf( "SQL Commands : '%s'\n", OUtoCStr( sSQLCmds ) );
-
- printf("Testing getColumns() : START\n");
- {
- Reference<XResultSet> xRes = xDmd->getColumns(
- makeAny(OUString::createFromAscii("")), // Catalog
- OUString::createFromAscii("%"), // Schema
- OUString::createFromAscii("%"), // TabName
- OUString::createFromAscii("%")
- );
- printXResultSets( xRes );
- }
- printf("Testing getColumns() : END\n");
-
- printf("Testing getTypeInfo() : START\n");
- {
- Reference<XResultSet> xRes = xDmd-> getTypeInfo();
- printXResultSets( xRes );
- }
- printf("Testing getTypeInfo() : END\n");
-
- printf("Testing getTables() : START\n");
- {
- Reference<XResultSet> xRes = xDmd->getTables(
- makeAny(OUString::createFromAscii("")), // Catalog
- OUString::createFromAscii("%"), // Schema
- OUString::createFromAscii("%"), // TabName
- Sequence<rtl::OUString>()
- );
- printXResultSets( xRes );
- }
- printf("Testing getTables() : END\n");
-
- } else {
- printf(": FAILED to get DatabaseMetaData \n");
- }
-
- return 0;
-}
-int TestBookMark(Reference<XResultSet> &xRes);
-int TestRowUpdate(Reference<XResultSet> &xRes);
-
-Reference<XResultSet> TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection,sal_Int32 choice)
-{
- // Try a query
- printf("Testing createStatement() & executeQuery() : START\n");
- Reference<XStatement> xStmt = pConnection->createStatement();
- Reference<XResultSet> xRes;
- if(xStmt.is())
- {
- printf(": got statement\n");
- printf(": excuteQuery() : START \n");
-// SELECT "First Name", "Display Name", "E-mail" FROM "addr" "addr"
- char sql[256]="SELECT \"First Name\", \"Display Name\", \"E-mail\" FROM \"addr\"";
- if (choice!=-1)
- {
- printf("Please input a query,end by \";\" and less then 256 char plz:\n");
- char ch=0;
- int index=0;
- while (ch != ';')
- {
- scanf("%c",&ch);
- sql[index++] = ch;
- }
- sql[index]= 0;
- printf("SQL:%s\n",sql);
- }
- try
- {
- sal_Int32 times=0;
- for (times = 0;times< 100;times ++)
- {
- Reference<XResultSet> tmpRes =
- //xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"addr\""));
- xStmt->executeQuery(OUString::createFromAscii(sql));
- // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"Personal Address Book\" WHERE ( PrimaryEmail IS NULL )"));
- // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"Personal Address Book\" WHERE ( PrimaryEmail LIKE \"Darren\" )"));
- // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"Personal Address Book\""));
- // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"myldap\" WHERE ( PrimaryEmail LIKE \"%Darren%\" OR DisplayName LIKE \"%Darren%\" )"));
-
- autoTest( tmpRes );
- Reference<XCloseable> clsRes(tmpRes,UNO_QUERY);
- clsRes->close();
- printf("Current Times:%d\n",times);
- }
- TestBookMark(xRes);
- TestRowUpdate(xRes);
- } catch ( Exception &e ) {
- printf( "Exception caught : %s\n", OUtoCStr( e.Message) );
- } catch (...) {
- printf( "Non-UNO Exception caught\n" );
- }
- printf(": excuteQuery() : END \n");
- }
- else
- {
- printf(": FAILED to get statement\n");
- }
- printf("Testing createStatement() & executeQuery() : END\n");
- return xRes;
-}
-Reference< ::com::sun::star::sdbc::XConnection> TestConnected
- (Reference< ::com::sun::star::sdbc::XDriver> &pDriver,sal_Int32 choice)
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection;
- printf("Begin Connect!\n");
- OUString url;
- Sequence<PropertyValue> aValue;
-
- switch (choice)
- {
- case -1:
- case 1: //mozilla
- url=OUString::createFromAscii("sdbc:address:mozilla://");
- break;
- case 2:
- url=OUString::createFromAscii("sdbc:address:ldap://");
- char hostname[40],basedn[40];
- scanf("%s %s",hostname,basedn);
- aValue.realloc(2);
- aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
- aValue[0].Value <<= rtl::OUString::createFromAscii(hostname);
- aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
- aValue[1].Value <<= rtl::OUString::createFromAscii(basedn);
- break;
- case 3:
- case 4:
- break;
- case 5:
- //Default LDAP AB
- url=OUString::createFromAscii("sdbc:address:ldap://");
- aValue.realloc(2);
- aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
- aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds");
- aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
- aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com");
- break;
- default:
- return pConnection;
- break;
- }
- pConnection =
- pDriver->connect(url,aValue);
- return pConnection;
- }
-
-void menuBookmark()
-{
- PRINTSTR("0 Exit\n")
- PRINTSTR("1 Show Max rowcount\n")
- PRINTSTR("2 Move First\n")
- PRINTSTR("3 Record bookmark 1\n")
- PRINTSTR("4 Record bookmark 2\n")
- PRINTSTR("5 Move to bookmark. Usage: 5 bookid\n")
- PRINTSTR("6 moveRelativeToBookmark, follow bookid rows plz\n")
- PRINTSTR("7 compareBookmark\n")
- PRINTSTR("8 print boomark hash. Usage: 8 bookid\n")
- PRINTSTR("9 print current row\n")
- PRINTSTR("10 Auto test\n")
-
- PRINTSTR("Please Input you choice:")
-}
-int autoTest(Reference<XResultSet> &xRes)
-{
- sal_Int32 nRows = 0;
- printColumns(xRes);
- if(xRes.is()) {
- while( xRes.is() && xRes->next())
- {
- nRows++;
- }
- printf( "%d Row(s)\n", nRows);
- sal_Int32 times;
- sal_Int32 pos;
- for(times = 1;times < 100; times ++)
- {
- pos= rand() % nRows+1;
- printf("pos:%d\n",pos);
- xRes->absolute(pos);
- printXResultSet(xRes);
- }
- } else {
- printf(": FAILED to get a ResultSet \n");
- }
- return 0;
-}
-int TestBookMark(Reference<XResultSet> &xRes)
-{
- Reference<XResultSet> mRes(xRes);
- if (!mRes.is() || !mRes->first())
- {
- return sal_False;
- }
-
- Reference<XRow> mRow(xRes,UNO_QUERY);
- Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(mRes,UNO_QUERY)->getMetaData();
- printXResultSet(mRes);
- Reference< ::com::sun::star::sdbcx::XRowLocate> xRowLocate(xRes, UNO_QUERY);
- ::com::sun::star::uno::Any xBookMark[2];
- int index;
- if (xRowLocate.is())
- {
- int choice=-1;
- while (choice)
- {
- menuBookmark();
-
- scanf("%d",&choice);
- printf("Your choice is:%d\n",choice);
- switch (choice)
- {
- case 1:
- printf("Rowcount:Current don't know\n");
- break;
- case 2:
- if (!mRes->isFirst()) mRes->first();
- break;
- case 3:
- xBookMark[0] = xRowLocate->getBookmark();
- break;
- case 4:
- xBookMark[1] = xRowLocate->getBookmark();
- break;
- case 5:
- scanf("%d",&index);
- if (index == 1 || index == 2)
- xRowLocate->moveToBookmark(xBookMark[index-1]);
- break;
- case 6:
- int rows;
- scanf("%d %d",&index,&rows);
- if (index == 1 || index == 2)
- xRowLocate->moveRelativeToBookmark(xBookMark[index-1],rows);
- break;
- case 7:
- printf("compareBookmarks:%d\n",xRowLocate->compareBookmarks(xBookMark[0],xBookMark[1]));
- break;
- case 8:
- scanf("%d",&index);
- printf("HashBookmark[%d]:%d\n",index,xRowLocate->hashBookmark(xBookMark[index-1]));
- break;
- case 9:
- printXResultSet(mRes);
- break;
- case 10:
- autoTest(mRes);
- break;
- default:
- break;
- }
- }
- }
- return 0;
-}
-void menuRowUpdate()
-{
- PRINTSTR("0 Exit\n")
- PRINTSTR("1 Print Columns\n")
- PRINTSTR("2 Move to row. Usage:2 rowid\n")
- PRINTSTR("3 Print Row values\n")
- PRINTSTR("4 Change Column Value: 4 columnid newvalue\n")
- PRINTSTR("5 Commit changes\n")
- PRINTSTR("6 Delete Current Row\n")
- PRINTSTR("Please Input Your choice:")
-}
-int TestRowUpdate(Reference<XResultSet> &xRes)
-{
- if (!xRes.is() || !xRes->first())
- {
- return sal_False;
- }
- printf("Test XRowUpdate START\n");
- Reference< ::com::sun::star::sdbc::XRowUpdate> xRowUpdate(xRes, UNO_QUERY);
- Reference< ::com::sun::star::sdbc::XResultSetUpdate> xResultSetUpdate(xRes, UNO_QUERY);
- int index;
- if (xRowUpdate.is())
- {
- int choice=-1;
- char newString[256];
- while (choice)
- {
- menuRowUpdate();
-
- scanf("%d",&choice);
- printf("Your choice is:%d\n",choice);
- switch (choice)
- {
- case 1:
- printColumns(xRes);
- break;
- case 2:
- scanf("%d",&index);
- xRes->absolute(index);
- break;
- case 3:
- printXResultSet(xRes);
- break;
- case 4:
- scanf("%d %s",&index,newString);
- xRowUpdate->updateString(index,OUString::createFromAscii(newString));
- printXResultSet(xRes);
- break;
- case 5:
- if (xResultSetUpdate.is())
- {
- xResultSetUpdate->updateRow();
- printXResultSet(xRes);
- }
- else
- printf("Can't update!\n");
- break;
- case 6:
- if (xResultSetUpdate.is())
- {
- xResultSetUpdate->deleteRow();
- printXResultSet(xRes);
- }
- else
- printf("Can't update!\n");
- break;
-
- default:
- break;
- }
- }
- }
- printf("Test XRowUpdate END\n");
- return 0;
-}
-
-void menuMain()
-{
- PRINTSTR("0 Exit\n")
- PRINTSTR("1 Open Mozilla Address Book\n")
- PRINTSTR("2 Open LDAP. Pleae follow hostname and base dn.\n")
- PRINTSTR("3 Open Outlook Address Book\n")
- PRINTSTR("4 Open OE Address Book\n")
- PRINTSTR("Please Input your choice:")
-}
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-
-{
- Reference< XMultiServiceFactory > xMgr = InitializeFac();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- try
- {
- Reference< ::com::sun::star::sdbc::XDriver>
- m_xDriver(xMgr->createInstance(
- OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")),
- UNO_QUERY);
- if(m_xDriver.is())
- {
- int choice=-1;
- if (argc > 1 )
- {
- menuMain();
- scanf("%d",&choice);
- }
-
- while (choice)
- {
-
- m_xConnection = TestConnected(m_xDriver,choice);
- if(m_xConnection.is())
- {
- if (!TestMetaData(m_xConnection))
- {
- Reference<XResultSet> xRes=TestQuery(m_xConnection,choice);
- if (xRes.is())
- {
- }
- }
- }else printf("Can't connected!\n");
-
- if (argc > 1)
- {
- menuMain();
- scanf("%d",&choice);
- }
- else
- choice = 0;
-
- }
- } else {
- printf("No driver!\n");
- }
- }
- catch(...)
- {
- printf("Exception thrown!\n");
- }
- printf("Exiting...\n");
- return 0;
-}
-
diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
deleted file mode 100644
index 1e9afc8..0000000
--- a/connectivity/workben/testmoz/makefile.mk
+++ /dev/null
@@ -1,66 +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=..$/..
-
-PRJNAME=connectivity
-TARGET=testmoz
-TARGETTYPE=CUI
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-OBJFILES= $(OBJ)$/main.obj
-
-
-APPSTDLIBS=$(SALLIB) \
- $(VOSLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
- $(DBTOOLSLIB) \
- $(COMPHELPERLIB)
-
-
-# ... cfgapi ..............................
-
-APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJFILES)
-APP1STDLIBS = $(APPSTDLIBS)
-
-
-
-APP2TARGET = mozThread
-APP2OBJS = $(OBJ)$/initUNO.obj \
- $(OBJ)$/mozthread.obj
-
-APP2STDLIBS = $(APPSTDLIBS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
deleted file mode 100644
index 73d44ee..0000000
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ /dev/null
@@ -1,473 +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.
- *
- *************************************************************/
-
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-#include <connectivity/sqlparse.hxx>
-#include "connectivity/sqliterator.hxx"
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <unotools/processfactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XDriver.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/sdbcx/XRowLocate.hpp>
-#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <com/sun/star/sdbc/XCloseable.hpp>
-#include <com/sun/star/sdb/XDatabaseEnvironment.hpp>
-#include <com/sun/star/uno/Any.hxx>
-
-#include "connectivity/sqlnode.hxx"
-#include <ucbhelper/contentbroker.hxx>
-#include <comphelper/regpathhelper.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/process.h>
-
-#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/registry/XImplementationRegistration.hpp>
-#include <com/sun/star/ucb/XContentProviderManager.hpp>
-
-#include <ucbhelper/content.hxx>
-#include <osl/module.h>
-#include <tools/config.hxx>
-
-#include <stdio.h>
-#include <osl/thread.hxx>
-#include <osl/diagnose.h>
-#include <osl/conditn.hxx>
-#include <time.h>
-
-
-using namespace comphelper;
-using namespace cppu;
-using namespace rtl;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::registry;
-using namespace com::sun::star::ucb;
-using namespace com::sun::star::beans;
-
-//using namespace com::sun::star;
-using namespace connectivity;
-using namespace com::sun::star::sdb;
-using namespace com::sun::star::sdbc;
-using namespace com::sun::star::sdbcx;
-using namespace ::com::sun::star::container;
-using namespace com::sun::star::registry;
-
-extern Reference< XMultiServiceFactory > InitializeFac( void );
-Reference< XMultiServiceFactory > mMgr;
-
-#define OUtoCStr( x ) (OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US ).getStr())
-#define PRINTSTR(x) printf("%s",x);
-#define PRINTLN(x) printf("%s\n",x);
-
-const int testLDAP=0;
-const int testMozilla=1;
-const int testOp=2;
-const int testOe=3;
-
-static int testCount = 0;
-static int testList[4] = {0,0,0,0};
-
-int autoTest(Reference<XResultSet> &xRes);
-
-void printColumns( Reference<XResultSet> &xRes )
-{
- if(xRes.is())
- {
- char* aPat = " %-22s ";
- char* aPat_Short = " %-12s ";
- Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
- OSL_TRACE( "ColumnCount = %d\n", xMeta->getColumnCount());
- for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i)
- {
- const char *str = OUtoCStr(xMeta->getColumnName(i));
- OSL_TRACE( aPat, str );
- }
- OSL_TRACE("\n");
- OSL_TRACE("------------------------------------------------------------------------------------------\n");
- }
- else
- {
- OSL_TRACE(": FAILED to get a ResultSet \n");
- }
-}
-void printXResultSet( Reference<XResultSet> &xRes )
-{
- if(xRes.is())
- {
- char* aPat = " %-22s ";
- char* aPat_Short = " %-12s ";
- Reference<XRow> xRow(xRes,UNO_QUERY);
- Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
- for(sal_Int32 j=1;j<=xMeta->getColumnCount();++j)
- {
- try
- {
- const char *str = OUtoCStr(xRow->getString(j));
- OSL_TRACE( aPat_Short, str );
- } catch (...) {
- OSL_TRACE(" Ex ");
- }
- }
- OSL_TRACE("\n");
- }
- else
- OSL_TRACE("FAILED to get a ResultSet \n");
-}
-
-void printXResultSets( Reference<XResultSet> &xRes )
-{
- if(xRes.is())
- {
- printColumns(xRes);
- sal_Int32 nRows = 0;
- while( xRes.is() && xRes->next())
- {
- printXResultSet(xRes);
- nRows++;
- }
- OSL_TRACE( "%d Row(s)\n", nRows);
- }else
- OSL_TRACE("FAILED to get a ResultSet \n");
-}
-
-
-
-int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
-{
- // Test some metadata
- Reference< XDatabaseMetaData > xDmd = pConnection->getMetaData();
- if ( xDmd.is() )
- {
- OSL_TRACE(": got DatabaseMetaData \n");
-
- OUString sQuoteStr = xDmd->getIdentifierQuoteString();
- OSL_TRACE( "Quote String : '%s'\n", OUtoCStr( sQuoteStr ) );
-
- OUString sSQLCmds = xDmd->getSQLKeywords();
- OSL_TRACE( "SQL Commands : '%s'\n", OUtoCStr( sSQLCmds ) );
-
- OSL_TRACE("Testing getColumns() : START\n");
- {
- Reference<XResultSet> xRes = xDmd->getColumns(
- makeAny(OUString::createFromAscii("")), // Catalog
- OUString::createFromAscii("%"), // Schema
- OUString::createFromAscii("%"), // TabName
- OUString::createFromAscii("%")
- );
- printXResultSets( xRes );
- }
- OSL_TRACE("Testing getColumns() : END\n");
-
- OSL_TRACE("Testing getTypeInfo() : START\n");
- {
- Reference<XResultSet> xRes = xDmd-> getTypeInfo();
- printXResultSets( xRes );
- }
- OSL_TRACE("Testing getTypeInfo() : END\n");
-
- OSL_TRACE("Testing getTables() : START\n");
- {
- Reference<XResultSet> xRes = xDmd->getTables(
- makeAny(OUString::createFromAscii("")), // Catalog
- OUString::createFromAscii("%"), // Schema
- OUString::createFromAscii("%"), // TabName
- Sequence<rtl::OUString>() );
- printXResultSets( xRes );
- }
- OSL_TRACE("Testing getTables() : END\n");
-
- }
- else
- OSL_TRACE(": FAILED to get DatabaseMetaData \n");
- return 0;
-}
-
-void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
-{
- // Try a query
- OSL_TRACE("Testing createStatement() & executeQuery() : START\n");
- Reference<XStatement> xStmt = pConnection->createStatement();
- Reference<XResultSet> xRes;
- if(xStmt.is())
- {
- OSL_TRACE(": got statement\n");
- OSL_TRACE(": excuteQuery() : START \n");
-// SELECT "First Name", "Display Name", "E-mail" FROM tablename
- OUString sqlPrefix= OUString::createFromAscii("SELECT \"First Name\", \"Display Name\", \"E-mail\" FROM ");
- try
- {
- sal_Int32 times=0;
- Reference< XDatabaseMetaData > xDmd = pConnection->getMetaData();
- if ( xDmd.is() )
- {
- OSL_TRACE("getTables() : START\n");
- OUString qut = xDmd->getIdentifierQuoteString();
-
- Reference<XResultSet> xRes = xDmd->getTables(
- makeAny(OUString::createFromAscii("")), // Catalog
- OUString::createFromAscii("%"), // Schema
- OUString::createFromAscii("%"), // TabName
- Sequence<rtl::OUString>() );
- sal_Int32 nTables = 0;
- while( xRes.is() && xRes->next())
- {
- Reference<XRow> xRow(xRes,UNO_QUERY);
- const char *strTableName = OUtoCStr(xRow->getString(3));
- OSL_TRACE("Testing Table:%s\n",strTableName);
-
- Reference<XResultSet> tmpRes =
- xStmt->executeQuery(sqlPrefix + qut + xRow->getString(3) + qut);
- autoTest( tmpRes );
- Reference<XCloseable> clsRes(tmpRes,UNO_QUERY);
- clsRes->close();
- nTables++;
- }
- OSL_TRACE("Tested Tables:%d\n",nTables);
- }
- } catch ( Exception &e ) {
- OSL_TRACE( "Exception caught : %s\n", OUtoCStr( e.Message) );
- }
-// catch (...) {
-// OSL_TRACE( "Non-UNO Exception caught\n" );
-// }
- OSL_TRACE("excuteQuery() : END \n");
- }
- else
- {
- OSL_TRACE(": FAILED to get statement\n");
- }
- OSL_TRACE("Testing createStatement() & executeQuery() : END\n");
-}
-Reference< ::com::sun::star::sdbc::XConnection> TestConnected
- (Reference< ::com::sun::star::sdbc::XDriver> &pDriver)
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection;
- OSL_TRACE("Begin Connect!\n");
- OUString url;
- Sequence<PropertyValue> aValue;
- int nType=0;
- srand( (unsigned)time( NULL ) );
- nType = rand() % testCount + 1;
- int nIndex=0,nCount=0;
- for ( nIndex = 0; nIndex< 4;nIndex++)
- {
- if (testList[nIndex])
- nCount++;
- if (nCount == nType)
- break;
- }
- switch( nIndex)
- {
- case testLDAP:
- url=OUString::createFromAscii("sdbc:address:ldap://");
- aValue.realloc(2);
- aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
- aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds");
- aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
- aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com");
- break;
- case testMozilla:
- url=OUString::createFromAscii("sdbc:address:mozilla://");
- break;
- case testOp:
- url=OUString::createFromAscii("sdbc:address:outlook://");
- break;
- case testOe:
- url=OUString::createFromAscii("sdbc:address:outlookexp://");
- break;
- default:
- url=OUString::createFromAscii("sdbc:address:mozilla://");
- break;
- }
- pConnection =
- pDriver->connect(url,aValue);
- return pConnection;
- }
-
-int autoTest(Reference<XResultSet> &xRes)
-{
- sal_Int32 nRows = 0;
- printColumns(xRes);
- if(xRes.is())
- {
- while( xRes.is() && xRes->next())
- {
- nRows++;
- }
- OSL_TRACE( "%d Row(s)\n", nRows);
- sal_Int32 times;
- sal_Int32 pos;
- if (nRows)
- {
- for(times = 1;times < 10; times ++)
- {
- pos= rand() % nRows+1;
- OSL_TRACE("pos:%d\n",pos);
- xRes->absolute(pos);
- printXResultSet(xRes);
- }
- }
- }
- else
- {
- OSL_TRACE(": FAILED to get a ResultSet \n");
- }
- TimeValue timeValue = { 1, 0 }; //sleep 1 Seconds to give time to other threads
- osl_waitThread(&timeValue);
- return 0;
-}
-void SAL_CALL mozThread(void*)
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- try
- {
- Reference< ::com::sun::star::sdbc::XDriver>
- m_xDriver(mMgr->createInstance(
- OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")),
- UNO_QUERY);
- if(m_xDriver.is())
- {
-
- m_xConnection = TestConnected(m_xDriver);
- if(m_xConnection.is())
- {
- if (!TestMetaData(m_xConnection))
- {
- TestQuery(m_xConnection);
- }
- }
- else
- OSL_TRACE("Can't connected!\n");
-
- }
- else
- {
- OSL_TRACE("No driver!\n");
- }
- } catch ( Exception &e ) {
- OSL_TRACE( "Exception caught : %s\n", OUtoCStr( e.Message) );
- }
-// catch (...) {
-// OSL_TRACE( "Non-UNO Exception caught\n" );
-// }
-}
-const int THREAD_COUNT=100;
-
-
-void usage()
-{
- PRINTLN("mozThread [opts] threadcount");
- PRINTLN("opts:");
- PRINTLN("-l test ldap");
- PRINTLN("-m test mozilla");
- PRINTLN("-p test outlook");
- PRINTLN("-e test outlook express");
- PRINTLN("0 < threadcount <= 100, default 100");
-}
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-
-{
- OSL_TRACE("Init UNO\n");
- Reference< XMultiServiceFactory > xMgr =InitializeFac();
- int threadCount=THREAD_COUNT;
- int nAc;
- for (nAc = 1; nAc < argc; nAc ++)
- {
- if (strcmp(argv[nAc],"-l") ==0)
- {
- testList[testLDAP] = 1;
- }else if(strcmp(argv[nAc],"-m") ==0)
- {
- testList[testMozilla]=1;
- }else if(strcmp(argv[nAc],"-p") ==0)
- {
- testList[testOp]=1;
- }else if(strcmp(argv[nAc],"-e") ==0)
- {
- testList[testOe]=1;
- }else if(strcmp(argv[nAc],"-h") ==0 || strcmp(argv[nAc],"--help") ==0)
- {
- usage();
- return 0;
- }else
- {
- int tmpCount = atoi(argv[nAc]);
- if (tmpCount > 0 && tmpCount < threadCount)
- {
- threadCount = tmpCount;
- }
- }
- }
- testCount = testList[testLDAP] + testList[testMozilla] + testList[testOp] + testList[testOe];
- if ( testCount == 0)
- {
- testList[testLDAP] = 1;
- testCount = 1;
- }
-
- if (!xMgr.is())
- {
- OSL_TRACE("Error init UNO\n");
- return 1;
- }
- else
- OSL_TRACE("UNO initted\n");
-
- mMgr = xMgr;
- oslThread xThreads[THREAD_COUNT];
- int index=0;
- for(index=0;index < threadCount; index++)
- {
- xThreads[index] = osl_createThread(mozThread,(void*)NULL);
- TimeValue timeValue = { 1, 0 }; //sleep 1 Seconds to give time to other threads
- osl_waitThread(&timeValue);
- }
- for(index=0;index < threadCount; index++)
- {
- if (osl_isThreadRunning(xThreads[index]))
- osl_joinWithThread(xThreads[index]);
- }
- OSL_TRACE("Exiting...\n");
- return 0;
-}
-
diff --git a/moz/README b/moz/README
deleted file mode 100644
index 6b1d0a2..0000000
--- a/moz/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Rebuild moz whenever changes have been made in the nss module. Those libs are
-merged into mozruntime.zip which is build in this project.
-
-Please read nss/readme.txt !!!
\ No newline at end of file
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
deleted file mode 100644
index b3f2ca0..0000000
--- a/moz/extractfiles.mk
+++ /dev/null
@@ -1,455 +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.
-#
-#**************************************************************
-
-
-
-MOZTARGET=$(OS)$(COM)$(CPU)
-MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/$(BUILD_DIR)$/dist
-MOZ_BIN_DIR=$(MOZ_DIST_DIR)$/bin
-RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime
-LIB_DIR=$(LB)
-INCLUDE_DIR=$(INCCOM)
-
-
-
-#If we build the NSS module then we do not need the old nss libs from here
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
-
-
-.IF "$(OS)" == "SOLARIS"
-.IF "$(CPU)" == "S" #32bit
-FREEBL_LIB=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-.ELIF "$(CPU)" == "U" #64bit unxsolu4
-FREEBL_LIB=freebl_64int_3 freebl_64fpu_3
-.ELSE
-FREEBL_LIB=freebl3
-.ENDIF #"$(CPU)" == "S"
-
-.ELSE # "$(OS)" == "SOLARIS"
-FREEBL_LIB=freebl3
-.ENDIF # "$(OS)" == "SOLARIS"
-
-
-NSS_MODULE_RUNTIME_LIST:= \
- $(FREEBL_LIB) \
- nspr4 \
- nss3 \
- nssckbi \
- nssdbm3 \
- nssutil3 \
- plc4 \
- plds4 \
- smime3 \
- softokn3 \
- sqlite/sqlite3 \
- ssl3
-
-BIN_RUNTIMELIST= \
- xpcom \
- xpcom_core \
- xpcom_compat
-.ELSE
-
-.IF "$(GUI)" == "WNT"
- FREEBL_LIB=freebl3
-.ELSE # "$(GUI)" == "WNT"
- .IF "$(OS)$(CPUNAME)" == "SOLARISSPARC"
- FREEBL_LIB=freebl_32fpu_3
- .ELSE # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
- FREEBL_LIB=freebl3
- .ENDIF # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
-.ENDIF # "$(GUI)" == "WNT"
-
-
-BIN_RUNTIMELIST= \
- nspr4 \
- plc4 \
- plds4 \
- xpcom \
- xpcom_core \
- xpcom_compat \
- nss3 \
- ssl3 \
- softokn3 \
- smime3 \
- $(FREEBL_LIB)
-.ENDIF # "$(ENABLE_NSS_MODULE)"=="YES"
-
-.IF "$(GUI)"=="WNT"
-BIN_RUNTIMELIST+= \
- js3250 \
- mozz \
- msgbsutl \
- nsldap32v50 \
- nsldappr32v50
-.ELSE #"$(GUI)"=="WNT"
-BIN_RUNTIMELIST+= \
- mozjs \
- mozz \
- msgbaseutil \
- ldap50 \
- prldap50
-.ENDIF
-
-COMPONENT_RUNTIMELIST= \
- addrbook \
- mork \
- mozldap \
- necko \
- profile \
- xpcom_compat_c \
- rdf \
- uconv \
- vcard \
- i18n \
- pipnss
-
-.IF "$(GUI)"=="WNT"
-COMPONENT_RUNTIMELIST+= \
- xppref32 \
- xpc3250
-.ELSE #"$(GUI)"=="WNT"
-COMPONENT_RUNTIMELIST+= \
- pref \
- xpconnect
-.ENDIF
-
-COMREGISTRY_FILELIST= \
- necko_dns.xpt \
- xpcom_base.xpt \
- xpcom_obsolete.xpt \
- xpcom_components.xpt \
- xpcom_ds.xpt \
- xpcom_io.xpt \
- xpcom_xpti.xpt \
- addrbook.xpt \
- mozldap.xpt \
- pref.xpt
-
-.IF "$(GUI)"=="WNT"
-COMREGISTRY_FILELIST+= xpcom_thread.xpt
-.ELSE #"$(GUI)"=="WNT"
-COMREGISTRY_FILELIST+= xpcom_threads.xpt
-.ENDIF
-
-DEFAULTS_RUNTIMELIST= \
- defaults$/pref$/browser-prefs.js \
- defaults$/pref$/mailnews.js \
- defaults$/pref$/mdn.js \
- defaults$/pref$/smime.js \
- defaults$/autoconfig$/platform.js \
- defaults$/autoconfig$/prefcalls.js \
- greprefs$/all.js \
- greprefs$/security-prefs.js
-
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
-#These headers come from the separate NSS module if enabled
-NSS_INCLUDE_LIST= nspr nss
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-
-LIBLIST= \
- libembed_base_s.a \
- libmozreg_s.a \
- libnslber32v50.a \
- libnsldap32v50.a \
- libxpcom_core.dll.a \
- libxpcom.dll.a
-
-.ELSE #"$(COM)"=="GCC"
-
-LIBLIST= \
- embed_base_s.lib \
- mozreg_s.lib \
- nslber32v50.lib \
- nsldap32v50.lib \
- xpcom_core.lib \
- xpcom.lib
-
-.ENDIF #"$(COM)"=="GCC"
-
-.ELSE #"$(GUI)"=="WNT"
-
-LIBLIST= \
- libembed_base_s.a \
- libmozreg_s.a \
- liblber50.a \
- libxpcom_core$(DLLPOST) \
- libxpcom$(DLLPOST) \
- libmsgbaseutil$(DLLPOST) \
- libldap50$(DLLPOST) \
-
-.ENDIF
-
-.ELSE # .IF"$(ENABLE_NSS_MODULE)"=="YES"
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-LIBLIST= \
- libembed_base_s.a \
- libmozreg_s.a \
- libnslber32v50.a \
- libnsldap32v50.a \
- libnspr4.a \
- libxpcom_core.dll.a \
- libxpcom.dll.a \
- libnss3.a \
- libsmime3.a
-
-.ELSE
-
-LIBLIST= \
- embed_base_s.lib \
- mozreg_s.lib \
- nslber32v50.lib \
- nsldap32v50.lib \
- nspr4.lib \
- xpcom_core.lib \
- xpcom.lib \
- plc4.lib \
- plds4.lib \
- nss3.lib \
- ssl3.lib \
- smime3.lib
-
-.ENDIF
-
-.ELSE #"$(GUI)"=="WNT"
-
-LIBLIST= \
- libembed_base_s.a \
- libmozreg_s.a \
- liblber50.a \
- libnspr4$(DLLPOST) \
- libxpcom_core$(DLLPOST) \
- libxpcom$(DLLPOST) \
- libmsgbaseutil$(DLLPOST) \
- libldap50$(DLLPOST) \
- libsoftokn3$(DLLPOST) \
- libplc4$(DLLPOST) \
- libplds4$(DLLPOST) \
- libnss3$(DLLPOST) \
- libssl3$(DLLPOST) \
- libsmime3$(DLLPOST)
-
-.ENDIF
-.ENDIF # .IF "$(ENABLE_NSS_MODULE)"=="YES"
-
-INCLUDE_PATH=$(MOZ_DIST_DIR)$/include$/
-PUBLIC_PATH=$(MOZ_DIST_DIR)$/public$/
-
-
-.IF "$(GUI)"=="WNT"
-REG_SUBFIX= .exe
-.ELSE #"$(GUI)"=="WNT"
-REG_SUBFIX=
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-extract_mozab_files: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) \
- make_temp_dir \
- $(MISC)$/build$/so_moz_runtime_files \
- $(MISC)$/build$/so_moz_include_files \
- $(MISC)$/build$/so_moz_lib_files
-
-make_temp_dir:
- @@-$(MKDIR) $(RUNTIME_DIR)
- @@-$(MKDIR) $(RUNTIME_DIR)$/components
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults$/pref
- @@-$(MKDIR) $(LIB_DIR)
- @@-$(MKDIR) $(INCLUDE_DIR)
-.IF "$(OS)"=="SOLARIS"
- @@-$(MKDIR) $(RUNTIME_DIR)$/res
-.ENDIF
-
-$(OUT)$/bin$/mozruntime.zip: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- noop
-
-$(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
-# copy files in BIN_RUNTIMELIST
- $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
- $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-.IF "$(GUI)" == "UNX"
- $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
- $(LIB_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-.IF "$(ENABLE_NSS_MODULE)" == "YES"
-# We add the libraries from the separate nss module
- $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARLIBDIR)$/$(file:d:d)/$(DLLPRE)$(file:f)$(DLLPOST) \
- $(RUNTIME_DIR)$/$(DLLPRE)$(file:f)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-.ENDIF
-.ELSE # .IF "$(GUI)" == "UNX"
-.IF "$(ENABLE_NSS_MODULE)" == "YES"
-# We add the libraries from the separate nss module
- $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARBINDIR)$/$(DLLPRE)$(file)$(DLLPOST) \
- $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-.ENDIF
-.ENDIF # .IF "$(GUI)" == "UNX"
-
-
-# copy files in RES_FILELIST
-.IF "$(OS)"=="SOLARIS"
- @$(COPY) $(MOZ_BIN_DIR)$/res$/charsetalias.properties $(RUNTIME_DIR)$/res$/charsetalias.properties
-.ELSE
- @echo No Res Files to copy.
-.ENDIF
-
-# copy files in COMPONENT_RUNTIMELIST
- $(foreach,file,$(COMPONENT_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) \
- $(RUNTIME_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-
-# copy files in COMREGISTRY_FILELIST
- $(foreach,file,$(COMREGISTRY_FILELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(file) \
- $(RUNTIME_DIR)$/components$/$(file) &&) \
- echo >& $(NULLDEV)
-
-# copy files in DEFAULTS_RUNTIMELIST
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults$/pref
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults$/autoconfig
- @@-$(MKDIR) $(RUNTIME_DIR)$/greprefs
- $(foreach,file,$(DEFAULTS_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(file) $(RUNTIME_DIR)$/$(file) &&) \
- echo >& $(NULLDEV)
-
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX"
- cd $(RUNTIME_DIR) && strip *$(DLLPOST)
- cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST)
-.ENDIF
-.ENDIF
-.IF "$(OS)"=="MACOSX"
- $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \
- $(RUNTIME_DIR)$/*$(DLLPOST)
-# A crude hack to adapt all the install names in the components subdir:
- $(foreach,file,$(shell ls $(RUNTIME_DIR)$/components$/*$(DLLPOST)) \
- install_name_tool \
- -change @executable_path/libldap50.dylib \
- @loader_path/../libldap50.dylib \
- -change @executable_path/libmozjs.dylib @loader_path/../libmozjs.dylib \
- -change @executable_path/libmozz.dylib @loader_path/../libmozz.dylib \
- -change @executable_path/libmsgbaseutil.dylib \
- @loader_path/../libmsgbaseutil.dylib \
- -change @executable_path/libnspr4.dylib @loader_path/../libnspr4.dylib \
- -change @executable_path/libnss3.dylib @loader_path/../libnss3.dylib \
- -change @executable_path/libplc4.dylib @loader_path/../libplc4.dylib \
- -change @executable_path/libplds4.dylib @loader_path/../libplds4.dylib \
- -change @executable_path/libprldap50.dylib \
- @loader_path/../libprldap50.dylib \
- -change @executable_path/libsmime3.dylib \
- @loader_path/../libsmime3.dylib \
- -change @executable_path/libsoftokn3.dylib \
- @loader_path/../libsoftokn3.dylib \
- -change @executable_path/libssl3.dylib @loader_path/../libssl3.dylib \
- -change @executable_path/libxpcom.dylib @loader_path/../libxpcom.dylib \
- -change @executable_path/libxpcom_compat.dylib \
- @loader_path/../libxpcom_compat.dylib \
- $(file) &&) true
-.ENDIF
-
-# zip runtime files to mozruntime.zip
- cd $(RUNTIME_DIR) && zip -r ..$/..$/bin$/mozruntime.zip *
-
- $(TOUCH) $@
-
-$(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @-echo "You can delete $(INCCOM) to force it copy all include files again."
-
-
-$(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
-.IF "$(OS)"!="SOLARIS"
- $(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
- $(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ELSE # "$(OS)"!="SOLARIS"
- $(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
- $(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
-.ENDIF # "$(OS)"!="SOLARIS"
-
-.IF "$(GUI)"=="UNX"
- chmod -R 775 $(INCCOM)
-.ENDIF
- $(TOUCH) $@
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
- +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCLUDE_DIR)$/$(dir) $(INCLUDE_DIR)$/$(dir)_remove_me &&) echo >& $(NULLDEV)
- $(foreach,dir,$(NSS_INCLUDE_LIST) rm -rf $(INCLUDE_DIR)$/$(dir)_remove_me &&) echo >& $(NULLDEV)
- -$(MKDIR) $(OUT)$/inc.nss
- cd $(OUT)$/inc.nss && $(foreach,dir,$(NSS_INCLUDE_LIST) $(GNUCOPY) -pRL $(SOLARINCDIR)$/mozilla/$(dir) . &&) echo >& $(NULLDEV)
-.ENDIF
-
-# On UNX the rules for so_moz_runtime_files copy files into the same directory
-# used here (LIB_DIR), and on MACOSX all those files together need to be
-# processed here, hence the dependency on so_moz_runtime_files:
-$(MISC)$/build$/so_moz_lib_files: $(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)) $(MISC)$/build$/so_moz_runtime_files
- echo $(foreach,file,$(LIBLIST) $(MOZ_DIST_DIR)$/lib$/$(file))
- $(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \
- $(LIB_DIR)$/$(file) &&) \
- echo >& $(NULLDEV)
-.IF "$(OS)"=="MACOSX"
- $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \
- $(LIB_DIR)$/*$(DLLPOST)
-.ENDIF
-.IF "$(GUI)"=="UNX"
- chmod -R 775 $(LB)
-.ENDIF
- $(TOUCH) $@
-
-$(BIN_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$@$(DLLPOST) $(RUNTIME_DIR)$/$(DLLPRE)$@$(DLLPOST)
-
-$(COMPONENT_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$@$(DLLPOST) $(RUNTIME_DIR)$/components$/$(DLLPRE)$@$(DLLPOST)
-
-$(COMREGISTRY_FILELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/components$/$@ $(RUNTIME_DIR)$/components$/$@
-
-$(DEFAULTS_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/$@ $(RUNTIME_DIR)$/$@
-
-RES_FILELIST: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
-.IF "$(OS)"=="SOLARIS"
- @$(COPY) $(MOZ_BIN_DIR)$/res$/charsetalias.properties $(RUNTIME_DIR)$/res$/charsetalias.properties
-.ELSE
- @echo No Res Files to copy.
-.ENDIF
-
-$(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- noop
-
-$(MISC)$/CREATETARBALL: extract_mozab_files
- @@-$(MKDIR) $(OUT)$/zipped
- $(COPY) $(BIN)$/mozruntime.zip $(OUT)$/zipped$/$(MOZTARGET)runtime.zip
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX"
- cd $(LB) && strip *$(DLLPOST)
-.ENDIF
-.ENDIF
- cd $(LB) && zip -r ..$/zipped$/$(MOZTARGET)lib.zip *
- cd $(INCCOM) && zip -r ..$/zipped$/$(MOZTARGET)inc.zip *
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
- cd $(OUT)$/inc.nss && zip -r ..$/zipped$/$(MOZTARGET)inc.zip *
-.ENDIF
diff --git a/moz/makefile.mk b/moz/makefile.mk
deleted file mode 100644
index 65b7861..0000000
--- a/moz/makefile.mk
+++ /dev/null
@@ -1,438 +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=.
-
-PRJNAME=ooo_mozab
-TARGET=ooo_mozab
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(WITH_MOZILLA)"=="NO"
-
-all:
- @echo Support for mozilla is disabled.
-
-.ELIF "$(BUILD_MOZAB)"==""
-
-all:
- @echo Use of internal mozilla is disabled.
-
-.ELSE
-
-
-# ----- pkg-config start -------
-.INCLUDE .IGNORE : pkgroot.mk
-.IF "$(PKGCONFIG_ROOT)"!=""
-PKG_CONFIG:=$(PKGCONFIG_ROOT)$/bin$/pkg-config
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig
-.IF "$(LD_LIBRARY_PATH)"=="" # assume empty implies unset
-LD_LIBRARY_PATH!:=$(PKGCONFIG_ROOT)$/lib
-.ELSE
-LD_LIBRARY_PATH!:=$(LD_LIBRARY_PATH)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib
-.ENDIF
-.EXPORT : PKG_CONFIG_PATH PKG_CONFIG LD_LIBRARY_PATH
-.ENDIF # "$(PKGCONFIG_ROOT)"!=""
-
-# reduce prerequisites by disabling mozilla binary
-DISABLE_MOZ_EXECUTABLE=TRUE
-.EXPORT : DISABLE_MOZ_EXECUTABLE
-
-.IF "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
-## hmm... rather gcc specific switches...
-CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib
-LDFLAGS:= -Wl,--unresolved-symbols=ignore-in-shared-libs -L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/X11R6/lib
-SYSBASE_X11:=--x-includes=$(SYSBASE)/usr/include/X11 --x-libraries=$(SYSBASE)/usr/X11R6/lib
-MOZ_ENABLE_COREXFONTS=1
-MOZILLA_CONFIGURE_FLAGS +=--disable-xft
-.EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS
-.ENDIF # "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
-
-.IF "$(SYSBASE)"!="" && "$(OS)" == "MACOSX"
-PKGCONFIG_ROOT!:=$(ENV_ROOT)$/macports-1.7.0
-PKG_CONFIG:=$(PKGCONFIG_ROOT)$/bin$/pkg-config
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig
-.EXPORT : PKG_CONFIG_PATH PKG_CONFIG
-# hmm... rather gcc specific switches...
-CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -L$(ENV_ROOT)/macports-1.7.0/lib -lmathCommon
-LDFLAGS:=-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/lib/system
-XLDOPTS:= -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -lmathCommon
-.EXPORT : CFLAGS LDFLAGS XLDOPTS
-.ENDIF # "$(SYSBASE)"!="" && "$(OS)" == "MACOSX"
-
-# ----- pkg-config end -------
-
-MOZILLA_VERSION=1.1.14
-TARFILE_NAME=seamonkey-$(MOZILLA_VERSION).source
-TARFILE_MD5=a169ab152209200a7bad29a275cb0333
-
-TARFILE_ROOTDIR=mozilla
-PATCH_FILES = \
- seamonkey-source-$(MOZILLA_VERSION).patch \
- patches/gcc46.patch \
- patches/gcc47.patch \
- patches/dtoa.patch \
- patches/respect_disable_pango.patch \
- patches/arm_build_fix.patch \
- patches/link_fontconfig.patch \
- patches/brokenmakefile.patch
-
-.IF "$(OS)"=="LINUX"
-PATCH_FILES+=patches/nss_linux.patch
-.ENDIF
-
-# This file is needed for the W32 build when BUILD_MOZAB is set
-# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
-.IF "$(COM)"=="GCC"
-LIBIDL_VC71_ZIPFILE_NAME*=vc71-libIDL-0.6.8-bin.zip
-LIBGLIB_VC71_ZIPFILE_NAME*=vc71-glib-1.2.10-bin.zip
-MOZTOOLS_ZIPFILE_NAME*=wintools.zip
-.ELSE
-MOZTOOLS_ZIPFILE_NAME*=vc8-moztools.zip
-.ENDIF
-
-ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp
-
-CONFIGURE_DIR=
-.IF "$(GUIBASE)"!="aqua"
-MOZILLA_CONFIGURE_FLAGS += $(SYSBASE_X11)
-.ENDIF
-
-MOZILLA_CONFIGURE_FLAGS += --disable-tests \
- --enable-application=suite \
- --enable-ldap \
- --enable-crypto \
- --enable-optimize \
- --enable-strip \
- --disable-profilelocking \
- --disable-activex \
- --disable-activex-scripting \
- --disable-gnomevfs \
- --disable-debug \
- --disable-xprint \
- --disable-postscript \
- --without-system-zlib \
- --disable-installer \
- --disable-accessibility \
- --disable-xpfe-components \
- --disable-mathml \
- --disable-oji \
- --disable-profilesharing \
- --disable-boehm \
- --disable-jsloader \
- --disable-canvas \
- --disable-freetype2 \
- --disable-gnomeui \
- --disable-image-encoders \
- --disable-plugins \
- --disable-printing \
- --disable-pango \
- --enable-extensions="pref"
-
-#.IF "$(GUI)"!="WNT"
-#MOZILLA_CONFIGURE_FLAGS += --enable-system-cairo
-#.ENDIF
-
-#disable profilelocking to share profile with mozilla
-#disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h
-#disable gnomevfs to remove the needed of gnome develop files
-#disable others to save build times
-
-.IF "$(GUI)"=="UNX"
-.IF "$(GUIBASE)"=="aqua"
-MACDEVSDK*=/Developer/SDKs/MacOSX10.4u.sdk
-MOZILLA_CONFIGURE_FLAGS+= \
- --with-macos-sdk=$(MACDEVSDK) \
- --disable-glibtest \
- --enable-macos-target=10.4 \
- --disable-libxul
-DEFAULT_MOZILLA_TOOLKIT=mac
-.ELSE
-#We do not need mozilla ui, but libIDL version are decided by default toolkit.
-#default-toolkit=xlib need libIDL < 0.68
-#default-toolkit=gtk2 need libIDL > 0.8 (know as libIDL2)
-DEFAULT_MOZILLA_TOOLKIT*=gtk2
-.ENDIF # "$(GUIBASE)"=="aqua"
-MOZILLA_CONFIGURE_FLAGS+= --enable-default-toolkit=$(DEFAULT_MOZILLA_TOOLKIT)
-.ENDIF
-
-# create a objdir build = build files in a seperate directory, not in the sourcetree directly
-CONFIGURE_DIR=$(CPU)_objdir
-BUILD_DIR=$(CONFIGURE_DIR)
-MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch $(MOZ_ARCH)" AR=ar
-
-CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
-
-BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
-
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CXXFLAGS:=-features=tmplife
-.IF "$(CPU)"=="U"
-CXXFLAGS+=-m64
-.ENDIF
-.EXPORT : CXXFLAGS
-.ENDIF # "$(COMNAME)"=="sunpro5"
-.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64"
-CXXFLAGS:=-mminimal-toc
-.EXPORT : CXXFLAGS
-.ENDIF
-.ENDIF
-
-.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
-.EXPORT: PKG_CONFIG_PATH
-MAKE=/usr/sfw/bin/gmake
-.EXPORT: MAKE
-CFLAGS=-I/usr/sfw/include
-.EXPORT: CFLAGS
-.ENDIF
-.IF "$(COM)"=="C52" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-CFLAGS=-m64
-ASFLAGS=-m64
-.EXPORT: CFLAGS ASFLAGS
-.ENDIF
-
-MOZDIR=$(MISC)$/build$/seamonkey
-MOZTARGET=$(OS)$(COM)$(CPU)
-
-.IF "$(GUI)"=="WNT"
-# "Our" build environment uses "NO" for the environment variable that
-# indicate if system libraries should be used, the mozilla build uses
-# "" in this case. This conflicts (at least for W32) with mozilla (1.7b)
-# because it disables the library checks for msvc so that
-# --without-system-* is not evaluated. To build the included libraries
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list