ooo-build r12043 - in trunk: . bin

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12043 - in trunk: . bin
Date: Fri, 28 Mar 2008 15:26:21 +0000 (GMT)
Author: szalaik
Date: Fri Mar 28 15:26:20 2008
New Revision: 12043
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12043&view=rev

Log:
2008-03-28  Kalman Szalai - KAMI <kamihir freemail hu>

	Introduce font updating facility for DejaVu and Liberation fonts:
	* bin/setup.in
	* bin/unpack
	* configure.in
	* download.in
	ooo-build's new configure options are:
	--with-dejavu-fonts=(version)
	--with-liberation-fonts
	Because these fonts are already parts of OOo we just do UPDATES.



Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Fri Mar 28 15:26:20 2008
@@ -46,6 +46,9 @@
 SYSTEM_LIBWPG= SYSTEM_LIBWPG@
 SYSTEM_LIBWPS= SYSTEM_LIBWPS@
 GLITZ_VER= GLITZ_VER@
+DEJAVU_FONTS_VER= DEJAVU_FONTS_VER@
+DEJAVU_FONTS_PACK_NAME= DEJAVU_FONTS_PACK_NAME@
+LIBERATION_FONTS_VER= LIBERATION_FONTS_VER@
 AGFA_MONOTYPE_FONTS_SOURCE= AGFA_MONOTYPE_FONTS_SOURCE@
 GNUCP= GNUCP@
 GNUPATCH= GNUPATCH@

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Fri Mar 28 15:26:20 2008
@@ -316,26 +316,6 @@
 	esac
     fi
 
-
-    if test "x$DEJAVU_FONTS_VER" != "x"; then
-        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
-	if [ "$DEJAVU_FONTS_VER" -gt "2.21" ]; then
-		DEJAVU_FONTSSRC=dejavu-fonts-ttf-$DEJAVU_FONTS_VER.tar.bz2
-	elif [ "$DEJAVU_FONTS_VER" -gt "2.11" ]; then
-		DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.bz2
-	else
-		DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
-	fi
-        if test -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
-            echo "Already have DejaVu fonts"
-        else
-            echo "Installing DejaVu fonts"
-            mkdir -p $DEJAVU_FONTSDEST || exit 1;
-            $GNUCP -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
-            echo "done"
-        fi
-    fi
-
     # Icons.
     # Just plunk them on top of the upstream ones for now. I'm
     # too lazy to add configury to make it optional and to check for
@@ -419,6 +399,26 @@
     $GNUTAR xjf $SRCDIR/openclipart-$OPENCLIPART_VER.tar.bz2 || exit 1;
 fi
 
+if test "x$DEJAVU_FONTS_VER" != "x"; then
+    DEJAVU_FONTSDEST=$OOBUILDDIR/bitstream_vera_fonts/download/
+    echo "Updating DejaVu fonts zip archive to version $DEJAVU_FONTS_VER"
+    $GNUCP -f $SRCDIR/$DEJAVU_FONTS_PACK_NAME.zip $DEJAVU_FONTSDEST || exit 1;
+    echo "done"
+    echo "Correcting the package names of DejaVu font packages to $DEJAVU_FONTS_PACK_NAME"
+    sed -e "s|TARFILE_NAME=.*$|TARFILE_NAME=$DEJAVU_FONTS_PACK_NAME|" -e "s|TARFILE_ROOTDIR=.*$|TARFILE_ROOTDIR=$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk >  $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver
+    mv $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
+    echo "done"
+fi
+
+if test "x$LIBERATION_FONTS_VER" != "x"; then
+    LIBERATION_FONTSDEST=$OOBUILDDIR/bitstream_vera_fonts/download/liberation-fonts.zip
+    echo "Updating Liberation fonts zip archive to version $LIBERATION_FONTS_VER"
+    LIBERATION_FONTSSRC=liberation-fonts-ttf-$LIBERATION_FONTS_VER.zip
+    $GNUCP -f $SRCDIR/$LIBERATION_FONTSSRC $LIBERATION_FONTSDEST || exit 1;
+    echo "done"
+fi
+
+
 if test "x$MDBTOOLS_SRC" != "x" -a "z$SYSTEM_MDBTOOLS" != "zYES"; then
     echo "Copying mdbtools into the tree"
     MDBDEST=$OOBUILDDIR/mdbtools/download

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Mar 28 15:26:20 2008
@@ -277,12 +277,25 @@
 
 AC_ARG_WITH(dejavu-fonts,
 [
-  --with-dejavu-fonts     Download and install DejaVu Fonts. The parameter is
+  --with-dejavu-fonts     Download and install updated DejaVu Fonts. The parameter is
                           a version number.
 		      
-			  Example: --with-dejavu-fonts=2.1],
+			  Example: --with-dejavu-fonts=2.24
+
+			  DejaVu Fonts already part of OpenOffice.org so you should
+			  add this parameter if you want newer version.],
+,)
+
+AC_ARG_WITH(liberation-fonts,
+[
+  --with-liberation-fonts
+		          Download and install updated Liberation Fonts. The parameter is
+                          a version number.
+		      
+			  Example: --with-liberation-fonts=1.1],
 ,)
 
+
 AC_ARG_WITH(gnu-cp,
 [
   --with-gnu-cp           The parameter is an absolute path to GNU cp.
@@ -802,21 +815,44 @@
 AC_SUBST(OPENCLIPART_VER)
 AC_SUBST(OPENCLIPART_DIR)
 
+
 AC_MSG_CHECKING([for DejaVu Fonts])
 DEJAVU_FONTS_VER=
+DEJAVU_FONTS_PACK_NAME=
 if test "z$with_dejavu_fonts" != "z" -a "z$with_dejavu_fonts" != "zno" ; then
     if test "z$with_dejavu_fonts" = "zyes" ; then
-	# the fonts from the source tarball by default
-	DEJAVU_FONTS_VER=2.1
+	# the fonts from the source zip by default
+	DEJAVU_FONTS_VER=2.24
     elif (echo "$with_dejavu_fonts" | $GREP "^[[0-9\.]]*$") ; then
 	# it's a version number
 	DEJAVU_FONTS_VER=$with_dejavu_fonts
+	DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$with_dejavu_fonts
     else
 	AC_MSG_ERROR([--with-dejavu-fonts requires either yes, no, or a version number])
     fi
+else DEJAVU_FONTS_PACK_NAME=dejavu-ttf-2.21
 fi
 AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no}])
 AC_SUBST(DEJAVU_FONTS_VER)
+AC_SUBST(DEJAVU_FONTS_PACK_NAME)
+
+
+AC_MSG_CHECKING([for Liberation Fonts])
+LIBERATION_FONTS_VER=
+if test "z$with_liberation_fonts" != "z" -a "z$with_liberation_fonts" != "zno" ; then
+    if test "z$with_liberation_fonts" = "zyes" ; then
+	# the fonts from the source zip by default
+	LIBERATION_FONTS_VER=1.1
+    elif (echo "$with_liberation_fonts" | $GREP "^[[0-9\.]]*$") ; then
+	# it's a version number
+	LIBERATION_FONTS_VER=$with_liberation_fonts
+    else
+	AC_MSG_ERROR([--with-liberation-fonts requires either yes, no, or a version number])
+    fi
+fi
+AC_MSG_RESULT([${LIBERATION_FONTS_VER:-no}])
+AC_SUBST(LIBERATION_FONTS_VER)
+
 
 AC_MSG_CHECKING([for GNU cp])
 GNUCP=cp

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Fri Mar 28 15:26:20 2008
@@ -60,7 +60,9 @@
     'dbghinst\.EXE'			 => 'http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US',
     '5_11_98Odma20\.zip'		 => '@MIRROR@/support',
     'openclipart-.*'			 => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
-    'dejavu-.*'				 => 'http://kent.dl.sf.net/sourceforge/dejavu/',
+#Update fonts:
+    'dejavu-fonts-ttf-.*'		 => '@MIRROR@/SRC680',
+    'liberation-fonts-ttf-.*'		 => '@MIRROR@/SRC680',
 # Win32 ant binaries ...
     'apache-ant-.*'                      => 'http://archive.apache.org/dist/ant/binaries',
 # Mozilla source and libraries
@@ -220,14 +222,11 @@
 }
 
 if ('@DEJAVU_FONTS_VER@' ne '') {
+    push @files, ( '@DEJAVU_FONTS_PACK_NAME  zip' );
+}
 
-    if ('@DEJAVU_FONTS_VER@' gt '2.21') {
-	push @files, ( 'dejavu-fonts-ttf- DEJAVU_FONTS_VER@.tar.bz2' );}
-    elsif ('@DEJAVU_FONTS_VER@' gt '2.11') {
-        push @files, ( 'dejavu-ttf- DEJAVU_FONTS_VER@.tar.bz2' );
-    } else {
-        push @files, ( 'dejavu-ttf- DEJAVU_FONTS_VER@.tar.gz' );
-    }
+if ('@LIBERATION_FONTS_VER@' ne '') {
+    push @files, ( 'liberation-fonts-ttf- LIBERATION_FONTS_VER@.zip' );
 }
 
 if ('@MDBTOOLS_SRC@' ne '') {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]