[Libreoffice-commits] .: configure.in download ooo.lst.in set_soenv.in

[Kalman "" Szalai]

 configure.in |   21 +++++++++++++++++++++
 download     |    6 ++++++
 ooo.lst.in   |    1 +
 set_soenv.in |   10 ++++++----
 4 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 8aa73a8f74cfcdc2fffdc16c8094bd257c8ade0d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Nov 29 17:12:02 2011 +0100

    Add enable-oxygenoffice configure switch
    
    Now only handling brand downloading

diff --git a/configure.in b/configure.in
index 3e3671f..005a68e 100644
--- a/configure.in
+++ b/configure.in
@@ -784,6 +784,11 @@ AC_ARG_ENABLE(extra-font,
         [Add extra font content.]),
 ,)
 
+AC_ARG_ENABLE(oxygenoffice,
+    AS_HELP_STRING([--enable-oxygenoffice],
+        [Download OxygenOffice branding and set custom settings.]),
+,)
+
 AC_ARG_ENABLE(lomenubar,
     AS_HELP_STRING([--enable-lomenubar],
         [Enable global menu support.]),
@@ -8437,6 +8442,22 @@ AC_SUBST(WITH_EXTRA_FONT)
 AC_SUBST(OOOP_FONTS_PACK)
 
 dnl ===================================================================
+dnl Test whether to download OxygenOffice branding and set custom settings
+dnl ===================================================================
+AC_MSG_CHECKING([whether to download OxygenOffice branding and set custom settings])
+if test "z$enable_oxygenoffice" = "z" -o "z$enable_oxygenoffice" = "zno" ; then
+    AC_MSG_RESULT([no])
+    ENABLE_OXYGENOFFICE=NO
+else
+    AC_MSG_RESULT([yes])
+    ENABLE_OXYGENOFFICE=YES
+    OXYGENOFFICE_PACK="18bf204479ff641d99a88cd71f6f25f7-oxygenoffice-001.zip"
+    BUILD_TYPE="$BUILD_TYPE OXYGENOFFICE"
+fi
+AC_SUBST(ENABLE_OXYGENOFFICE)
+AC_SUBST(OXYGENOFFICE_PACK)
+
+dnl ===================================================================
 dnl Test whether to build global menu support
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build global menu support])
diff --git a/download b/download
index ded21af..716bd53 100755
--- a/download
+++ b/download
@@ -278,6 +278,12 @@ for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLAT
     unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
 done
 
+if [ $OXYGENOFFICE_PACK = "YES" ] ; then
+    check_file $TARFILE_LOCATION/$OXYGENOFFICE_PACK
+    echo "Unpacking OxygenOffice '$OXYGENOFFICE_PACK' ..."
+    unzip -o -q $TARFILE_LOCATION/$OXYGENOFFICE_PACK -d $SRC_ROOT/src
+fi
+
 # Extensions copy
 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_RU_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
diff --git a/ooo.lst.in b/ooo.lst.in
index 51695cf..991bca5 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -98,6 +98,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @OOOP_TEMPLATES_PACK@
 @OOOP_FONTS_PACK@
 @OOOP_SAMPLES_PACK@
+ at OXYGENOFFICE_PACK@
 @CT2N_EXTENSION_PACK@
 @BARCODE_EXTENSION_PACK@
 @DIAGRAM_EXTENSION_PACK@
diff --git a/set_soenv.in b/set_soenv.in
index 3011c09..b399531 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1942,10 +1942,12 @@ ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
 ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
 ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
-ToFile( "WITH_EXTRA_GALLERY",       "@WITH_EXTRA_GALLERY@",      "e" );
-ToFile( "WITH_EXTRA_TEMPLATE",       "@WITH_EXTRA_TEMPLATE@",      "e" );
-ToFile( "WITH_EXTRA_SAMPLE",       "@WITH_EXTRA_SAMPLE@",      "e" );
-ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
+ToFile( "WITH_EXTRA_GALLERY","@WITH_EXTRA_GALLERY@",      "e" );
+ToFile( "WITH_EXTRA_TEMPLATE","@WITH_EXTRA_TEMPLATE@",      "e" );
+ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@",      "e" );
+ToFile( "WITH_EXTRA_FONT",   "@WITH_EXTRA_FONT@",      "e" );
+ToFile( "ENABLE_OXYGENOFFICE","@ENABLE_OXYGENOFFICE@","e" );
+ToFile( "OXYGENOFFICE_PACK","@OXYGENOFFICE_PACK@","e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
 ToFile( "SYSTEM_DB_CFLAGS",  "@SYSTEM_DB_CFLAGS@", "e" );
 ToFile( "DB_LIB",            "@DB_LIB@",           "e" );