summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/download.pm3
-rwxr-xr-xsolenv/bin/ooinstall10
-rw-r--r--solenv/gbuild/CppunitTest.mk2
-rw-r--r--solenv/inc/langlist.mk37
-rw-r--r--solenv/inc/postset.mk107
-rw-r--r--solenv/inc/rules.mk4
-rw-r--r--solenv/inc/settings.mk4
7 files changed, 16 insertions, 151 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index ce21395cb6a9..604f7574cc95 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -473,6 +473,7 @@ sub get_downloadname_productname
if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
+
return $start;
}
@@ -1335,7 +1336,7 @@ sub get_language_string_from_language_block
##################################################################
# Windows: Replacing strings in NSIS nsh file
# nsh file syntax:
-# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswhlen"
+# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis ausw�hlen"
##################################################################
sub replace_identifier_in_nshfile
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index c4f44b4d713b..56825e18e813 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -43,9 +43,13 @@ for $arg (@ARGV) {
} elsif ($arg eq '-h' || $arg eq '--help') {
$help = 1;
} else {
- # Cwd::realpath does not work if the path does not exist
- mkpath($arg) unless -d $arg;
- $path = Cwd::realpath( $arg );
+ # Cwd::realpath does not work if the path does not exist
+ mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
+ $path = Cwd::realpath( $ENV{DESTDIR} . $arg );
+ if (!$do_link) {
+ my $destdir = Cwd::realpath( $ENV{DESTDIR} );
+ $path =~ s|$destdir||;
+ }
}
}
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b7049af6cf97..3dbd33d7a0ae 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -43,7 +43,7 @@ endif
# gb_CppunitTest_TARGETTYPE
# gb_CppunitTest_get_filename
gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) LANG=en_US.UTF-8 $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET)
+gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET)
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
# TODO: move this to platform under suitable name
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index f4e485380ae1..0e58717c6a2e 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -25,10 +25,10 @@
#
#*************************************************************************
+# Complete list of all supported localizations (ISO codes)
completelangiso=af \
ar \
as \
-as-IN \
ast \
be \
bo \
@@ -36,10 +36,7 @@ bg \
br \
brx \
bn \
-bn-BD \
-bn-IN \
bs \
-by \
ca \
ca-XV \
cs \
@@ -59,26 +56,18 @@ eu \
fa \
fi \
fr \
-fur \
ga \
-gd \
gl \
gu \
-gu-IN \
he \
hi \
-hi-IN \
hr \
-ht \
hu \
+id \
is \
it \
ja \
-jbo \
-kid \
-ky \
ka \
-kab \
kk \
km \
kn \
@@ -93,11 +82,8 @@ mai \
mk \
mn \
mni \
-ms \
ml \
-ml-IN \
mr \
-mr-IN \
my \
ne \
nb \
@@ -105,48 +91,31 @@ nl \
nn \
nr \
nso \
-ny \
om \
-oms \
oc \
or \
-or-IN \
-pap \
-pa \
pa-IN \
pl \
-ps \
pt \
pt-BR \
-gug \
-pyg \
ro \
ru \
rw \
sat \
-sa \
sa-IN \
si \
-sc \
sd \
sq \
sk \
sl \
sh \
-so \
sr \
ss \
st \
sv \
-sw \
sw-TZ \
te \
-te-IN \
-ti \
-ti-ER \
ta \
-ta-IN \
-tlh \
th \
tn \
tr \
@@ -154,8 +123,6 @@ tk \
ts \
tg \
ug \
-ur \
-ur-IN \
uk \
uz \
ve \
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 487cc8f2d559..3d4f4158d08f 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -29,110 +29,7 @@
# This language will be always included!
defaultlangiso=en-US
-# Complete list of all supported ISO codes
-completelangiso=af \
-ar \
-as \
-ast \
-be \
-bo \
-bg \
-br \
-brx \
-bn \
-bs \
-ca \
-ca-XV \
-cs \
-cy \
-da \
-de \
-dgo \
-dz \
-el \
-en-GB \
-en-US \
-en-ZA \
-eo \
-es \
-et \
-eu \
-fa \
-fi \
-fr \
-ga \
-gl \
-gu \
-he \
-hi \
-hr \
-hu \
-id \
-is \
-it \
-ja \
-ka \
-kk \
-km \
-kn \
-ko \
-kok \
-ks \
-ku \
-lo \
-lt \
-lv \
-mai \
-mk \
-mn \
-mni \
-ml \
-mr \
-my \
-ne \
-nb \
-nl \
-nn \
-nr \
-nso \
-om \
-oc \
-or \
-pa-IN \
-pl \
-pt \
-pt-BR \
-ro \
-ru \
-rw \
-sat \
-sa-IN \
-si \
-sd \
-sq \
-sk \
-sl \
-sh \
-sr \
-ss \
-st \
-sv \
-sw-TZ \
-te \
-ta \
-th \
-tn \
-tr \
-ts \
-tg \
-ug \
-uk \
-uz \
-ve \
-vi \
-xh \
-zh-CN \
-zh-TW \
-zu
+# Complete list of all supported localizations (ISO codes)
+.INCLUDE : langlist.mk
alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index db97eddea355..0ff659c7ec1b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -715,14 +715,14 @@ $(MISC)/%.sh : %.sh
.IF "$(WITH_LANG)"!=""
$(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
@echo "Making: " $(@:f)
- $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
- $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index da564bf60724..04dfd3490387 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -826,10 +826,6 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.EXPORT : SOLARBINDIR
-.IF "$(GUI)" == "WNT"
-L10N_MODULE*=$(shell cygpath -m $(SRC_ROOT)/translations)
-.ELSE
-.ENDIF
.IF "$(WITH_LANG)"!=""
.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk