[Libreoffice-commits] .: bin/unpack download.in

[Tor Lillqvist]

 bin/unpack  |   22 ++++++----------------
 download.in |    2 +-
 2 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit 65ddb37212f8014e57eda41fdfcf7ae1e113b075
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 13:58:05 2011 +0300

    Replace l10n with translations
    
    Also, drop the no longer needed workaround for i#95634, bnc#571489
    regarding vendor names.

diff --git a/bin/unpack b/bin/unpack
index 2023326..9ec756f 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -56,7 +56,7 @@ check_git_repo()
         if test "$CURRENT_BRANCH" = "$BUILD_BRANCH"; then
 	    echo "ok"
         else
-	    echo "warning, current branch is $CURRENT_BRANCH"
+	    echo "warning, current branch is $CURRENT_BRANCH which is different from $BUILD_BRANCH"
         fi
     else
         echo "missing the $tree clone; run './download'"
@@ -100,7 +100,7 @@ if test "z$OOO_GIT" = "z" ; then
 	    CORE_PKGS=$ALL_CORE_PKGS
 	fi
 	if test "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" -a "z$PIECE" = "z" ; then
-	    CORE_PKGS="$CORE_PKGS l10n"
+	    CORE_PKGS="$CORE_PKGS translations"
 	fi
 	for pkg in $CORE_PKGS; do
 	    check_tarball "$OOO_SPLIT_PREFIX$pkg-$OOO_SOURCEVERSION.tar.bz2"
@@ -117,8 +117,9 @@ else
         CORE_PKGS=$ALL_CORE_PKGS
     fi
     if test \( "z$OOO_LANGS" != "z" -a "z$OOO_LANGS" != "zen-US" -a "z$PIECE" = "z" \) -o "z$BUILD_WIN32" != "z"; then
-        CORE_PKGS="$CORE_PKGS l10n"
+        CORE_PKGS="$CORE_PKGS translations"
     fi
+    cd $RAWBUILDDIR
     for pkg in $CORE_PKGS ; do
         check_git_repo $pkg
     done
@@ -280,9 +281,9 @@ else
     touch "$CLONEDIR/repos_changed"
     rsync -prLt --exclude .git --exclude '/clone' --exclude 'unx*.pro' --exclude 'wnt*.pro' "$RAWBUILDDIR/" "$OOBUILDDIR/"
     touch "$TOOLSDIR/stamp/refresh"
-    if test -d "$CLONEDIR/l10n" && [ "$OOO_LANGS" != "en-US" ]; then
+    if test -d "$CLONEDIR/translations" && [ "$OOO_LANGS" != "en-US" ]; then
 	echo "* copying translations into $OOBUILDDIR..."
-	rsync -a --exclude .git $CLONEDIR/l10n/* $OOBUILDDIR/
+	rsync -a --exclude .git $CLONEDIR/translations/* $OOBUILDDIR/
     fi
 fi
 
@@ -320,17 +321,6 @@ echo "$OOO_SOURCEDIRNAME" > "$OOBUILDDIR/.source"
 echo "Fixing unfortunate snafus"
 cd $BUILDDIR
 
-# workaround for i#95634, bnc#571489
-
-if test "z$PIECE" = "z"; then
-    if [ -d $OOBUILDDIR/l10n ]; then
-    for file in `find $OOBUILDDIR/l10n -type f -name "localize.sdf"` ; do
-	chmod 644 $file
-	perl -i -pe 's/(instsetoo_native\tinc_openoffice\\windows\\msi_languages\\Control.ulf.*OOO_CONTROL_124.*)(Sun Microsystems, Inc.|Oracle)/\1$ENV{"VENDORNAME"}/' $file
-    done
-    fi
-fi
-
 # copy in the prebuilt jsr173_1.0_api.jar if available
 # allows to build with JDK 1.4
 JSR_API_JAR=jsr173_1.0_api.jar
diff --git a/download.in b/download.in
index d7a8096..d71f93d 100755
--- a/download.in
+++ b/download.in
@@ -519,7 +519,7 @@ source_file( '@OOO_EXTRA_ARTWORK@' ) if '@OOO_EXTRA_ARTWORK@';
 source_file( "biblio.tar.bz2" );
 
 if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@BUILD_WIN32@' ne '' ) {
-    source_file_ooo( "l10n" );
+    source_file_ooo( "translations" );
 }
 
 if ('@PIECE@' eq 'bootstrap') {