strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undo basis/brand split: moved .rdb files from basis program/ to brand program/ (merging the two services.rdb files).

Browse source
This commit is contained in:
Stephan Bergmann 2011-10-19 16:36:46 +02:00
parent 9132e6ffa7
commit a015cda8f2
7 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
postprocess/packcomponents/makefile.mk
View file

@ -103,6 +103,7 @@ my_components = \
component/scripting/source/basprov/basprov \
component/scripting/source/dlgprov/dlgprov \
component/scripting/source/protocolhandler/protocolhandler \
component/scripting/source/pyprov/mailmerge \
component/scripting/source/stringresource/stringresource \
component/scripting/source/vbaevents/vbaevents \
component/scripting/util/scriptframe \
@ -365,11 +366,9 @@ my_components += evoab
my_components += component/avmedia/source/gstreamer/avmediagstreamer
.END
my_ooo_components = component/scripting/source/pyprov/mailmerge
.INCLUDE: target.mk
ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb
ALLTAR : $(MISC)/services.rdb
$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
@ -380,14 +379,3 @@ $(MISC)/services.input : makefile.mk
echo \
'<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
> $@
$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(MISC)/ooo-services.input \
$(my_ooo_components:^"$(SOLARXMLDIR)/":+".component")
$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
$(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
$(MISC)/ooo-services.input : makefile.mk
echo '<list>' \
'$(my_ooo_components:^"<filename>":+".component</filename>")' \
'</list>' > $@

2
postprocess/prj/d.lst
View file

@ -2,6 +2,4 @@ mkdir: %_DEST%\xml\ooo
..\%__SRC%\bin\uiconfig.zip %_DEST%\bin\uiconfig.zip
..\%__SRC%\misc\*.xcd %_DEST%\xml\
..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\
..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml\ooo\services.rdb
..\%__SRC%\misc\services.input %_DEST%\xml\services.input
..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb

2
scp2/source/binfilter/file_binfilter.scp
View file

@ -38,7 +38,7 @@ End
File gid_Starregistry_Legacy_Binfilters_Rdb
TXT_FILE_BODY;
Name = "legacy_binfilters.rdb";
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
End

3
scp2/source/ooo/common_brand.scp
View file

@ -86,7 +86,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
gid_Brand_File_ServicesRdb,
gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
@ -1209,7 +1208,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_MORE_TYPES";
Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}";
Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services

12
scp2/source/ooo/file_ooo.scp
View file

@ -629,14 +629,14 @@ End
File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
Name = "offapi.rdb";
End
File gid_File_Rdb_TypesVba
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED, OVERWRITE);
Name = "oovbaapi.rdb";
End
@ -1142,14 +1142,14 @@ End
File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
Name = "services.rdb";
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
End
#ifdef LINUX
File gid_File_Dat_Root3
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Name = "root3.dat";
Styles = (PACKED);
End
@ -1158,7 +1158,7 @@ End
#ifdef LINUX
File gid_File_Dat_Root4
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Name = "root4.dat";
Styles = (PACKED);
End
@ -1167,7 +1167,7 @@ End
#ifdef LINUX
File gid_File_Dat_Root5
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Dir = gid_Brand_Dir_Program;
Name = "root5.dat";
Styles = (PACKED);
End

7
scp2/source/ooo/ooo_brand.scp
View file

@ -39,13 +39,6 @@ Directory gid_Dir_Brand_Root
End
#endif
File gid_Brand_File_ServicesRdb
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = "/ooo/services.rdb";
Styles = (PACKED);
End
ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
ProfileID = gid_Brand_Profile_Bootstrap_Ini;
ModuleID = gid_Module_Root_Brand;

4
scp2/source/ooo/profileitem_ooo.scp
View file

@ -333,7 +333,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_MORE_TYPES";
Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
@ -341,7 +341,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_MORE_SERVICES";
Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES}";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types