[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 4 commits - configure.in distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download ooo.lst.in scp2/source set_soenv.in
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Tue May 3 19:56:48 PDT 2011
configure.in | 34 +++++++++++++++++-----
distro-configs/OxygenOfficeLinux.conf | 2 +
distro-configs/OxygenOfficeWin32.conf | 2 +
download | 30 +++++++++++++++++++
ooo.lst.in | 9 +++++
scp2/source/accessories/file_font_accessories.scp | 19 ------------
set_soenv.in | 13 ++++++++
7 files changed, 83 insertions(+), 26 deletions(-)
New commits:
commit b66d73dec37f748917627ce525f428825b7d9089
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 4 04:55:31 2011 +0200
Refine lication of OxygenOffice splash
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index d2050eb..a1a4327 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -1,5 +1,7 @@
--with-vendor=OxygenOffice Professional Team
--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
--enable-vba
--enable-build-mozilla
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index 45927e0..ba6f999 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -1,5 +1,7 @@
--with-vendor=OxygenOffice Professional Team
--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
--enable-vba
--disable-build-mozilla
commit 08a8f790026dd4dc2d8f72cba93958ffbc90e0f0
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 4 04:54:34 2011 +0200
Remove already integrated fonts from extra fonts
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
index 2683ed9..9adbe4b 100644
--- a/scp2/source/accessories/file_font_accessories.scp
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -880,22 +880,3 @@ STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Ser
STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
#endif
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital)
-#endif
-
commit b7bc669766dcae71653d57dde01db1d2ae6ed734
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Apr 24 10:53:35 2011 +0200
Add copy and extract for extras and few extensions
diff --git a/download b/download
index 45c356c..abe4c79 100755
--- a/download
+++ b/download
@@ -34,6 +34,18 @@ fi
# we want to clone if we are in the bootstrap git repo and clone does not exist yet
# we need to test for a .git in order not to clone after rsync if we are called in
# the inner autogen of the buid-repo based build
+
+check_file()
+{
+ echo "Looking for $1 ..."
+ if test -f $1; then
+ echo "ok"
+ else
+ echo "missing required archive; run './download' again";
+ exit 1;
+ fi
+}
+
if [ -d .git ] ; then
if [ -z "$GIT_LINK_SRC" ]; then
./g -f clone
@@ -276,6 +288,24 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then
fi
fi
+# OxygenOffice extras
+echo "Unpacking OxygenOffice extras ..."
+for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
+ check_file $TARFILE_LOCATION/$pack
+ echo "Unpacking $pack ..."
+ unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
+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 ; do
+ check_file $TARFILE_LOCATION/$pack
+ packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2 | cut --delimiter=_ --fields=1`
+ echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
+ mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
+ cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
+done
+
[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
./post_download || exit 1
diff --git a/set_soenv.in b/set_soenv.in
index a1bd947..522de78 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1874,6 +1874,19 @@ ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" );
ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" );
ToFile( "MOZ_NSS_LIBS", "@MOZ_NSS_LIBS@", "e" );
ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
+ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" );
+ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" );
+ToFile( "OOOP_FONTS_PACK", "@OOOP_FONTS_PACK@","e" );
+ToFile( "OOOP_SAMPLES_PACK", "@OOOP_SAMPLES_PACK@","e" );
+ToFile( "CT2N_EXTENSION_PACK", "@CT2N_EXTENSION_PACK@","e" );
+ToFile( "BARCODE_EXTENSION_PACK", "@BARCODE_EXTENSION_PACK@","e" );
+ToFile( "DIAGRAM_EXTENSION_PACK", "@DIAGRAM_EXTENSION_PACK@","e" );
+ToFile( "VALIDATOR_EXTENSION_PACK", "@VALIDATOR_EXTENSION_PACK@","e" );
+ToFile( "WATCH_WINDOW_EXTENSION_PACK", "@WATCH_WINDOW_EXTENSION_PACK@","e" );
+ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
+ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
+ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
+ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
commit 8647a5a6e70b0c478bc26b419d4651ec6df47260
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Apr 23 09:31:45 2011 +0200
Add download support to a few extension in bootstrap
diff --git a/configure.in b/configure.in
index 895d43b..939d567 100755
--- a/configure.in
+++ b/configure.in
@@ -7150,11 +7150,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Watch Window extension integration])
if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
AC_MSG_RESULT([no])
+ WATCH_WINDOW_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+ WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
fi
-AC_SUBST(WITH_WATCH_WINDOW_EXTENSION)
+AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Diagram extension
@@ -7162,11 +7164,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Diagram extension integration])
if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
AC_MSG_RESULT([no])
+ DIAGRAM_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
+ DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
fi
-AC_SUBST(WITH_DIAGRAM_EXTENSION)
+AC_SUBST(DIAGRAM_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Validator extension
@@ -7174,11 +7178,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Validator extension integration])
if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
AC_MSG_RESULT([no])
+ VALIDATOR_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
+ VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
fi
-AC_SUBST(WITH_VALIDATOR_EXTENSION)
+AC_SUBST(VALIDATOR_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Barcode extension
@@ -7186,11 +7192,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Barcode extension integration])
if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
AC_MSG_RESULT([no])
+ BARCODE_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
+ BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
fi
-AC_SUBST(WITH_BARCODE_EXTENSION)
+AC_SUBST(BARCODE_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include ConvertTextToNumber extension
@@ -7198,11 +7206,14 @@ dnl ===================================================================
AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
if test "z$enable_ext_ct2n" = "z" -o "z$enable_ext_ct2n" = "zno" ; then
AC_MSG_RESULT([no])
+ CT2N_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE CT2N"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
+ CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
fi
+AC_SUBST(CT2N_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Numbertext extension
@@ -7210,11 +7221,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Numbertext extension integration])
if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
AC_MSG_RESULT([no])
+ NUMBERTEXT_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
+ NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext-0.9.4.oxt"
fi
-AC_SUBST(WITH_NUMBERTEXT_EXTENSION)
+AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Hungarian Cross-reference Toolbar extension
@@ -7222,11 +7235,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
AC_MSG_RESULT([no])
+ HUNART_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
+ HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart-0.3.oxt"
fi
-AC_SUBST(WITH_HUNART_EXTENSION)
+AC_SUBST(HUNART_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Typography Toolbar extension
@@ -7234,11 +7249,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Typography Toolbar extension integration])
if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
AC_MSG_RESULT([no])
+ TYPO_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
+ TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo-0.4.2.oxt"
fi
-AC_SUBST(WITH_TYPO_EXTENSION)
+AC_SUBST(TYPO_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Google Docs extension
@@ -7246,10 +7263,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Google Docs extension integration])
if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
AC_MSG_RESULT([no])
+ GOOGLE_DOCS_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
+ GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
fi
+AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include NLPSolver extension
diff --git a/ooo.lst.in b/ooo.lst.in
index 94d69c2..f20a385 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,4 +90,13 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@OOOP_TEMPLATES_PACK@
@OOOP_FONTS_PACK@
@OOOP_SAMPLES_PACK@
+ at CT2N_EXTENSION_PACK@
+ at BARCODE_EXTENSION_PACK@
+ at DIAGRAM_EXTENSION_PACK@
+ at VALIDATOR_EXTENSION_PACK@
+ at WATCH_WINDOW_EXTENSION_PACK@
+ at NUMBERTEXT_EXTENSION_PACK@
+ at HUNART_EXTENSION_PACK@
+ at TYPO_EXTENSION_PACK@
+ at GOOGLE_DOCS_EXTENSION_PACK@
More information about the Libreoffice-commits
mailing list