[ooo-build-commit] Branch 'ooo/master' - 2 commits - instsetoo_native/prj scp2/prj solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Jun 17 17:12:06 PDT 2009
instsetoo_native/prj/build.lst | 2 -
scp2/prj/build.lst | 2 -
solenv/bin/build.pl | 4 ++
solenv/config/sdev300.ini | 3 +-
solenv/inc/_tg_srs.mk | 60 +++++++++++++++++++++++++++--------------
solenv/inc/minor.mk | 6 ++--
solenv/inc/rules.mk | 50 +++++++++++++++++-----------------
solenv/inc/settings.mk | 35 ++++++++++++++++++++++-
solenv/inc/target.mk | 25 +++++++++++++++--
solenv/inc/tg_config.mk | 6 ++--
solenv/inc/tg_merge.mk | 28 ++++++++++---------
solenv/inc/tg_srs.mk | 6 ++--
solenv/inc/unitools.mk | 10 ++++--
13 files changed, 161 insertions(+), 76 deletions(-)
New commits:
commit b52c809db9c1224d9f8a34a5d6a2ddd5e2af147e
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jun 17 15:03:17 2009 +0000
DEV300
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a3b4fff..d88e1fd 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m50(Build:9406)
-BUILD=9406
-LAST_MINOR=m50
+RSCREVISION=300m51(Build:9408)
+BUILD=9408
+LAST_MINOR=m51
SOURCEVERSION=DEV300
commit 346293e07779de39d01b2404020fc3582805ba71
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jun 17 13:15:46 2009 +0000
CWS-TOOLING: integrate CWS l10ncleanup04
2009-05-28 13:46:54 +0200 ihi r272407 : remove forgotten sdf's
2009-05-25 22:32:35 +0200 ihi r272273 : no WITH_LANG fix
2009-05-25 20:45:58 +0200 ihi r272272 : remove some comments
2009-05-25 19:55:21 +0200 ihi r272271 : svx dialog -> cui l10n move
2009-05-25 18:30:58 +0200 ihi r272268 : build fix
2009-05-18 16:32:02 +0200 ihi r272033 : bash fix
2009-05-18 16:31:32 +0200 ihi r272032 : bash fix
2009-05-14 16:23:39 +0200 ihi r271901 : #i79750# Translation moved to l10n module
2009-05-11 23:36:05 +0200 ihi r271793 : #i79750# Translation moved into own module
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 9aeff0a..8e8079d 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon instsetoo_native :: postprocess packimages testautomation NULL
+oon instsetoo_native :: l10n postprocess packimages testautomation NULL
oon instsetoo_native usr1 - all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 111afe4..342053a 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp scp2 : setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 00eecc8..c5cb123 100644
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -978,11 +978,12 @@ sub check_deps_hash {
my $string;
my $log_name;
my $build_number = 0;
-
do {
$consistent = '';
foreach $key (sort keys %deps_hash) {
$local_deps_ref = $deps_hash{$key};
+ $little_key = $key;
+ #print "Key = $key , consi = '$consistent' ";
if (!scalar keys %$local_deps_ref) {
if (defined $module) {
$build_number++;
@@ -1027,6 +1028,7 @@ sub check_deps_hash {
};
RemoveFromDependencies($key, \%deps_hash);
delete $deps_hash{$key};
+ #print " ... OK!\n";
$consistent++;
};
};
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index d5e7fae..041b224 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -13,7 +13,7 @@ common
BMP_WRITES_FLAG TRUE
BTARGET 1
BUILD_SPECIAL TRUE
- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX
+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX L10N
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
@@ -62,6 +62,7 @@ common
common:2 IF %UPDATER% == YES
{
WITH_LANG en-US de
+ BUILD_TYPE l10n
}
common:3 IF %UPDATER% != YES
{
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 1c03571..bc23ed5 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -22,10 +22,12 @@ $(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -71,10 +73,12 @@ $(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -120,10 +124,12 @@ $(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -169,10 +175,12 @@ $(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -218,10 +226,12 @@ $(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -267,10 +277,12 @@ $(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -316,10 +328,12 @@ $(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -365,10 +379,12 @@ $(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -414,10 +430,12 @@ $(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
@@ -463,10 +481,12 @@ $(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10F
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 4fc5532..0496b94 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -752,37 +752,38 @@ $(MISC)$/%.sh : %.sh
$(COMMONMISC)$/$(TARGET)$/%.ulf : %.ulf
-$(MKDIR) $(@:d)
-$(RM) $@
- $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(COMMONMISC)$/$(TARGET)$/%.xrb : %.xrb
-$(MKDIR) $(@:d)
-$(RM) $@
- $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
$(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm
-$(MKDIRHIER) $(@:d)
-$(RM) $@
- $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ echo trysdf = $(TRYSDF)
+ $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
-$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
- -$(MKDIRHIER) $(@:d)
- -$(RM) $@
- $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
-
-$(COMMONMISC)$/%.xrm : %.xrm
- -$(MKDIR) $(@:d)
- -$(RM) $@
- $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+#$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
+# -$(MKDIRHIER) $(@:d)
+# -$(RM) $@
+# $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+# $(RENAME) $@.$(INPATH) $@
+# -$(RM) $@.$(INPATH)
+#
+#$(COMMONMISC)$/%.xrm : %.xrm
+# -$(MKDIR) $(@:d)
+# -$(RM) $@
+# $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+# $(RENAME) $@.$(INPATH) $@
+# -$(RM) $@.$(INPATH)
.ENDIF # "$(WITH_LANG)"!=""
.IF "$(WITH_LANG)"!=""
@@ -818,15 +819,16 @@ $(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf
@$(RENAME) $@.$(INPATH) $@
@-$(RM) $@.$(INPATH)
-#$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
-# -$(MKDIR) $(@:d)
-# -$(RM) $@
-# $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-# $(RENAME) $@.$(INPATH) $@
-# -$(RM) $@.$(INPATH)
+# This is still needed?????
+$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm
+ -$(MKDIR) $(@:d)
+ -$(RM) $@
+ $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+ $(RENAME) $@.$(INPATH) $@
+ -$(RM) $@.$(INPATH)
# dirty hack
# if local *.sdf file is missing
-%.sdf:
- echo > $@
+#%.sdf:
+# echo > $@
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 8b6fcd5..a3c43ed 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: settings.mk,v $
#
-# $Revision: 1.238 $
+# $Revision: 1.214.30.8 $
#
# This file is part of OpenOffice.org.
#
@@ -638,6 +638,7 @@ $(LOCAL_COMMON_OUT)$/inc$/%world.mk :
.ENDIF # "$(PRJNAME)"!="solenv"
.ENDIF # "$(common_build)"!=""
+.INCLUDE .IGNORE : office.mk
# Misc-Pfad
.IF "$(UNR)"!=""
@@ -649,6 +650,34 @@ MISC=$(OUT)$/misc
COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
.ENDIF
+L10N_MODULE*=l10n
+ALT_L10N_MODULE*=l10n_so
+
+.IF "$(WITH_LANG)"!=""
+.INCLUDE .IGNORE: $(SOLARSRC)$/$(L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(SOLARSRC)$/$(ALT_L10N_MODULE)/localization_present.mk
+
+#.IF "$(USE_SHELL)"!="4nt"
+#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ);pwd)$/,$(NULL) $(PWD))
+#.ELSE # "$(USE_SHELL)"!="4nt"
+#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) ^ echo %_cwd)$/,$(NULL) $(PWD))
+#.ENDIF # "$(USE_SHELL)"!="4nt"
+.IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
+TRYSDF:=$(SOLARSRC)$/$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+.IF "$(ALT_LOCALIZATION_FOUND)"!=""
+TRYALTSDF:=$(SOLARSRC)$/$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+# TODO: check performance impact...
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
+.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!=""
+some_local_helper_var:=$(strip $(shell +$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) ))
+LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF))
+LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf $(LOCALIZESDF))
+.ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
+LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+.ENDIF # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
+.ENDIF # "$(WITH_LANG)"!=""
+
+
OUTCXX=$(OUT)$/cxx
.IF "$(PACKAGE)"!=""
@@ -707,7 +736,6 @@ CLASSPATH!:=$(CLASSPATH:s/tkt/no/)
PROCESSOUT*:=$(MISC)
# Makros fuer die Librarynamen des Solar
-.INCLUDE .IGNORE : office.mk
.INCLUDE : libs.mk
.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
@@ -808,13 +836,16 @@ SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(EXT_UPDMINOR)
SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(EXT_UPDMINOR)
SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(EXT_UPDMINOR)
SOLARPCKDIR=$(SOLARVERSION)$/$(INPATH)$/pck$(EXT_UPDMINOR)
+SOLARSDFDIR=$(SOLARVERSION)$/$(INPATH)$/sdf$(EXT_UPDMINOR)
SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(EXT_UPDMINOR)
SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(EXT_UPDMINOR)
SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(EXT_UPDMINOR)
+SOLARCOMMONSDFDIR=$(SOLARVERSION)$/common$(PROEXT)$/sdf$(EXT_UPDMINOR)
.IF "$(common_build)"==""
SOLARCOMMONBINDIR=$(SOLARBINDIR)
SOLARCOMMONRESDIR=$(SOLARRESDIR)
SOLARCOMMONPCKDIR=$(SOLARPCKDIR)
+SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.ENDIF
.EXPORT : SOLARBINDIR
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 61de651..8c1ba38 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1388,6 +1388,25 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
.ENDIF # "$(UNIXTEXT)"!=""
+.IF "$(WITH_LANG)"!=""
+.IF "$(LOCALIZATION_FOUND)"==""
+.IF "$(LOCALIZESDF)"!=""
+"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ @@-$(MKDIRHIER) $(@:d)
+ @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ @@-cp -r $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)$/* $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)
+ @@-$(RM) -rf $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)
+.ENDIF # "$(LOCALIZESDF)"!=""
+.ENDIF # "$(LOCALIZATION_FOUND)"==""
+.ENDIF # "$(WITH_LANG)"!=""
+
+.IF "$(LOCALIZESDF)"!=""
+"$(LOCALIZESDF)%" :
+ echo $(LOCALIZESDF)
+ @@-$(MKDIRHIER) $(@:d)
+ @$(TOUCH) $(LOCALIZESDF)
+.ENDIF # "$(LOCALIZESDF)"!=""
+
.IF "$(EXTUPDATEINFO_NAME)"!=""
$(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
$(PERL) $(SOLARENV)$/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE)
@@ -1501,14 +1520,14 @@ $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME)
# LASTRUN_MERGED
.INCLUDE .IGNORE : $(INCCOM)$/$(TARGET)_lastrun.mk
.IF "$(LASTRUN_MERGED)"=="TRUE"
-$(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) localize.sdf
+$(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) $(LOCALIZESDF)
.ELSE # "$(LASTRUN_MERGED)"=="TRUE"
-$(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) localize.sdf
+$(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
echo LASTRUN_MERGED:=TRUE > $(INCCOM)$/$(TARGET)_lastrun.mk
.ENDIF # "$(LASTRUN_MERGED)"=="TRUE"
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)$/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m localize.sdf -l all
+ $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)$/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
.ENDIF # "$(WITH_LANG)"==""
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 637efb8..61130c2 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: tg_config.mk,v $
#
-# $Revision: 1.22 $
+# $Revision: 1.21.72.2 $
#
# This file is part of OpenOffice.org.
#
@@ -121,12 +121,12 @@ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
# --- localizations ---
.IF "$(WITH_LANG)"!=""
.IF "$(XCU_LANG)"!=""
-$(XCU_LANG) : localize.sdf
+$(XCU_LANG) : $(LOCALIZESDF)
.ENDIF # "$(XCU_LANG)"!=""
$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu
-$(MKDIRHIER) $(@:d)
- $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all
+ $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
.IF "$(XCU_LANG)" != ""
$(XCU_LANG) : $(XSLDIR)$/alllang.xsl
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index 7e94a27..a1f348a 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: tg_merge.mk,v $
#
-# $Revision: 1.12 $
+# $Revision: 1.11.72.2 $
#
# This file is part of OpenOffice.org.
#
@@ -35,23 +35,27 @@ MKFILENAME:=tg_merge.mk
.IF "$(WITH_LANG)"!=""
.IF "$(ULFFILES)"!=""
-$(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+$(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
.ENDIF # "$(ULFFILES)"!=""
# *.xrb merge
.IF "$(XMLPROPERTIES)"!=""
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
-.ENDIF # "$(XMLPROPERTIES)"!=""
+$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
+.ENDIF # "$(ULFFILES)"!=""
# *.xrm merge
-.IF "$(APOCHELPFILES)"!=""
-$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)$/$(MYPATH)$/$(i:b).xrm) : $$(@:f) localize.sdf
-.ENDIF # "$(APOCHELPFILES)"!=""
+.IF "$(READMEFILES)"!=""
+$(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF)
+.ENDIF # "$(ULFFILES)"!=""
+# *.xrm merge
+#.IF "$(APOCHELPFILES)"!=""
+#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)$/$(MYPATH)$/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF)
+#.ENDIF # "$(ULFFILES)"!=""
# *.xcu merge
.IF "$(LOCALIZEDFILES)"!=""
-$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) localize.sdf
-.ENDIF # "$(LOCALIZEDFILES)"!=""
+$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF)
+.ENDIF # "$(ULFFILES)"!=""
.ENDIF # "$(WITH_LANG)"!=""
# dependencies from *.ulf to par-files
@@ -60,7 +64,7 @@ $(ULFPARFILES) : $(COMMONMISC)$/$(TARGET)$/$$(@:b).$(LANGFILEEXT)
.ENDIF # "$(ULFPARFILES)"!=""
# *.xrm merge
-.IF "$(READMEFILES)"!=""
-$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) localize.sdf
-.ENDIF # "$(READMEFILES)"!=""
+#.IF "$(READMEFILES)"!=""
+#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF)
+#.ENDIF # "$(ULFFILES)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 9d8a3ca..1c34aaa 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -54,10 +54,12 @@ $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTIC
$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
.IF "$(WITH_LANG)"!=""
-$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
-$(MKDIR) $(@:d)
-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(RENAME) $@.$(INPATH) $@
-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 3da9ed3..706ec85 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: unitools.mk,v $
#
-# $Revision: 1.59 $
+# $Revision: 1.53.30.4 $
#
# This file is part of OpenOffice.org.
#
@@ -63,14 +63,17 @@ USQ:="
NULLDEV:=/dev/null
+
# iz29609 helpmacro to check if file exists
.IF "$(USE_SHELL)"=="bash"
-IFEXIST:=if test -e
-THEN:= ; then
+IFEXIST:=if [ -f
+IFNOTEXIST:= if ! test -f
+THEN:= ] ; then
FI:= ; fi
PIPEERROR=2>&1 |
.ELSE
IFEXIST:=if ( -e
+IFNOTEXIST:=if ( ! -e
THEN:= )
FI:=
PIPEERROR=|&
@@ -94,6 +97,7 @@ NULLDEV:=nul
# iz29609 helpmacro to check if file exists 4nt style
IFEXIST:=+if exist
+IFNOTEXIST:=+if not exist
THEN:=
FI:=
PIPEERROR=|&
More information about the ooo-build-commit
mailing list