[ooo-build-commit] Branch 'ooo/master' - 4 commits - instsetoo_native/util scp2/source solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jul 20 17:06:22 PDT 2009
instsetoo_native/util/pack.lst | 4 ++--
scp2/source/ooo/file_library_ooo.scp | 4 ++++
solenv/bin/clipatchconfig.pl | 20 ++++++++++----------
solenv/inc/target.mk | 7 ++++---
4 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit b22e9e2dff26d1e9364c990bad5f11aa6db82c0b
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Jul 20 14:43:55 2009 +0000
#i10000# ar removed
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 1709883..2e62a49 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -7,12 +7,12 @@
# Product List_of_platforms List_of_languages Target
-OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar openoffice
+OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
#BrOffice pt-BR broffice
#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12 en-US openofficewithjre
#BrOffice_wJRE pt-BR brofficewithjre
-OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US|ar openofficedev
+OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev
#BrOffice_Dev pt-BR brofficedev
OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
commit b4cbb154d15144c498f0dda775e2a8ef4b1b9081
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Jul 20 13:16:32 2009 +0000
#i10000# l10n fix for a locale environment
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 8c1ba38..0264ac9 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1393,9 +1393,10 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
.IF "$(LOCALIZESDF)"!=""
"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
@@-$(MKDIRHIER) $(@:d)
- @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
- @@-cp -r $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)$/* $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)
- @@-$(RM) -rf $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)
+ @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
+ @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)$/* $(COMMONMISC)$/$(PRJNAME)
+ @@-$(RM) -rf $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
.ENDIF # "$(LOCALIZESDF)"!=""
.ENDIF # "$(LOCALIZATION_FOUND)"==""
.ENDIF # "$(WITH_LANG)"!=""
commit 807412f7a8f3d45ce91590aae72c9a7bef5b64ae
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Jul 20 12:59:30 2009 +0000
#i10000# build fix
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
index 33bea6b..aa73d86 100644
--- a/solenv/bin/clipatchconfig.pl
+++ b/solenv/bin/clipatchconfig.pl
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -36,9 +36,9 @@ use strict;
sub trim;
sub readRedirectionValues($);
-my $usage =
+my $usage =
"Usage is: \n clipatchconfig.pl configTemplate redirections policyConfig
-
+
configTemplate: The config file which is used for the policy assembly. It
contains place holders for the binding redirection.
@@ -48,7 +48,7 @@ my $usage =
policyConfig: Name of the file in which we want to write the config file.
";
-
+
if (scalar @ARGV < 3) {
print $usage;
exit -1;
@@ -93,20 +93,20 @@ sub readRedirectionValues($)
if (length($trimmed = trim($_)) == 0) {
next;
}
-
+
#Skip comment symbol: #
if ($trimmed =~ /^#/) {
next;
}
my @lineParts = split /=/,$_;
-
+
#Check if we have valid name value pairs.
if (scalar @lineParts != 2) {
print "Error: Values in $ARGV[1] are not correct (Entries must have the form name=value). Invalid line: \n$_\n";
exit -1;
}
-
+
#Trim the strings and check if they still contain characters
my $name = trim($lineParts[0]);
my $value = trim($lineParts[1]);
@@ -114,7 +114,7 @@ sub readRedirectionValues($)
print "Error: Values in $ARGV[1] are not correct. Invalid line: \n$_\n";
exit -1;
}
-
+
#Check if we have duplicate key names
for (keys %redirectionValues) {
if ( $name eq $_) {
@@ -122,7 +122,7 @@ sub readRedirectionValues($)
exit -1;
}
}
-
+
$redirectionValues{$name} = $value;
}
return %redirectionValues;
@@ -134,4 +134,4 @@ sub trim($)
$string =~ s/^\s+//;
$string =~ s/\s+$//;
return $string;
-}
+}
\ No newline at end of file
commit 91838569e3484cdbb20898991013359e3dee1031
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jul 17 12:48:43 2009 +0000
#i10000# #i103467# build fix
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2434342..0c7e4a3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -958,7 +958,11 @@ File gid_File_Oo_Office_Dataaccess_Mozab_Xcu
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+#ifdef WNT
Name = "/registry/spool/DataAccess/mozab.xcu";
+#else
+ Name = "/registry/spool/DataAccess/mozab2.xcu";
+#endif
End
STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
More information about the ooo-build-commit
mailing list