[ooo-build-commit] Branch 'ooo/master' - 2 commits - scp2/source solenv/bin

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Jul 3 17:05:28 PDT 2009


 scp2/source/calc/file_calc.scp           |    6 ++
 scp2/source/calc/module_calc.scp         |    2 
 scp2/source/ooo/directory_ooo.scp        |   30 +++++++++-
 scp2/source/ooo/file_library_ooo.scp     |   85 +++++++++++++++++++++++++++++--
 scp2/source/ooo/file_ooo.scp             |    7 ++
 scp2/source/ooo/module_hidden_ooo.scp    |   13 ++++
 scp2/source/ooo/module_lang_template.scp |    1 
 solenv/bin/checkapi                      |    9 ++-
 solenv/bin/install-sh                    |    3 +
 solenv/bin/installoffice                 |   15 +++--
 solenv/bin/installoffice.btm             |   72 ++++++++++++++++++++------
 solenv/bin/installoffice.pl              |   46 +++++++++++++---
 solenv/bin/installoffice_impress.oxt     |binary
 13 files changed, 246 insertions(+), 43 deletions(-)

New commits:
commit 05055ce0f4ac22027e26f8502822d21548cc156a
Author: Release Engineers <releng at openoffice.org>
Date:   Fri Jul 3 12:24:35 2009 +0000

    CWS-TOOLING: integrate CWS dbaperf2
    2009-06-22 11:04:36 +0200 msc  r273202 : #100000# fix to run this test
    2009-06-22 09:41:04 +0200 msc  r273200 : #100000# correct case
    2009-06-22 09:02:42 +0200 msc  r273199 : new SRB
    2009-06-22 08:53:26 +0200 msc  r273198 : #100000
    2009-06-15 12:36:32 +0200 oj  r272976 : test
    2009-06-12 14:23:23 +0200 msc  r272918 : #101587# unused feature was removed
    2009-06-12 06:45:17 +0200 oj  r272903 : use GUI instead of OS
    2009-06-11 09:12:30 +0200 oj  r272845 : remove unused dep
    2009-06-11 09:11:09 +0200 oj  r272844 : ColumnAliasInOrderBy not supported
    2009-06-11 08:27:00 +0200 oj  r272843 : CWS-TOOLING: rebase CWS dbaperf2 to trunk at 272827 (milestone: DEV300:m50)
    2009-06-10 15:30:17 +0200 msc  r272822 : #100000
    2009-06-10 15:27:40 +0200 msc  r272820 : #102515# new function for the database type list
    2009-06-10 15:26:09 +0200 msc  r272818 : move file to dbaccess/tools/dbcreatetools.inc
    2009-06-10 15:20:10 +0200 msc  r272816 : #102515# new function for the database type list
    2009-06-10 12:34:46 +0200 oj  r272803 : #i101587# check extension
    2009-06-10 11:53:45 +0200 oj  r272800 : remove unused code
    2009-06-09 09:57:25 +0200 oj  r272752 : #i101587# EscapeDateTime moved into features section
    2009-06-09 09:56:26 +0200 oj  r272751 : enable finish
    2009-06-08 11:50:37 +0200 oj  r272726 : #i102588# move convert tzo saveDataSource
    2009-06-05 11:54:20 +0200 jsk  r272676 : #i102515# - NEW: Functions to retrieve Database names from API
    2009-06-05 10:52:22 +0200 jsk  r272671 : NEW: Functions to retrieve Database names from API
    2009-06-05 09:36:54 +0200 oj  r272666 : handle win and unx differently
    2009-06-05 09:36:28 +0200 oj  r272665 : handle win and unx differently
    2009-06-04 13:41:56 +0200 oj  r272625 : #i101268# make use of stringbuffer instead of oustring
    2009-06-04 10:18:14 +0200 oj  r272612 : add SAL_DLLPUBLIC_EXPORT
    2009-05-28 10:56:33 +0200 oj  r272381 : #i101587# create langpacks
    2009-05-28 10:41:59 +0200 oj  r272380 : #i101587# create langpacks
    2009-05-28 10:29:30 +0200 oj  r272379 : #i101587# create langpacks
    2009-05-07 10:11:46 +0200 oj  r271635 : fix compile warnings
    2009-05-07 07:01:31 +0200 oj  r271619 : change type from int32 to PathID
    2009-05-07 06:53:19 +0200 oj  r271618 : add all
    2009-05-06 14:57:02 +0200 oj  r271595 : add missing lib
    2009-05-06 14:56:54 +0200 oj  r271594 : no used anymore
    2009-05-06 14:56:08 +0200 oj  r271593 : no used anymore
    2009-05-06 14:54:25 +0200 oj  r271592 : no used anymore
    2009-05-06 14:45:59 +0200 oj  r271591 : add missing lib
    2009-05-06 14:41:54 +0200 oj  r271590 : change wnt
    2009-05-06 14:22:21 +0200 oj  r271589 : #i101587# use config for the drivers
    2009-05-06 14:21:39 +0200 oj  r271588 : #i101587# add new set for metadata and config data for driver
    2009-05-06 14:19:36 +0200 oj  r271587 : #i101587# handle metadata and props of driver
    2009-05-06 10:11:11 +0200 oj  r271570 : #i101587# correct wrong use of reference
    2009-05-06 09:24:33 +0200 oj  r271567 : #i101587# add new set for metadata
    2009-05-06 08:52:06 +0200 oj  r271563 : #i101587# add driver configuration
    2009-05-06 08:51:04 +0200 oj  r271562 : #i101587# add driver configuration
    2009-05-04 10:24:41 +0200 oj  r271442 : CWS-TOOLING: rebase CWS dbaperf2 to trunk at 271427 (milestone: DEV300:m47)
    2009-04-28 07:06:22 +0200 oj  r271303 : compile error
    2009-04-27 14:12:48 +0200 oj  r271270 : #i101268# make use of stringbuffer instead of oustring
    2009-04-27 14:12:27 +0200 oj  r271269 : #i101268# make use of stringbuffer instead of oustring
    2009-04-27 09:30:10 +0200 oj  r271255 : use string buffer when possible
    2009-04-24 11:56:01 +0200 oj  r271207 : #i101268# remove end() call from loop
    2009-04-23 14:24:03 +0200 oj  r271171 : add dep
    2009-04-23 13:25:25 +0200 oj  r271164 : #i101268# add config entries for database drivers
    2009-04-23 13:07:13 +0200 oj  r271161 : #i101268# add config entries for database drivers
    2009-04-23 13:06:33 +0200 oj  r271160 : #i101268# add parent url pattern entry for driver node
    2009-04-23 13:05:39 +0200 oj  r271159 : #i101268# add config entry for driver node
    2009-04-23 13:04:09 +0200 oj  r271157 : #i101268# add config entry for driver node
    2009-04-23 06:41:32 +0200 oj  r271142 : #i101268# add new configuration file Drivers
    2009-04-22 13:49:19 +0200 oj  r271103 : convert EOL
    2009-04-22 13:29:17 +0200 oj  r271101 : #i101268# use of driver configuration entries for features and properties
    2009-04-22 13:28:08 +0200 oj  r271100 : #i101268# use of driver configuration entries for features and properties
    2009-04-22 13:15:26 +0200 oj  r271098 : #i101268# add new configuration file Drivers
    2009-04-22 13:14:43 +0200 oj  r271097 : #i101268# use of driver configuration entries for features and properties

diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 904960f..89096b8 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,6 +41,12 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
+File gid_File_Oo_Office_Dataaccess_Calc_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/calc.xcu";
+End
 STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index eac234c..939b2cd 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -45,7 +45,7 @@ Module gid_Module_Prg_Calc_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+    Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
     gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
     gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index a7b58c8..a6e2eba 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -207,6 +207,11 @@ Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui
     DosName = "UI";
 End
 
+Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess
+    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
+    HostName = "DataAccess";
+End
+
 Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement
     ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
     DosName = "OOoImprovement";
@@ -747,6 +752,11 @@ Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui
     HostName = "UI";
 End
 
+Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess
+    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
+    HostName = "DataAccess";
+End
+
 Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement
     ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
     HostName = "OOoImprovement";
@@ -792,6 +802,11 @@ Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui
     HostName = "UI";
 End
 
+Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess
+    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
+    HostName = "DataAccess";
+End
+
 Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb
     ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
     HostName = "ucb";
@@ -922,11 +937,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting
     HostName = "Scripting";
 End
 
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "DataAccess";
-End
-
 Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons
     ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
     HostName = "Addons";
@@ -957,6 +967,16 @@ Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc
     HostName = "Misc";
 End
 
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
+	HostName = "DataAccess";
+End
+
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess;
+	HostName = "Drivers";
+End
+
 Directory gid_Dir_Autotext
     ParentID = gid_Dir_Share;
     DosName = "autotext";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index c5cffb6..fb04a05 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -39,10 +39,22 @@ End
 #endif
 #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
 STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
+File gid_File_Oo_Office_Dataaccess_Adabas_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/adabas.xcu";
+End
 #endif
 
 #if defined(WNT)
 STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
+File gid_File_Oo_Office_Dataaccess_Ado_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/ado.xcu";
+End
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
@@ -267,10 +279,15 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
+File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/dbase.xcu";
+End
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
-
-STD_LIB_FILE(gid_File_Lib_Odbcbase,odbcbase)
+STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
 
 
 File gid_File_Lib_Dbpool
@@ -435,7 +452,12 @@ End
 #ifdef UNX
 
 #ifdef ENABLE_KAB
-
+File gid_File_Oo_Office_Dataaccess_Kab_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/kab.xcu";
+End
 File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -454,7 +476,12 @@ End
 #endif
 
 #ifdef MACOSX
-
+File gid_File_Oo_Office_Dataaccess_Macab_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/macab.xcu";
+End
 File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -473,6 +500,12 @@ End
 #endif  // #ifdef ENABLE_KAB
 
 #ifdef ENABLE_EVOAB2
+File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/evoab2.xcu";
+End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
@@ -502,6 +535,12 @@ File gid_File_Lib_Filterconfig1
     Name = SPECIAL_NAME(filterconfig1);
 End
 
+File gid_File_Oo_Office_Dataaccess_Flat_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/flat.xcu";
+End
 STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
@@ -781,11 +820,22 @@ End
 #ifdef SOLAR_JAVA
 
 STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
+File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/jdbc.xcu";
+End
 
 #endif
 
 #ifdef SOLAR_JAVA
-
+File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/hsqldb.xcu";
+End
 File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -904,6 +954,13 @@ End
 
 #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
+File gid_File_Oo_Office_Dataaccess_Mozab_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/mozab.xcu";
+End
+
 STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
@@ -1011,7 +1068,25 @@ End
 #endif
 
 STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
+File gid_File_Oo_Office_Dataaccess_Mysql_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/mysql.xcu";
+End
 STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
+File gid_File_Oo_Office_Dataaccess_Odbc_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/odbc.xcu";
+End
+
+File gid_File_Registry_Drivers_Zip
+    Dir = gid_Dir_Share_Registry_Res_Lang;
+    ARCHIVE_TXT_FILE_BODY;
+    EXTRA_ALL_LANG(fcfg_drivers);
+End
 
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 69afeed..5ddbbe7 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1513,6 +1513,13 @@ File gid_File_Oo_Office_Dataaccess_Xcu
     Name = "/registry/data/org/openoffice/Office/DataAccess.xcu";
 End
 
+File gid_File_Oo_Office_Dataaccess_Drivers_Xcs
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess;
+    Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs";
+End
+
 File gid_File_Oo_Office_Ui_Dbucommands_Xcs
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3d9aefb..c08852a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -174,10 +174,12 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Dba,
 	gid_File_Lib_Dbacfg,
 	gid_File_Lib_Dbase2,
+	gid_File_Oo_Office_Dataaccess_Dbase_Xcu,
 	gid_File_Lib_Dbaxml,
 	gid_File_Lib_Dbt,
 	gid_File_Lib_Dbfile,
 	gid_File_Lib_Drawinglayer,
+	gid_File_Oo_Office_Dataaccess_Flat_Xcu,
 	gid_File_Lib_Flat,
 	gid_File_Lib_For,
 	gid_File_Lib_Forui,
@@ -279,6 +281,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Comphelper2,
 	gid_File_Lib_Sysmgr1,
 	gid_File_Lib_Adabas,
+	gid_File_Oo_Office_Dataaccess_Adabas_Xcu,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
 	gid_File_Lib_Db,
@@ -286,8 +289,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
 	gid_File_Lib_Evoab_2,
+	gid_File_Oo_Office_Dataaccess_Evoab_Xcu,
 	gid_File_Lib_Kab_1,
+	gid_File_Oo_Office_Dataaccess_Kab_Xcu,
     gid_File_Lib_Kab_Drv_1,
+    gid_File_Oo_Office_Dataaccess_Macab_Xcu,
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Evtatt,
@@ -309,14 +315,19 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Localedata_Es,
 	gid_File_Lib_Localedata_Euro,
 	gid_File_Lib_Localedata_Others,
+	gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu,
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
+	gid_File_Oo_Office_Dataaccess_Jdbc_Xcu,
 	gid_File_Lib_Mcnttype,
+	gid_File_Oo_Office_Dataaccess_Mozab_Xcu,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Mysql,
+	gid_File_Oo_Office_Dataaccess_Mysql_Xcu,
 	gid_File_Lib_Odbc,
+	gid_File_Oo_Office_Dataaccess_Odbc_Xcu,
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
 	gid_File_Lib_Package2,
@@ -376,6 +387,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Stdc_5,
 	gid_File_Lib_Accessbridge,
 	gid_File_Lib_Ado,
+	gid_File_Oo_Office_Dataaccess_Ado_Xcu,
 	gid_File_Lib_Dl,
 	gid_File_Lib_Dnd,
 	gid_File_Lib_Dtrans,
@@ -666,6 +678,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Oo_Office_Ui_Controller_Xcu,
 	gid_File_Oo_Office_Dataaccess_Xcs,
 	gid_File_Oo_Office_Dataaccess_Xcu,
+	gid_File_Oo_Office_Dataaccess_Drivers_Xcs,
 	gid_File_Oo_Office_Ui_Dbucommands_Xcs,
 	gid_File_Oo_Office_Ui_Dbucommands_Xcu,
 	gid_File_Oo_Office_Ui_Basewindowstate_Xcs,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index b62635f..d28fa5b 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -47,6 +47,7 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Wordbook,
              gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
+             gid_File_Registry_Drivers_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
              gid_File_Registry_Spool_Oo_Common_Ctl_Xcu,
commit a833137a97923377b1795fb8efcbf4cb1d1e8ac5
Author: Release Engineers <releng at openoffice.org>
Date:   Fri Jul 3 10:14:57 2009 +0000

    CWS-TOOLING: integrate CWS perftest08
    2009-07-02 10:03:16 +0200 lla  r273621 : #159516# support systems with no JAVA_HOME
    2009-07-02 10:00:25 +0200 lla  r273620 : #159516# if path is null this not an error
    2009-07-01 14:36:05 +0200 lla  r273583 : #159516# add check for wrong cygwin path
    2009-06-22 13:18:14 +0200 lla  r273223 : #159516# add PipeConnectionString
    2009-06-18 21:44:59 +0200 lla  r273137 : #159516# cleanups
    2009-06-18 21:44:17 +0200 lla  r273136 : #159516# handle null
    2009-06-18 21:42:56 +0200 lla  r273135 : #159516# add getElementCount() function
    2009-06-15 10:40:05 +0200 lla  r272966 : CWS-TOOLING: rebase CWS perftest08 to trunk at 272827 (milestone: DEV300:m50)
    2009-06-02 09:06:22 +0200 lla  r272480 : CWS-TOOLING: rebase CWS perftest08 to trunk at 272291 (milestone: DEV300:m49)
    2009-05-08 11:40:22 +0200 mib  r271710 : #159717#: File name info for performance test (added void to hasLogFile() parameter list)
    2009-05-05 14:14:25 +0200 mib  r271514 : #159717#: File name info for performance test
    2009-05-04 15:23:01 +0200 mib  r271466 : #159717#: File name infor for performance test
    2009-05-04 15:22:27 +0200 mib  r271465 : #159717#: File name infor for performance test
    2009-05-04 15:21:56 +0200 mib  r271464 : #159717#: File name infor for performance test
    2009-05-04 15:21:18 +0200 mib  r271462 : #159717#: File name infor for performance test
    2009-04-29 16:23:40 +0200 lla  r271383 : #159516# cleanups
    2009-04-29 16:23:20 +0200 lla  r271382 : #159516# cleanups
    2009-04-08 12:23:01 +0200 lla  r270631 : #159516# typo
    2009-04-07 10:30:35 +0200 lla  r270580 : #159516# add prototype
    2009-04-07 10:21:15 +0200 lla  r270579 : #159516# cleanup
    2009-04-03 09:05:26 +0200 lla  r270448 : #159516# small cleanups
    2009-03-30 13:22:26 +0200 lla  r270221 : #159517# merge perftest07

diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
index 4725045..6ddabfe 100755
--- a/solenv/bin/checkapi
+++ b/solenv/bin/checkapi
@@ -8,6 +8,7 @@ fi
 JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
 SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
 
+# it is possible to give an other OOoRunner.jar
 if [ -n "$RUNNERJAR" ]; then
     myCLASSPATH=$RUNNERJAR
 else 
@@ -26,8 +27,12 @@ elif [ -n "$JAVA_HOME" ]; then
         JAVABIN=$JAVA_HOME/bin/java
     fi
 else
-	echo "please set environment variable JAVA_HOME"
-	exit 1
+    # there seems to be some machines without real java
+    JAVABIN=$(which java)
+    if [ -z "$JAVABIN" ]; then 
+        echo "please set environment variable JAVA_HOME"
+        exit 1
+    fi
 fi
 
 if [ x${USER}x = xx ]; then
diff --git a/solenv/bin/install-sh b/solenv/bin/install-sh
new file mode 100755
index 0000000..fb942ef
--- /dev/null
+++ b/solenv/bin/install-sh
@@ -0,0 +1,3 @@
+;; This file is automatically created by diff_all_filter.pl
+;; Fri Mar 27 08:02:00 2009
+
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
index 6029349..2964568 100755
--- a/solenv/bin/installoffice
+++ b/solenv/bin/installoffice
@@ -1,3 +1,4 @@
+#!/bin/bash
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
@@ -5,10 +6,6 @@
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: installoffice,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +24,6 @@
 # for a copy of the LGPLv3 License.
 #***********************************************************************/
 
-#!/bin/bash
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 EXIT_ERROR=2
@@ -47,6 +43,8 @@ usage() {
         echo "[-d] installation with debug output" >&2
         echo "" >&2
         echo "[-a] the office will be patched to run without FirstStartWizard" >&2
+        echo "" >&2
+        echo "[-i] impress should open documents without autopilot" >&2
         exit $EXIT_FAILURE
 }
 
@@ -63,7 +61,7 @@ fi
 DESTPATH=/tmp/$USER
 PARAM=""
 
-while getopts ':mt:acdhot' OPTION ; do
+while getopts ':mt:aicdhot' OPTION ; do
         case $OPTION in
         d)        PARAM="$PARAM -debug true"
                 ;;
@@ -73,6 +71,8 @@ while getopts ':mt:acdhot' OPTION ; do
                 ;;
         a)        PARAM="$PARAM -autorun true"
                 ;;
+        i)        PARAM="$PARAM -autoimpress true"
+                ;;
         t)        DESTPATH="$OPTARG"
                 ;;
         h)        usage $EXIT_SUCCESS
@@ -93,7 +93,10 @@ LOCALUNPACKDIR=$DESTPATH/unpack
 
 export LOCALINSTALLDIR
 export LOCALUNPACKDIR
+echo "export LOCALINSTALLDIR"
+echo "export LOCALUNPACKDIR"
 
+unset LD_LIBRARY_PATH
 unset FORCE2ARCHIVE
 
 echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@"
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
index 983ee9e..ffd6633 100755
--- a/solenv/bin/installoffice.btm
+++ b/solenv/bin/installoffice.btm
@@ -28,6 +28,54 @@ REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
 REM ************************************************************************/
 
+
+SET DESTPATH=%USERNAME%
+SET DEBUG=false
+SET OOO=false
+SET PARAM=
+
+for %opt in (%&%) DO (
+    iff "%opt%" == "-d" THEN 
+        SET PARAM=%PARAM% -debug true
+        shift
+
+    elseiff "%opt%" == "-o" THEN 
+        SET PARAM=%PARAM% -ooo true
+        shift
+
+    elseiff "%opt%" == "-c" THEN 
+        SET PARAM=%PARAM% -cwscheckapi true
+        shift
+
+    elseiff "%opt%" == "-a" THEN 
+        SET PARAM=%PARAM% -autorun true
+        shift
+
+    elseiff "%opt%" == "-i" THEN
+        SET PARAM=%PARAM% -autoimpress true
+        shift
+
+    elseiff "%opt%" == "-t" THEN 
+        SET DESTPATH=%2
+        shift
+        shift
+
+    elseiff "%opt%" == "-h" THEN 
+        goto usage
+
+    elseiff "%opt%" == "/h" THEN 
+        goto usage
+
+    elseiff "%opt%" == "%DESTPATH%" THEN
+        shift
+
+    else 
+        echo wrong param: %opt%
+        goto usage
+    endiff
+)
+
+iff "%DESTPATH%" == "%USERNAME%" THEN
 iff EXIST e:\  then
     iff EXIST e:\temp then
         set temppath=e:\temp
@@ -44,25 +92,15 @@ elseiff EXIST c:\temp then
 else
     set temppath=%TMP%
 endiff
-
-SET DESTPATH=%temppath%\%USERNAME%
-SET DEBUG=false
-SET OOO=false
-SET PARAM=
-
-for %opt in (%&%) DO (
-    if "%opt%" == "-d" (SET PARAM=%PARAM% -debug true ^ shift)
-    if "%opt%" == "-o" (SET PARAM=%PARAM% -ooo true ^ shift)
-    if "%opt%" == "-c" (SET PARAM=%PARAM% -cwscheckapi true ^ shift)
-    if "%opt%" == "-a" (SET PARAM=%PARAM% -autorun true ^ shift)
-    if "%opt%" == "-t" (SET DESTPATH=%2  ^ shift ^ shift)
-    if "%opt%" == "-h" goto usage
-    if "%opt%" == "/h" goto usage
-)
+    DESTPATH=%temppath%\%USERNAME%
+endiff
 
 SET LOCALINSTALLDIR=%DESTPATH%\office
 SET LOCALUNPACKDIR=%DESTPATH%\unpack
+echo LOCALINSTALLDIR=%LOCALINSTALLDIR%
+echo LOCALUNPACKDIR=%LOCALUNPACKDIR%
 
+echo call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
 call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
 
 quit %?
@@ -75,8 +113,10 @@ quit %?
     echo. 
     echo [-o] force OpenOffice.org installation instead of StarOffice>&2
     echo. 
-    echo [-t] target path: path wehre tho office should installed to. The default is '%DESTPATH%'>&2
+    echo [-t] target path: path where the office should installed to. The default is '%DESTPATH%'>&2
     echo.
     echo [-a] the office will be patched to run without FirstStartWizard >&2
    echo. 
+    echo [-i] impress should open documents without autopilot
+    echo.
     quit 1
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
index 4b1429f..6ac7606 100755
--- a/solenv/bin/installoffice.pl
+++ b/solenv/bin/installoffice.pl
@@ -39,6 +39,9 @@ my $script = $0;
 ( our $script_name = $script ) =~ s/^.*\b(\w+)\.pl$/$1/;
 ( our $script_path = $script ) =~ s/$script_name.*//;
 
+# Prototypes
+sub installOffice();
+
 our $debug = 0;           # run without executing commands
 
 our $is_command_infos = 1;   # print command details before exec
@@ -54,6 +57,9 @@ our $cleanup = 0;
 # should the office be startable without user interaction
 our $autorun = 0;
 
+# should impress open documents without autopilot
+our $autoimpress = 0;
+
 # force openOffice.org installation if StarOffice is available
 our $is_ooo = 0;
 
@@ -292,18 +298,31 @@ sub installOffice(){
         makeAutoRun($destinationPath);
     }
     
+    if ($autoimpress) {
+        makeAutoImpress($destinationPath);
+    }
+    
     return $success;
 }
 
+sub makeAutoImpress(){
+    my $destinationPath = shift;
+    
+    if (patchXCU ($destinationPath, $script_path.$script_name."_impress.oxt") != 0) {
+        print_error("could not register ".$script_path.$script_name."_impress.oxt", "1");
+    }
+    return 0;
+}
+    
+    
 sub makeAutoRun(){
     
     my $destinationPath = shift;
     
     patchBootstraprc($destinationPath);
     
-
-    if (patchXCU ($destinationPath) != 0) {
-        print_error("could not patch XCU files", "1");
+    if (patchXCU ($destinationPath, $script_path.$script_name.".oxt") != 0) {
+        print_error("could not register ".$script_path.$script_name.".oxt", "1");
     }
     return 0;
 }
@@ -340,6 +359,7 @@ sub patchBootstraprc(){
 
 sub patchXCU(){
     my $destinationPath = shift;
+    my $oxt = shift;
     my $unopkg="";
     
     find sub { $unopkg=$File::Find::name if -e _ && /$UNOPKGBIN$/ }, $destinationPath;
@@ -351,8 +371,8 @@ sub patchXCU(){
         $unopkg = "\"$unopkg\"";
     }
     
-    my $unopkgCommand = "$unopkg add $script_path".$script_name.".oxt";
-    print "patch xcu files for automatic office start...\n" if $debug;
+    my $unopkgCommand = "$unopkg add $oxt";
+    print "register oxt file ...\n" if $debug;
     print "call $unopkgCommand\n" if $debug;
     my $success=0;
     $success = system($unopkgCommand);
@@ -471,12 +491,17 @@ sub getInstsetUtilFolder(){
     my $instsetFolder = $RootDir.$PS.$instset;
     my $utilFolder="";
     
-    if(-w $instsetFolder) { 
+    if( open(DATEI, ">$instsetFolder".$PS."touch"))
+    { 
+        close(DATEI);
+        unlink($instsetFolder.$PS."touch");
         print "$instsetFolder is writable \n" if $debug; 
         $utilFolder = $RootDir.$PS.$instset.$PS."util";
-    } else { 
+    }
+    else
+    { 
         print "$instsetFolder is NOT writable \n" if $debug; 
-        print "copy $instset to $destPath$PS..n" if $debug;
+        print "copy $instset to $destPath$PS..\n" if $debug;
         my $prjPath=$destPath.$PS."..";
         
         my $command = "$ENV{COPYPRJ} -x $instset $prjPath";
@@ -874,6 +899,11 @@ sub parseArgs
             if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autorun = 1 };
         }
         
+        if ( $ARGV[$i] =~ /^-autoimpress$/ ) {
+            my $value = $ARGV[++$i];
+            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autoimpress = 1 };
+        }
+        
         if ( $ARGV[$i] =~ /^-debug$/ ) {
             my $value = $ARGV[++$i];
             if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $debug = 1 };
diff --git a/solenv/bin/installoffice_impress.oxt b/solenv/bin/installoffice_impress.oxt
new file mode 100755
index 0000000..31c7bfa
Binary files /dev/null and b/solenv/bin/installoffice_impress.oxt differ


More information about the ooo-build-commit mailing list