diff options
author | sb <sb@openoffice.org> | 2010-09-10 13:10:07 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-09-10 13:10:07 +0200 |
commit | c096e86385f35a6d8485325ad0c3ae52f70cacef (patch) | |
tree | b722e568c4aa0b42bd429adbf0dd420f4dd6fb58 | |
parent | cc1e8cca21d9dea91a0eabbaffe38d8f98173dad (diff) |
sb129: #i113189# change UNO components to use passive registration
43 files changed, 395 insertions, 2014 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 5d83c5f98baa..e1f630ee19b9 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -76,7 +76,6 @@ OpenOffice PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL - SERVICESPROJEKT 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt @@ -140,7 +139,6 @@ OpenOffice_wJRE PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL - SERVICESPROJEKT 1 WITHJREPRODUCT 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles @@ -211,7 +209,6 @@ OpenOffice_Dev PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL - SERVICESPROJEKT 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt @@ -264,7 +261,6 @@ URE LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION LICENSENAME LGPL - SERVICESPROJEKT 1 SETSTATICPATH 1 NOVERSIONINDIRNAME 1 PCPFILENAME ure.pcp @@ -274,7 +270,6 @@ URE DOWNLOADBITMAP urebitmap.bmp DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 - SERVICESPROJEKT 1 RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp @@ -287,7 +282,7 @@ URE active 1 compression 5 script ure - include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/lib.{minor},{solarenvpath}/{os}/MS + include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS } } @@ -421,7 +416,6 @@ BrOffice PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL - SERVICESPROJEKT 1 SETSTATICPATH 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles @@ -491,7 +485,6 @@ BrOffice_wJRE PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL - SERVICESPROJEKT 1 WITHJREPRODUCT 1 SETSTATICPATH 1 GLOBALFILEGID gid_File_Lib_Vcl @@ -563,7 +556,6 @@ BrOffice_Dev PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL - SERVICESPROJEKT 1 SETSTATICPATH 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 91c74499a916..5388fe8d105d 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -290,24 +290,6 @@ Styles = (PACKED,DONT_OVERWRITE,PATCH); \ End -#define UNO_JAR_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE, UNO_COMPONENT); \ - End - -#define UNO_JAR_FILE_PATCH(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT,PATCH); \ - End - #define JARFILENAME(name) STRING(CONCAT2(name,.jar)) #define PACKED_SHELLNEW_FILE_BODY \ @@ -322,52 +304,16 @@ Name = STRING(name) ; \ End -#define PACKED_UNO_LIB_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (PACKED,UNO_COMPONENT); \ - Dir = SCP2_OOO_BIN_DIR; \ - RegistryID = gid_Starregistry_Services_Rdb - -#define PACKED_UNO_LIB_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (PACKED,UNO_COMPONENT,PATCH); \ - Dir = SCP2_OOO_BIN_DIR; \ - RegistryID = gid_Starregistry_Services_Rdb - -#define STD_UNO_LIB_FILE(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ - End - -#define STD_UNO_LIB_FILE_PATCH(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_UNO_LIB_FILE(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ - End - -#define SPECIAL_UNO_LIB_FILE_PATCH(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_UNO_COMPONENT_LIB_FILE(id,name) \ +#define SPECIAL_COMPONENT_LIB_FILE(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ + PACKED_LIB_FILE_BODY; \ End -#define SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(id,name) \ +#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ + PACKED_LIB_FILE_BODY_PATCH; \ End #define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll)) @@ -396,15 +342,6 @@ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \ End -#define SPECIAL_UNO_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = LIBNAME(name); \ - Dir = SCP2_OOO_BIN_DIR; \ - Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - End - // --------------------------------------- #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 3d209912479c..4c934c429d13 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -48,29 +48,29 @@ File gid_File_Exe_Odbcconfig End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Abp, abp) +STD_LIB_FILE( gid_File_Lib_Abp, abp) STD_RES_FILE( gid_File_Res_Abp, abp) -STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp) +STD_LIB_FILE( gid_File_Lib_Dbp, dbp) STD_RES_FILE( gid_File_Res_Dbp, dbp) -STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu ) +STD_LIB_FILE( gid_File_Lib_Dbu, dbu ) STD_RES_FILE( gid_File_Res_Dbu, dbu) -STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) +STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) STD_RES_FILE( gid_File_Res_Adabasui, adabasui) STD_RES_FILE( gid_File_Res_Cnr, cnr) STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl) STD_RES_FILE( gid_File_Res_Sdberr, sdberr) -STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt ) +STD_LIB_FILE( gid_File_Lib_Rpt, rpt ) STD_RES_FILE( gid_File_Res_Rpt, rpt) -STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui ) +STD_LIB_FILE( gid_File_Lib_Rptui, rptui ) STD_RES_FILE( gid_File_Res_Rptui, rptui) -STD_UNO_LIB_FILE( gid_File_Lib_Rptxml, rptxml ) +STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml ) File gid_File_Help_Sdatabase_Zip Dir = gid_Dir_Help_Isolanguage; diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index be66b907a25d..951caadf69fb 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -39,7 +39,7 @@ File gid_Starregistry_Legacy_Binfilters_Rdb TXT_FILE_BODY; Name = "legacy_binfilters.rdb"; Dir = gid_Dir_Program; - Styles = (PACKED, STARREGISTRY); + Styles = (PACKED); End @@ -59,8 +59,8 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw) STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper) STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters) -STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) -STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet) +STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter) +STD_LIB_FILE( gid_File_Lib_Bindet, bindet) STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch ) STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx ) diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 7b392f173378..59d7a5aac90e 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -27,7 +27,7 @@ #include "macros.inc" -STD_UNO_LIB_FILE( gid_File_Lib_Solver, solver) +STD_LIB_FILE( gid_File_Lib_Solver, solver) #ifndef SYSTEM_LPSOLVE File gid_File_Lib_Lpsolve @@ -36,7 +36,7 @@ File gid_File_Lib_Lpsolve End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis) +STD_LIB_FILE( gid_File_Lib_Analysis, analysis) File gid_File_Share_Registry_Calc_Xcd TXT_FILE_BODY; @@ -45,17 +45,17 @@ File gid_File_Share_Registry_Calc_Xcd Name = "calc.xcd"; End -STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) +STD_LIB_FILE( gid_File_Lib_Calc, calc) -STD_UNO_LIB_FILE( gid_File_Lib_Date, date) +STD_LIB_FILE( gid_File_Lib_Date, date) -STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc) +STD_LIB_FILE( gid_File_Lib_Sc, sc) STD_LIB_FILE( gid_File_Lib_Scui, scui) STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) -STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) +STD_LIB_FILE( gid_File_Lib_Scd, scd) STD_RES_FILE( gid_File_Res_Solver, solver) diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 435cef4304f8..2d7af5321f35 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -29,8 +29,7 @@ File gid_File_Lib_CairoCanvas TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index f095eff9f23e..9788a90c7f3a 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -36,5 +36,5 @@ STD_LIB_FILE(gid_File_Lib_Agg, agg) #endif #endif -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index febdb8428c8b..e79f711aaacd 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -29,8 +29,8 @@ #ifdef WNT # ifdef USE_DIRECTX5 -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) # endif -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) #endif diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index 5f69de34fee9..c17301f56d76 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -27,4 +27,4 @@ #include "macros.inc" -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9d10261843d2..d48915072742 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -32,8 +32,6 @@ File gid_File_Lib_GIO Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "ucpgio-ucd.txt"; End #endif @@ -43,8 +41,6 @@ File gid_File_Lib_Gnomevfs Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "ucpgvfs-ucd.txt"; End #endif @@ -63,7 +59,5 @@ File gid_File_Lib_Gconfbe Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "gconfbe1-ucd.txt"; End #endif diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 2cd0f53f9e56..be1d35ed84cc 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -34,7 +34,7 @@ File gid_File_Share_Registry_Graphicfilter_Xcd Name = "graphicfilter.xcd"; End -STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash ) +STD_LIB_FILE( gid_File_Lib_Flash, flash ) -STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter ) +STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index 00dde2ca9162..35f934da962e 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -29,12 +29,12 @@ File gid_File_Lib_Placeware Name = LIBNAME(placeware); - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End File gid_File_Lib_Animcore Name = SPECIAL_NAME(animcore); - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End File gid_File_Share_Registry_Impress_Xcd diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 06fbb4bfcc1a..300deca7aa34 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -38,8 +38,7 @@ End File gid_File_Lib_OpenGLTransitions TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX)); diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp index d7a902dbf00f..a6d3f3329b25 100644 --- a/scp2/source/javafilter/file_javafilter.scp +++ b/scp2/source/javafilter/file_javafilter.scp @@ -76,6 +76,6 @@ STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc ) STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel ) STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword ) STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) -UNO_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) +STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index 0e0b3d1b73bb..3d139b797d67 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -32,8 +32,6 @@ File gid_File_Lib_Kdebe Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "kdebe1-ucd.txt"; End #endif @@ -43,7 +41,5 @@ File gid_File_Lib_Kde4be Styles = (PACKED); Dir = gid_Dir_Program; Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "kde4be1-ucd.txt"; End #endif diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 4da9f1a23bbc..6ab010baaf31 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -37,9 +37,9 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm) +STD_LIB_FILE( gid_File_Lib_Sm , sm) -STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd) +STD_LIB_FILE( gid_File_Lib_Smd , smd) STD_RES_FILE( gid_File_Res_Sm, sm ) diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index e33eb6fa35c7..2a7ddd376b6f 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -27,7 +27,7 @@ #include "macros.inc" -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp index 224d26de6a0d..cd6cfe715d64 100644 --- a/scp2/source/ooo/file_improvement.scp +++ b/scp2/source/ooo/file_improvement.scp @@ -37,5 +37,5 @@ End #endif #if defined(BUILD_SPECIAL) -STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement) +STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement) #endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 0d50e685d449..cacfb19cad6b 100644..100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -35,19 +35,18 @@ File gid_File_Lib_Accessbridge End #endif #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) ) -STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) +STD_LIB_FILE( gid_File_Lib_Adabas, adabas) #endif #if defined(WNT) -STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) +STD_LIB_FILE( gid_File_Lib_Ado, ado) #endif -STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl) +STD_LIB_FILE( gid_File_Lib_Basctl, basctl) File gid_File_Lib_Basprov TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -59,8 +58,7 @@ End #ifdef ENABLE_VBA File gid_File_Lib_Vbaevent TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -70,12 +68,11 @@ File gid_File_Lib_Vbaevent End #endif // ENABLE_VBA -STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib) +STD_LIB_FILE( gid_File_Lib_Bib , bib) File gid_File_Lib_Cached1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libcached1,UNXSUFFIX)); @@ -84,13 +81,12 @@ File gid_File_Lib_Cached1 #endif End -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) #ifdef WITH_LDAP File gid_File_Lib_Ldapbe2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX)); @@ -100,10 +96,10 @@ File gid_File_Lib_Ldapbe2 End #endif -STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller) -STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel) -STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools) -STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview) +STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller) +STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel) +STD_LIB_FILE(gid_File_Lib_Charttools, charttools) +STD_LIB_FILE(gid_File_Lib_Chartview, chartview) #if defined WNT && defined _MSC @@ -157,7 +153,7 @@ End #if ! defined WNT // no longer supported on Windows -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno ) #endif @@ -169,11 +165,10 @@ File gid_File_Lib_Comphelper2 Name = STRING(CONCAT3(comphelp4,COMID,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End -STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl) +STD_LIB_FILE( gid_File_Lib_Ctl , ctl) STD_LIB_FILE( gid_File_Lib_Cui, cui) @@ -235,15 +230,15 @@ End #endif #endif -STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba) +STD_LIB_FILE( gid_File_Lib_Dba, dba) -STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt) +STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt) -STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm) +STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm) -STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) +STD_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) -STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase ) +STD_LIB_FILE( gid_File_Lib_Dbase2, dbase ) STD_LIB_FILE( gid_File_Lib_Dbfile , file) STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) @@ -251,8 +246,7 @@ STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) File gid_File_Lib_Dbpool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX)); @@ -261,9 +255,9 @@ File gid_File_Lib_Dbpool #endif End -STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools ) +STD_LIB_FILE( gid_File_Lib_Dbt, dbtools ) -STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml ) +STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml ) File gid_File_Lib_Dict_Ja TXT_FILE_BODY; @@ -322,8 +316,7 @@ End File gid_File_Lib_Dlgprov TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -334,8 +327,7 @@ End File gid_File_Lib_Stringresource TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -349,8 +341,7 @@ End File gid_File_Lib_Vbaobj TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -361,8 +352,7 @@ End File gid_File_Lib_Vbaswobj TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -373,8 +363,7 @@ End File gid_File_Lib_Vbamsforms TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX)); @@ -387,7 +376,6 @@ End File gid_File_Lib_Vbahelper TXT_FILE_BODY; Styles = (PACKED); - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX)); @@ -402,8 +390,7 @@ End File gid_File_Lib_Dnd TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "dnd.dll"; End @@ -416,23 +403,22 @@ File gid_File_Lib_Dtrans TXT_FILE_BODY; Name = "dtrans.dll"; Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED, UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End #endif STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj) +SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) #ifndef DISABLE_ATL -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) +SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif #if defined(WNT) && !defined(DISABLE_ATL) -STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser ) +STD_LIB_FILE( gid_File_Lib_Emser, emser ) File gid_File_Lib_Inprocserv TXT_FILE_BODY; @@ -448,8 +434,7 @@ End #ifdef ENABLE_KAB File gid_File_Lib_Kab_1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libkab1,UNXSUFFIX)); End @@ -466,8 +451,7 @@ End #ifdef MACOSX File gid_File_Lib_Macab_1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libmacab1,UNXSUFFIX)); End @@ -483,7 +467,7 @@ End #ifdef ENABLE_EVOAB2 -STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) +STD_LIB_FILE( gid_File_Lib_Evoab , evoab) #endif // #ifdef ENABLE_EVOAB2 @@ -491,8 +475,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) File gid_File_Lib_Evtatt TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libevtatt,UNXSUFFIX)); @@ -501,24 +484,22 @@ File gid_File_Lib_Evtatt #endif End -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc) +SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc) File gid_File_Lib_Filterconfig1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; Name = SPECIAL_NAME(filterconfig1); End -STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat) +STD_LIB_FILE( gid_File_Lib_Flat, flat) #ifdef WNT File gid_File_Lib_Fop TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "fop.dll"; End @@ -529,8 +510,7 @@ End File gid_File_Lib_Fps TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "fps.dll"; End @@ -544,8 +524,6 @@ File gid_File_Lib_Desktopbe Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX)); - RegistryID = gid_Starregistry_Services_Rdb; - Regmergefile = "desktopbe1-ucd.txt"; End #ifdef ENABLE_GTK @@ -553,10 +531,8 @@ End File gid_File_Lib_Fps_Gnome TXT_FILE_BODY; Styles = (PACKED); - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno); - Regmergefile = "fps-gnome-ucd.txt"; End #endif #endif @@ -564,11 +540,9 @@ End #ifndef MACOSX File gid_File_Lib_Fps_Kde4 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = gid_Dir_Program; Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno); - Regmergefile = "fps-kde4-ucd.txt"; End #endif #endif @@ -579,32 +553,28 @@ End File gid_File_Lib_Fps_Aqua TXT_FILE_BODY; Styles = (PACKED); - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno); - Regmergefile = "fps-aqua-ucd.txt"; End File gid_File_Lib_MacOSXSpell TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(MacOSXSpell); Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_avmediaQuickTime TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(avmediaQuickTime); Dir = SCP2_OOO_BIN_DIR; End #endif #endif -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) #if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO)) @@ -630,16 +600,15 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm) +STD_LIB_FILE( gid_File_Lib_Frm , frm) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno ) #ifdef WNT File gid_File_Lib_Ftransl TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "ftransl.dll"; End @@ -653,14 +622,13 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi) File gid_File_Lib_Fwk Name = LIBNAME(fwk); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End -STD_UNO_LIB_FILE( gid_File_Lib_Fwl , fwl) +STD_LIB_FILE( gid_File_Lib_Fwl , fwl) -STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm) +STD_LIB_FILE( gid_File_Lib_Fwm , fwm) #ifdef WNT File gid_File_Lib_Gdiplus @@ -671,14 +639,13 @@ File gid_File_Lib_Gdiplus End #endif -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) File gid_File_Lib_I18npool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX)); @@ -700,8 +667,7 @@ End File gid_File_Lib_I18nsearch TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX)); @@ -782,15 +748,14 @@ End #ifdef SOLAR_JAVA -STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) +STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc) #endif #ifdef SOLAR_JAVA File gid_File_Lib_Hsqldb_2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX)); @@ -856,7 +821,7 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng) +STD_LIB_FILE( gid_File_Lib_Lng, lng) File gid_File_Lib_Localedata_En TXT_FILE_BODY; @@ -904,8 +869,7 @@ End File gid_File_Lib_Mcnttype TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX)); @@ -916,15 +880,14 @@ End #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX) // #i91209# -STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab) +STD_LIB_FILE(gid_File_Lib_Mozab,mozab) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) #else File gid_File_Lib_Mozbootstrap TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX)); @@ -935,11 +898,11 @@ End #endif -STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft) +STD_LIB_FILE(gid_File_Lib_Wpft,wpft) -STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter) +STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter) -STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) +STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) #ifdef WNT #if defined(_gcc3) @@ -1048,12 +1011,12 @@ End #endif #endif -STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) -STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc) +STD_LIB_FILE(gid_File_Lib_Mysql,mysql) +STD_LIB_FILE(gid_File_Lib_Odbc,odbc) // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) -STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc) +STD_LIB_FILE( gid_File_Lib_Offacc, offacc) #ifdef SOLAR_JAVA #ifndef MACOSX @@ -1076,23 +1039,22 @@ End File gid_File_Lib_Ole TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "oleautobridge.uno.dll"; End #endif -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2) +SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno ) -STD_UNO_LIB_FILE( gid_File_Lib_Pcr, pcr) +STD_LIB_FILE( gid_File_Lib_Pcr, pcr) -STD_UNO_LIB_FILE( gid_File_Lib_Log, log) +STD_LIB_FILE( gid_File_Lib_Log, log) -STD_UNO_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter) +STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter) File gid_File_Lib_Deployment #if defined UNX @@ -1100,7 +1062,7 @@ File gid_File_Lib_Deployment #else Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll)); #endif - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End File gid_File_Lib_DeploymentGui @@ -1109,18 +1071,18 @@ File gid_File_Lib_DeploymentGui #else Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll)); #endif - PACKED_UNO_LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; End STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) #ifndef WITHOUT_MOZILLA -STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl) +STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload) +STD_LIB_FILE( gid_File_Lib_Preload, preload) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno ) #if defined(UNX) && ! defined(QUARTZ) File gid_File_Lib_Desktop_Detector @@ -1238,15 +1200,13 @@ End File gid_File_Lib_Res Name = LIBNAME(res); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End File gid_File_Lib_Sax_Uno TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED,DONT_OVERWRITE); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(sax.uno,UNXSUFFIX)); @@ -1257,8 +1217,7 @@ End File gid_File_Lib_Fastsax_Uno TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED,DONT_OVERWRITE); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX)); @@ -1269,11 +1228,11 @@ End STD_LIB_FILE( gid_File_Lib_Sax , sax) -STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox) +STD_LIB_FILE( gid_File_Lib_Oox , oox) -STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb) +STD_LIB_FILE( gid_File_Lib_Sb , sb) -STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn) +STD_LIB_FILE( gid_File_Lib_Scn, scn) File gid_File_Lib_Scriptframe TXT_FILE_BODY; @@ -1286,18 +1245,16 @@ File gid_File_Lib_Scriptframe #else Name = "scriptframe.dll"; #endif - RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End -STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd) +STD_LIB_FILE( gid_File_Lib_Sd , sd) STD_LIB_FILE( gid_File_Lib_Sdui, sdui) File gid_File_Lib_Slideshow TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX)); @@ -1308,8 +1265,7 @@ End File gid_File_Lib_Sdbc_2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX)); @@ -1318,16 +1274,15 @@ File gid_File_Lib_Sdbc_2 #endif End -STD_UNO_LIB_FILE( gid_File_Lib_Sdd , sdd) +STD_LIB_FILE( gid_File_Lib_Sdd , sdd) -STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) +STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) File gid_File_Lib_Sfx Name = LIBNAME(sfx); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End #ifdef WNT @@ -1345,15 +1300,14 @@ End File gid_File_Lib_Smplmail TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "smplmail.uno.dll"; End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot ) +STD_LIB_FILE( gid_File_Lib_Sot, sot ) #if defined(UNX) && !defined(QUARTZ) @@ -1368,29 +1322,28 @@ End File gid_File_Lib_Spell TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(spell); Dir = SCP2_OOO_BIN_DIR; End -STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl) +STD_LIB_FILE( gid_File_Lib_Spl, spl) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) +SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) STD_LIB_FILE( gid_File_Lib_Sts , sts) -STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl ) -STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) +STD_LIB_FILE( gid_File_Lib_Svl, svl ) +STD_LIB_FILE( gid_File_Lib_Svtools, svt ) -STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) -STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) -STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) +STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) +STD_LIB_FILE( gid_File_Lib_Svx, svx) +STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_LIB_FILE( gid_File_Lib_Editeng, editeng) STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) -STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw) +STD_LIB_FILE( gid_File_Lib_Sw , sw) STD_LIB_FILE( gid_File_Lib_Swui, swui) STD_LIB_FILE( gid_File_Lib_Msword, msword ) @@ -1398,33 +1351,31 @@ STD_LIB_FILE( gid_File_Lib_Msword, msword ) #if ! defined UNX File gid_File_Lib_Sysdtrans TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = "sysdtrans.dll"; End #endif -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) #ifdef WNT -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno ) #endif #ifdef MACOSX -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno ) #endif -STD_UNO_LIB_FILE( gid_File_Lib_Tk, tk ) +STD_LIB_FILE( gid_File_Lib_Tk, tk ) STD_LIB_FILE( gid_File_Lib_Acc, acc ) STD_LIB_FILE( gid_File_Lib_Tools, tl ) File gid_File_Lib_Tvhlp1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX)); @@ -1435,8 +1386,7 @@ End File gid_File_Lib_Ucb1 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libucb1,UNXSUFFIX)); @@ -1464,59 +1414,55 @@ File gid_File_Lib_Ucpchelp1 Name = "ucpchelp1.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED, UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End #ifndef DISABLE_NEON -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #ifndef SYSTEM_NEON SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) #endif #endif -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1) -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) +SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) File gid_File_Lib_Lnth TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(lnth); Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_Hyph TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Name = LIBNAME(hyphen); Dir = SCP2_OOO_BIN_DIR; End -STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl) +STD_LIB_FILE( gid_File_Lib_Utl , utl) -STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui ) +STD_LIB_FILE( gid_File_Lib_Uui, uui ) STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx ) File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End File gid_File_Lib_Vos @@ -1530,30 +1476,27 @@ File gid_File_Lib_Vos Styles = (PACKED); End -// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp) - -STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr) -STD_UNO_LIB_FILE( gid_File_Lib_Xmx , xmx) -STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof) +STD_LIB_FILE( gid_File_Lib_Xcr, xcr) +STD_LIB_FILE( gid_File_Lib_Xmx , xmx) +STD_LIB_FILE( gid_File_Lib_Xof , xof) File gid_File_Lib_Xo Name = LIBNAME(xo); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - RegistryID = gid_Starregistry_Services_Rdb; End -SPECIAL_UNO_LIB_FILE(gid_File_Lib_Xstor,xstor) +SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor) -STD_UNO_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) -STD_UNO_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) -STD_UNO_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa ) -STD_UNO_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd ) +STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) +STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) +STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa ) +STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd ) #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) -UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) +STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) +STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) #endif #ifndef SYSTEM_LIBXSLT @@ -1578,21 +1521,21 @@ End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) +STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) // AVMedia -STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) +STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) #if defined UNX #if defined ENABLE_GSTREAMER -SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst ) +SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst ) #endif #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia ) +STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia ) #endif #elif defined WNT #ifdef ENABLE_DIRECTX -SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) +SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) #endif #endif @@ -1605,8 +1548,7 @@ File gid_File_Lib_XSec_Framework Name = "xsec_fw.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End File gid_File_Lib_XSec_XmlSec @@ -1617,8 +1559,7 @@ File gid_File_Lib_XSec_XmlSec Name = "xsec_xmlsec.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End File gid_File_Lib_XSec_XMLSecurity @@ -1629,8 +1570,7 @@ File gid_File_Lib_XSec_XMLSecurity Name = "xmlsecurity.dll"; #endif Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); End #ifdef WNT @@ -1662,8 +1602,7 @@ End File gid_File_Lib_Migrationoo2 TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX)); @@ -1685,11 +1624,11 @@ File gid_File_Lib_Libtextcat End #endif -STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) +STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) -STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk ) +STD_LIB_FILE( gid_File_Lib_Updchkui , updchk ) -SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) +SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) #ifdef WNT File gid_File_Lib_Onlinecheck @@ -1737,7 +1676,7 @@ File gid_File_Lib_Unopkgapp Styles = (PACKED); End -STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore) +STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore) #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \ !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG) @@ -1816,8 +1755,8 @@ File gid_File_Lib_Rdf End #endif // SYSTEM_REDLAND -STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf) +STD_LIB_FILE(gid_File_Lib_Unordf, unordf) -STD_UNO_LIB_FILE( gid_File_Lib_For, for) +STD_LIB_FILE( gid_File_Lib_For, for) STD_LIB_FILE( gid_File_Lib_Forui, forui) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 66cb1d60f476..3586844209a8 100755..100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -423,14 +423,13 @@ File gid_File_Help_Schart_Zip EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart); End -#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT +#if defined WNT File gid_File_Jar_Accessbridge TXT_FILE_BODY; Name = "java_uno_accessbridge.jar"; - RegistryID = gid_Starregistry_Services_Rdb; Dir = gid_Dir_Classes; - Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT); + Styles = (PACKED,DONT_OVERWRITE); End #endif @@ -449,7 +448,7 @@ STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 ) #endif #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) +STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) #endif #ifdef SOLAR_JAVA @@ -473,14 +472,14 @@ End #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Report, report ) -UNO_JAR_FILE( gid_File_Jar_Table, table ) -UNO_JAR_FILE( gid_File_Jar_Letter, letter ) -UNO_JAR_FILE( gid_File_Jar_Form, form ) -UNO_JAR_FILE( gid_File_Jar_Fax, fax ) -UNO_JAR_FILE( gid_File_Jar_Agenda, agenda ) -UNO_JAR_FILE( gid_File_Jar_Query, query ) -UNO_JAR_FILE( gid_File_Jar_Web, web ) +STD_JAR_FILE( gid_File_Jar_Report, report ) +STD_JAR_FILE( gid_File_Jar_Table, table ) +STD_JAR_FILE( gid_File_Jar_Letter, letter ) +STD_JAR_FILE( gid_File_Jar_Form, form ) +STD_JAR_FILE( gid_File_Jar_Fax, fax ) +STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) +STD_JAR_FILE( gid_File_Jar_Query, query ) +STD_JAR_FILE( gid_File_Jar_Web, web ) #endif #ifdef SOLAR_JAVA @@ -500,10 +499,10 @@ End #endif #ifdef SOLAR_JAVA -UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) -UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) -UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) -UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) +STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) +STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) +STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) +STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) #endif #ifdef SOLAR_JAVA @@ -1686,13 +1685,7 @@ File gid_Starregistry_Services_Rdb TXT_FILE_BODY; Name = "services.rdb"; Dir = gid_Dir_Program; - Styles = (PACKED, STARREGISTRY); -#if defined WNT - NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/"; -#else - NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/"; -#endif - JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/"; + Styles = (PACKED); End #ifdef LINUX @@ -1805,9 +1798,8 @@ End File gid_File_Jar_Productregistration TXT_FILE_BODY; Name = "productregistration.jar"; - RegistryID = gid_Starregistry_Services_Rdb; Dir = gid_Dir_Classes; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End #endif diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index cf5751ba45e6..5f2e2795eaad 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -49,9 +49,6 @@ SCPDEFS+=-DBUILD_SPECIAL SCPDEFS+=-DBUILD_X64 .ENDIF - -SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE - .IF "$(PROF_EDITION)"!="" SCPDEFS+=-DPROF_EDITION .ENDIF diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 55b394f85495..804f0edad0b2 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -674,8 +674,7 @@ File gid_File_Dl_Acceptor TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("acceptor.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0"; End @@ -683,8 +682,7 @@ File gid_File_Dl_Bootstrap TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("bootstrap.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "2620B307-25DB-498F-B2B8-46D928165331"; End @@ -692,8 +690,7 @@ File gid_File_Dl_Bridgefac TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("bridgefac.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E025163F-FE1E-4E8C-B0E5-49C08924A646"; End @@ -701,8 +698,7 @@ File gid_File_Dl_Connector TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("connector.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D"; End @@ -710,8 +706,7 @@ File gid_File_Dl_Introspection TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("introspection.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1"; End @@ -719,8 +714,7 @@ File gid_File_Dl_Invocadapt TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("invocadapt.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9"; End @@ -728,8 +722,7 @@ File gid_File_Dl_Invocation TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("invocation.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C"; End @@ -739,8 +732,7 @@ File gid_File_Dl_Javaloader TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("javaloader.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346"; End #endif @@ -750,8 +742,7 @@ File gid_File_Dl_Javavm TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("javavm.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA"; End #endif @@ -760,8 +751,7 @@ File gid_File_Dl_Namingservice TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("namingservice.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31"; End @@ -769,8 +759,7 @@ File gid_File_Dl_Stocservices TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("stocservices.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07"; End @@ -778,8 +767,7 @@ File gid_File_Dl_Proxyfac TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("proxyfac.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F"; End @@ -787,8 +775,7 @@ File gid_File_Dl_Reflection TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("reflection.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3"; End @@ -796,8 +783,7 @@ File gid_File_Dl_Remotebridge TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("remotebridge.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "B440B28E-B7AD-40C7-89E1-1508CA798347"; End @@ -805,8 +791,7 @@ File gid_File_Dl_Streams TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("streams.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B"; End @@ -814,8 +799,7 @@ File gid_File_Dl_Textinstream TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("textinstream.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA"; End @@ -823,8 +807,7 @@ File gid_File_Dl_Textoutstream TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("textoutstream.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4"; End @@ -832,8 +815,7 @@ File gid_File_Dl_Uuresolver TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; Name = SCP2_URE_DL_BARE("uuresolver.uno"); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206"; End @@ -1025,8 +1007,7 @@ File gid_File_Java_JuhJar TXT_FILE_BODY; Dir = gid_Dir_Ure_Java; Name = "juh.jar"; - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492"; End #endif @@ -1073,6 +1054,13 @@ File gid_File_Misc_TypesRdb // CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44"; End +File gid_File_Misc_ServicesRdb + TXT_FILE_BODY; + Dir = gid_Dir_Ure_Misc; + Name = "/ure/services.rdb"; + Styles = (PACKED); +End + // Private Miscellaneous Files: #if defined SOLAR_JAVA @@ -1085,18 +1073,6 @@ File gid_File_Misc_JavavendorsXml End #endif -// StarRegistry File - -File gid_Starregistry_Services_Rdb_Ure - TXT_FILE_BODY; - Name = "services.rdb"; - Dir = gid_Dir_Ure_Misc; - Styles = (PACKED, STARREGISTRY, VERSION_INDEPENDENT_COMP_ID); - NativeServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/"; - JavaServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_JAVA_DIR/"; - // CompID = "F4BD7B0A-5A20-4167-9D10-18597C5F85AF"; -End - #if defined MACOSX Unixlink gid_Unixlink_Ure_Bin_Urelibs Dir = gid_Dir_Ure_Bin; @@ -1212,8 +1188,8 @@ Module gid_Module_Root_Ure_Hidden gid_File_Java_RidlJar, gid_File_Java_JavaUnoJar, gid_File_Misc_TypesRdb, - gid_File_Misc_JavavendorsXml, - gid_Starregistry_Services_Rdb_Ure); + gid_File_Misc_ServicesRdb, + gid_File_Misc_JavavendorsXml); Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs); End diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 5cd84d82b3e9..c99a93407e87 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -46,9 +46,7 @@ File gid_File_Lib_Pythonloader #else Name = "pythonloader.uno.dll"; #endif - RegistryID = gid_Starregistry_Services_Rdb; - NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/"; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End File gid_File_Py_Unohelper @@ -110,8 +108,7 @@ File gid_File_Py_Pythonscript TXT_FILE_BODY; Dir = gid_Dir_Program; Name = "pythonscript.py"; - RegistryID = gid_Starregistry_Services_Rdb; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End //Scripting Framework Python example scripts diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp index 00a5c30a122c..15177971ba1a 100644 --- a/scp2/source/python/module_python_mailmerge.scp +++ b/scp2/source/python/module_python_mailmerge.scp @@ -31,6 +31,5 @@ File gid_File_Pymailmerge TXT_FILE_BODY; Dir = gid_Dir_Program; Name = "mailmerge.py"; - RegistryID = gid_Starregistry_Services_Rdb; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED); End diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 3d7c22b9e7a9..e3f6c532fc0c 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -27,19 +27,9 @@ #include "macros.inc" -STD_UNO_LIB_FILE( gid_File_Lib_Swd , swd) +STD_LIB_FILE( gid_File_Lib_Swd , swd) -File gid_File_Lib_Hwpreader - TXT_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT2(libhwp,UNXSUFFIX)); - #else - Name = "hwp.dll"; - #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED, UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; -End +SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp) File gid_File_Exe_Swriter BIN_FILE_BODY; diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk index 5261ee5175f6..5f6b188a56d7 100644 --- a/soldep/source/makefile.mk +++ b/soldep/source/makefile.mk @@ -127,16 +127,6 @@ APP1OBJS= \ .INCLUDE : target.mk -ALLTAR : $(BIN)$/applicat.rdb - -$(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB) - rm -f $@ - $(GNUCOPY) $(UNOUCRRDB) $@ - cd $(BIN) && \ - $(REGCOMP) -register -r applicat.rdb \ - -c i18nsearch.uno$(DLLPOST) \ - -c i18npool.uno$(DLLPOST) - $(MISC)$/$(SHL1TARGET).flt: makefile.mk @echo ------------------------------ @echo Making: $@ diff --git a/solenv/bin/createcomponent.xslt b/solenv/bin/createcomponent.xslt new file mode 100644 index 000000000000..7f7695d533b3 --- /dev/null +++ b/solenv/bin/createcomponent.xslt @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:uc="http://openoffice.org/2010/uno-components"> + <xsl:param name="uri"/> + <xsl:strip-space elements="*"/> + <xsl:template match="uc:component"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:attribute name="uri"> + <xsl:value-of select="$uri"/> + </xsl:attribute> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + <xsl:template match="*"> + <xsl:copy> + <xsl:apply-templates select="@*"/> + <xsl:apply-templates/> + </xsl:copy> + </xsl:template> + <xsl:template match="@*"> + <xsl:copy/> + </xsl:template> +</xsl:stylesheet> diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 335ecf961253..d28a2e7e3fa0 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -54,11 +54,9 @@ use installer::packagepool; use installer::parameter; use installer::pathanalyzer; use installer::profiles; -use installer::regmerge; use installer::scppatchsoname; use installer::scpzipfiles; use installer::scriptitems; -use installer::servicesfile; use installer::setupscript; use installer::simplepackage; use installer::sorter; @@ -892,43 +890,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::worker::resolving_hidden_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13c.log", $filesinproductlanguageresolvedarrayref); } - ##################################### - # Creating services.rdb - ##################################### - - if ( $allvariableshashref->{'SERVICESPROJEKT'} ) - { - if (! $installer::globals::languagepack) - { - # ATTENTION: For creating the services.rdb it is necessary to execute the native file - # "regcomp" or "regcomp.exe". Therefore this function can only be executed on the - # corresponding platform. - - if ( $installer::globals::servicesrdb_can_be_created ) - { - installer::logger::print_message( "... creating preregistered services.rdb ...\n" ); - - installer::servicesfile::create_services_rdb($allvariableshashref, $filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref); - if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14.log", $filesinproductlanguageresolvedarrayref); } - } - } - } - - ##################################### - # Calls of regmerge - ##################################### - - if (!($installer::globals::is_copy_only_project)) - { - if (! $installer::globals::languagepack) - { - installer::logger::print_message( "... merging files into registry database ...\n" ); - - installer::regmerge::merge_registration_files($filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref, $allvariableshashref); - if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14b.log", $filesinproductlanguageresolvedarrayref); } - } - } - ############################################ # Collecting directories for epm list file ############################################ diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index b54912b72616..98bdffb3122a 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -117,9 +117,6 @@ sub set_global_environment_variables if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; } if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; } - if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjava = 1; } - if ( $ENV{'JDKLIB'} ) { $installer::globals::jdklib = $ENV{'JDKLIB'}; } - if ( $ENV{'JREPATH'} ) { $installer::globals::jrepath = $ENV{'JREPATH'}; } if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; } if ( $ENV{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; } diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 582bd8c708b1..7d6e8c4a9b8f 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -118,8 +118,6 @@ BEGIN $dounzip = 1; $languages_defined_in_productlist = 0; $setupscript_defined_in_productlist = 0; - $services_rdb_created = 0; - $servicesrdb_can_be_created = 0; $islinux = 0; $issolaris = 0; $ismacosx = 0; @@ -238,9 +236,6 @@ BEGIN $creating_windows_installer_patch = 0; $strip = 1; - $solarjava = 0; - $jdklib = ""; - $jrepath = ""; $globallogging = 0; $globalloggingform21 = 1; @@ -409,9 +404,6 @@ BEGIN %usedtreeconditions = (); %moduledestination = (); - $unomaxservices = 1800; # regcomp -c argument length - $javamaxservices = 15; - $one_cab_file = 0; $fix_number_of_cab_files = 1; $cab_file_per_component = 0; @@ -454,8 +446,6 @@ BEGIN @solarispatchfiles = (".diPatch", "patchinfo"); @environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" ); @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" ); - @regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "xmerge.jar", "commonwizards.jar" ); - @regcompregisterlibs = ( "javavm.uno", "javaloader.uno", "stocservices.uno" ); @languagepackfeature =(); @featurecollector =(); $msiassemblyfiles = ""; @@ -502,7 +492,6 @@ BEGIN $separator = "/"; $pathseparator = "\:"; $libextension = "\.dll"; - $quote = "\'"; $isunix = 0; $iswin = 1; $archiveformat = ".zip"; @@ -527,7 +516,6 @@ BEGIN $libextension = "\.so"; } $archiveformat = ".tar.gz"; - $quote = "\'"; $isunix = 1; $iswin = 0; } diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index d3ce8a1d3a32..70bc32e36c7c 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -368,19 +368,6 @@ sub setglobalvariables if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; } - # $installer::globals::servicesrdb_can_be_created can only be set, if regcomp (regcomp.exe) can be executed. - - if ( $installer::globals::iswin && $installer::globals::iswindowsbuild ) { $installer::globals::servicesrdb_can_be_created = 1; } - if ( $installer::globals::islinux && $installer::globals::islinuxbuild ) { $installer::globals::servicesrdb_can_be_created = 1; } - if ( $installer::globals::issolaris && $installer::globals::issolarisbuild ) { $installer::globals::servicesrdb_can_be_created = 1; } - - # ToDo: Needs to be expanded for additional compiler (setting $installer::globals::servicesrdb_can_be_created = 1 for all external platforms) - - if ((!($installer::globals::iswindowsbuild)) && (!($installer::globals::islinuxbuild)) && (!($installer::globals::issolarisbuild))) - { - $installer::globals::servicesrdb_can_be_created = 1; - } - # extension, if $installer::globals::pro is set if ($installer::globals::pro) { $installer::globals::productextension = ".pro"; } @@ -638,8 +625,6 @@ sub outputparameter if ( $installer::globals::debian ) { push(@output, "Linux: Creating Debian packages\n"); } if ( $installer::globals::dounzip ) { push(@output, "Unzip ARCHIVE files\n"); } else { push(@output, "Not unzipping ARCHIVE files\n"); } - if ( $installer::globals::servicesrdb_can_be_created ) { push(@output, "services.rdb can be created\n"); } - else { push(@output, "services.rdb cannot be created !\n"); } if (!($installer::globals::languages_defined_in_productlist)) { push(@output, "Languages:\n"); diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm deleted file mode 100644 index 1c2821549131..000000000000 --- a/solenv/bin/modules/installer/regmerge.pm +++ /dev/null @@ -1,340 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -package installer::regmerge; - -use Cwd; -use installer::converter; -use installer::existence; -use installer::exiter; -use installer::globals; -use installer::logger; -use installer::pathanalyzer; -use installer::remover; -use installer::scriptitems; -use installer::systemactions; - -################################################################ -# Collecting all files with content: -# Regmergefile = "mydatabasepart.rdb"; -################################################################ - -sub collect_all_regmergefiles -{ - my ($filesarrayref) = @_; - - my @regmergefiles = (); - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - my $onefile = ${$filesarrayref}[$i]; - if ( $onefile->{'Regmergefile'} ) { push(@regmergefiles, $onefile); } - } - - return \@regmergefiles; -} - -################################################################ -# Collecting all gids of the databases, that are part of -# the file definition -################################################################ - -sub collect_all_database_gids -{ - my ($filesarrayref) = @_; - - my @databasegids = (); - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - my $onefile = ${$filesarrayref}[$i]; - - if ( $onefile->{'RegistryID'} ) - { - my $databasegid = $onefile->{'RegistryID'}; - if (! installer::existence::exists_in_array($databasegid, \@databasegids)) { push(@databasegids, $databasegid); } - } - else - { - installer::exiter::exit_program("ERROR: File defintion error. File :$onefile->{'gid'} without RegistryID!", "collect_all_database_gids"); - } - } - - return \@databasegids; -} - -################################################################ -# Returning the database file from the files collector. In the -# future this file does not need to exist, but currently it -# has to exist already in the files collector. -################################################################ - -sub get_database_file -{ - my ($databasegid, $filesarrayref) = @_; - - my $found = 0; - my $onefile; - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - $onefile = ${$filesarrayref}[$i]; - my $gid = $onefile->{'gid'}; - - if ( $databasegid eq $gid ) - { - $found = 1; - last; - } - } - - if ( ! $found ) { installer::exiter::exit_program("ERROR: Did not find StarRegistry file $databasegid!", "get_database_file"); } - - return $onefile; -} - -################################################################ -# The regmerge file has to be found the in include pathes -################################################################ - -sub get_regmerge_file -{ - my ($includepatharrayref) = @_; - - my $searchname; - - if ($installer::globals::isunix) { $searchname = "regcomplazy"; } - else { $searchname = "regcomplazy.exe"; } - - my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1); - if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); } - - return $$regmergefileref; -} - -################################################################ -# Collecting all files that are merged to one defined -# StarRegistry database -################################################################ - -sub collect_all_files_for_one_registry -{ - my ($regmergefiles, $databasegid) = @_; - - my @regmergefiles = (); - - for ( my $i = 0; $i <= $#{$regmergefiles}; $i++ ) - { - my $onefile = ${$regmergefiles}[$i]; - if ( $onefile->{'RegistryID'} eq $databasegid ) { push(@regmergefiles, $onefile); } - } - - return \@regmergefiles; -} - -################################################################ -# Collecting all particles from the regmerge files -################################################################ - -sub collect_all_regmerge_particles -{ - my ($databaseregisterfiles) = @_; - - my @regmergeparticles = (); - - for ( my $i = 0; $i <= $#{$databaseregisterfiles}; $i++ ) - { - my $onefile = ${$databaseregisterfiles}[$i]; - if ( $onefile->{'Regmergefile'} ) { push(@regmergeparticles, $onefile->{'Regmergefile'}); } - else { installer::exiter::exit_program("ERROR: Could not find entry for \"Regmergefile\" in $onefile->{'gid'}!", "collect_all_regmerge_particles"); } - } - - return \@regmergeparticles; -} - -################################################################ -# Collecting all source pathes of the regmerge particles -################################################################ - -sub get_all_source_pathes -{ - my ($regmergeparticles, $includepatharrayref) = @_; - - my @regmergeparticles = (); - - for ( my $i = 0; $i <= $#{$regmergeparticles}; $i++ ) - { - my $filename = ${$regmergeparticles}[$i]; - - my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1); - if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for merging the StarRegistry!", "get_all_source_pathes"); } - - push(@regmergeparticles, $$fileref); - } - - return \@regmergeparticles; -} - -################################################################ -# Merging the rdb files into the StarRegistry database -################################################################ - -sub merge_files -{ - my ($regmergefile, $databasefile, $registerfiles, $databasedir, $allvariableshashref) = @_; - - my $databasesource = $databasefile->{'sourcepath'}; - my $databasename = $databasefile->{'Name'}; - my $databasedest = $databasedir . $installer::globals::separator . $databasename; - - installer::systemactions::copy_one_file($databasesource, $databasedest); - $databasefile->{'sourcepath'} = $databasedest; # new sourcepath for the StarRegistry file - - # One call for every merge particle. This is only possible, if there are only a few merge particles. - - my $prefix = $databasefile->{'NativeServicesURLPrefix'}; - # TODO: "NativeServicesURLPrefix" or "JavaServicesURLPrefix" - - my $error_occured = 0; - - for ( my $i = 0; $i <= $#{$registerfiles}; $i++ ) - { - my $registerfile = $databasedir . $installer::globals::separator . $i . ".tmp"; - open (IN, '<', $registerfiles->[$i]) or $error_occured = 1; - open (OUT, '>', $registerfile) or $error_occured = 1; - while (<IN>) - { - s/^ComponentName=/ComponentName=$prefix/; - print OUT $_ or $error_occured = 1; - } - close IN or $error_occured = 1; - close OUT or $error_occured = 1; - - my $systemcall = $regmergefile . " -v " . $databasedest . " " . $registerfile . " 2\>\&1 |"; - - my @regmergeoutput = (); - - my $var_library_path; - my $old_library_path; - if ($installer::globals::isunix) { - $var_library_path = $installer::globals::ismacosx ? - 'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH'; - $old_library_path = $ENV{$var_library_path}; - installer::servicesfile::include_libdir_into_ld_library_path( - $var_library_path, $regmergefile); - } - - open (REG, "$systemcall"); - while (<REG>) {push(@regmergeoutput, $_); } - close (REG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - if (defined $var_library_path) { - if (defined $old_library_path) { - $ENV{$var_library_path} = $old_library_path; - } else { - delete $ENV{$var_library_path}; - } - } - - my $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - - for ( my $j = 0; $j <= $#regmergeoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regmergeoutput[$j]"); } - - if ($returnvalue) - { - $infoline = "ERROR: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; - } - else - { - $infoline = "SUCCESS: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - } - } - - return $error_occured; -} - -################################################################ -# Expanding the registry database files by merging rdb files -# into this registry database files. -################################################################ - -sub merge_registration_files -{ - my ($filesarrayref, $includepatharrayref, $languagestringref, $allvariableshashref) = @_; - - installer::logger::include_header_into_logfile("Creating starregistry databases:"); - - # Test if there is something to do. At least one file has to have the content: - # Regmergefile = "mydatabasepart.rdb"; - - my $regmergefiles = collect_all_regmergefiles($filesarrayref); - - if ( $#{$regmergefiles} > -1 ) # not empty -> at least one regmerge file - { - # prepare registration - - my $regmergefile = get_regmerge_file($includepatharrayref); # searching for regmerge (regcomplazy.exe) - - my $databasegids = collect_all_database_gids($regmergefiles); - - # iterating over all database gids - - my $regmergeerror = 0; - - for ( my $i = 0; $i <= $#{$databasegids}; $i++ ) - { - $databasegid = ${$databasegids}[$i]; - - # my $databasedirname = "starregistryrdb"; <- not unique! - my $databasedirname = $databasegid . "_rdb"; # <- unique! - my $databasedir = installer::systemactions::create_directories($databasedirname, $languagestringref); - push(@installer::globals::removedirs, $databasedir); - - my $databasefile = get_database_file($databasegid, $filesarrayref); - my $databaseregisterfiles = collect_all_files_for_one_registry($regmergefiles, $databasegid); - - if ( $#{$databaseregisterfiles} > -1 ) # not empty -> at least one regmerge file - { - my $regmergeparticles = collect_all_regmerge_particles($databaseregisterfiles); - $regmergeparticles = get_all_source_pathes($regmergeparticles, $includepatharrayref); - my $oneregmergeerror = merge_files($regmergefile, $databasefile, $regmergeparticles, $databasedir, $allvariableshashref); - if ($oneregmergeerror) { $regmergeerror = 1; } - } - } - - if ( $regmergeerror ) { installer::exiter::exit_program("ERROR: regmerge !", "merge_registration_files"); } - - } -} - -1; diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 7a2c4cb3f5e3..54d22df1e19e 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1223,7 +1223,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist my $styles = ""; my $file_can_miss = 0; if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; } - if (( $styles =~ /\bSTARREGISTRY\b/ ) || ( $styles =~ /\bFILE_CAN_MISS\b/ )) { $file_can_miss = 1; } + if ( $styles =~ /\bFILE_CAN_MISS\b/ ) { $file_can_miss = 1; } if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; } @@ -1352,12 +1352,21 @@ sub remove_Files_Without_Sourcedirectory if ($sourcepath eq "") { my $styles = $onefile->{'Styles'}; + my $filename = $onefile->{'Name'}; - if ( ! ( $styles =~ /\bSTARREGISTRY\b/ )) # StarRegistry files will be created later + if ( ! $installer::globals::languagepack ) { - my $filename = $onefile->{'Name'}; + $infoline = "ERROR: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + + push(@missingfiles, "ERROR: File not found: $filename\n"); + $error_occured = 1; - if ( ! $installer::globals::languagepack ) + next; # removing this file from list, if sourcepath is empty + } + else # special case for language packs + { + if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) { $infoline = "ERROR: Removing file $filename from file list.\n"; push( @installer::globals::logfileinfo, $infoline); @@ -1367,27 +1376,14 @@ sub remove_Files_Without_Sourcedirectory next; # removing this file from list, if sourcepath is empty } - else # special case for language packs + else { - if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) - { - $infoline = "ERROR: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - - push(@missingfiles, "ERROR: File not found: $filename\n"); - $error_occured = 1; - - next; # removing this file from list, if sourcepath is empty - } - else - { - $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n"; - push( @installer::globals::logfileinfo, $infoline); - $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n"; - push( @installer::globals::logfileinfo, $infoline); + $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n"; + push( @installer::globals::logfileinfo, $infoline); + $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n"; + push( @installer::globals::logfileinfo, $infoline); - next; # removing this file from list, if sourcepath is empty - } + next; # removing this file from list, if sourcepath is empty } } } diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm deleted file mode 100644 index 63e5f44125c8..000000000000 --- a/solenv/bin/modules/installer/servicesfile.pm +++ /dev/null @@ -1,1073 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -package installer::servicesfile; - -use Cwd; -use installer::converter; -use installer::existence; -use installer::exiter; -use installer::globals; -use installer::logger; -use installer::pathanalyzer; -use installer::remover; -use installer::scriptitems; -use installer::systemactions; - -################################################################ -# Adding the newly created file into the files collector -################################################################ - -sub add_services_sourcepath_into_filearray -{ - my ( $filesarrayref, $servicesfile, $servicesname ) = @_; - - my $found = 0; - my $onefile; - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - $onefile = ${$filesarrayref}[$i]; - my $name = $onefile->{'Name'}; - - if ( $servicesname eq $name ) - { - $found = 1; - $onefile->{'sourcepath'} = $servicesfile; # setting the sourcepath! - last; - } - } - - if ( ! $found ) { installer::exiter::exit_program("ERROR: Did not find $servicesname in files collector!", "add_services_sourcepath_into_filearray"); } - -} - -################################################################ -# Generating a file url from a path -################################################################ - -sub make_file_url -{ - my ( $path ) = @_; - - my $fileurl = ""; - - # removing ending slash/backslash - - installer::remover::remove_ending_pathseparator(\$path); - - if ($installer::globals::iswin) - { - $path =~ s/\\/\//g; - $fileurl = "file\:\/\/\/" . $path; - } - else - { - $fileurl = "file\:\/\/" . $path; - } - - return $fileurl; -} - -################################################################ -# Determining all sourcepath from the uno components -################################################################ - -sub get_all_sourcepathes -{ - my ( $filesref ) = @_; - - my @pathes = (); - - for ( my $i = 0; $i <= $#{$filesref}; $i++ ) - { - my $onefile = ${$filesref}[$i]; - my $path = $onefile->{'sourcepath'}; - - installer::pathanalyzer::get_path_from_fullqualifiedname(\$path); - - if (! installer::existence::exists_in_array($path, \@pathes)) - { - push(@pathes, $path); - } - } - - return \@pathes; -} - -################################################################ -# Registering all uno component files in the services.rdb -################################################################ - -sub register_unocomponents -{ - my ($allvariableshashref, $unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix) = @_; - - installer::logger::include_header_into_logfile("Registering UNO components:"); - - my $error_occured = 0; - my $filestring = ""; - for ( my $i = 0; $i <= $#{$unocomponents}; ++$i ) - { - my $local_error1_occured = 0; - my $local_error2_occured = 0; - - my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'}); - my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'}; - if (defined($urlprefix)) - { - $local_error1_occured = call_regcomp($regcompfileref, $servicesfile, $sourcepath, $urlprefix); - } - else - { - $filestring .= ";" unless $filestring eq ""; - $filestring .= $sourcepath; - } - if (length($filestring) > $installer::globals::unomaxservices || - ($i == $#{$unocomponents} && $filestring ne "")) - { - $local_error2_occured = call_regcomp($regcompfileref, $servicesfile, $filestring, $nativeservicesurlprefix); - $filestring = ""; - } - - if (( $local_error1_occured ) || ( $local_error2_occured )) { $error_occured = 1; } - } - - return $error_occured; -} - -sub call_regcomp -{ - my ($regcompfileref, $servicesfile, $filestring, $urlprefix) = @_; - my @regcompoutput = (); - - my $error_occured = 0; - - my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |"; - - open (REG, "$systemcall"); - while (<REG>) {push(@regcompoutput, $_); } - close (REG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - my $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - - for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); } - - if ($returnvalue) - { - $infoline = "ERROR: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; - } - else - { - $infoline = "SUCCESS: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - return $error_occured; -} - -################################################################ -# Registering all java component files in the services.rdb -################################################################ - -sub register_javacomponents -{ - my ($allvariableshashref, $javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix) = @_; - - installer::logger::include_header_into_logfile("Registering Java components:"); - - my $ridljar_ref = "ridl.jar"; - my $ure_internal_java_dir_ref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$ridljar_ref, "", 1); - installer::pathanalyzer::get_path_from_fullqualifiedname($ure_internal_java_dir_ref); - if ( $$ure_internal_java_dir_ref eq "" ) { installer::exiter::exit_program("Could not determine URE_INTERNAL_JAVA_DIR when registering Java components!", "register_javacomponents"); } - - my $error_occured = 0; - - my $do_register = 1; - if (!( $installer::globals::solarjava )) { $do_register = 0; } - - if ( $do_register ) - { - my $filestring = ""; - - for ( my $i = 0; $i <= $#{$javacomponents}; ) - { - my $sourcepath = ${$javacomponents}[$i++]->{'sourcepath'}; - - $filestring = $filestring . make_file_url($sourcepath); - - if ( $i % $installer::globals::javamaxservices == 0 || $i > $#{$javacomponents} ) # limiting to $installer::globals::maxservices files - { - my @regcompoutput = (); - - my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |"; - - open (REG, "$systemcall"); - while (<REG>) {push(@regcompoutput, $_); } - close (REG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - my $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - - for ( my $k = 0; $k <= $#regcompoutput; $k++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$k]"); } - - if ($returnvalue) - { - $infoline = "ERROR: $systemcall\n"; - $error_occured = 1; - } - else - { - $infoline = "SUCCESS: $systemcall\n"; - } - - push( @installer::globals::logfileinfo, $infoline); - - $filestring = ""; - } - else - { - $filestring = $filestring . ";"; - } - } - } - - return $error_occured; -} - - - -################################################################ -# Helper routine to change cygwin (POSIX) path to DOS notation -# if needed -################################################################ -sub fix_cygwin_path -{ - my ( $path ) = @_; - - if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" ) - { - $path = qx{cygpath -m "$path"}; - chomp($path); - } - - return $path; -} - - - -################################################################ -# Registering all uno component files in the services.rdb -################################################################ -sub get_source_path_cygwin_safe -{ - my ( $name, $array, $int ) = @_; - - my $ret = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$name, $array, $int); - if ( $installer::globals::iswin eq 1 ) - { - if( substr( $$ret, 1,1 ) eq ":" ) - { - chomp($$ret = qx{cygpath -u "$$ret"}); - } - } - return $ret; -} - -sub register_pythoncomponents -{ - my ($pythoncomponents, $regcompfileref, $servicesfile,$includepatharrayref) = @_; - - installer::logger::include_header_into_logfile("Registering python UNO components:"); - - my $error_occured = 0; - my $counter = 0; - - my $systemcall = ""; - - my $allsourcepathes = get_all_sourcepathes($pythoncomponents); - - for ( my $j = 0; $j <= $#{$allsourcepathes}; $j++ ) - { - my $filestring = ""; - my $onesourcepath = ${$allsourcepathes}[$j]; - my $to = ""; - my $from = cwd(); - if ( $installer::globals::iswin ) { $from =~ s/\//\\/g; } - - my $typesrdbname = "types.rdb"; - - # FIXME: Remove the unneeded - # get_source_path_cygwin_safe() -> fix_cygwin_path() - # when WRAPCMD is gone - my $typesrdbref = get_source_path_cygwin_safe($typesrdbname, $includepatharrayref, 1); - - if ( $$typesrdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $typesrdbname !", "register_pythoncomponents"); } - - my $pyunoservicesrdbname = "pyuno_services.rdb"; - my $pyunoservicesrdbref = get_source_path_cygwin_safe($pyunoservicesrdbname, $includepatharrayref, 1); - - if ( $$pyunoservicesrdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $pyunoservicesrname !", "register_pythoncomponents"); } - - for ( my $i = 0; $i <= $#{$pythoncomponents}; $i++ ) - { - my $doinclude = 1; - my $sourcepath = ${$pythoncomponents}[$i]->{'sourcepath'}; - - $to = $sourcepath; - installer::pathanalyzer::get_path_from_fullqualifiedname(\$to); - - if (!($to eq $onesourcepath)) { $doinclude = 0; } - - if ( $doinclude ) - { - my $filename = ${$pythoncomponents}[$i]->{'Name'}; - $filestring = $filestring . $filename . "\;"; - $counter++; - } - - if ( $counter > 0 ) - { - $filestring =~ s/\;\s*$//; - $filestring = substr( $filestring, 0, length($filestring)-3); - chdir($onesourcepath); - - my @regcompoutput = (); - - $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register" - . " -br " . fix_cygwin_path($$typesrdbref) - . " -br " . fix_cygwin_path($$pyunoservicesrdbref) - . " -r " . fix_cygwin_path($servicesfile) - . " -c vnd.openoffice.pymodule:" . $filestring . " -l com.sun.star.loader.Python 2\>\&1 |"; - - open (REG, "$systemcall"); - while (<REG>) {push(@regcompoutput, $_); } - close (REG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - my $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - - for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); } - - if ($returnvalue) - { - $infoline = "ERROR: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; - } - else - { - $infoline = "SUCCESS: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - chdir($from); - - $counter = 0; - $filestring = ""; - } - } - } - - return $error_occured; -} - -################################################################ -# Iterating over all files, to find all files with the -# style UNO_COMPONENT. This can be libraries and jar files. -################################################################ - -sub register_all_components -{ - my ( $allvariableshashref, $servicesgid, $filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix ) = @_; - - my $registererrorflag = 0; - - my @unocomponents = (); - my @javacomponents = (); - my @pythoncomponents = (); - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - my $onefile = ${$filesarrayref}[$i]; - my $styles = ""; - my $regmergefile = ""; - my $registryid = ""; - - if ( $onefile->{'RegistryID'} ) { $registryid = $onefile->{'RegistryID'}; } - - if ( $servicesgid ne $registryid ) { next; } # only registration for the current $servicesgid - - if ( $onefile->{'Regmergefile'} ) { $regmergefile = $onefile->{'Regmergefile'}; } - - if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; } - - if (( $styles =~ /\bUNO_COMPONENT\b/ ) && ( $regmergefile eq "" )) # regmergefiles will not be registered with regcomp - { - my $filename = $onefile->{'Name'}; - - if ( $filename =~ /\.jar\s*$/ ) # java component - { - push(@javacomponents, $onefile); - } - elsif( $filename =~ /\.py\s*$/ ) # python_component - { - push(@pythoncomponents, $onefile); - } - else # uno component - { - push(@unocomponents, $onefile); - } - } - } - - $uno_error_occured = 0; - $java_error_occured = 0; - $python_error_occured = 0; - - if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents($allvariableshashref, \@unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix); } - if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \@javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); } - if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } - - if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } - - return $registererrorflag; -} - -################################################### -# Include the solver lib directory into -# the LD_LIBRARY_PATH for Unix platforms -################################################### - -sub include_libdir_into_ld_library_path -{ - my ( $var, $binfile ) = @_; - - my $ld_library_path = $binfile; - installer::pathanalyzer::get_path_from_fullqualifiedname(\$ld_library_path); - $ld_library_path =~ s/\/\s*$//; # removing ending slashes - $ld_library_path =~ s/\/bin\./\/lib\./; - $ld_library_path =~ s/\/bin\s*$/\/lib/; # when packing from flat - - my $oldldlibrarypathstring = $ENV{$var}; - my $new_ld_library_path = $ld_library_path; - if ( defined $oldldlibrarypathstring ) { - $new_ld_library_path = $new_ld_library_path . $installer::globals::pathseparator . $oldldlibrarypathstring; - } - if ( $ENV{'SYSTEM_MOZILLA'} && $ENV{'SYSTEM_MOZILLA'} eq "YES" && - (!$ENV{'WITH_OPENLDAP'} || $ENV{'WITH_OPENLDAP'} ne "YES")) { - $new_ld_library_path = $new_ld_library_path . $installer::globals::pathseparator . $ENV{'MOZ_LIB'}; - } - $ENV{$var} = $new_ld_library_path; - - my $infoline = "Setting $var to $ENV{$var}\n"; - push( @installer::globals::logfileinfo, $infoline); -} - -################################################################## -# Setting the needed jar files into the CLASSPATH -# They are needed from regcomp. -# The jar files are defined in @installer::globals::regcompjars -################################################################## - -sub prepare_classpath_for_java_registration -{ - my ( $includepatharrayref ) = @_; - my $local_pathseparator = $installer::globals::pathseparator; - - if( $^O =~ /cygwin/i ) - { # $CLASSPATH must use DOS separator even when using cygwin's perl - $local_pathseparator = ';'; - } - - for ( my $i = 0; $i <= $#installer::globals::regcompjars; $i++ ) - { - my $filename = $installer::globals::regcompjars[$i]; - - my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1); - - if ( $$jarfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for registering java components!", "prepare_classpath_for_java_registration"); } - - my $oldclasspathstring = ""; - if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; } - else { $oldclasspathstring = "\."; } - my $classpathstring = $$jarfileref . $local_pathseparator . $oldclasspathstring; - if ( $^O =~ /cygwin/i ) { - $classpathstring =~ s/\//\\/g; # guw.pl likes '\' in $PATH. - } - $ENV{'CLASSPATH'} = $classpathstring; - - my $infoline = "Setting CLASSPATH to $ENV{'CLASSPATH'}\n"; - push( @installer::globals::logfileinfo, $infoline); - } -} - -################################################################## -# Setting the jdk lib into the LD_LIBRARY_PATH (Unix) -# This is used by regcomp to register Java components. -# The jdk lib is defined in $installer::globals::jdklib -################################################################## - -sub add_jdklib_into_ld_library_path -{ - my ($var) = @_; - if (defined $installer::globals::jdklib) { - my $oldldlibrarypathstring = $ENV{$var}; - my $new_ld_library_path = $installer::globals::jdklib; - if (defined $oldldlibrarypathstring) { - $new_ld_library_path .= - $installer::globals::pathseparator . $oldldlibrarypathstring; - } - $ENV{$var} = $new_ld_library_path; - my $infoline = "Setting $var to $ENV{$var}\n"; - push( @installer::globals::logfileinfo, $infoline); - } -} - -################################################################## -# Adding the libraries included in zip files into path variable -# (for example mozruntime.zip). This is needed to register all -# libraries successfully. -################################################################## - -sub add_path_to_pathvariable_directory -{ - my ( $filesarrayref, $searchstring ) = @_; - - # determining the path - - my $path = ""; - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - my $onefile = ${$filesarrayref}[$i]; - my $sourcepath = $onefile->{'sourcepath'}; - - installer::pathanalyzer::get_path_from_fullqualifiedname(\$sourcepath); - installer::remover::remove_ending_pathseparator(\$sourcepath); - - if ( $sourcepath =~ /\Q$searchstring\E\s*$/ ) - { - $path = $sourcepath; - last; - } - } - - # adding the path to the PATH variable - - if ( $path ne "" ) - { - my $oldpath = ""; - if ( $ENV{'PATH'} ) { $oldpath = $ENV{'PATH'}; } - else { $oldpath = "\."; } - if ( $^O =~ /cygwin/i ) { - $path = qx(cygpath -u "$path"); - chomp $path; - } - my $newpath = $path . $installer::globals::pathseparator . $oldpath; - $ENV{'PATH'} = $newpath; - - my $infoline = "Setting PATH to $ENV{'PATH'}\n"; - push( @installer::globals::logfileinfo, $infoline); - } -} - -################################################################## -# Adding the path of a specified library to the path variable -# (for example msvcr70.dll). This is needed to register all -# libraries successfully. -################################################################## - -sub add_path_to_pathvariable -{ - my ( $filesarrayref, $searchstring ) = @_; - - # determining the path - - my $path = ""; - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - my $onefile = ${$filesarrayref}[$i]; - my $sourcepath = $onefile->{'sourcepath'}; - - if ( $sourcepath =~ /\Q$searchstring\E\s*$/ ) - { - installer::pathanalyzer::get_path_from_fullqualifiedname(\$sourcepath); - installer::remover::remove_ending_pathseparator(\$sourcepath); - $path = $sourcepath; - last; - } - } - - # adding the path to the PATH variable - - if ( $path ne "" ) - { - my $oldpath = ""; - if ( $ENV{'PATH'} ) { $oldpath = $ENV{'PATH'}; } - else { $oldpath = "\."; } - if ( $^O =~ /cygwin/i ) { - $path = qx(cygpath -u "$path"); - chomp $path; - } - my $newpath = $path . $installer::globals::pathseparator . $oldpath; - $ENV{'PATH'} = $newpath; - - my $infoline = "Setting PATH to $ENV{'PATH'}\n"; - push( @installer::globals::logfileinfo, $infoline); - } -} - -################################################################## -# Setting the jre path into the PATH (Windows only) -# This is used by regcomp.exe to register Java components. -# The jre path is saved in $installer::globals::jrepath -################################################################## - -sub add_jrepath_into_path -{ - my $oldpath = ""; - if ( $ENV{'PATH'} ) { $oldpath = $ENV{'PATH'}; } - else { $oldpath = "\."; } - - if ( $installer::globals::jrepath ne "" ) - { - my $newpath = $installer::globals::jrepath . $installer::globals::pathseparator . $oldpath; - $ENV{'PATH'} = $newpath; - - my $infoline = "Setting PATH to $ENV{'PATH'}\n"; - push( @installer::globals::logfileinfo, $infoline); - } -} - -####################################################################################### -# Preparing a registry "regcomp.rdb" which regcomp can work on (types+java services). -# Copying the "udkapi.rdb", renaming it to "regcomp.rdb" and registering the -# libraries @installer::globals::regcompregisterlibs, which are javavm.uno.so -# and javaloader.uno.so or javavm.uno.dll and javaloader.uno.dll -####################################################################################### - -sub prepare_regcomp_rdb -{ - my ( $regcompfile, $servicesdir, $includepatharrayref) = @_; - - # udkapi.rdb has to be found in the sourcepath - - my $filename = "udkapi.rdb"; - my $udkapirdbref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1); - if ( $$udkapirdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for creating regcomp.rdb!", "prepare_regcomp_rdb"); } - - my $regcompfilename = "regcomp.rdb"; - my $regcomprdb = $servicesdir . $installer::globals::separator . $regcompfilename; - - # If there is an older version of this file, it has to be removed - if ( -f $regcomprdb ) { unlink($regcomprdb); } - - installer::systemactions::copy_one_file($$udkapirdbref, $regcomprdb); - - # now the libraries in @installer::globals::regcompregisterlibs can be registered in the "regcomp.rdb" - - for ( my $i = 0; $i <= $#installer::globals::regcompregisterlibs; $i++ ) - { - my $libfilename = $installer::globals::regcompregisterlibs[$i] . $installer::globals::libextension; - my $libfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$libfilename, $includepatharrayref, 1); - if ( $$libfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $libfilename for creating regcomp.rdb!", "prepare_regcomp_rdb"); } - - my $from = cwd(); - if ( $installer::globals::iswin ) { $from =~ s/\//\\/g; } - - my $to = $$libfileref; - installer::pathanalyzer::get_path_from_fullqualifiedname(\$to); - - chdir($to); - - my $systemcall = "$installer::globals::wrapcmd $regcompfile -register -s -r " . fix_cygwin_path($regcomprdb) . " -c $libfilename"; - - my $returnvalue = system($systemcall); - - chdir($from); - - my $infoline; - if ($returnvalue) { $infoline = "ERROR: $systemcall\n"; } - else { $infoline = "SUCCESS: $systemcall\n"; } - - push( @installer::globals::logfileinfo, $infoline); - } - - return $regcomprdb; -} - -################################################################ -# Collecting all gids of the databases, that are part of -# the file definition -################################################################ - -sub collect_all_services_gids -{ - my ($filesarrayref) = @_; - - my @databasegids = (); - my $error_occured = 0; - my @error_files = (); - - for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ ) - { - my $onefile = ${$filesarrayref}[$i]; - - if ( $onefile->{'RegistryID'} ) - { - my $databasegid = $onefile->{'RegistryID'}; - if (! installer::existence::exists_in_array($databasegid, \@databasegids)) { push(@databasegids, $databasegid); } - } - else - { - push(@error_files, $onefile->{'gid'}); - $error_occured = 1; - } - } - - if ( $error_occured ) - { - my $infoline = "ERROR: Style UNO_COMPONENT is set, but no RegistryID is assigned!\n"; - push( @installer::globals::logfileinfo, $infoline); - print $infoline; - - for ( my $j = 0; $j <= $#error_files; $j++ ) - { - $infoline = "$error_files[$j]\n"; - push( @installer::globals::logfileinfo, $infoline); - print $infoline; - } - - installer::exiter::exit_program("ERROR: File defintion error.", "collect_all_services_gids"); - } - - return \@databasegids; -} - -###################################################################### -# All gids in $databasegids are as RegistryID assigned to files. -# For all this Registry Files a definition has to exist. -###################################################################### - -sub check_defintion_of_databasegids -{ - my ($databasegids, $registryfiles) = @_; - - my @registryfiles = (); - - # First check: For all assigned Registry files, a definition of - # a file with flag STARREGISTRY has to exist. - - for ( my $i = 0; $i <= $#{$databasegids}; $i++ ) - { - my $onegid = ${$databasegids}[$i]; - my $gid_defined = 0; - - for ( my $j = 0; $j <= $#{$registryfiles}; $j++ ) - { - my $registrygid = ${$registryfiles}[$j]->{'gid'}; - - if ( $onegid eq $registrygid ) - { - $gid_defined = 1; - last; - } - } - - if ( ! $gid_defined ) - { - installer::exiter::exit_program("ERROR: Gid $onegid is assigned to file(s), but not defined!", "check_defintion_of_databasegids"); - } - } - - # Second check: If there is a file defined as StarRegistry, is a file with flag UNO_COMPONENT assigned? - - for ( my $j = 0; $j <= $#{$registryfiles}; $j++ ) - { - my $onefile = ${$registryfiles}[$j]; - my $registrygid = $onefile->{'gid'}; - - my $gid_assigned = 0; - - for ( my $i = 0; $i <= $#{$databasegids}; $i++ ) - { - my $onegid = ${$databasegids}[$i]; - - if ( $onegid eq $registrygid ) - { - $gid_assigned = 1; - last; - } - } - - if ( ! $gid_assigned ) - { - my $infoline = "Warning: $registrygid is defined with flag STARREGISTRY, but no file is assigned to the registry.\n"; - push( @installer::globals::logfileinfo, $infoline); - } - else - { - push(@registryfiles, $onefile); - } - } - - return \@registryfiles; -} - -################################################################ -# Some files have flag UNO_COMPONENT, but are not registered -# with regcomp. This files use the regmerge mechanism, that -# is not used in this perl-file. Therefore this files -# have to be filtered out here. -################################################################ - -sub filter_regmergefiles -{ - my ($unocomponentfiles) = @_; - - my @regcompfiles = (); - - for ( my $i = 0; $i <= $#{$unocomponentfiles}; $i++ ) - { - my $onefile = ${$unocomponentfiles}[$i]; - my $regmergefile = ""; - - if ( $onefile->{'Regmergefile'} ) { $regmergefile = $onefile->{'Regmergefile'}; } - if ( $regmergefile ne "" ) { next; } - - push(@regcompfiles, $onefile); - } - - return \@regcompfiles; -} - -################################################################ -# Setting defaults for Creating services.rdb file by registering all uno components -################################################################ - -sub set_url_prefixes -{ - my ( $registryfile ) = @_; - - my $nativeservicesurlprefix = ""; - my $javaservicesurlprefix = ""; - - if ( $registryfile->{'NativeServicesURLPrefix'} ) { $nativeservicesurlprefix = $registryfile->{'NativeServicesURLPrefix'}; } - else { $nativeservicesurlprefix = "vnd.sun.star.expand:\$ORIGIN/"; } - - if ( $registryfile->{'JavaServicesURLPrefix'} ) { $javaservicesurlprefix = $registryfile->{'JavaServicesURLPrefix'}; } - else { $javaservicesurlprefix = "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/"; } - - return ($nativeservicesurlprefix, $javaservicesurlprefix); -} - -################################################################ -# Creating services.rdb file by registering all uno components -################################################################ - -sub create_services_rdb -{ - my ($allvariableshashref, $filesarrayref, $includepatharrayref, $languagestringref) = @_; - - # collecting all services files - my $unocomponentfiles = installer::worker::collect_all_items_with_special_flag($filesarrayref, "UNO_COMPONENT"); - $unocomponentfiles = filter_regmergefiles($unocomponentfiles); - - if ( $#{$unocomponentfiles} > -1 ) # not empty -> at least one file with flag UNO_COMPONENT - { - my $databasegids = collect_all_services_gids($unocomponentfiles); - - my $registryfiles = installer::worker::collect_all_items_with_special_flag($filesarrayref, "STARREGISTRY"); - - $registryfiles = check_defintion_of_databasegids($databasegids, $registryfiles); - - # Now the creation of all files with flag STARREGISTRY can begin - - for ( my $i = 0; $i <= $#{$registryfiles}; $i++ ) - { - my $registryfile = ${$registryfiles}[$i]; - - # my $servicesname = "services.rdb"; - my $servicesname = $registryfile->{'Name'}; # not unique! - my $servicesgid = $registryfile->{'gid'}; # unique - my $uniquedirname = $servicesgid . "_servicesrdb"; - # my $uniquedirname = $servicesgid; - - my ($nativeservicesurlprefix, $javaservicesurlprefix) = set_url_prefixes($registryfile); - - installer::logger::include_header_into_logfile("Creating $servicesname ($servicesgid):"); - - # my $servicesdir = installer::systemactions::create_directories($servicesname, $languagestringref); - my $servicesdir = installer::systemactions::create_directories($uniquedirname, $languagestringref); - -# if ( $^O =~ /cygwin/i ) -# { # $servicesdir is used as a parameter for regcomp and has to be DOS style -# $servicesdir = qx{cygpath -d "$servicesdir"}; -# chomp($servicesdir); -# $servicesdir =~ s/\\/\//g; -# } - - push(@installer::globals::removedirs, $servicesdir); - - my $servicesfile = $servicesdir . $installer::globals::separator . $servicesname; - - # If there is an older version of this file, it has to be removed - if ( -f $servicesfile ) { unlink($servicesfile); } - - # if ((-f $servicesfile) && (!($installer::globals::services_rdb_created))) { $installer::globals::services_rdb_created = 1; } - # if ((!($installer::globals::services_rdb_created)) && $installer::globals::servicesrdb_can_be_created ) # This has to be done once - if ( $installer::globals::servicesrdb_can_be_created ) # This has to be done always - { - # Creating the services.rdb in directory "inprogress" - my $origservicesdir = $servicesdir; - $servicesdir = installer::systemactions::make_numbered_dir("inprogress", $servicesdir); - $servicesfile = $servicesdir . $installer::globals::separator . $servicesname; - - # determining the location of the file regcomp - # Because the program regcomp.exe (regcomp) is used now, it has to be taken the version - # from the platform, this script is running. It is not important, for which platform the - # product is built. - - my $searchname; - - if ($installer::globals::isunix) { $searchname = "regcomp"; } - else { $searchname = "regcomp.exe"; } - - $regcompfileref = get_source_path_cygwin_safe($searchname, $includepatharrayref, 1); - if ( $$regcompfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); } - - # For Windows the libraries included into the mozruntime.zip have to be added to the path - if ($installer::globals::iswin) { add_path_to_pathvariable_directory($filesarrayref, "mozruntime_zip"); } - if ($installer::globals::iswin) { add_path_to_pathvariable($filesarrayref, "msvcr70.dll"); } - - # setting the LD_LIBRARY_PATH, needed by regcomp - # Linux: Take care of the lock daemon. He has to be started! - # For windows it is necessary that "msvcp7x.dll" and "msvcr7x.dll" are included into the path ! - - my $var_library_path; - my $old_library_path; - if ( $installer::globals::isunix ) { - $var_library_path = $installer::globals::ismacosx ? - 'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH'; - $old_library_path = $ENV{$var_library_path}; - include_libdir_into_ld_library_path( - $var_library_path, $$regcompfileref); - } - - my $regcomprdb = ""; - - if ( $installer::globals::solarjava ) # this is needed to register Java components - { - prepare_classpath_for_java_registration($includepatharrayref); - - if ( $installer::globals::isunix ) - { add_jdklib_into_ld_library_path($var_library_path); } - else { add_jrepath_into_path(); } - - # Preparing a registry which regcomp can work on (types+java services). - # Copying the "udkapi.rdb", renaming it to "regcomp.rdb" and registering the - # libraries $(REGISTERLIBS_JAVA), which are javavm.uno.so and javaloader.uno.so - # or javavm.uno.dll and javaloader.uno.dll - - $regcomprdb = prepare_regcomp_rdb($$regcompfileref, $servicesdir, $includepatharrayref); - } - - # and now iteration over all files - - # my $error_during_registration = register_all_components($filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref); - my $error_during_registration = register_all_components($allvariableshashref, $servicesgid, $unocomponentfiles, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix); - - if (defined $var_library_path) { - if (defined $old_library_path) { - $ENV{$var_library_path} = $old_library_path; - } else { - delete $ENV{$var_library_path}; - } - } - - # Dependent from the success, the registration directory can be renamed. - - if ( $error_during_registration ) - { - $servicesdir = installer::systemactions::rename_string_in_directory($servicesdir, "inprogress", "witherror"); - push(@installer::globals::removedirs, $servicesdir); - # and exiting the packaging process - installer::exiter::exit_program("ERROR: Could not register all components for file $servicesname ($servicesgid)!", "create_services_rdb"); - } - else - { - $servicesdir = installer::systemactions::rename_directory($servicesdir, $origservicesdir); - } - - $servicesfile = $servicesdir . $installer::globals::separator . $servicesname; - } - else - { - my $infoline; - - if (!($installer::globals::servicesrdb_can_be_created)) - { - $infoline = "Warning: $servicesname was not created. Build platform and compiler do not match. Build platform: $installer::globals::plat, compiler : $installer::globals::compiler\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - if ( $installer::globals::services_rdb_created ) - { - $infoline = "Info: $servicesname was not created. $servicesfile already exists.\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - if ((!($installer::globals::servicesrdb_can_be_created)) && (!($installer::globals::services_rdb_created))) - { - $infoline = "ERROR: $servicesname was not created and does not exist!\n"; - push( @installer::globals::logfileinfo, $infoline); - } - } - - # Adding the new services file source path to the filearray - $registryfile->{'sourcepath'} = $servicesfile; # setting the sourcepath! - # add_services_sourcepath_into_filearray( $filesarrayref, $servicesfile, $servicesname ); - } - } - - # Setting the global variable $installer::globals::services_rdb_created - - $installer::globals::services_rdb_created = 1; -} - -1; diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm index 7a975f530445..78808cee9191 100644 --- a/solenv/bin/modules/par2script/check.pm +++ b/solenv/bin/modules/par2script/check.pm @@ -139,55 +139,6 @@ sub check_module_existence } ######################################################## -# If the StarRegistry is not defined in the script, -# it has to be removed from the file definition. -######################################################## - -sub check_registry_at_files -{ - my %starregistrygid = (); - - my $item; - foreach $item ( keys %{$par2script::globals::definitions{'File'}} ) - { - if (( exists($par2script::globals::definitions{'File'}->{$item}->{'Styles'}) ) && - ( $par2script::globals::definitions{'File'}->{$item}->{'Styles'} =~ /\bSTARREGISTRY\b/ )) - { - $starregistrygid{$item} = 1; - } - } - - foreach $item ( keys %{$par2script::globals::definitions{'File'}} ) - { - if ( exists($par2script::globals::definitions{'File'}->{$item}->{'RegistryID'}) ) - { - my $registryid = $par2script::globals::definitions{'File'}->{$item}->{'RegistryID'}; - if ( ! exists($starregistrygid{$registryid}) ) - { - die "\nERROR: No definition found for $registryid at file $item\n\n"; - } - - # if ( ! ( $par2script::globals::definitions{'File'}->{$item}->{'Styles'} =~ /\bUNO_COMPONENT\b/ )) - # { - # die "\nERROR: Flag UNO_COMPONENT required for file $item\n\n"; - # } - # -> also possible, that Regmergefile is defined (does not require flag UNO_COMPONENT) - } - - # and also vice versa - - if (( exists($par2script::globals::definitions{'File'}->{$item}->{'Styles'}) ) && - ( $par2script::globals::definitions{'File'}->{$item}->{'Styles'} =~ /\bUNO_COMPONENT\b/ )) - { - if ( ! exists($par2script::globals::definitions{'File'}->{$item}->{'RegistryID'}) ) - { - die "\nERROR: Flag UNO_COMPONENT defined, but no file as \"RegistryID\" at file $item !\n\n"; - } - } - } -} - -######################################################## # Every script has to contain exactly one root module. # This module has no ParentID or an empty ParentID. ######################################################## diff --git a/solenv/bin/packcomponents.xslt b/solenv/bin/packcomponents.xslt new file mode 100644 index 000000000000..6e037a677f73 --- /dev/null +++ b/solenv/bin/packcomponents.xslt @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:uc="http://openoffice.org/2010/uno-components"> + <xsl:param name="prefix"/> + <xsl:strip-space elements="*"/> + <xsl:template match="/"> + <xsl:element name="components" + namespace="http://openoffice.org/2010/uno-components"> + <xsl:for-each select="list/filename"> + <xsl:variable name="doc" select="document(concat($prefix, .))"/> + <xsl:choose> + <xsl:when test="count($doc/uc:component) = 1"> + <xsl:copy-of select="$doc/uc:component"/> + </xsl:when> + <xsl:otherwise> + <xsl:message terminate="yes"> + <xsl:text>cannot process </xsl:text> + <xsl:value-of select="."/> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:element> + </xsl:template> +</xsl:stylesheet> diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl index 0789c460d510..06928ad68439 100644 --- a/solenv/bin/par2script.pl +++ b/solenv/bin/par2script.pl @@ -86,8 +86,6 @@ print "Checking module definitions ...\n"; par2script::check::check_module_existence(); print "Checking module assignments ...\n"; par2script::check::check_moduleid_at_items(); -print "Checking StarRegistry ...\n"; -par2script::check::check_registry_at_files(); print "Checking Root Module ..."; par2script::check::check_rootmodule(); print "Checking Shortcut assignments ...\n"; diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 67f074f610ce..026cbccda6c9 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -19,8 +19,6 @@ common ENABLE_CUPS TRUE ENABLE_DIRECTX TRUE ENABLE_FONTCONFIG TRUE - ENABLE_GCONF TRUE - ENABLE_GNOMEVFS TRUE ENABLE_GTK TRUE ENABLE_MEDIAWIKI YES ENABLE_MINIMIZER YES @@ -186,8 +184,6 @@ finish } common_0:0 IF %OS% == MACOSX { - ENABLE_GCONF - ENABLE_GNOMEVFS ENABLE_GTK SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC% } @@ -359,6 +355,8 @@ unxfbsdi SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH% SOLAR_JAVA TRUE ZIPDEP perl %SOLARENV%/bin/zipdep.pl + ENABLE_GCONF TRUE + ENABLE_GNOMEVFS TRUE } common0 { @@ -605,6 +603,8 @@ unxlngi6 SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH% SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl + ENABLE_GCONF TRUE + ENABLE_GNOMEVFS TRUE } common0 { @@ -883,6 +883,8 @@ unxlngx6 SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH% SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl + ENABLE_GCONF TRUE + ENABLE_GNOMEVFS TRUE } common0 { @@ -1430,6 +1432,8 @@ unxsoli4 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% + ENABLE_GCONF TRUE + ENABLE_GNOMEVFS TRUE } common0 { @@ -1687,6 +1691,8 @@ unxsols4 SOLAR_JAVA TRUE ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% + ENABLE_GCONF TRUE + ENABLE_GNOMEVFS TRUE } common0 { @@ -1945,7 +1951,6 @@ unxsolu4 COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%/bin/deliver.pl DMAKEROOT %SOLARENV%/inc/startup - ENABLE_GNOMEVFS FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2 FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2 @@ -1962,6 +1967,8 @@ unxsolu4 SYSTEM_LIBXSLT YES ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT% + ENABLE_GCONF TRUE +# ENABLE_GNOMEVFS TRUE } common0 { diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 6806e15c69e7..30c6168c2647 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -89,11 +89,11 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \ echo "$$my_tmp" > $@ .END -cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb +cpptest .PHONY : $(RM) -r $(MISC)/$(TARGET)/user $(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ - -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ + -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ $(my_cppenv) $(OOO_CPPTEST_ARGS) @@ -103,12 +103,6 @@ cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb cpptest : $(MISC)/$(TARGET)/installation.flag .END -$(MISC)/$(TARGET)/services.rdb : - $(MKDIRHIER) $(@:d) - $(RM) $@ - $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \ - -c remotebridge.uno -c uuresolver.uno - .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" javatest .PHONY : $(JAVATARGET) $(RM) -r $(MISC)/$(TARGET)/user diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 68bbc797d8af..c24ab9d72d2c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1354,6 +1354,17 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar CPPUNIT_CFLAGS = .END +COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ +COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ +.IF "$(OS)" == "WNT" +COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ +.ELSE +COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +.END +COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ +COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: +COMPONENTPREFIX_INBUILD = vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/ + # workaround for strange dmake bug: # if the previous block was a rule or a target, "\#" isn't recognized # as an escaped "#". if it was an assignment, escaping works... diff --git a/solenv/src/component.map b/solenv/src/component.map index ac2c3750bfe0..62b8829a0f51 100755 --- a/solenv/src/component.map +++ b/solenv/src/component.map @@ -1,7 +1,6 @@ UDK_3_0_0 { global: component_getImplementationEnvironment; - component_writeInfo; component_getFactory; local: *; diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map new file mode 100755 index 000000000000..ac2c3750bfe0 --- /dev/null +++ b/solenv/src/reg-component.map @@ -0,0 +1,8 @@ +UDK_3_0_0 { + global: + component_getImplementationEnvironment; + component_writeInfo; + component_getFactory; + local: + *; +}; diff --git a/solenv/src/unloadablecomponent.map b/solenv/src/unloadablecomponent.map index 30c5bb729ac7..2da0c5709c7b 100755 --- a/solenv/src/unloadablecomponent.map +++ b/solenv/src/unloadablecomponent.map @@ -1,7 +1,6 @@ UDK_3_0_0 { global: component_getImplementationEnvironment; - component_writeInfo; component_getFactory; component_canUnload; local: |