[ooo-build-commit] .: 61 commits - scp2/source solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 8 08:35:23 PDT 2010
scp2/source/ooo/common_brand.scp | 18 ++-
scp2/source/ooo/profileitem_ooo.scp | 1
scp2/source/ooo/windowscustomaction_ooo.scp | 29 +++++
solenv/bin/build.pl | 6 -
solenv/bin/modules/installer/epmfile.pm | 48 ++------
solenv/bin/modules/installer/simplepackage.pm | 150 ++++++++++++--------------
solenv/bin/subsequenttests | 2
solenv/bin/transform_description.pl | 4
solenv/inc/_tg_srs.mk | 20 +--
solenv/inc/minor.mk | 6 -
solenv/inc/rules.mk | 2
solenv/inc/settings.mk | 3
solenv/inc/target.mk | 3
solenv/inc/tg_config.mk | 2
solenv/inc/tg_help.mk | 10 +
solenv/inc/tg_srs.mk | 2
solenv/inc/tg_xmerge.mk | 108 ++++++++++++++++++
solenv/inc/version.hrc | 2
solenv/inc/version_so.hrc | 4
19 files changed, 269 insertions(+), 151 deletions(-)
New commits:
commit db5eab1a8ef5522cd80391fe0718ce17695fd0c5
Merge: d01099e... e77fae2...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 8 11:34:00 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit d01099e4dae44ec8dab839114082e68bd6435135
Merge: 85ea422... 251a3be...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 7 09:33:00 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit e77fae24e24e2def264b5f24fd5755220c3dfd20
Author: Kurt Zenker <kz at openoffice.org>
Date: Mon Sep 6 14:50:48 2010 +0200
masterfix: #i10000# use last version of sooo330.ini
diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index a6807e5..ab42c23 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -96,7 +96,7 @@ common
product full
PROEXT .pro
PROFULLSWITCH product=full
- WITH_LANG af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sq sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
+ WITH_LANG af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
}
pro:1 IF %UPDATER% != YES
{
commit c24a6cc9a73910799a967e75fc430c336909e484
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 3 17:04:59 2010 +0200
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 11e864f..d769c5b 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m6(Build:9524)
-BUILD=9524
-LAST_MINOR=m6
+RSCREVISION=330m7(Build:9526)
+BUILD=9526
+LAST_MINOR=m7
SOURCEVERSION=OOO330
commit 52e465962da883fb3771ee735bfb4753d0fcecad
Merge: 8d8e07c... 4894b0a...
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 3 15:24:25 2010 +0200
CWS-TOOLING: integrate CWS ooo330l10n2
commit 8d8e07c690775c1b14d5b5d980d3387836d096fe
Merge: 251a3be... 6c301b4...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Aug 31 15:51:23 2010 +0200
CWS-TOOLING: integrate CWS fwk154
commit 251a3be85a6cd5da0075c8ef85dc83a2ed5e15f2
Author: Release Engineering <releng at openoffice.org>
Date: Thu Aug 26 17:43:27 2010 +0200
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a6e3941..11e864f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m5(Build:9521)
-BUILD=9521
-LAST_MINOR=m5
+RSCREVISION=330m6(Build:9524)
+BUILD=9524
+LAST_MINOR=m6
SOURCEVERSION=OOO330
commit 5d599a71562e4fc384089022e637efda6ee732b5
Merge: 7d9a97a... ddb099a...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Aug 26 15:45:29 2010 +0200
CWS-TOOLING: integrate CWS coc03
commit ddb099ae44524b5f03a25af3b4d7a9c9dfbc8f8d
Author: Juergen Schmidt <jsc at openoffice.org>
Date: Wed Aug 25 15:25:30 2010 +0200
coc03: merge changes from ext004, and introduce XHPDEST
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
index 021e1c0..b0d0ce7 100644
--- a/solenv/bin/transform_description.pl
+++ b/solenv/bin/transform_description.pl
@@ -55,9 +55,9 @@ sub parse_args
# check which languages to use
my $languages = $ENV{WITH_LANG};
- if ( ! defined $languages )
+ if ( ( ! defined $languages ) || ( "$languages" eq "" ) )
{
- print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+ print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n";
$languages = "en-US";
}
@languages = split ( ' ', $languages );
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
index b98e0c6..bfd5a0d 100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -47,7 +47,7 @@ $(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
.IF "$(WITH_LANG)"!=""
- $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+ $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
.ELSE # "$(WITH_LANG)"!=""
cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
.ENDIF # "$(WITH_LANG)"!=""
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index fa3e229..6ff412b 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -27,33 +27,32 @@
.IF "$(XTXFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
+L10NEXT*=.txt
+XTX_TARGET_PATH*=$(MISC)/$(TARGET)
-.IF "$(L10NEXT)"==""
-L10NEXT:=.txt
-.ENDIF
+ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES)
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES)
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXFILES)
$(XTXFILES) : $(LOCALIZESDF)
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk
+.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk
.IF "$(alllangiso)"!="$(last_merge)"
XTXMERGEPHONY:=.PHONY
.ENDIF # "$(alllangiso)" != "$(last_merge)"
-$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
- $(COMMAND_ECHO)$(COPY) $< $@
+ $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT)
.ELSE # "$(WITH_LANG)"==""
@@-$(RM) $@
$(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
$(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
.ENDIF # "$(WITH_LANG)"==""
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST)
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST)
.IF "$(WITH_LANG)"!=""
# xtxex command file requirements:
# - one file per line
commit 7d9a97af7bfcd711e6f4e95c5c28bf7c657fe148
Merge: 3c81bc6... 561cd79...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Aug 25 14:42:57 2010 +0200
CWS-TOOLING: integrate CWS ext004
commit 4894b0a26c7285b426a6738101fe55ba80eb35de
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Aug 25 10:40:29 2010 +0200
ooo330l10n2: #i113960#, #i113994# , #i113945#, #i113816#, #i113963#, #i113967#, #i113825#, #i113986#, #i113996#, #i113736#, #i113944#, #i113968#, #i111094#, #i113983# and pootle update for OOO330 l10n
diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index ab42c23..a6807e5 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -96,7 +96,7 @@ common
product full
PROEXT .pro
PROFULLSWITCH product=full
- WITH_LANG af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
+ WITH_LANG af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sq sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
}
pro:1 IF %UPDATER% != YES
{
commit 6c301b4695ce58e530fbd8e93f8915f80bcfcbc0
Merge: 3c81bc6... fef44be...
Author: Dirk Voelzke <dv at openoffice.org>
Date: Wed Aug 25 10:35:59 2010 +0200
fwk154: merged heads
commit fef44be31db0616502cedd8b72fcfb90c7991bc4
Author: Dirk Voelzke <dv at openoffice.org>
Date: Wed Aug 25 08:25:36 2010 +0200
fwk154#i114083# fixed some file properies for the Oracle Open Office executables
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
old mode 100644
new mode 100755
index 9c2b9be..1abf729
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -38,7 +38,7 @@
#define VER_FINAL 0
#define VER_DAY 1
-#define VER_MONTH 1
+#define VER_MONTH 8
#define VER_YEAR 2010
#ifndef VER_FIRSTYEAR
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
old mode 100644
new mode 100755
index 9773f10..5e2c35b
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -25,7 +25,7 @@
*
*************************************************************************/
-#define VERSION 9
+#define VERSION 3
#define SUBVERSION 3
//#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID)
// .0 + VER_CONCEPT
@@ -38,7 +38,7 @@
#define VER_FINAL 0
#define VER_DAY 1
-#define VER_MONTH 1
+#define VER_MONTH 8
#define VER_YEAR 2010
#ifndef VER_FIRSTYEAR
commit 561cd791cf0807cb43e162281c714def6d5aeaba
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Mon Aug 23 21:18:17 2010 +0200
ext004: also recognize a set, but empty WITH_LANG
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
index 021e1c0..b0d0ce7 100644
--- a/solenv/bin/transform_description.pl
+++ b/solenv/bin/transform_description.pl
@@ -55,9 +55,9 @@ sub parse_args
# check which languages to use
my $languages = $ENV{WITH_LANG};
- if ( ! defined $languages )
+ if ( ( ! defined $languages ) || ( "$languages" eq "" ) )
{
- print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+ print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n";
$languages = "en-US";
}
@languages = split ( ' ', $languages );
commit efeaec936d8babf4de996e72d436c81cf6786376
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Mon Aug 23 21:13:50 2010 +0200
ext004: correction to the previous fix
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index ac1ddab..6ff412b 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -45,7 +45,7 @@ XTXMERGEPHONY:=.PHONY
$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
- $(COMMAND_ECHO)$(COPY) $< $(@:f)_en-US$(L10NEXT)
+ $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT)
.ELSE # "$(WITH_LANG)"==""
@@-$(RM) $@
$(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
commit c78e4efe36ad47b81d39aa6388b613df68e5afa9
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Mon Aug 23 21:04:03 2010 +0200
ext004: without WITH_LANG, ensure the XTX file nonetheless has the en-US prefix
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index f8f7879..ac1ddab 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -45,7 +45,7 @@ XTXMERGEPHONY:=.PHONY
$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
- $(COMMAND_ECHO)$(COPY) $< $@
+ $(COMMAND_ECHO)$(COPY) $< $(@:f)_en-US$(L10NEXT)
.ELSE # "$(WITH_LANG)"==""
@@-$(RM) $@
$(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
commit 200cc116c073a05befa12b065cd4604435322c98
Merge: 10a6845... 3c81bc6...
Author: Juergen Schmidt <jsc at openoffice.org>
Date: Mon Aug 23 14:28:22 2010 +0200
coc03: merge with ooo303m5
diff --cc solenv/inc/tg_help.mk
index b98e0c6,89f1eba..b98e0c6
mode 100755,100644..100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
commit 10a68459b9253a7ce2ecf80a8df1b5aa8fadc35f
Author: Juergen Schmidt <jsc at openoffice.org>
Date: Mon Aug 23 13:45:23 2010 +0200
i113538: add XHPDEST variable to make destination of generarted xhp file sconfigurable
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
old mode 100644
new mode 100755
index aa62b1c..b98e0c6
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -31,13 +31,15 @@
aux_alllangiso*:=$(alllangiso)
SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
-HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+XHPDEST*:=$(COMMONMISC)
+
+HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
$(HLANGXHPFILES) : $$(@:d)thisdir.created
-$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
+$(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
@$(TOUCH) $@
# internal dependencies not sufficient to trigger merge?
# @$(NULL)
@@ -45,9 +47,9 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
.IF "$(WITH_LANG)"!=""
- $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+ $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
.ELSE # "$(WITH_LANG)"!=""
- cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
+ cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
.ENDIF # "$(WITH_LANG)"!=""
.IF "$(OS)"=="SOLARIS"
@$(ECHONL) " "
commit 26910ddb06f393528c06e51a5116c3e8aa5e8246
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Aug 20 09:37:47 2010 +0200
txtl10n: allow localizing xtx files to a non-default location (XTX_TARGET_PATH)
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index fa3e229..f8f7879 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -27,23 +27,22 @@
.IF "$(XTXFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
+L10NEXT*=.txt
+XTX_TARGET_PATH*=$(MISC)/$(TARGET)
-.IF "$(L10NEXT)"==""
-L10NEXT:=.txt
-.ENDIF
+ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES)
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES)
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXFILES)
$(XTXFILES) : $(LOCALIZESDF)
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk
+.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk
.IF "$(alllangiso)"!="$(last_merge)"
XTXMERGEPHONY:=.PHONY
.ENDIF # "$(alllangiso)" != "$(last_merge)"
-$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
$(COMMAND_ECHO)$(COPY) $< $@
@@ -53,7 +52,7 @@ $(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
$(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
.ENDIF # "$(WITH_LANG)"==""
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST)
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST)
.IF "$(WITH_LANG)"!=""
# xtxex command file requirements:
# - one file per line
commit 3c81bc6102f96f679daa55944a17e8a0df316865
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Aug 19 15:13:01 2010 +0200
#i113965# fix for start directory
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
old mode 100755
new mode 100644
index d4d728c..5810ebb
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1150,8 +1150,8 @@ sub get_stand_dir {
print_error('Found no project to build');
};
$initial_module = substr($initial_dir, length($StandDir) + 1);
- if ($initial_module =~ /\\|\//) {
- $initial_module = File::Basename::dirname($initial_module);
+ if ($initial_module =~ /(\\|\/)/) {
+ $initial_module = $`;
};
$module_paths{$initial_module} = $StandDir . "/$initial_module";
# $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
commit c6b40a36b28fea2c819b1fba148182b6f6b29528
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 17:38:47 2010 +0200
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f245848..a6e3941 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m4(Build:9520)
-BUILD=9520
-LAST_MINOR=m4
+RSCREVISION=330m5(Build:9521)
+BUILD=9521
+LAST_MINOR=m5
SOURCEVERSION=OOO330
commit dc7820462bad881949007e6ae7510b1cf63eacea
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 17:20:56 2010 +0200
masterfix: #i113912# fixed creating log directory
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 6890cc1..d4d728c 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -234,7 +234,7 @@
if (defined $html_path) {
$html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
} else {
- my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/../log'));
+ my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/..')) . '/log';
if ((!-d $log_directory) && (!mkdir($log_directory))) {
print_error("Cannot create $log_directory for writing html file\n");
};
commit e78b9961b8e0d882e841c0f626597ecac2a16d86
Merge: f0548b2... 29847bb...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 16:59:10 2010 +0200
CWS-TOOLING: integrate CWS txtl10n
diff --cc solenv/inc/tg_help.mk
index aa62b1c,89f1eba..89f1eba
mode 100644,100755..100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
commit f0548b287d1ebee53a1974f0e63dc377d56424c2
Merge: b2cf522... 743f394...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit 743f3949570d3fadd57e66c4e17d5d4805c846f4
Merge: 14e380d... 4b3b964...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit 4b3b9649dfb62c976f313c13a30af38b29b65985
Merge: 2fe3d09... 14e380d...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit 14e380d63298654fe94f1ba5d668d22aaf6c1aeb
Merge: eaee262... 7ff7653...
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit eaee2624a3f596221e0836a0cee575339e66795d
Merge: e77c2fc... 0ee70a8...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Thu Jul 29 13:55:23 2010 +0200
jl154: Local merge
commit 0ee70a80e279f8028cb215e8ed9fe639fabc4644
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Jul 28 17:03:11 2010 +0200
jl154 #162868# no registration of extensions in products without unopkg file
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index addda2d..aaa70e9 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -110,6 +110,13 @@ sub register_extensions
$infoline = "Language packs do not contain unopkg!\n";
push( @installer::globals::logfileinfo, $infoline);
}
+
+ if ( ! -f $unopkgfile )
+ {
+ $unopkgexists = 0;
+ $infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
if ( $unopkgexists )
{
commit 29847bb7ea1c0482f8f07016d02aec80a40e2e35
Merge: 907ee04... 7ff7653...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Jul 27 16:50:00 2010 +0200
merged OOO330 m2
commit 907ee04e827ad42346dd0a06787d7e600c68361d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jul 23 14:26:15 2010 +0200
txtl10n: removal of verbose switch
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 063f98f..a71216f 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -28,7 +28,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -81,7 +81,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -134,7 +134,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -187,7 +187,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -240,7 +240,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -293,7 +293,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -346,7 +346,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -399,7 +399,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -452,7 +452,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -505,7 +505,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 63c4d0c..7ad8fd1 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -722,7 +722,7 @@ $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)$(ULFEX) $(ULFEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c5283fb..cfd4d89 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -964,9 +964,6 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
.IF "$(VERBOSE)" == "FALSE"
VERBOSITY=-quiet
ZIP_VERBOSITY=-q
- TRANSEX_VERBOSITY=-QQ
- CFGEX_VERBOSITY=-QQ
- ULFEX_VERBOSITY=-QQ
.ENDIF
.ENDIF # "$(VERBOSE)" == "TRUE"
COMPILE_ECHO_SWITCH=
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 68f3121..0fe0614 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1518,7 +1518,7 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
.ENDIF # "$(LASTRUN_MERGED)"=="TRUE"
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)$(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
.ENDIF # "$(WITH_LANG)"==""
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index bbc720e..cfe2fe1 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -137,7 +137,7 @@ $(XCU_LANG) : $(LOCALIZESDF)
$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(CFGEX) $(CFGEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
.IF "$(XCU_LANG)" != ""
$(XCU_LANG) : $(XSLDIR)/alllang.xsl
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
old mode 100644
new mode 100755
index aa62b1c..89f1eba
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -45,7 +45,7 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
.IF "$(WITH_LANG)"!=""
- $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+ $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
.ELSE # "$(WITH_LANG)"!=""
cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
.ENDIF # "$(WITH_LANG)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 347dd25..4e70eb0 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -56,7 +56,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESD
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
- $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
commit e77c2fc775340305b6335a051cfbb75269c9951e
Author: Ingo Schmidt <is at openoffice.org>
Date: Fri Jul 23 10:37:24 2010 +0200
jl154 #162868# bundled folder in prereg folder
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 0a15626..addda2d 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -72,7 +72,7 @@ sub get_extensions_dir
my $extensiondir = $subfolderdir . $installer::globals::separator;
if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
- my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg";
+ my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled";
return ( $extensionsdir, $preregdir );
}
commit 4ba1f37d21774aafcc6e15bc588f303e86a5c72e
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 22 17:06:05 2010 +0200
txtl10n: #i113008# #i113125# cleanup / write to misc
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index b494cfd..fa3e229 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -43,7 +43,7 @@ $(XTXFILES) : $(LOCALIZESDF)
XTXMERGEPHONY:=.PHONY
.ENDIF # "$(alllangiso)" != "$(last_merge)"
-$(COMMONMISC)/$(PACKAGE)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
$(COMMAND_ECHO)$(COPY) $< $@
commit 5ea6e495f7c5232a14462d72c96fedfe8e535825
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jul 22 16:44:05 2010 +0200
txtl10n: #i113008# #i113125# cleanup / variable rename
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index e5fa65e..b494cfd 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -49,19 +49,19 @@ $(COMMONMISC)/$(PACKAGE)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
$(COMMAND_ECHO)$(COPY) $< $@
.ELSE # "$(WITH_LANG)"==""
@@-$(RM) $@
- $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
- $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+ $(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
+ $(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
.ENDIF # "$(WITH_LANG)"==""
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
+$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST)
.IF "$(WITH_LANG)"!=""
# xtxex command file requirements:
# - one file per line
# - no spaces
# - no empty lines
# $(uniq ...) to workaround $assign adding the value twice...
- @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
- $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)"
+ @noop $(assign XTXMERGEFILELIST:=$(uniq $(XTXMERGELIST)))
+ $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(XTXDESTDIR) -i @$(mktmp $(XTXMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)"
.ENDIF # "$(WITH_LANG)"!=""
@-$(RM) $@
@@ -87,20 +87,20 @@ $(OUT_HELP)/en-US/help.tree $(TREEMERGEPHONY) : help.tree
$(COMMAND_ECHO)$(COPY) $< $@
.ELSE # "$(WITH_LANG)"==""
@@-$(RM) $@
- $(COMMAND_ECHO)@noop $(assign PMERGELIST1+:=$(<:f))
- $(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d))
+ $(COMMAND_ECHO)@noop $(assign TREEMERGELIST+:=$(<:f))
+ $(COMMAND_ECHO)@noop $(assign TREEDESTDIR:=$(@:d:d:d))
.ENDIF # "$(WITH_LANG)"==""
-$(MISC)/$(TARGET).tree.pmerge.mk : $(PMERGELIST1)
+$(MISC)/$(TARGET).tree.pmerge.mk : $(TREEMERGELIST)
.IF "$(WITH_LANG)"!=""
# xtxex command file requirements:
# - one file per line
# - no spaces
# - no empty lines
# $(uniq ...) to workaround $assign adding the value twice...
- @noop $(assign PMERGEFILELIST1:=$(uniq $(PMERGELIST1)))
+ @noop $(assign TREEMERGEFILELIST:=$(uniq $(TREEMERGELIST)))
# Variables for the pattern filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
- $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree"
+ $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(TREEDESTDIR) -i @$(mktmp $(TREEMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree"
.ENDIF # "$(WITH_LANG)"!=""
@-$(RM) $@
$(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
commit db31206f353a540215c48b54cea8eafeb57e69c0
Merge: ede2323... 917214a...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Thu Jul 22 10:44:04 2010 +0200
jl154: Local branch merge
commit c2154599a53159774a310ad665d5aff0ca0a133d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 21 19:05:43 2010 +0200
txtl10n: #i113008# #i113125# changed output dir
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index 943b807..e5fa65e 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -81,7 +81,7 @@ $(TREEFILE) : $(LOCALIZESDF)
TREEMERGEPHONY:=.PHONY
.ENDIF # "$(alllangiso)" != "$(last_merge)"
-$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(TREEMERGEPHONY) : %.tree
+$(OUT_HELP)/en-US/help.tree $(TREEMERGEPHONY) : help.tree
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
$(COMMAND_ECHO)$(COPY) $< $@
commit 917214a6bd2426892c68297365c60c2ac4cdc0f6
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Jul 21 12:04:31 2010 +0200
jl154 #162868# new share/prereg folder
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c444273..5ed8c97 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -44,6 +44,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Config,
gid_Brand_Dir_Share_Extension,
gid_Brand_Dir_Share_Extensions,
+ gid_Brand_Dir_Share_Prereg,
gid_Brand_Dir_Share_Uno_Packages,
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
@@ -223,6 +224,12 @@ Directory gid_Brand_Dir_Share_Extensions
DosName = "extensions";
End
+Directory gid_Brand_Dir_Share_Prereg
+ ParentID = gid_Brand_Dir_Share;
+ DosName = "prereg";
+ Styles = (CREATE);
+End
+
Directory gid_Brand_Dir_Share_Extensions_Install
ParentID = gid_Brand_Dir_Share_Extension;
DosName = "install";
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 94a3e5b..0a15626 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -71,9 +71,10 @@ sub get_extensions_dir
my $extensiondir = $subfolderdir . $installer::globals::separator;
if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
- $extensiondir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+ my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+ my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg";
- return $extensiondir;
+ return ( $extensionsdir, $preregdir );
}
####################################################
@@ -82,13 +83,13 @@ sub get_extensions_dir
sub register_extensions
{
- my ($officedir, $languagestringref, $presetsdir) = @_;
+ my ($officedir, $languagestringref, $preregdir) = @_;
my $infoline = "";
- if ( $presetsdir eq "" )
+ if ( $preregdir eq "" )
{
- $infoline = "ERROR: Failed to determine directory \"presets\" for extension registration! Please check your installation set.\n";
+ $infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n";
push( @installer::globals::logfileinfo, $infoline);
installer::exiter::exit_program($infoline, "register_extensions");
}
@@ -128,17 +129,16 @@ sub register_extensions
if ( $^O =~ /cygwin/i )
{
$localtemppath = $installer::globals::cyg_temppath;
- $presetsdir = qx{cygpath -m "$presetsdir"};
- chomp($presetsdir);
+ $preregdir = qx{cygpath -m "$preregdir"};
+ chomp($preregdir);
}
$localtemppath =~ s/\\/\//g;
$slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
}
- $presetsdir =~ s/\/\s*$//g;
- my $bundleddir = $presetsdir . "/bundled";
+ $preregdir =~ s/\/\s*$//g;
- my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
+ my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
print "... $systemcall ...\n";
@@ -638,8 +638,6 @@ sub create_simple_package
installer::logger::print_message( "... creating directories ...\n" );
installer::logger::include_header_into_logfile("Creating directories:");
- my $presetsdir = "";
-
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
my $onedir = ${$dirsref}[$i];
@@ -647,7 +645,6 @@ sub create_simple_package
if ( $onedir->{'HostName'} )
{
my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
- if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
if ( ! -d $destdir )
{
@@ -777,14 +774,14 @@ sub create_simple_package
installer::logger::print_message( "... removing superfluous directories ...\n" );
installer::logger::include_header_into_logfile("Removing superfluous directories:");
- my $extensionfolder = get_extensions_dir($subfolderdir);
+ my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);
installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
# Registering the extensions
installer::logger::print_message( "... registering extensions ...\n" );
installer::logger::include_header_into_logfile("Registering extensions:");
- register_extensions($subfolderdir, $languagestringref, $presetsdir);
+ register_extensions($subfolderdir, $languagestringref, $preregdir);
if ( $installer::globals::compiler =~ /^unxmacx/ )
{
commit 5f98650d9fe267890e703f9aa9e8dcd6e0ec959b
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Jul 20 13:11:02 2010 +0200
txtl10n: #i113008# #i113125# rename .xht to .tree
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index 26c81ff..943b807 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -68,20 +68,20 @@ $(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
$(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
.ENDIF # "$(XTXFILES)"!=""
-.IF "$(XHTFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).xht.pmerge.mk $(XHTFILES)
+.IF "$(TREEFILE)"!=""
+ALLTAR : $(MISC)/$(TARGET).tree.pmerge.mk $(TREEFILE)
-$(MISC)/$(TARGET).xht.pmerge.mk : $(XHTFILES)
+$(MISC)/$(TARGET).tree.pmerge.mk : $(TREEFILE)
-$(XHTFILES) : $(LOCALIZESDF)
+$(TREEFILE) : $(LOCALIZESDF)
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).xht.pmerge.mk
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).tree.pmerge.mk
.IF "$(alllangiso)"!="$(last_merge)"
-XHTMERGEPHONY:=.PHONY
+TREEMERGEPHONY:=.PHONY
.ENDIF # "$(alllangiso)" != "$(last_merge)"
-$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht
+$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(TREEMERGEPHONY) : %.tree
@@-$(MKDIRHIER) $(@:d)
.IF "$(WITH_LANG)"==""
$(COMMAND_ECHO)$(COPY) $< $@
@@ -91,7 +91,7 @@ $(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht
$(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d))
.ENDIF # "$(WITH_LANG)"==""
-$(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
+$(MISC)/$(TARGET).tree.pmerge.mk : $(PMERGELIST1)
.IF "$(WITH_LANG)"!=""
# xtxex command file requirements:
# - one file per line
@@ -104,6 +104,6 @@ $(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
.ENDIF # "$(WITH_LANG)"!=""
@-$(RM) $@
$(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-.ENDIF # "$(XHTFILES)"!=""
+.ENDIF # "$(TREEFILE)"!=""
commit ede232332f8582b78ba0c41c03b436786df5a516
Merge: 94e7115... 71854ea...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Mon Jul 19 14:42:46 2010 +0200
jl154: Local merge
commit 71854ea302c8dc12cfa35dfeaaa6a24fedf5ed84
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 19 14:23:27 2010 +0200
jl154 #162868# guarantee existence of extensions folder
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b1f39c2..c444273 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,7 +98,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_Printeradmin,
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
- gid_Brand_File_Share_Xdg_Writer);
+ gid_Brand_File_Share_Xdg_Writer,
+ gid_Brand_File_Txt_Package);
Unixlinks = (gid_Brand_Unixlink_BasisLink,
gid_Brand_Unixlink_Program,
gid_Brand_Unixlink_Unopkg,
@@ -220,7 +221,6 @@ End
Directory gid_Brand_Dir_Share_Extensions
ParentID = gid_Brand_Dir_Share;
DosName = "extensions";
- Styles = (CREATE);
End
Directory gid_Brand_Dir_Share_Extensions_Install
@@ -646,6 +646,13 @@ File gid_Brand_File_Images_Brand_Zip
Styles = (PACKED);
End
+File gid_Brand_File_Txt_Package
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Extensions;
+ Name = "package.txt";
+ Styles = (PACKED);
+End
+
File gid_Brand_File_Share_Registry_Brand_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
commit 94e71155402e46c558aaf7e991bc2cb3428f88b8
Merge: ee31558... 1a57e6c...
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit ee315588001238375acdebcdc1623bbc29b34b22
Merge: 5c67018... 0f04949...
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Jul 16 12:10:22 2010 +0200
jl154 merging
commit 5c670180591181a8fe3d75f2b9032bdedd6c15e7
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Jul 16 11:52:44 2010 +0200
jl154 #162868# removing the package.txt from the extensions folder. Extensions folder will be created in a different way than installing a dummy file
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c444273..b1f39c2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,8 +98,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_Printeradmin,
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
- gid_Brand_File_Share_Xdg_Writer,
- gid_Brand_File_Txt_Package);
+ gid_Brand_File_Share_Xdg_Writer);
Unixlinks = (gid_Brand_Unixlink_BasisLink,
gid_Brand_Unixlink_Program,
gid_Brand_Unixlink_Unopkg,
@@ -221,6 +220,7 @@ End
Directory gid_Brand_Dir_Share_Extensions
ParentID = gid_Brand_Dir_Share;
DosName = "extensions";
+ Styles = (CREATE);
End
Directory gid_Brand_Dir_Share_Extensions_Install
@@ -646,13 +646,6 @@ File gid_Brand_File_Images_Brand_Zip
Styles = (PACKED);
End
-File gid_Brand_File_Txt_Package
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Extensions;
- Name = "package.txt";
- Styles = (PACKED);
-End
-
File gid_Brand_File_Share_Registry_Brand_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
commit b9c218048ab0ca4274b61bda3be9d70206417e07
Author: Joachim Lingner <jl at openoffice.org>
Date: Thu Jul 15 17:22:01 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6f0384a..c444273 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -43,6 +43,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_C05_Faq,
gid_Brand_Dir_Share_Config,
gid_Brand_Dir_Share_Extension,
+ gid_Brand_Dir_Share_Extensions,
gid_Brand_Dir_Share_Uno_Packages,
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
@@ -97,7 +98,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_Printeradmin,
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
- gid_Brand_File_Share_Xdg_Writer);
+ gid_Brand_File_Share_Xdg_Writer,
+ gid_Brand_File_Txt_Package);
Unixlinks = (gid_Brand_Unixlink_BasisLink,
gid_Brand_Unixlink_Program,
gid_Brand_Unixlink_Unopkg,
@@ -219,7 +221,6 @@ End
Directory gid_Brand_Dir_Share_Extensions
ParentID = gid_Brand_Dir_Share;
DosName = "extensions";
- Styles = (CREATE);
End
Directory gid_Brand_Dir_Share_Extensions_Install
@@ -645,6 +646,13 @@ File gid_Brand_File_Images_Brand_Zip
Styles = (PACKED);
End
+File gid_Brand_File_Txt_Package
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Extensions;
+ Name = "package.txt";
+ Styles = (PACKED);
+End
+
File gid_Brand_File_Share_Registry_Brand_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
commit ffbce6f2eb359b5e2b3b0674502904bc8463f363
Author: Joachim Lingner <jl at openoffice.org>
Date: Thu Jul 15 16:48:34 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 52c89ef..6f0384a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -85,7 +85,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
gid_Brand_File_Share_Registry_Brand_Xcd,
- gid_Brand_File_Share_Registry_O5oo_Xcd
+ gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
gid_Brand_File_Share_Xdg_Calc,
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 9138f5b..94a3e5b 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -82,13 +82,13 @@ sub get_extensions_dir
sub register_extensions
{
- my ($officedir, $languagestringref, $bundleddir) = @_;
+ my ($officedir, $languagestringref, $presetsdir) = @_;
my $infoline = "";
- if ( $bundleddir eq "" )
+ if ( $presetsdir eq "" )
{
- $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n";
+ $infoline = "ERROR: Failed to determine directory \"presets\" for extension registration! Please check your installation set.\n";
push( @installer::globals::logfileinfo, $infoline);
installer::exiter::exit_program($infoline, "register_extensions");
}
@@ -128,13 +128,16 @@ sub register_extensions
if ( $^O =~ /cygwin/i )
{
$localtemppath = $installer::globals::cyg_temppath;
- $bundleddir = qx{cygpath -m "$bundleddir"};
- chomp($bundleddir);
+ $presetsdir = qx{cygpath -m "$presetsdir"};
+ chomp($presetsdir);
}
$localtemppath =~ s/\\/\//g;
$slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
}
+ $presetsdir =~ s/\/\s*$//g;
+ my $bundleddir = $presetsdir . "/bundled";
+
my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
print "... $systemcall ...\n";
@@ -635,7 +638,7 @@ sub create_simple_package
installer::logger::print_message( "... creating directories ...\n" );
installer::logger::include_header_into_logfile("Creating directories:");
- my $bundleddir = "";
+ my $presetsdir = "";
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
@@ -644,7 +647,7 @@ sub create_simple_package
if ( $onedir->{'HostName'} )
{
my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
- if ( $destdir =~ /\Wbundled\s*$/ ) { $bundleddir = $destdir; }
+ if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
if ( ! -d $destdir )
{
@@ -781,7 +784,7 @@ sub create_simple_package
installer::logger::print_message( "... registering extensions ...\n" );
installer::logger::include_header_into_logfile("Registering extensions:");
- register_extensions($subfolderdir, $languagestringref, $bundleddir);
+ register_extensions($subfolderdir, $languagestringref, $presetsdir);
if ( $installer::globals::compiler =~ /^unxmacx/ )
{
commit 44826ac21001d1c71de94672534903dc665593ee
Author: Joachim Lingner <jl at openoffice.org>
Date: Thu Jul 15 16:28:33 2010 +0200
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f505a88..52c89ef 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -219,6 +219,7 @@ End
Directory gid_Brand_Dir_Share_Extensions
ParentID = gid_Brand_Dir_Share;
DosName = "extensions";
+ Styles = (CREATE);
End
Directory gid_Brand_Dir_Share_Extensions_Install
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 87fa78f..cc805f9 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -179,12 +179,6 @@ Directory gid_Dir_User_Xslt
DosName = "xslt";
End
-Directory gid_Dir_User_Bundled
- ParentID = gid_Dir_User;
- DosName = "bundled";
- Styles = (CREATE);
-End
-
Directory gid_Dir_User_Autotext
ParentID = gid_Dir_User;
DosName = "autotext";
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index 53cea79..a249104 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -45,13 +45,6 @@ Profile gid_Profile_Version_Ini_Basis
Styles = ();
End
-Profile gid_Profile_Bundled_Ini_Basis
- ModuleID = gid_Module_Root;
- Name = PROFILENAME(bundled);
- Dir = gid_Dir_User_Bundled;
- Styles = ();
-End
-
Profile gid_Profile_Fundamentalbasis_Ini
ModuleID = gid_Module_Root;
Name = PROFILENAME(fundamentalbasis);
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index d7f069e..724316b 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -461,13 +461,3 @@ ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion
Key = "OOOPackageVersion";
Value = "${OOOPACKAGEVERSION}";
End
-
-// Basis layer: gid_Profile_Version_Ini_Basis
-
-ProfileItem gid_Basis_Profileitem_Bundled_Buildid
- ProfileID = gid_Profile_Bundled_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Bootstrap";
- Key = "buildid";
- Value = "<buildid>";
-End
commit 0f049493732d7e813eab36427b47eaf8b4a45c58
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Jul 14 17:37:41 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index bcb0d1e..1a6e242 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -215,7 +215,7 @@ WindowsCustomAction gid_Customaction_Remove_Extensions
Source = "shlxtmsi.dll";
Target = "RemoveExtensions";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "FileCost");
+ Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "FileCost");
End
WindowsCustomAction gid_Customaction_Set_Admininstall
commit f9e463e84810b4726afacc2c2b69351c2bc8eeea
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Jul 14 16:41:49 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 6ae56be..bcb0d1e 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -215,7 +215,7 @@ WindowsCustomAction gid_Customaction_Remove_Extensions
Source = "shlxtmsi.dll";
Target = "RemoveExtensions";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "end");
+ Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "FileCost");
End
WindowsCustomAction gid_Customaction_Set_Admininstall
commit c1735cbb8283483e392f73dbf6178e02e51282c0
Author: Joachim Lingner <jl at openoffice.org>
Date: Wed Jul 14 09:23:58 2010 +0200
jl154 #162868# windows custom action for running unopkg sync
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index f3f9306..6ae56be 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -209,6 +209,15 @@ WindowsCustomAction gid_Customaction_Register_Extensions
Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
End
+WindowsCustomAction gid_Customaction_Remove_Extensions
+ Name = "RemoveExtensions";
+ Typ = "65";
+ Source = "shlxtmsi.dll";
+ Target = "RemoveExtensions";
+ Inbinarytable = 1;
+ Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "end");
+End
+
WindowsCustomAction gid_Customaction_Set_Admininstall
Name = "SetAdminInstallProperty";
Typ = "65";
commit dad997ba5c1dddfd5f6b8ab75e328949f9ab9cb5
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Jul 13 18:57:19 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index aad2dee..2ad27cf 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -762,42 +762,19 @@ sub replace_many_variables_in_shellscripts
foreach $key (keys %{$variableshashref})
{
my $value = $variableshashref->{$key};
- if ( ! $value =~ /.oxt/ ) { $value = lc($value); } # lowercase !
- if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; } # openofficeorg instead of openoffice.org
+ # $value = lc($value); # lowercase !
+ # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; } # openofficeorg instead of openoffice.org
replace_variable_in_shellscripts($scriptref, $value, $key);
}
}
#######################################
-# Setting oxt file name variable
-#######################################
-
-sub set_oxt_filename
-{
- my ($filesinpackage, $allvariables) = @_;
-
- for ( my $i = 0; $i <= $#{$filesinpackage}; $i++ )
- {
- my $onefile = ${$filesinpackage}[$i];
- if ( $onefile->{'Name'} =~ /.oxt\s*$/ )
- {
- $allvariables->{'OXTFILENAME'} = $onefile->{'Name'};
- # $allvariables->{'FULLOXTFILENAME'} = $onefile->{'destination'};
- last; # only one oxt file for each rpm!
- }
- }
-}
-
-#######################################
# Adding shell scripts to epm file
#######################################
sub adding_shellscripts_to_epm_file
{
my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
-
- # Setting variable for ${OXTFILENAME} into $allvariableshashref, if this is a RPM with an extension
- set_oxt_filename($filesinpackage, $allvariableshashref);
# $installer::globals::shellscriptsfilename
@@ -1803,26 +1780,27 @@ sub is_extension_package
# share/extension/install
######################################################################
-sub get_extension_name
+sub contains_extension_dir
{
my ($prototypefile) = @_;
- my $extensionName = "";
+ my $contains_extension_dir = 0;
+
+ # d none opt/openoffice.org3/share/extensions/
for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
{
my $line = ${$prototypefile}[$i];
- if ( $line =~ /^\s*f\s+none\s+share\/extension\/install\/(\w+?\.oxt)\s*\=/ )
+ if ( $line =~ /^\s*d\s+none\s.*\/share\/extensions\// )
{
- $extensionName = $1;
+ $contains_extension_dir = 1;
last;
}
}
- return $extensionName;
+ return $contains_extension_dir;
}
-
############################################################
# A Solaris patch contains 7 specific scripts
############################################################
@@ -1839,9 +1817,9 @@ sub add_scripts_into_prototypefile
$path = $path . $installer::globals::separator;
my @newlines = ();
- my $extensionname = get_extension_name($prototypefile);
+ my $is_extension_package = contains_extension_dir($prototypefile);
- if ( $extensionname ne "" )
+ if ( $is_extension_package )
{
for ( my $i = 0; $i <= $#installer::globals::solarispatchscriptsforextensions; $i++ )
{
@@ -1865,9 +1843,7 @@ sub add_scripts_into_prototypefile
my $scriptfile = installer::files::read_file($sourcefilename);
# Replacing variables
- my $oldstring = "\$\{OXTFILENAME\}";
- replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $extensionname);
- $oldstring = "PRODUCTDIRECTORYNAME";
+ my $oldstring = "PRODUCTDIRECTORYNAME";
replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $staticpath);
# Saving file
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index d7ca067..9138f5b 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -84,6 +84,15 @@ sub register_extensions
{
my ($officedir, $languagestringref, $bundleddir) = @_;
+ my $infoline = "";
+
+ if ( $bundleddir eq "" )
+ {
+ $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ installer::exiter::exit_program($infoline, "register_extensions");
+ }
+
my $programdir = $officedir . $installer::globals::separator;
if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
$programdir = $programdir . "program";
@@ -91,8 +100,6 @@ sub register_extensions
my $from = cwd();
chdir($programdir);
- my $infoline = "";
-
my $unopkgfile = $installer::globals::unopkgfile;
my $unopkgexists = 1;
commit 8a0dc2078c54e15f8526b4febf253c8ac48de123
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Jul 13 17:47:46 2010 +0200
txtl10n: #113125# Support of help tree files in the L10N process
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index f172b2c..26c81ff 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -33,7 +33,6 @@ ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
L10NEXT:=.txt
.ENDIF
-
$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES)
$(XTXFILES) : $(LOCALIZESDF)
@@ -62,14 +61,11 @@ $(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
# - no empty lines
# $(uniq ...) to workaround $assign adding the value twice...
@noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
-# $(COMMAND_ECHO)
- $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)"
-
+ $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)"
.ENDIF # "$(WITH_LANG)"!=""
@-$(RM) $@
$(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
.ENDIF # "$(XTXFILES)"!=""
.IF "$(XHTFILES)"!=""
@@ -103,14 +99,11 @@ $(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
# - no empty lines
# $(uniq ...) to workaround $assign adding the value twice...
@noop $(assign PMERGEFILELIST1:=$(uniq $(PMERGELIST1)))
-# $(COMMAND_ECHO)
-# filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
- $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree"
+# Variables for the pattern filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+ $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree"
.ENDIF # "$(WITH_LANG)"!=""
-
@-$(RM) $@
$(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
.ENDIF # "$(XHTFILES)"!=""
commit 960036300daef181d942108697519c2d458b5fee
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Jul 13 17:44:56 2010 +0200
txtl10n: #113125# Support of help tree files in the L10N process
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 13874a0..68f3121 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2043,7 +2043,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
.INCLUDE : tg_merge.mk
.INCLUDE : tg_propmerge.mk
-.INCLUDE : tg_xtxmerge.mk
+.INCLUDE : tg_xmerge.mk
wordcount:
wc *.* >> $(TMP)/wc.lst
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
new file mode 100755
index 0000000..f172b2c
--- /dev/null
+++ b/solenv/inc/tg_xmerge.mk
@@ -0,0 +1,116 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.IF "$(XTXFILES)"!=""
+
+ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
+
+.IF "$(L10NEXT)"==""
+L10NEXT:=.txt
+.ENDIF
+
+
+$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES)
+
+$(XTXFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+XTXMERGEPHONY:=.PHONY
+.ENDIF # "$(alllangiso)" != "$(last_merge)"
+
+$(COMMONMISC)/$(PACKAGE)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+ @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+ $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE # "$(WITH_LANG)"==""
+ @@-$(RM) $@
+ $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
+ $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+.ENDIF # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+ @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
+# $(COMMAND_ECHO)
+ $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)"
+
+.ENDIF # "$(WITH_LANG)"!=""
+
+ @-$(RM) $@
+ $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF # "$(XTXFILES)"!=""
+
+.IF "$(XHTFILES)"!=""
+ALLTAR : $(MISC)/$(TARGET).xht.pmerge.mk $(XHTFILES)
+
+$(MISC)/$(TARGET).xht.pmerge.mk : $(XHTFILES)
+
+$(XHTFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).xht.pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+XHTMERGEPHONY:=.PHONY
+.ENDIF # "$(alllangiso)" != "$(last_merge)"
+
+$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht
+ @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+ $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE # "$(WITH_LANG)"==""
+ @@-$(RM) $@
+ $(COMMAND_ECHO)@noop $(assign PMERGELIST1+:=$(<:f))
+ $(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d))
+.ENDIF # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+ @noop $(assign PMERGEFILELIST1:=$(uniq $(PMERGELIST1)))
+# $(COMMAND_ECHO)
+# filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+ $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree"
+.ENDIF # "$(WITH_LANG)"!=""
+
+ @-$(RM) $@
+ $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF # "$(XHTFILES)"!=""
+
+
diff --git a/solenv/inc/tg_xtxmerge.mk b/solenv/inc/tg_xtxmerge.mk
deleted file mode 100755
index 7fb661d..0000000
--- a/solenv/inc/tg_xtxmerge.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(XTXFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).pmerge.mk $(XTXFILES)
-
-$(MISC)/$(TARGET).pmerge.mk : $(XTXFILES)
-
-$(XTXFILES) : $(LOCALIZESDF)
-
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).pmerge.mk
-
-.IF "$(alllangiso)"!="$(last_merge)"
-MERGEPHONY:=.PHONY
-.ENDIF # "$(alllangiso)" != "$(last_merge)"
-
-$(COMMONMISC)/$(PACKAGE)/%.xtx $(MERGEPHONY) : %.xtx
- @@-$(MKDIRHIER) $(@:d)
-.IF "$(WITH_LANG)"==""
- $(COMMAND_ECHO)$(COPY) $< $@
-.ELSE # "$(WITH_LANG)"==""
- @@-$(RM) $@
- $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
- $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
-.ENDIF # "$(WITH_LANG)"==""
-
-$(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
-.IF "$(WITH_LANG)"!=""
-# xtxex command file requirements:
-# - one file per line
-# - no spaces
-# - no empty lines
-# $(uniq ...) to workaround $assign adding the value twice...
- @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
- $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
-.ENDIF # "$(WITH_LANG)"!=""
-
- @-$(RM) $@
- $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
-.ENDIF # "$(XTXFILES)"!=""
-
-
commit 6ba4a568ee1c4aff4345f499ef5a80e2804fc232
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 12 18:24:42 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 568b399..f3f9306 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -199,6 +199,16 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
End
+WindowsCustomAction gid_Customaction_Register_Extensions
+ Name = "RegisterExtensions";
+ Typ = "65";
+ Source = "shlxtmsi.dll";
+ Target = "RegisterExtensions";
+ Inbinarytable = 1;
+ Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+ Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+End
+
WindowsCustomAction gid_Customaction_Set_Admininstall
Name = "SetAdminInstallProperty";
Typ = "65";
@@ -287,6 +297,16 @@ WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
End
+WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
+ Name = "RegisterExtensions";
+ Typ = "65";
+ Source = "lngpckinsthlp.dll";
+ Target = "RegisterExtensions";
+ Inbinarytable = 1;
+ Assignment1 = ("InstallExecuteSequence", "", "end");
+ Assignment2 = ("AdminExecuteSequence", "", "end");
+End
+
WindowsCustomAction gid_Customaction_Patch_SetFeatureState
Name = "SetFeatureState";
Typ = "65";
commit b0fd7aa66bffc438efae8e2aea22bcaa831811a2
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 12 18:02:39 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 610ce2a..d7ca067 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -114,6 +114,8 @@ sub register_extensions
my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
+ my $slash = "";
+
if ( $installer::globals::iswindowsbuild )
{
if ( $^O =~ /cygwin/i )
@@ -122,15 +124,11 @@ sub register_extensions
$bundleddir = qx{cygpath -m "$bundleddir"};
chomp($bundleddir);
}
- else
- {
- $windowsslash = "\/";
- }
$localtemppath =~ s/\\/\//g;
- $localtemppath = "/".$localtemppath;
+ $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
}
- my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+ my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
print "... $systemcall ...\n";
commit 2eb6028cd39f24fe366318d6b1154b00c42ed4a5
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 12 16:20:39 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index fbfffeb..610ce2a 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -130,7 +130,7 @@ sub register_extensions
$localtemppath = "/".$localtemppath;
}
- my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+ my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
print "... $systemcall ...\n";
commit 2c00eba98ad216590f7497be25d16834e22ade2c
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 12 15:22:50 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index b9d9178..fbfffeb 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -119,6 +119,8 @@ sub register_extensions
if ( $^O =~ /cygwin/i )
{
$localtemppath = $installer::globals::cyg_temppath;
+ $bundleddir = qx{cygpath -m "$bundleddir"};
+ chomp($bundleddir);
}
else
{
commit 8c39fb0c8adb505972e602aa97f5d325576bb51e
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 12 13:26:09 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index cc805f9..87fa78f 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -179,6 +179,12 @@ Directory gid_Dir_User_Xslt
DosName = "xslt";
End
+Directory gid_Dir_User_Bundled
+ ParentID = gid_Dir_User;
+ DosName = "bundled";
+ Styles = (CREATE);
+End
+
Directory gid_Dir_User_Autotext
ParentID = gid_Dir_User;
DosName = "autotext";
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index a249104..53cea79 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -45,6 +45,13 @@ Profile gid_Profile_Version_Ini_Basis
Styles = ();
End
+Profile gid_Profile_Bundled_Ini_Basis
+ ModuleID = gid_Module_Root;
+ Name = PROFILENAME(bundled);
+ Dir = gid_Dir_User_Bundled;
+ Styles = ();
+End
+
Profile gid_Profile_Fundamentalbasis_Ini
ModuleID = gid_Module_Root;
Name = PROFILENAME(fundamentalbasis);
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 9818d5b..d7f069e 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -462,3 +462,12 @@ ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion
Value = "${OOOPACKAGEVERSION}";
End
+// Basis layer: gid_Profile_Version_Ini_Basis
+
+ProfileItem gid_Basis_Profileitem_Bundled_Buildid
+ ProfileID = gid_Profile_Bundled_Ini_Basis;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Key = "buildid";
+ Value = "<buildid>";
+End
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 71e94ba..b9d9178 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -82,7 +82,7 @@ sub get_extensions_dir
sub register_extensions
{
- my ($officedir, $languagestringref, $presetsdir) = @_;
+ my ($officedir, $languagestringref, $bundleddir) = @_;
my $programdir = $officedir . $installer::globals::separator;
if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
@@ -127,8 +127,8 @@ sub register_extensions
$localtemppath =~ s/\\/\//g;
$localtemppath = "/".$localtemppath;
}
-
- my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=file://" . $presetsdir . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+
+ my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
print "... $systemcall ...\n";
@@ -628,7 +628,7 @@ sub create_simple_package
installer::logger::print_message( "... creating directories ...\n" );
installer::logger::include_header_into_logfile("Creating directories:");
- my $presetsdir = "";
+ my $bundleddir = "";
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
@@ -637,7 +637,7 @@ sub create_simple_package
if ( $onedir->{'HostName'} )
{
my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
- if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
+ if ( $destdir =~ /\Wbundled\s*$/ ) { $bundleddir = $destdir; }
if ( ! -d $destdir )
{
@@ -774,7 +774,7 @@ sub create_simple_package
installer::logger::print_message( "... registering extensions ...\n" );
installer::logger::include_header_into_logfile("Registering extensions:");
- register_extensions($subfolderdir, $languagestringref, $presetsdir);
+ register_extensions($subfolderdir, $languagestringref, $bundleddir);
if ( $installer::globals::compiler =~ /^unxmacx/ )
{
commit 8d25017b88ca85d78e90094ce5638ffa37703483
Author: Ingo Schmidt <is at openoffice.org>
Date: Mon Jul 12 11:04:05 2010 +0200
jl154 #162868# unopkg is back in packaging and installation
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index b833cc0..71e94ba 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -82,10 +82,9 @@ sub get_extensions_dir
sub register_extensions
{
- my ($officedir, $languagestringref) = @_;
+ my ($officedir, $languagestringref, $presetsdir) = @_;
my $programdir = $officedir . $installer::globals::separator;
- # if ( $installer::globals::sundirhostname ne "" ) { $programdir = $programdir . $installer::globals::sundirhostname . $installer::globals::separator; }
if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
$programdir = $programdir . "program";
@@ -94,9 +93,6 @@ sub register_extensions
my $infoline = "";
- # my $unopkgfile = $officedir . $installer::globals::separator . "program" .
- # $installer::globals::separator . $installer::globals::unopkgfile;
-
my $unopkgfile = $installer::globals::unopkgfile;
my $unopkgexists = 1;
@@ -107,87 +103,64 @@ sub register_extensions
push( @installer::globals::logfileinfo, $infoline);
}
- # my $extensiondir = $officedir . $installer::globals::separator . "share" .
- # $installer::globals::separator . "extension" .
- # $installer::globals::separator . "install";
-
- my $extensiondir = ".." . $installer::globals::separator . "share" . $installer::globals::separator . "extension" . $installer::globals::separator . "install";
-
- my $allextensions = installer::systemactions::find_file_with_file_extension("oxt", $extensiondir);
-
- if (( $#{$allextensions} > -1 ) && ( $unopkgexists ))
+ if ( $unopkgexists )
{
my $currentdir = cwd();
print "... current dir: $currentdir ...\n";
$infoline = "Current dir: $currentdir\n";
push( @installer::globals::logfileinfo, $infoline);
-
- for ( my $i = 0; $i <= $#{$allextensions}; $i++ )
- {
- my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i];
-
- # my $systemcall = $unopkgfile . " add --shared --suppress-license " . "\"" . $oneextension . "\"";
- if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
- if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); }
+ if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
- my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
+ my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
- if ( $installer::globals::iswindowsbuild )
+ if ( $installer::globals::iswindowsbuild )
+ {
+ if ( $^O =~ /cygwin/i )
{
- if ( $^O =~ /cygwin/i )
- {
- $localtemppath = $installer::globals::cyg_temppath;
- }
- else
- {
- $windowsslash = "\/";
- }
- $localtemppath =~ s/\\/\//g;
- $localtemppath = "/".$localtemppath;
+ $localtemppath = $installer::globals::cyg_temppath;
}
- my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+ else
+ {
+ $windowsslash = "\/";
+ }
+ $localtemppath =~ s/\\/\//g;
+ $localtemppath = "/".$localtemppath;
+ }
- print "... $systemcall ...\n";
+ my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=file://" . $presetsdir . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
- $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ print "... $systemcall ...\n";
- my @unopkgoutput = ();
+ $infoline = "Systemcall: $systemcall\n";
+ push( @installer::globals::logfileinfo, $infoline);
- open (UNOPKG, $systemcall);
- while (<UNOPKG>)
- {
- my $lastline = $_;
- push(@unopkgoutput, $lastline);
- }
- close (UNOPKG);
+ my @unopkgoutput = ();
- my $returnvalue = $?; # $? contains the return value of the systemcall
+ open (UNOPKG, $systemcall);
+ while (<UNOPKG>)
+ {
+ my $lastline = $_;
+ push(@unopkgoutput, $lastline);
+ }
+ close (UNOPKG);
- if ($returnvalue)
- {
- # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
- # contains strings like "Error" even in the case of success. This causes a packaging error
- # when the log file is analyzed at the end, even if there is no real error.
- for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
+ my $returnvalue = $?; # $? contains the return value of the systemcall
- $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
- push( @installer::globals::logfileinfo, $infoline);
- installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
- }
- else
- {
- $infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
+ if ($returnvalue)
+ {
+ # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
+ # contains strings like "Error" even in the case of success. This causes a packaging error
+ # when the log file is analyzed at the end, even if there is no real error.
+ for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
+
+ $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
}
- }
- else
- {
- if ( ! ( $#{$allextensions} > -1 ))
+ else
{
- $infoline = "No extensions located in directory $extensiondir.\n";
+ $infoline = "Success: Executed \"$systemcall\" successfully!\n";
push( @installer::globals::logfileinfo, $infoline);
}
}
@@ -655,6 +628,8 @@ sub create_simple_package
installer::logger::print_message( "... creating directories ...\n" );
installer::logger::include_header_into_logfile("Creating directories:");
+ my $presetsdir = "";
+
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
my $onedir = ${$dirsref}[$i];
@@ -662,6 +637,8 @@ sub create_simple_package
if ( $onedir->{'HostName'} )
{
my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
+ if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
+
if ( ! -d $destdir )
{
if ( $^O =~ /cygwin/i ) # Cygwin performance check
@@ -786,20 +763,19 @@ sub create_simple_package
my $localcall = "chmod -R 755 " . "\"" . $subfolderdir . "\"";
system($localcall);
}
-
- # Registering the extensions
-
- # installer::logger::print_message( "... registering extensions ...\n" );
- # installer::logger::include_header_into_logfile("Registering extensions:");
- # register_extensions($subfolderdir, $languagestringref);
installer::logger::print_message( "... removing superfluous directories ...\n" );
installer::logger::include_header_into_logfile("Removing superfluous directories:");
-
- my $extensionfolder = get_extensions_dir($subfolderdir);
-
+
+ my $extensionfolder = get_extensions_dir($subfolderdir);
installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
+
+ # Registering the extensions
+ installer::logger::print_message( "... registering extensions ...\n" );
+ installer::logger::include_header_into_logfile("Registering extensions:");
+ register_extensions($subfolderdir, $languagestringref, $presetsdir);
+
if ( $installer::globals::compiler =~ /^unxmacx/ )
{
installer::worker::put_scpactions_into_installset("$installdir/$packagename");
commit 9c12bf0ad83854c0ffe730e43989cd8f6b555d05
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jul 7 15:37:18 2010 +0200
txtl10n: #i113008# add support for xtx files (single text files)
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 1a4ad6e..13874a0 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2043,6 +2043,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
.INCLUDE : tg_merge.mk
.INCLUDE : tg_propmerge.mk
+.INCLUDE : tg_xtxmerge.mk
wordcount:
wc *.* >> $(TMP)/wc.lst
diff --git a/solenv/inc/tg_xtxmerge.mk b/solenv/inc/tg_xtxmerge.mk
new file mode 100755
index 0000000..7fb661d
--- /dev/null
+++ b/solenv/inc/tg_xtxmerge.mk
@@ -0,0 +1,67 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.IF "$(XTXFILES)"!=""
+ALLTAR : $(MISC)/$(TARGET).pmerge.mk $(XTXFILES)
+
+$(MISC)/$(TARGET).pmerge.mk : $(XTXFILES)
+
+$(XTXFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+MERGEPHONY:=.PHONY
+.ENDIF # "$(alllangiso)" != "$(last_merge)"
+
+$(COMMONMISC)/$(PACKAGE)/%.xtx $(MERGEPHONY) : %.xtx
+ @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+ $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE # "$(WITH_LANG)"==""
+ @@-$(RM) $@
+ $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
+ $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+.ENDIF # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+ @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
+ $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
+.ENDIF # "$(WITH_LANG)"!=""
+
+ @-$(RM) $@
+ $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF # "$(XTXFILES)"!=""
+
+
commit 80d7de44ce342af127452071063af8aac140f9b0
Merge: ab42f2d... 27b9afa...
Author: Joachim Lingner <jl at openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
diff --cc solenv/config/sdev300.ini
index d04a87c,3e80e14..3e80e14
mode 100755,100755..100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
commit ab42f2dd02a028e73ec11c2cb12e818ea91acb55
Author: sb <sb at openoffice.org>
Date: Tue Jun 29 16:39:39 2010 +0200
jl154: #i112789# call SourceConfig->new() so that it always works
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
old mode 100755
new mode 100644
index 34e6b80..3caa842
--- a/solenv/bin/subsequenttests
+++ b/solenv/bin/subsequenttests
@@ -47,7 +47,7 @@ while (@ARGV) {
}
my @testpaths = ();
-my $sc = SourceConfig->new();
+my $sc = SourceConfig->new($ENV{'SOLARSRC'});
my $module;
foreach $module ($sc->get_active_modules()) {
my $buildlst = $sc->get_module_build_list($module);
More information about the ooo-build-commit
mailing list