Merge commit 'libreoffice-3.4.0.2'

Conflicts: configure.in distro-configs/LibreOfficeMacOSX.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download instsetoo_native/util/openoffice.lst ooo.lst.in set_soenv.in solenv/bin/modules/installer/download.pm solenv/gbuild/CppunitTest.mk solenv/inc/minor.mk solenv/inc/settings.mk
author: Jan Holesovsky <kendy@suse.cz> 2011-05-31 10:45:37 +0200
committer: Jan Holesovsky <kendy@suse.cz> 2011-05-31 10:45:37 +0200
commit: 07c1d34ec78dd6e980c4ae370042ab5e3870aa0b (patch)
tree: 15568d84be2d77cb24edb7e9cc53fa0b1ceef820
parent: Put the .o files in iOS archive libraries, not the empty .obj files (diff)
parent: Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2) (diff)
download: core-07c1d34ec78dd6e980c4ae370042ab5e3870aa0b.tar.gz
core-07c1d34ec78dd6e980c4ae370042ab5e3870aa0b.zip
19 files changed, 63 insertions, 213 deletions
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index b6ec7ef66d92..8de4d3109642 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -345,6 +345,7 @@ my $log_suffix;
 my $log;
 my $branch_name;
 my $git_command = "git log";
+my $branch_name;
 my @git_args;
 my %data;
 my %print_filters = ();
diff --git a/configure.in b/configure.in
index bc6d4bad26a8..f50c90f62e50 100755
--- a/configure.in
+++ b/configure.in
@@ -416,15 +416,6 @@ AC_ARG_ENABLE(check-only,
     ],
 ,)
 
-AC_ARG_ENABLE(ccache-skip,
-    AS_HELP_STRING([--enable-ccache-skip],
-        [Allow the use of --ccache-skip to escape compiler flags that would
-         otherwise prevent caching of the result (currently used on Mac only)
-         NOTE: requires patched version because of a bug in ccache (see issue
-         104567 for details and patch) explicitly enable if your version of
-         ccache doesn't identify as version 2.4_OOo. (default=auto)]),
-,enable_ccache_skip=auto)
-
 AC_ARG_ENABLE(build-unowinreg,
     AS_HELP_STRING([--enable-build-unowinreg],
         [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
@@ -1240,7 +1231,7 @@ AC_ARG_WITH(install-dirname,
         [Specify the directory name of the core LibO install dir. The final
          installation path is defined by <libdir>/<install-dirname>.
          The default value is "libreoffice" and the default installation
-         patch is /usr/lib/libreoffice.
+         path is /usr/lib/libreoffice.
 
          FIXME: It affects only the installation by "make install" and not the
          generated installation sets.])
@@ -3152,19 +3143,14 @@ fi
 AC_SUBST(HAVE_CXX0X)
 
 # ===================================================================
-# use --ccache-skip?
+# use ccache?
 # ===================================================================
-dnl used to escape compiler options for ccache that otherwise prevent
+dnl need to check for ccache version: otherwise prevents
 dnl caching of the results (like "-x objective-c++" for Mac)
-AC_MSG_CHECKING([whether we are allowed and able to use --ccache-skip])
+AC_MSG_CHECKING([whether we are able to use --ccache-skip])
 if test "$_os" != "Darwin" ; then
    AC_MSG_RESULT([only used on Mac currently, skipping])
-elif test "$enable_ccache_skip" = "no" ; then
-   AC_MSG_RESULT([no - diabled explicitly])
-elif test "$enable_ccache_skip" = "yes" ; then
-   AC_MSG_RESULT([yes - enabled explicitly, skipping checks])
-   AC_SUBST([USE_CCACHE], [YES])
-elif test "$enable_ccache_skip" = "auto" ; then
+else
    # checking for ccache presence/version
    AC_MSG_RESULT([probing...])
    AC_PATH_PROG([CCACHE],[ccache],[not_found])
@@ -3174,7 +3160,8 @@ elif test "$enable_ccache_skip" = "auto" ; then
       # check ccache version
       AC_MSG_CHECKING([whether version of ccache is suitable])
       CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
-      if test "$CCACHE_VERSION" = "2.4_OOo"; then
+      CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+      if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
          AC_MSG_RESULT([yes])
          AC_MSG_CHECKING([whether ccache is actually used for the build])
          AC_LANG_PUSH([C++])
@@ -3193,11 +3180,9 @@ elif test "$enable_ccache_skip" = "auto" ; then
          AC_LANG_POP([C++])
       else
          AC_MSG_RESULT([no])
-         AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip])
+         AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. ccache will not be used.])
       fi
    fi
-else
-   AC_MSG_ERROR([invalid option to --enable-ccache-skip. Valid values are "auto", "yes" and "no"])
 fi
 
 dnl ===================================================================
@@ -8416,14 +8401,14 @@ dnl ===================================================================
 GIT_REPO_NAMES="artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing ure writer"
 AC_MSG_CHECKING([which languages to be built])
 # get list of all languages
-# generate shell variable from completelangiso= from solenv/inc/postset.mk
+# generate shell variable from completelangiso= from solenv/inc/langlist.mk
 # the sed command does the following:
 #   + if a line ends with a backslash, append the next line to it
 #   + adds " on the beginning of the value (after =)
 #   + adds " at the end of the value
 #   + removes en-US; we want to put it on the beginning
 #   + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
-[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/postset.mk)]
+[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/langlist.mk)]
 ALL_LANGS="en-US $completelangiso"
 # check the configured localizations
 WITH_LANG="$with_lang"
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 28f49fa3838c..1fb7e4ed54e0 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,8 +1,6 @@
 --with-vendor=The Document Foundation
---enable-opengl
---enable-hids
+--enable-epm
 --enable-binfilter
---with-fonts
 --with-java-target-version=1.5
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
@@ -12,4 +10,5 @@
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
 --enable-ext-scripting-python
+--enable-ext-nlpsolver
 --with-extension-integration
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 8a3a7efea779..a1a432737041 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -1,5 +1,5 @@
 --with-vendor=OxygenOffice Professional Team
---with-build-version=OxygenOffice Professional Alpha 3.5.0 M000 - OxygenOffice Build 0
+--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
 --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
 --enable-binfilter
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index 8c5f4021b58a..ba6f999b653c 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -1,5 +1,5 @@
 --with-vendor=OxygenOffice Professional Team
---with-build-version=OxygenOffice Professional Alpha 3.5.0 M000 - OxygenOffice Build 0
+--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
 --with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
 --with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
 --enable-binfilter
diff --git a/download b/download
index c337fd2d0826..0af6751223a1 100755
--- a/download
+++ b/download
@@ -284,6 +284,7 @@ for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLAT
 done
 
 # Extensions copy
+echo "Copy extensions to their location ..."
 for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
     check_file $TARFILE_LOCATION/$pack
     packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index d5121ad0bee0..bd8268e90dc2 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -9,7 +9,7 @@ Globals
 			UREPACKAGEVERSION 3.4.0
 			URELAYERVERSION 1
 			BASISROOTNAME LibreOffice
-			UNIXBASISROOTNAME libreoffice
+			UNIXBASISROOTNAME libreoffice3.4
 			SERVICETAG_PRODUCTNAME LibreOffice 3.4
 			SERVICETAG_PRODUCTVERSION 3.4
 			SERVICETAG_PARENTNAME LibreOffice 3.4
@@ -56,10 +56,10 @@ LibreOffice
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta2
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -74,7 +74,7 @@ LibreOffice
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -121,10 +121,10 @@ LibreOffice_wJRE
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta2
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -138,7 +138,7 @@ LibreOffice_wJRE
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -185,12 +185,12 @@ LibreOffice_Dev
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION beta2
+			SHORT_PRODUCTEXTENSION rc2
 			BASISROOTNAME LibO-dev
 			UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -208,7 +208,7 @@ LibreOffice_Dev
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -259,9 +259,9 @@ URE
             PACKAGEVERSION 3.4
             PACKAGEREVISION 1
             PRODUCTEXTENSION
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta2
+            SHORT_PRODUCTEXTENSION rc2
             LICENSENAME LGPL
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
@@ -299,12 +299,12 @@ LibreOffice_SDK
             PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta2
+            SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             PACKAGEVERSION 3.4.0
-            PACKAGEREVISION {milestone}
+            PACKAGEREVISION {buildid}
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
@@ -345,14 +345,14 @@ LibreOffice_Dev_SDK
             PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION beta2
+            SHORT_PRODUCTEXTENSION rc2
             BASISROOTNAME LibO-dev
             UNIXBASISROOTNAME lo-dev
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3
+            BRANDPACKAGEVERSION 3.4
             PACKAGEVERSION 3.4.0
-            PACKAGEREVISION {milestone}
+            PACKAGEREVISION {buildid}
             BASISPACKAGEPREFIX libobasis-dev
             UREPACKAGEPREFIX lodev
             SOLSUREPACKAGEPREFIX lodev
@@ -397,10 +397,10 @@ OxygenOffice
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION  beta2
+			SHORT_PRODUCTEXTENSION  rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -415,7 +415,7 @@ OxygenOffice
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -467,10 +467,10 @@ OxygenOffice_wJRE
 			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION
 			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION beta2
+			SHORT_PRODUCTEXTENSION rc2
             POSTVERSIONEXTENSION
             POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3
+			BRANDPACKAGEVERSION 3.4
 			USERDIRPRODUCTVERSION 3
 			ABOUTBOXPRODUCTVERSION 3.4.0
 			BASEPRODUCTVERSION 3.4
@@ -484,7 +484,7 @@ OxygenOffice_wJRE
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
 			PACKAGEVERSION 3.4.0
-			PACKAGEREVISION {milestone}
+			PACKAGEREVISION {buildid}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
 			WITHJREPRODUCT 1
diff --git a/post_download.in b/post_download.in
index fc4207e709fa..d7fa19a47f7d 100755
--- a/post_download.in
+++ b/post_download.in
@@ -1,4 +1,4 @@
-AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/])
+AC_INIT([LibreOffice], [3.4],,, [http://documentfoundation.org/])
 AC_PREREQ(2.50)
 
 echo "********************************************************************"
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index abfdb1537041..e3313c821db4 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -44,10 +44,7 @@ Module gid_Module_Prg_Impress_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
     gid_File_Share_Registry_Impress_Xcd,
-	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
- #if defined ENABLE_OPENGL
-     gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml,
- #endif
+    gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3142ac6e0e20..293878bc9e71 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -149,7 +149,7 @@ Module gid_Module_Root_Extension_Dictionary_En
     Files = (gid_File_Extension_Dictionary_En);
     InstallOrder = "2000";
     Sortkey = "550";
-    Spellcheckerlanguage = "en-US";
+    Spellcheckerlanguage = "en";
     PackageInfo = "packinfo_office.txt";
     ParentID = gid_Module_Dictionaries;
     Styles = ();
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 3071059f282b..e66214bbc71c 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -51,6 +51,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Lib_Wpft,
     gid_File_Lib_Msworks,
     gid_File_Lib_T602Filter,
+    gid_File_Lib_Writerfilter,
     gid_File_Lib_Wlwp,
     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
diff --git a/set_soenv.in b/set_soenv.in
index 724af0e11ec0..73c94e3cd0bf 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -989,8 +989,9 @@ $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
 # Check for poor help localizations, i.e. no help translation at all...
 @languages=();
 if (opendir(DIR,$L10N_MODULE . "/source"))
-{  @languages = readdir(DIR);
-   closedir(DIR);
+{
+    @languages = readdir(DIR);
+    closedir(DIR);
 }
 $WITH_POOR_HELP_LOCALIZATIONS = "";
 
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 ausw�hlen"
+# !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
author	Jan Holesovsky <kendy@suse.cz>	2011-05-31 10:45:37 +0200
committer	Jan Holesovsky <kendy@suse.cz>	2011-05-31 10:45:37 +0200
commit	07c1d34ec78dd6e980c4ae370042ab5e3870aa0b (patch)
tree	15568d84be2d77cb24edb7e9cc53fa0b1ceef820
parent	Put the .o files in iOS archive libraries, not the empty .obj files (diff)
parent	Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2) (diff)
download	core-07c1d34ec78dd6e980c4ae370042ab5e3870aa0b.tar.gz core-07c1d34ec78dd6e980c4ae370042ab5e3870aa0b.zip