You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/04 14:04:57 UTC
svn commit: r1538584 - in /openoffice/branches/Remove_MOZ/main:
connectivity/ connectivity/prj/ connectivity/source/drivers/mozab/
postprocess/packcomponents/ postprocess/packregistry/
qadevOOo/runner/basicrunner/ scp2/source/ooo/
Author: hdu
Date: Mon Nov 4 13:04:57 2013
New Revision: 1538584
URL: http://svn.apache.org/r1538584
Log:
#i123575# drop seamonkey provided address books
Removed:
openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/
Modified:
openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst
openoffice/branches/Remove_MOZ/main/connectivity/prj/d.lst
openoffice/branches/Remove_MOZ/main/connectivity/version.mk
openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk
openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk
openoffice/branches/Remove_MOZ/main/qadevOOo/runner/basicrunner/BasicTestCase.java
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
Modified: openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst Mon Nov 4 13:04:57 2013
@@ -8,9 +8,6 @@ cn connectivity\source\cpool
cn connectivity\source\resource nmake - all cn_res cn_inc NULL
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_inc NULL
cn connectivity\source\drivers\ado nmake - all cn_ado cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file cn_inc NULL
-cn connectivity\source\drivers\mozab\bootstrap nmake - all cn_mozab_bootstrap cn_mozab_mozillasrc cn_inc NULL
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_bootstrap cn_dbtools cn_inc NULL
cn connectivity\source\drivers\kab nmake - all cn_kab cn_dbtools cn_inc NULL
cn connectivity\source\drivers\macab nmake - all cn_macab cn_dbtools cn_inc NULL
cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2 cn_dbtools cn_file cn_inc NULL
@@ -29,4 +26,4 @@ cn connectivity\source\simpledbt
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+cn connectivity\util nmake - all cn_util cn_ado cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
Modified: openoffice/branches/Remove_MOZ/main/connectivity/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/prj/d.lst?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/prj/d.lst (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/prj/d.lst Mon Nov 4 13:04:57 2013
@@ -17,7 +17,6 @@
..\source\drivers\dbase\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\jdbc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\odbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mozab\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\evoab2\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
@@ -40,14 +39,11 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component
..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component
..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component
-..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component
..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
-..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component
-..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
Modified: openoffice/branches/Remove_MOZ/main/connectivity/version.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/version.mk?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/version.mk (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/version.mk Mon Nov 4 13:04:57 2013
@@ -69,23 +69,10 @@ DBPOOL_MICRO=0
# target
DBASE_TARGET=dbase
-# ----------------------------MOZAB settings-----------------------------------#
-# the major
-MOZAB_MAJOR=2
-# the minor
-MOZAB_MINOR=0
-# the micro
-MOZAB_MICRO=0
-
# ----------------------------MySQL settings-----------------------------------#
# target
MYSQL_TARGET=mysql
-
-# ----------------------------Evoab settings-----------------------------------#
-# target
-EVOAB_TARGET=evoab
-
# ----------------------------Kab settings-------------------------------------#
# target
KAB_TARGET=kab
Modified: openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk Mon Nov 4 13:04:57 2013
@@ -359,13 +359,6 @@ my_components += directx5canvas
my_components += adabas
.END
-.IF ("$(SYSTEM_MOZILLA)" == "YES") || ("$(WITH_MOZILLA)" == "YES")
- my_components += mozbootstrap
- .IF "$(OS)" != "MACOSX" // #i91209# mozilla address books disabled on OSX
- my_components += mozab
- .END
-.END
-
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2"
my_components += desktopbe1
.END
Modified: openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk Mon Nov 4 13:04:57 2013
@@ -357,14 +357,6 @@ MY_FILES_main += \
.IF "$(ENABLE_KAB)" == "TRUE"
MY_FILES_main += $(MY_MOD)/DataAccess/kab.xcu
.END
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
- "$(OS)" != "MACOSX"
-#.IF "$(OS)" == "WNT"
-#MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
-#.ELSE
-#MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
-#.END
-.END
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
.ELSE
Modified: openoffice/branches/Remove_MOZ/main/qadevOOo/runner/basicrunner/BasicTestCase.java
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/qadevOOo/runner/basicrunner/BasicTestCase.java?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/qadevOOo/runner/basicrunner/BasicTestCase.java (original)
+++ openoffice/branches/Remove_MOZ/main/qadevOOo/runner/basicrunner/BasicTestCase.java Mon Nov 4 13:04:57 2013
@@ -112,8 +112,6 @@ public class BasicTestCase extends TestC
tParam.get("adabas.password") + "\"");
oBasicHandler.perform("setValue", "adoUrl = \"sdbc:ado:" +
tParam.get("ado.url") + "\"");
- oBasicHandler.perform("setValue", "mozabUrl = \"sdbc:address:" +
- tParam.get("mozab.url") + "\"");
} catch (BasicException e) {
log.println(e.info);
throw new RuntimeException(e.info);
Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp?rev=1538584&r1=1538583&r2=1538584&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp Mon Nov 4 13:04:57 2013
@@ -921,26 +921,6 @@ File gid_File_Lib_Mcnttype
#endif
End
-#if defined(WITH_MOZILLA)
-
-#if !defined(MACOSX) // #i91209# mozilla address books disabled on Mac
-STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
-STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
-#endif
-
-File gid_File_Lib_Mozbootstrap
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
- #else
- Name = "mozbootstrap.dll";
- #endif
-End
-
-#endif // WITH_MOZILLA
-
#ifdef SYSTEM_LIBWPD
STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
@@ -1709,7 +1689,7 @@ STD_LIB_FILE( gid_File_Lib_Smime3, smime
STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
-#ifndef MACOSX // #i122483# use system sqlite3 on MacOSX
+#ifndef MACOSX // #i108575# use system sqlite3 on MacOSX
STD_LIB_FILE( gid_File_Lib_Sqlite3, sqlite3)
#endif