[ooo-build-commit] Branch 'ooo/master' - 7 commits - instsetoo_native/util scp2/source solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jul 28 17:07:30 PDT 2009
instsetoo_native/util/makefile.mk | 12 ++
instsetoo_native/util/openoffice.lst | 49 +++++++++++
instsetoo_native/util/pack.lst | 1
scp2/source/ooo/common_brand.scp | 16 +++
scp2/source/ooo/file_library_ooo.scp | 11 ++
scp2/source/ooo/ure.scp | 4
scp2/source/ooo/windowscustomaction_ooo.scp | 10 ++
solenv/bin/modules/installer/epmfile.pm | 12 +-
solenv/bin/modules/installer/exiter.pm | 4
solenv/bin/modules/installer/globals.pm | 2
solenv/bin/modules/installer/windows/admin.pm | 3
solenv/bin/modules/installer/windows/property.pm | 5 -
solenv/bin/modules/installer/xpdinstaller.pm | 4
solenv/config/sdev300.ini | 1
solenv/inc/_tg_srs.mk | 100 ++++++++++++++++-------
solenv/inc/tg_srs.mk | 10 +-
16 files changed, 200 insertions(+), 44 deletions(-)
New commits:
commit 6da06cde81429110194ee116ee4bc49ab88c37fe
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Tue Jul 28 16:16:54 2009 +0000
CWS-TOOLING: integrate CWS smoketest23
2009-07-27 14:24:59 +0200 kz r274367 : #159577# correct permission after calling admin.pm
2009-07-22 15:45:19 +0200 kz r274245 : #159577# create path before calling admin.pm
2009-07-10 17:45:31 +0200 kz r273904 : #159577# fix for cygwin
2009-07-10 17:41:12 +0200 kz r273903 : #159577# dif. lineend fixed
2009-07-01 17:32:09 +0200 kz r273608 : #159577# an exithandler can be used from smoketest
2009-07-01 17:27:50 +0200 kz r273607 : #159577# now smoketest can use admin.pm for installation on windows
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index db46b7e..ad12493 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -106,6 +106,10 @@ sub exit_program
if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
installer::logger::stoptime();
+
+ if (defined($installer::globals::exithandler)) {
+ &$installer::globals::exithandler;
+ }
exit(-1);
}
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 1e2436b..f01f8cc 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -477,6 +477,8 @@ BEGIN
@emptypackages = ();
%fontpackageexists = ();
+ $exithandler = undef;
+
$plat = $^O;
if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )))
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 73b252c..808b367 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -79,10 +79,11 @@ sub unpack_cabinet_file
my $systemcall = "";
if ( $^O =~ /cygwin/i ) {
my $localunpackdir = qx{cygpath -w "$unpackdir"};
+ chomp ($localunpackdir);
$localunpackdir =~ s/\\/\\\\/g;
$cabfilename =~ s/\\/\\\\/g;
$cabfilename =~ s/\s*$//g;
- $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir;
+ $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir . " \> " . $expandlogfile;
}
else
{
commit 9eee37c6015b5e00ae69bba3063c8838fc471b77
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Tue Jul 28 15:55:01 2009 +0000
CWS-TOOLING: integrate CWS jl130_DEV300
2009-07-15 08:29:18 +0200 jl r273988 : #160194# patch flag for javaldx and sunjavaplugin
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index f616a89..bc9629b 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx
BIN_FILE_BODY;
Dir = gid_Dir_Ure_Bin;
Name = EXENAME(javaldx);
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
// CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
End
#endif
@@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_BARE("sunjavaplugin");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
// CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
End
#endif
commit 6a2a73012e158e02db1f82afe1db59d53b605192
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Tue Jul 28 15:05:10 2009 +0000
CWS-TOOLING: integrate CWS so91s10u8_DEV300
2009-07-21 09:12:39 +0200 releng r274160 : #b6835838#
2009-07-21 09:10:03 +0200 releng r274158 : #b6836360#
2009-06-26 16:18:53 +0200 releng r273427 : #i10000# remove wrong elsif lines
2009-06-26 13:54:07 +0200 obo r273408 : #b6836339#,#b6835838#,#b6836573#,#b6836360#,#b6840384#,#b6836711#,#159633#,#159138#,#b6838895#,#b6836340#,#b6836712# initial changes
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 9191623..da10a60 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1931,10 +1931,8 @@ sub include_patchinfos_into_pkginfo
$newline = "SUNW_REQUIRES=" . $requires . "\n";
add_one_line_into_file($changefile, $newline, $filename);
}
-
$newline = "SUNW_PATCH_PROPERTIES=\n";
add_one_line_into_file($changefile, $newline, $filename);
-
# $newline = "SUNW_PKGTYPE=usr\n";
# add_one_line_into_file($changefile, $newline, $filename);
@@ -1954,14 +1952,20 @@ sub get_solaris_language_for_langpack
$sollanguage =~ s/\-/\_/;
if ( $sollanguage eq "de" ) { $sollanguage = "de"; }
+ elsif ( $sollanguage eq "en_US" ) { $sollanguage = "en_AU,en_CA,en_GB,en_IE,en_MT,en_NZ,en_US,en_US.UTF-8"; }
elsif ( $sollanguage eq "es" ) { $sollanguage = "es"; }
elsif ( $sollanguage eq "fr" ) { $sollanguage = "fr"; }
+ elsif ( $sollanguage eq "hu" ) { $sollanguage = "hu_HU"; }
elsif ( $sollanguage eq "it" ) { $sollanguage = "it"; }
+ elsif ( $sollanguage eq "nl" ) { $sollanguage = "nl_BE,nl_NL"; }
+ elsif ( $sollanguage eq "pl" ) { $sollanguage = "pl_PL"; }
elsif ( $sollanguage eq "sv" ) { $sollanguage = "sv"; }
+ elsif ( $sollanguage eq "pt" ) { $sollanguage = "pt_PT"; }
elsif ( $sollanguage eq "pt_BR" ) { $sollanguage = "pt_BR"; }
+ elsif ( $sollanguage eq "ru" ) { $sollanguage = "ru_RU"; }
elsif ( $sollanguage eq "ja" ) { $sollanguage = "ja,ja_JP,ja_JP.PCK,ja_JP.UTF-8"; }
elsif ( $sollanguage eq "ko" ) { $sollanguage = "ko,ko.UTF-8"; }
- elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN,zh_CN.GB18030,zh.UTF-8"; }
+ elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN.GB18030,zh.UTF-8"; }
elsif ( $sollanguage eq "zh_TW" ) { $sollanguage = "zh_TW,zh_TW.BIG5,zh_TW.UTF-8,zh_HK.BIG5HK,zh_HK.UTF-8"; }
return $sollanguage;
@@ -2156,7 +2160,7 @@ sub prepare_packages
if ( $installer::globals::issolarisx86build ) { fix_architecture_setting($changefile); }
if ( ! $installer::globals::patch ) { set_patchlist_in_pkginfo_for_respin($changefile, $filename, $variableshashref, $packagename); }
if ( $installer::globals::patch ) { include_patchinfos_into_pkginfo($changefile, $filename, $variableshashref); }
- if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
+ if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" ) && ( $onepackage->{'language'} ne "en-US" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
installer::files::save_file($completefilename, $changefile);
my $prototypefilename = $packagename . ".prototype";
commit b52c0da6b57dd80469b068dea127e060ac20a528
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Jul 28 13:56:40 2009 +0000
#i103736# avoid additional dependencies showing up on the rsc commandline
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 3d26024..d1d1d70 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -15,7 +15,9 @@ ALLTAR : $(HIDSRS1PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
@@ -31,7 +33,9 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -41,7 +45,7 @@ $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -66,7 +70,9 @@ ALLTAR : $(HIDSRS2PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
@@ -82,7 +88,9 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -92,7 +100,7 @@ $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -117,7 +125,9 @@ ALLTAR : $(HIDSRS3PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
@@ -133,7 +143,9 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -143,7 +155,7 @@ $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -168,7 +180,9 @@ ALLTAR : $(HIDSRS4PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
@@ -184,7 +198,9 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -194,7 +210,7 @@ $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -219,7 +235,9 @@ ALLTAR : $(HIDSRS5PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
@@ -235,7 +253,9 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -245,7 +265,7 @@ $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -270,7 +290,9 @@ ALLTAR : $(HIDSRS6PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
@@ -286,7 +308,9 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -296,7 +320,7 @@ $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -321,7 +345,9 @@ ALLTAR : $(HIDSRS7PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
@@ -337,7 +363,9 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -347,7 +375,7 @@ $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -372,7 +400,9 @@ ALLTAR : $(HIDSRS8PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
@@ -388,7 +418,9 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -398,7 +430,7 @@ $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -423,7 +455,9 @@ ALLTAR : $(HIDSRS9PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
@@ -439,7 +473,9 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -449,7 +485,7 @@ $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
@@ -474,7 +510,9 @@ ALLTAR : $(HIDSRS10PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
@@ -490,7 +528,9 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -500,7 +540,7 @@ $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index d4a04f8..75b91b0 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -47,7 +47,9 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
@echo ------------------------------
@echo Making: $@
@@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
@@ -63,7 +65,9 @@ $(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) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
.ENDIF # "$(WITH_LANG)"!=""
@@ -73,7 +77,7 @@ $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-fp=$@.$(INPATH) \
- $< \
+ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
)
-$(RM) $@
$(RENAME) $@.$(INPATH) $@
commit 10ef292d48f6a9a49621811ceb91812bf3abe5ea
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jul 28 11:44:19 2009 +0000
#i10000# WITH_MOZILLA=NO removed for unxlngx6
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index b3ed564..c331c2f 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -991,7 +991,6 @@ 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
{
commit 59f2fc98477be75730f173af000a9fb5fd1783e3
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Tue Jul 28 10:56:08 2009 +0000
CWS-TOOLING: integrate CWS native256
2009-07-15 10:53:01 +0200 is r273996 : #i103325# new product ooodev sdk
2009-07-15 10:49:33 +0200 is r273995 : #i103325# new product ooodev sdk
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index d819d60..99ca8b1 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -149,6 +149,8 @@ ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
+sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
+
ure: $(foreach,i,$(alllangiso) ure_$i)
broffice: $(foreach,i,$(alllangiso) broffice_$i)
@@ -195,6 +197,8 @@ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
@@ -274,6 +278,14 @@ sdkoo_% :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
.IF "$(PKGFORMAT)"!=""
+$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
+sdkoodev_%{$(PKGFORMAT:^".")} :
+.ELSE # "$(PKGFORMAT)"!=""
+sdkoodev_% :
+.ENDIF # "$(PKGFORMAT)"!=""
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+
+.IF "$(PKGFORMAT)"!=""
$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
ure_%{$(PKGFORMAT:^".")} :
.ELSE # "$(PKGFORMAT)"!=""
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 7e65e07..76c70ed 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -323,6 +323,55 @@ OpenOffice_SDK
}
}
+OpenOffice_Dev_SDK
+{
+ Settings
+ {
+ downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
+ variables
+ {
+ PRODUCTNAME OOo-dev
+ PRODUCTVERSION 3.2
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION
+ BASISROOTNAME OOo-dev
+ UNIXBASISROOTNAME ooo-dev
+ POSTVERSIONEXTENSION SDK
+ POSTVERSIONEXTENSIONUNIX sdk
+ BRANDPACKAGEVERSION 3
+ PACKAGEVERSION 3.2.0
+ PACKAGEREVISION {milestone}
+ BASISPACKAGEPREFIX ooobasis-dev
+ UREPACKAGEPREFIX ooodev
+ SOLSUREPACKAGEPREFIX ooodev
+ REGISTRYLAYERNAME LayerDev
+ PACK_INSTALLED 1
+ POOLPRODUCT 0
+ DMG_VOLUMEEXTENSION SDK
+ DATABASENAME openofficeorg32devsdk
+ NO_README_IN_ROOTDIR 1
+ LICENSENAME LGPL
+ IGNOREDIRECTORYLAYER 1
+ NOVERSIONINDIRNAME 0
+ NOSPACEINDIRECTORYNAME 1
+ CHANGETARGETDIR 1
+ DOWNLOADBANNER ooosdkbanner.bmp
+ DOWNLOADBITMAP ooosdkbitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ DONTUSESTARTMENUFOLDER 1
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
+ }
+ active 1
+ compression 5
+ script sdkoo
+ include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+ }
+}
+
BrOffice
{
Settings
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 2e62a49..875865d 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -15,6 +15,7 @@ OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
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
+OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12 de ooolanguagepack
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index fde62da..5b97d23 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -584,6 +584,7 @@ sub get_size_value
}
}
my ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
+ $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
# Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
if ( $error )
{
@@ -592,7 +593,6 @@ sub get_size_value
($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_size_value"); }
}
- $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
$value = do_sum($rpmout); # adding all filesizes in bytes
$value = $value/1000;
@@ -722,6 +722,7 @@ sub get_fullpkgname_value
}
}
my ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
+ $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
# Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH
if ( $error )
{
@@ -731,7 +732,6 @@ sub get_fullpkgname_value
if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_fullpkgname_value"); }
}
$value = ${$returnarray}[0];
- $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
installer::remover::remove_leading_and_ending_whitespaces(\$value);
my $rpmname = $packagename;
commit a843a4243bdeea934faefe912d53ec0920a51589
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Tue Jul 28 09:21:19 2009 +0000
CWS-TOOLING: integrate CWS fwk112
2009-07-17 08:54:15 +0200 cd r274075 : #i102094# MinGW needs additional path info for linking
2009-07-13 15:09:07 +0200 cd r273938 : #i102094# Add special part for MinGW linking to imagehlp.lib
2009-07-10 08:05:14 +0200 cd r273871 : #i102094# Use size_t for constant values to fix warnings
2009-07-09 13:45:27 +0200 cd r273859 : #i102094# MinGW needs include malloc.h for function alloca
2009-07-09 12:37:39 +0200 cd r273856 : #i102094# Fix problem with signed/unsigned comparision warning
2009-06-19 11:34:40 +0200 cd r273154 : #i102094# Added comment for future maintenance
2009-06-19 11:34:11 +0200 cd r273153 : #i102094# Added comment for future maintenance
2009-06-16 17:25:03 +0200 cd r273032 : #i102094# Extend md5.cxx to detect Windows PE images and ignore PE header date+time/checksum to have the same MD5 checksum
2009-06-16 17:22:47 +0200 cd r273031 : #i102094# Added rebase custom action
2009-06-16 17:01:12 +0200 cd r273030 : #i102094# Use rebaseoo.exe instead of rebase.exe to prevent clash with build tool
2009-06-16 17:00:34 +0200 cd r273029 : #i102094# Execute rebase custom action for administrative installations
2009-06-16 16:59:11 +0200 cd r273028 : #i102094# Small changes for rebaseoo/rebasegui tools
2009-06-16 16:58:29 +0200 cd r273027 : i102094# Deliver rebase tool as rebaseoo.exe as build env already use a rebase.exe
2009-06-16 16:57:15 +0200 cd r273026 : i102094# Crash reporter should not use PE header date+time/checksum data for MD5 checksum
2009-05-29 17:03:26 +0200 cd r272474 : #i102094# Fix wrong deliver statement
2009-05-29 14:55:35 +0200 cd r272459 : #i102904# Make executables more robust. Add error message if installation cannot be found
2009-05-28 17:41:07 +0200 cd r272422 : CWS-TOOLING: rebase CWS fwk112 to trunk at 272291 (milestone: DEV300:m49)
2009-05-28 17:31:27 +0200 cd r272421 : #i10000# Resolve conflict on merge
2009-05-28 15:32:09 +0200 cd r272409 : #i102094# Added resource and localization files for rebasegui tool
2009-05-27 13:56:33 +0200 cd r272341 : #i102094# Added new command line tool to rebase libraries to a default virtual load address. Additional GUI tool to check the state of an installation
2009-05-26 10:49:20 +0200 cd r272285 : #i102094# New command line tool to rebase libraries to a default virtual load address
2009-05-26 10:40:02 +0200 cd r272282 : #i102094# New command line tool to rebase libraries to a default virtual load address
2009-05-26 08:57:24 +0200 cd r272280 : #i102094# Fixed wrong variable usage
2009-05-26 08:41:29 +0200 cd r272278 : #i102094# New command line tool to rebase libraries to a default virtual load address
2009-05-20 16:47:24 +0200 cd r272141 : #102094# Added missing include statement for debug build
2009-05-20 15:39:21 +0200 is r272136 : #102094# rebase to default value in installation
2009-05-20 15:38:38 +0200 is r272135 : #102094# rebase to default value in installation
2009-05-20 15:37:45 +0200 is r272134 : #102094# rebase to default value in installation
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 920f5c5..7863b39 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -460,6 +460,22 @@ File gid_Brand_File_Bin_Unopkgexe
End
#endif
+#ifdef WNT
+File gid_Brand_File_Bin_Rebaseoo
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Styles = (PACKED);
+ Name = "rebaseoo.exe";
+End
+
+File gid_Brand_File_Bin_Rebasegui
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Styles = (PACKED);
+ Name = "rebasegui.exe";
+End
+#endif
+
#if defined UNX && !defined MACOSX
File gid_Brand_File_Script_Unopkg
BIN_FILE_BODY;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0c7e4a3..98d407c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -894,6 +894,17 @@ End
#endif
+#ifdef WNT
+
+File gid_File_Lib_Rebasemsi
+ TXT_FILE_BODY;
+ Name = "rebase.dll";
+ Dir = gid_Dir_Program;
+ Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
+End
+
+#endif
+
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
File gid_File_Lib_Localedata_En
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 2328cbc..d5ececc 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -483,6 +483,16 @@ WindowsCustomAction gid_Customaction_ShowReleaseNotes2
Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
End
+WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
+ Name = "RebaseLibrariesOnProperties";
+ Typ = "65";
+ Source = "rebase.dll";
+ Target = "RebaseLibrariesOnProperties";
+ Inbinarytable = 1;
+ Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+ Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+End
+
WindowsCustomAction gid_Customaction_ShowSurvey
Name = "ShowSurveyAfterUninstall";
Typ = "65";
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 6146595..68e4992 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -304,9 +304,12 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
- my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "0" . "\n";
+ my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
+ $onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n";
+ push(@{$propertyfile}, $onepropertyline);
+
if ( $installer::globals::sundirexists )
{
my $onepropertyline = "SUNDIREXISTS" . "\t" . "1" . "\n";
More information about the ooo-build-commit
mailing list