[Libreoffice-commits] .: 2 commits - postprocess/packcomponents postprocess/prj scp2/source solenv/bin
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Wed Oct 19 07:41:47 PDT 2011
postprocess/packcomponents/makefile.mk | 16 ++--------------
postprocess/prj/d.lst | 2 --
scp2/source/binfilter/file_binfilter.scp | 2 +-
scp2/source/ooo/common_brand.scp | 3 +--
scp2/source/ooo/file_ooo.scp | 12 ++++++------
scp2/source/ooo/ooo_brand.scp | 7 -------
scp2/source/ooo/profileitem_ooo.scp | 4 ++--
solenv/bin/linkoo | 15 +++------------
8 files changed, 15 insertions(+), 46 deletions(-)
New commits:
commit 1206a75575f28da6368ec3851658528143d7805f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 19 16:37:17 2011 +0200
Undo basis/brand split: adapted linkoo.
Linking .rdb files has been disabled as it appears completely broken
(erroneously picking up a testtools/*/lib/services.rdb instead of one
from solver).
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 14b595b..1c22cb0 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -109,8 +109,6 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_
# setup global variables
-my $basis_dir = 'basis-link/program';
-my $win_basis_dir = 'Basis/program';
my $brand_program_dir = 'program';
my $ure_lib_dir = 'basis-link/ure-link/lib';
my $win_ure_lib_dir = 'URE/bin';
@@ -121,18 +119,11 @@ my $bin;
$bin = "|\\.bin" if ($TARGET eq 'wntgcci.pro');
my %replaceable = (
$brand_program_dir => "(\\.so|\\.dll|\\.exe|\\.com$bin)\$",
- $basis_dir => "\\.rdb",
- $win_basis_dir => "\\.rdb",
$ure_lib_dir => "(\\.so\$|\\.so\\.3\$)",
$win_ure_lib_dir => "(\\.dll|\\.exe|\\.bin|\\.com)\$",
- $basis_dir . '/resource' => '\.res$',
- $basis_dir . '/classes' => '\.jar$',
- $win_basis_dir . '/resource' => '\.res$',
- $win_basis_dir . '/classes' => '\.jar$',
- 'basis-link/share/config' => '\.zip$',
- 'Basis/share/config' => '\.zip$',
- 'ure/share/misc' => '\.rdb$',
- 'URE/misc' => '\.rdb$'
+ $brand_program_dir . '/resource' => '\.res$',
+ $brand_program_dir . '/classes' => '\.jar$',
+ 'share/config' => '\.zip$',
# 'share/uno_packages' => '\.zip$'
);
commit a015cda8f2c5a5c3c897e0933b631b9c0f6afd6b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Oct 19 16:36:46 2011 +0200
Undo basis/brand split: moved .rdb files from basis program/ to brand program/ (merging the two services.rdb files).
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index bbea2d1..07d6ccf 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -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>' > $@
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 6038024..171e9db 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -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
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index c1d1b1c..538d1a2 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -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
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c9aae2b..a0270cd 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -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
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b7b3294..769eba6 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -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
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 649c6b6..a4106b6 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -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;
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 78b9606..37d30a1 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -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
More information about the Libreoffice-commits
mailing list