[ooo-build-commit] Branch 'ooo/master' - 3 commits - configure.in scp2/source solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Jul 15 17:06:44 PDT 2009
configure.in | 56 ++++++++++++++-----------
scp2/source/ooo/file_library_ooo.scp | 13 ++---
solenv/bin/cws.pl | 2
solenv/bin/make_installer.pl | 5 +-
solenv/bin/modules/installer/scppatchsoname.pm | 53 +++++++++++++++++++----
solenv/bin/modules/installer/simplepackage.pm | 18 ++++----
solenv/config/sdev300.ini | 2
solenv/inc/_tg_srs.mk | 40 ++++++++---------
solenv/inc/tg_srs.mk | 4 -
9 files changed, 122 insertions(+), 71 deletions(-)
New commits:
commit 33752d5e6486494b4ed2147b3113a7ea860ad5c1
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 15 16:00:45 2009 +0000
CWS-TOOLING: integrate CWS ause105
2009-07-08 17:57:23 +0200 hjs r273843 : #i103418# add missing dependency on localized .hrc files
2009-07-08 17:28:46 +0200 hjs r273841 : #i103416# handle new solver subdir sdf
2009-07-08 11:27:47 +0200 hjs r273823 : #i103409# disable cmd.exe autorun
2009-07-07 19:23:23 +0200 hjs r273813 : #i103394# fix path handling of files failed in first run of rebase.exe
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index ecd26b8..611f9e9 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -1117,7 +1117,7 @@ sub update_solver
my $solver = shift;
my $milestone = shift;
- my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml');
+ my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf');
use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index bc23ed5..3d26024 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -15,7 +15,7 @@ ALLTAR : $(HIDSRS1PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
@@ -31,7 +31,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -66,7 +66,7 @@ ALLTAR : $(HIDSRS2PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
@@ -82,7 +82,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -117,7 +117,7 @@ ALLTAR : $(HIDSRS3PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
@@ -133,7 +133,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -168,7 +168,7 @@ ALLTAR : $(HIDSRS4PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
@@ -184,7 +184,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -219,7 +219,7 @@ ALLTAR : $(HIDSRS5PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
@@ -235,7 +235,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -270,7 +270,7 @@ ALLTAR : $(HIDSRS6PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
@@ -286,7 +286,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -321,7 +321,7 @@ ALLTAR : $(HIDSRS7PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
@@ -337,7 +337,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -372,7 +372,7 @@ ALLTAR : $(HIDSRS8PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
@@ -388,7 +388,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -423,7 +423,7 @@ ALLTAR : $(HIDSRS9PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
@@ -439,7 +439,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -474,7 +474,7 @@ ALLTAR : $(HIDSRS10PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
@@ -490,7 +490,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
.ENDIF # "$(WITH_LANG)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 1c34aaa..d4a04f8 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -47,7 +47,7 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
@@ -63,7 +63,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZE
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
.ENDIF # "$(WITH_LANG)"!=""
commit eb61ecc3208c75e8d6092aa6a05267fad608c6f9
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 15 14:31:28 2009 +0000
CWS-TOOLING: integrate CWS native254
2009-07-06 11:53:05 +0200 is r273730 : #159765# setting of unixrights for Windows not required
2009-07-03 14:34:49 +0200 is r273699 : #160182# new ooo transformation wizard
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 223cf70..fc164e0 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -949,11 +949,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "ScpActions");
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions5.log", $scpactionsinproductlanguageresolvedarrayref); }
- # Editing scpactions with flag SCPZIP_REPLACE.
+ # Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME.
installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6.log", $scpactionsinproductlanguageresolvedarrayref); }
+ installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
+ if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6a.log", $scpactionsinproductlanguageresolvedarrayref); }
+
#########################################################
# language dependent links part
#########################################################
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index c789085..cee75e8 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -52,6 +52,20 @@ sub change_length_of_string
}
########################################################################################
+# The length of the new string must be identical with the length of the old string
+########################################################################################
+
+sub change_length_of_string_with_letter
+{
+ my ($newstringref, $oldstring, $onestring) = @_;
+
+ while ( length($$newstringref) < length($oldstring) )
+ {
+ $$newstringref = $$newstringref . $onestring;
+ }
+}
+
+########################################################################################
# Converting a string to a unicode string
########################################################################################
@@ -78,24 +92,47 @@ sub convert_to_unicode
sub replace_productname_in_file
{
- my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_;
+ my ($sourcepath, $destpath, $variableshashref, $onefilehash, $styles) = @_;
my $onefile = installer::files::read_binary_file($sourcepath);
+ # searching for "x"
+
my $onestring = "x" . chr(0);
my $replacestring = "";
for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
- if ( $filedescription ne "" ) { $productname = $filedescription; }
+ if ( exists($onefilehash->{'FileDescription'}) ) { $productname = $onefilehash->{'FileDescription'}; }
my $unicode_productname = convert_to_unicode($productname);
change_length_of_string(\$unicode_productname, $replacestring);
- my $found = $onefile =~ s/$replacestring/$unicode_productname/s;
-
+ my $found1 = $onefile =~ s/$replacestring/$unicode_productname/sg;
+
+ my $found2 = 0;
+
+ if ( $styles =~ /\bPATCH_SO_NAME_Z\b/ )
+ {
+ # searching for "z"
+
+ $onestring = "z" . chr(0);
+ $replacestring = "";
+ for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
+
+ my $productname2 = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
+ if ( exists($onefilehash->{'FileDescriptionZ'}) ) { $productname2 = $onefilehash->{'FileDescriptionZ'}; }
+ my $unicode_productname2 = convert_to_unicode($productname2);
+
+ change_length_of_string_with_letter(\$unicode_productname2, $replacestring, $onestring);
+
+ $found2 = $onefile =~ s/$replacestring/$unicode_productname2/sg;
+ }
+
installer::files::save_binary_file($onefile, $destpath);
+ my $found = $found1 + $found2;
+
return $found;
}
@@ -106,7 +143,7 @@ sub replace_productname_in_file
sub resolving_patchsoname_flag
{
my ($filesarrayref, $variableshashref, $item, $languagestringref) = @_;
-
+
my $diritem = lc($item);
my $replacedirbase = installer::systemactions::create_directories("patchsoname_$diritem", $languagestringref);
@@ -117,7 +154,7 @@ sub resolving_patchsoname_flag
{
my $onefile = ${$filesarrayref}[$i];
my $styles = "";
-
+
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
if ( $styles =~ /\bPATCH_SO_NAME\b/ )
@@ -141,8 +178,6 @@ sub resolving_patchsoname_flag
my $sourcepath = $onefile->{'sourcepath'};
my $destinationpath = $replacedir . $onefilename;
my $movepath = $destinationpath . ".orig";
-
- if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; }
# if (!(-f $destinationpath)) # do nothing if the file already exists
# {
@@ -152,7 +187,7 @@ sub resolving_patchsoname_flag
if ( $copysuccess )
{
# Now the file can be patch (binary!)
- my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription);
+ my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $onefile, $styles);
if ($found == 0)
{
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index bbce941..cab2e48 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -404,14 +404,18 @@ sub create_simple_package
else
{
installer::systemactions::copy_one_file($source, $destination);
- # see issue 102274
- my $unixrights = "";
- if ( $onefile->{'UnixRights'} )
+
+ if ( ! $installer::globals::iswindowsbuild )
{
- $unixrights = $onefile->{'UnixRights'};
-
- my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
- system($localcall);
+ # see issue 102274
+ my $unixrights = "";
+ if ( $onefile->{'UnixRights'} )
+ {
+ $unixrights = $onefile->{'UnixRights'};
+
+ my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
+ system($localcall);
+ }
}
}
}
commit 2320281a19c49a40fa026785317196803c68d939
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 15 11:06:05 2009 +0000
CWS-TOOLING: integrate CWS moz2seamonkey01
2009-06-18 20:56:43 +0200 fs r273133 : #i10000# corrected resolved of merge conflict
2009-06-18 20:55:34 +0200 fs r273132 : #i10000# corrected resolved of merge conflict
2009-06-18 10:49:26 +0200 fs r273105 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk at 272827 (milestone: DEV300:m50)
2009-06-17 20:48:35 +0200 fs r273094 : #i84961# removed 'pointless and buggy' echo statement
2009-05-22 11:27:08 +0200 fs r272176 : #i101763#
provided by tono at openoffice.org
make compile with mingw
2009-05-22 11:22:25 +0200 fs r272175 : #i101763#
provided by tono at openoffice.org
allow compilation in with mingw
2009-04-15 12:09:28 +0200 fs r270830 : unconditionally disable moz executables
2009-03-27 12:29:38 +0100 fs r270149 : ignore some configure-related files
2009-03-27 11:47:35 +0100 fs r270145 : SolarisSparc needs libfreebl_32fpu_3.so
2009-03-27 11:38:09 +0100 fs r270141 : regxpcom call not needed nowadays / also pack libfreebl3 (needed for signature/encryption)
2009-03-26 21:40:17 +0100 fs r270108 : superseded by 1.1.14 version
2009-03-24 13:07:21 +0100 fs r269938 : xptitemp.dat seemingly not needed anymore
2009-03-23 12:56:29 +0100 fs r269869 : files with : in their name break the build
2009-03-23 12:22:01 +0100 fs r269866 : files with : in their name break the build
2009-03-21 23:12:06 +0100 fs r269843 : manual resync: merge the changes which happened on TRUNK in mozilla-source-1.7.5.patch herein
2009-03-21 21:58:17 +0100 fs r269841 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk at 269781 (milestone: DEV300:m44)
2009-03-18 12:04:25 +0100 fs r269649 : in SunHH environment, use pre-requisites from /so/env
2009-03-16 12:33:18 +0100 pastea_p r269522 : correct makefile.mk sorry again
2009-03-15 17:32:43 +0100 pastea_p r269506 : last files about migration to 1.1.14
2009-03-15 17:19:39 +0100 pastea_p r269505 : Migrates some files to 1.1.14
2009-03-04 07:45:40 +0100 fs r268782 : also add pref.xpt
2009-02-27 09:57:37 +0100 fs r268555 : #i66338# for the moment, disable Mozilla-based code for unxlngx6
2009-02-23 10:56:28 +0100 fs r268346 : syntax
2009-02-19 14:14:56 +0100 fs r268283 : make PrintPDE compile in Sun's internal build environment by removing some unneeded stuff
2009-02-18 15:40:40 +0100 fs r268236 : #i66338# re-enable MozAB on Mac
2009-02-18 15:39:55 +0100 fs r268235 : #i66338#
2009-02-18 15:30:38 +0100 fs r268232 : #i66338# tar => $(TAR) (provided by hjs)
2009-02-18 15:28:45 +0100 fs r268231 : more build envs supported (thanks to hjs for all this work!)
2009-02-18 15:27:02 +0100 fs r268230 : #i66338#
2009-02-18 15:23:04 +0100 fs r268229 : #i66338# let it build on Solaris, in Sun Hamburg's build environment
2009-02-18 12:00:12 +0100 fs r268210 : #i10000#
2009-02-18 08:17:29 +0100 fs r268198 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now
2009-02-18 08:16:50 +0100 fs r268197 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now
2009-02-14 14:05:24 +0100 fs r267757 : redo the Windows related changes lost with recent resync
2009-02-14 00:06:33 +0100 ericb r267755 : #i94628# remove the config_office dir now
2009-02-14 00:04:59 +0100 ericb r267754 : #i94628# remove all files in config_office now
2009-02-14 00:01:26 +0100 ericb r267753 : #i94628# remove guw in config_office
2009-02-13 23:53:00 +0100 ericb r267752 : #i94628# remove files in config_office
2009-02-13 16:02:58 +0100 fs r267725 : #i10000#
2009-02-12 18:14:31 +0100 ericb r267685 : #i94628# new generated configure
2009-02-12 18:13:52 +0100 ericb r267684 : #i94628# fix a path issue for finding seamonkey01
2009-02-12 14:39:17 +0100 ericb r267662 : #i94628# removing seamonkey.1.1.12 patch
2009-02-12 14:21:04 +0100 ericb r267658 : #i94628# the new configure, after autoconf
2009-02-12 14:13:21 +0100 ericb r267656 : #i94628# other missing changes for Windows
2009-02-12 14:04:26 +0100 ericb r267655 : #i94628# recommit configure.in changes after config_office removing
2009-02-12 13:46:12 +0100 ericb r267653 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk at 267171 (milestone: DEV300:m41)
2009-02-12 12:00:48 +0100 ericb r267643 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk at 267171 (milestone: DEV300:m41)
2009-02-11 13:28:50 +0100 pl r267595 : #i94628# add MACDEVSDK variable for unxmacxi
2009-02-06 09:44:15 +0100 ericb r267446 : #i98957# provide the zipped archives too
2009-02-06 09:43:32 +0100 ericb r267445 : #i98957# make seamonkey buildable on OpenSolaris, adding the right options for configure
2009-02-06 09:42:45 +0100 ericb r267444 : #i98957# make seamonkey buildable on OpenSolaris
2009-02-02 09:41:57 +0100 fs r267252 : #i66338#
2009-02-02 09:41:43 +0100 fs r267251 : #i66338#
2009-01-30 15:12:03 +0100 fs r267200 : code consolidation - MQueryHelper now uses MLdapAttributeMap's fillCardFromResult and fillResultFromCard, which makes the code as such shorter, and eliminates information duplication
2009-01-30 11:53:31 +0100 fs r267189 : reworked the statement parsing / statement execution / result set creation: now we don't anymore create three result sets (two of them leaking) for a single prepared statement ...
2009-01-29 20:37:01 +0100 fs r267170 : #i10000#
2009-01-29 20:32:50 +0100 fs r267169 : more explicit return type of parseSql
2009-01-29 17:32:56 +0100 fs r267163 : slightly refactored the statement class hierarchy (basically remove OStatement_BASE2, and renamed the other base classes)
2009-01-29 17:14:58 +0100 fs r267161 : #i66338# first implementation to re-enable LDAP access. Still work in progress (but hey, you can see the data already :)
2009-01-12 11:25:56 +0100 fs r266138 : allow using a debug-enabled version of Mozilla/SeaMonkey when MOZILLA_ENABLE_DEBUG is set
2009-01-10 22:01:40 +0100 fs r266126 : #i95772# nsldap32v50.dll also needs an embedded manifest (the LDP configuration backend links directly against it)
2009-01-09 11:15:32 +0100 fs r266065 : manifests for DLLs need to have ID 2, not 1
2009-01-08 20:02:24 +0100 fs r266035 : #i95772# embed manifest file in shared libs built in directory/c-sdk, too
2009-01-05 20:45:38 +0100 ericb r265886 : #i66338# commiting the correct configure for the tinderboxes
2009-01-05 17:42:34 +0100 ericb r265883 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk at 265758 (milestone: DEV300:m38)
2008-12-16 15:34:26 +0100 ericb r265550 : #i94628# change for seamonkey1.1.13 : do not forget to do autoconf in config_office before configure
2008-12-16 15:25:37 +0100 pastea_p r265547 : 1.1.12 to 1.1.13
2008-12-16 14:20:18 +0100 pastea_p r265540 : correct the hunk about no core_abspath which one broke linux build
2008-12-16 13:10:06 +0100 pastea_p r265535 : Change name of patch to 1.1.13
2008-12-15 23:32:54 +0100 pastea_p r265518 : 2008-12-12 18:43:36 +0100 pastea_p r265435 : update to 1.1.13
2008-12-12 10:56:38 +0100 fs r265398 : #i95772# embed .manifest files into SHARED_LIBRARYs built in nsprpub, too
2008-12-12 09:56:38 +0100 fs r265391 : #i95772# don't use regxpcomp on Windows, it's not needed
2008-12-11 11:22:43 +0100 fs r265269 : #i95772# Moz/SeaMonkey libs on Windows now link against msvc?80.dll
2008-12-10 13:45:51 +0100 fs r265182 : proper OSL_ENSURE message
2008-11-13 13:18:03 +0100 fs r263635 : #i95772# more patches
2008-11-13 12:14:41 +0100 fs r263630 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:13:33 +0100 fs r263629 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:08:22 +0100 fs r263628 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:04:15 +0100 fs r263627 : #i95772#
2008-11-12 08:23:20 +0100 fs r263575 : i95772# use xpcom_core on Windows, too
2008-11-11 21:02:14 +0100 fs r263574 : i95772# use xpcom_core.lib on Windows, too
2008-11-11 20:58:07 +0100 fs r263573 : i95772# use xpcom_core.lib on Windows, too
2008-11-11 15:05:42 +0100 fs r263564 : alternative fix for part 1 of #i94957#
2008-11-10 22:18:14 +0100 fs r263541 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842)
2008-11-10 22:15:57 +0100 fs r263540 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842)
2008-11-10 09:28:26 +0100 fs r263509 : #i95772# when building on WNT, embed the .manifest file into the .dll/.exe
2008-11-10 09:19:06 +0100 fs r263508 : collect single patches which comprise the complete patch
2008-11-06 09:10:21 +0100 fs r263360 : #i95772# core_abspath does not work on Windows, too (at least in security/nss/cmd/shlibsign). Replace with 'cygpath -d -a'
2008-11-02 22:51:27 +0100 fs r263277 : #i95772# sanitize INCLUDEDIR and GENHEADERS to use cygwin path notation - cygwin's make 1.81 doesn't cope with Windows path notation
2008-11-02 22:50:15 +0100 fs r263276 : #i95772# no --enable-system-cairo on Windows
2008-10-18 20:12:36 +0200 pastea_p r262297 : 2008-10-16 17:15:35 +0200 ericb r262267 : #i94957# fix the breakage in connectivity, for the seamonkey migration
2008-10-16 17:14:49 +0200 ericb r262266 : #i94957# fix the breakage in connectivity, for the seamonkey migration
2008-10-16 16:58:21 +0200 ericb r262263 : #i94957# fix the breakage in connectivity, for the seamonkey migration
2008-10-15 20:16:28 +0200 ericb r262242 : #i94628# use mac as default toolkit on mac
2008-10-14 18:54:13 +0200 ericb r262216 : #i90774# modify the configure.in for moz2seamonkey migration
2008-10-14 18:48:57 +0200 ericb r262215 : #i90774# commit moz2seamonkey changes for svn migration
2008-10-14 18:47:05 +0200 ericb r262214 : #i90774# commit moz2seamonkey changes for svn migration
diff --git a/configure.in b/configure.in
index 94d57c0..e46776b 100644
--- a/configure.in
+++ b/configure.in
@@ -1760,12 +1760,15 @@ dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out
AC_MSG_RESULT([found Compiler version $CCNUMVER.])
if test "$CCNUMVER" -ge "001500000000"; then
COMEX=12
+ MSVSVER=2008
AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
elif test "$CCNUMVER" -ge "001400000000"; then
COMEX=11
+ MSVSVER=2005
AC_MSG_RESULT([found .NET 2005.])
elif test "$CCNUMVER" -ge "001300102240"; then
COMEX=10
+ MSVSVER=2003
AC_MSG_RESULT([found .NET 2003.])
else
AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
@@ -4126,9 +4129,14 @@ AC_SUBST(MOZILLA_VERSION)
AC_MSG_CHECKING([for toolkit mozilla should use])
if test -z "$with_mozilla_toolkit"; then
- if test "$_os" != "WINNT"; then
- MOZILLA_TOOLKIT=gtk2
- AC_MSG_RESULT([gtk2])
+ if test "$_os" != "WINNT" ; then
+ if test "$_os" = "Darwin" ; then
+ MOZILLA_TOOLKIT=mac
+ AC_MSG_RESULT([mac])
+ else
+ MOZILLA_TOOLKIT=gtk2
+ AC_MSG_RESULT([gtk2])
+ fi
fi
else
MOZILLA_TOOLKIT=$with_mozilla_toolkit
@@ -4150,7 +4158,7 @@ else
enable_build_mozilla=
fi
-AC_MSG_CHECKING([whether to build Mozilla])
+AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
if test -n "$enable_build_mozilla"; then
BUILD_MOZAB="TRUE"
AC_MSG_RESULT([yes])
@@ -4160,17 +4168,25 @@ else
fi
if test "$BUILD_MOZAB" = "TRUE"; then
+ if test "$_os" = "WINNT"; then
+ if test "$WITH_MINGWIN" != "yes"; then
+ # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
+ if test "$MSVSVER" != "2005"; then
+ AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.])
+ fi
+ else
+ AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.])
+ echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
+ fi
+ fi
+
if test -z "$MOZILLA_VERSION"; then
- MOZILLA_VERSION=1.7.5
- fi
- if test "$MOZILLA_VERSION" = "1.7b" ; then
- MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source"
- else
- MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}"
+ MOZILLA_VERSION=1.1.14
fi
+ MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
for e in gz bz2; do
AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e])
- if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
+ if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
AC_MSG_RESULT([not found])
HAVE_MOZILLA_TARBALL=n
else
@@ -4179,22 +4195,16 @@ if test "$BUILD_MOZAB" = "TRUE"; then
fi
done
if test "$HAVE_MOZILLA_TARBALL" != "y"; then
- AC_MSG_ERROR([Mozilla source archive not found.
+ AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
The archives can be found here:
-http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/])
+http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/])
fi
if test "$_os" = "WINNT"; then
- AC_MSG_CHECKING([for glib and libIDL binaries])
- if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
- -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
- -o ! -e "./moz/download/wintools.zip" ; then
-AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
- vc71-glib-1.2.10-bin.zip
- vc71-libIDL-0.6.8-bin.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
- wintools.zip
-(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)])
+ AC_MSG_CHECKING([for moztools binaries])
+ if test ! -e "moz/download/vc8-moztools.zip" ; then
+ AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip
+(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
else
AC_MSG_RESULT([ok])
fi
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f07438c..1be88f7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1771,20 +1771,17 @@ End
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
-#if defined WNT && \
- (defined M1310 || \
- ((defined M1400 || defined M1500) && \
- !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_File_Moz_Msvcp71
+#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
+File gid_File_Moz_Msvcp80
TXT_FILE_BODY;
Dir = gid_Dir_Program;
- Name = SCP2_URE_DL_NORMAL("msvcp71" SCP2_STDLP_DEBUG);
+ Name = SCP2_URE_DL_NORMAL("msvcp80");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
-File gid_File_Moz_Msvcr71
+File gid_File_Moz_Msvcr80
TXT_FILE_BODY;
Dir = gid_Dir_Program;
- Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
+ Name = SCP2_URE_DL_NORMAL("msvcr80");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
#endif
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index b7a9f15..a16d69e 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -991,6 +991,7 @@ unxlngx6
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
+ WITH_MOZILLA NO
}
common0
{
@@ -1307,6 +1308,7 @@ unxmacxi
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
+ MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
}
common1
{
More information about the ooo-build-commit
mailing list