---------- Forwarded message ----------
From: KAMI911 KAMI911 <kami...@gmail.com>
Date: 2011/4/24
Subject: [PATCH] Initial steps to support extras - download
To: Katarina Machalkova <kmachalk...@suse.cz>
Copy and extract for extensions and extras.
Please review it and add to libreoffice-3-4 and master.
Thanks,
KAMI
2011/4/23 KAMI911 KAMI911 <kami...@gmail.com>:
> Hi,
>
> Additional download support for extensions. Please review it and add
> to libreoffice-3-4 and master.
>
> Thanks,
> KAMI
>
> 2011/4/22 KAMI911 KAMI911 <kami...@gmail.com>:
>> Hi Katarina,
>>
>> Yes I did, now I attached.
>>
>> Thanks,
>> KAMI
>>
>> 2011/4/22 Katarina Machalkova <kmachalk...@suse.cz>
>>>
>>> Hey,
>>>
>>> > Please review the attached stuffs. I would like to add it to master and
>>> > libreoffice-3-4. Not affecting LibreOffice. It adds support to download
>>> > extra stuffs.
>>>
>>> Didn't you forget to actually attach something? :) ;)
>>>
>>> B.
>>> _______________________________________________
>>> LibreOffice mailing list
>>> LibreOffice@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>
>
From 1e221d083f1410c3fb2c8a31d71ccef264babf55 Mon Sep 17 00:00:00 2001
From: Kalman Szalai - KAMI <kami...@gmail.com>
Date: Sun, 24 Apr 2011 10:53:35 +0200
Subject: [PATCH] Add copy and extract for extras and few extensions
---
download | 30 ++++++++++++++++++++++++++++++
set_soenv.in | 13 +++++++++++++
2 files changed, 43 insertions(+), 0 deletions(-)
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 01865de..69d596e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1855,6 +1855,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" );
--
1.7.4.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
