[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 7 commits - configure.in download ooo.lst.in scp2/source set_soenv.in solenv/bin solenv/inc
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu May 12 03:25:59 PDT 2011
configure.in | 39 ++++++++++++++++++++++++++---
download | 4 +-
ooo.lst.in | 9 ++++++
scp2/source/extensions/file_extensions.scp | 16 +++++------
set_soenv.in | 11 ++++++++
solenv/bin/modules/installer/download.pm | 2 +
solenv/inc/productversion.mk | 2 -
7 files changed, 68 insertions(+), 15 deletions(-)
New commits:
commit 16f9691579f35f050b064c3679df2fc3554ba354
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 4 04:45:32 2011 +0200
Add OxygenOffice related settings
* Start download package name with OOOP in case of OxygenOffice
* Ability to create oxygenoffice product
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 05bc77a..621d7ee 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -469,6 +469,8 @@ sub get_downloadname_productname
if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 002c63a..948d0c0 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRODUCTLIST = libreoffice broffice
+PRODUCTLIST = libreoffice broffice oxygenoffice
# default values to minimize maintainance effort
PRODUCTVERSION = 3.4
commit 4e44e1dae5b02820c3d1452d51112acc07207ab5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed May 11 12:46:47 2011 +0300
AC_SUBST also OOOBLOGGER_EXTENSION_PACK as set_soenv.in uses it
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index d1d2152..0705312 100755
--- a/configure.in
+++ b/configure.in
@@ -7300,6 +7300,7 @@ else
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
fi
+AC_SUBST(OOOBLOGGER_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Sun Professional Template Pack
commit ef47a7cd01ce45f66f264b7201c60259f019d75d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 11 11:18:37 2011 +0200
Fix oooblogger extension download mechanism
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 0c47e01..d1d2152 100755
--- a/configure.in
+++ b/configure.in
@@ -7294,9 +7294,11 @@ dnl ===================================================================
AC_MSG_CHECKING([for oooblogger extension integration])
if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
AC_MSG_RESULT([no])
+ OOOBLOGGER_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
+ OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
fi
dnl ===================================================================
diff --git a/download b/download
index a353687..e2c209e 100755
--- a/download
+++ b/download
@@ -298,7 +298,7 @@ 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 $LIGHTPROOF_HU_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
+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_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
packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index 8566ef0..7a64faf 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -99,6 +99,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@HUNART_EXTENSION_PACK@
@TYPO_EXTENSION_PACK@
@GOOGLE_DOCS_EXTENSION_PACK@
+ at OOOBLOGGER_EXTENSION_PACK@
@LIGHTPROOF_EN_US_PACK@
@LIGHTPROOF_HU_PACK@
@SUNTEMPLATES_DE_PACK@
diff --git a/set_soenv.in b/set_soenv.in
index a21178f..b2d6bfd 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,7 @@ 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( "OOOBLOGGER_EXTENSION_PACK", "@OOOBLOGGER_EXTENSION_PACK@","e" );
ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
commit e070f5298f161c47fc34145c405d0c6cc82a7298
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 19:30:24 2011 +0200
When downloading extensions to src, cut is provided with wrong option switches
I used long switches for cut and your (Windows??) box does not adore about it.
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/10214
diff --git a/download b/download
index 1b9c699..a353687 100755
--- a/download
+++ b/download
@@ -300,7 +300,7 @@ done
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 $LIGHTPROOF_HU_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
- packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
+ packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
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
commit b973b670860f74d9bf4f42affcd364f48354ff15
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 11:18:46 2011 +0200
Fix space and tab jam in my last commit
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 768e1a8..0c47e01 100755
--- a/configure.in
+++ b/configure.in
@@ -7331,14 +7331,14 @@ else
for lang in $wanted_sun_templates ; do
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
- case $lang in
- "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
- "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
- "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
- "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
- "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
- "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
- esac
+ case $lang in
+ "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+ "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+ "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+ "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+ "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+ "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+ esac
fi
done
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
commit 7b64870186c80e1dfb4112aaa51bdf662db9691b
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 11:14:57 2011 +0200
Fix SUN Template extension configure, download, handling
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 81ed085..768e1a8 100755
--- a/configure.in
+++ b/configure.in
@@ -7321,15 +7321,35 @@ else
done
fi
SUNTEMPLATES_LANG=
+ SUNTEMPLATES_DE_PACK=
+ SUNTEMPLATES_EN_US_PACK=
+ SUNTEMPLATES_ES_PACK=
+ SUNTEMPLATES_FR_PACK=
+ SUNTEMPLATES_HU_PACK=
+ SUNTEMPLATES_IT_PACK=
# check whether the langs are requested at all
for lang in $wanted_sun_templates ; do
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+ case $lang in
+ "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+ "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+ "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+ "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+ "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+ "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+ esac
fi
done
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
fi
AC_SUBST(SUNTEMPLATES_LANG)
+AC_SUBST(SUNTEMPLATES_DE_PACK)
+AC_SUBST(SUNTEMPLATES_EN_US_PACK)
+AC_SUBST(SUNTEMPLATES_ES_PACK)
+AC_SUBST(SUNTEMPLATES_FR_PACK)
+AC_SUBST(SUNTEMPLATES_HU_PACK)
+AC_SUBST(SUNTEMPLATES_IT_PACK)
dnl ===================================================================
dnl Test whether to include fonts
diff --git a/download b/download
index 127be9e..1b9c699 100755
--- a/download
+++ b/download
@@ -298,7 +298,7 @@ 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 $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK; do
+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 $LIGHTPROOF_HU_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
packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index c4084d0..8566ef0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -101,4 +101,10 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@GOOGLE_DOCS_EXTENSION_PACK@
@LIGHTPROOF_EN_US_PACK@
@LIGHTPROOF_HU_PACK@
+ at SUNTEMPLATES_DE_PACK@
+ at SUNTEMPLATES_EN_US_PACK@
+ at SUNTEMPLATES_ES_PACK@
+ at SUNTEMPLATES_FR_PACK@
+ at SUNTEMPLATES_HU_PACK@
+ at SUNTEMPLATES_IT_PACK@
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index ff61178..a2b48ec 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -295,12 +295,12 @@ File gid_File_Optional_Extensions_Sun_Template_Pack
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
- Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt";
- Name (de) = "Sun_ODF_Template_Pack_de.oxt";
- Name (it) = "Sun_ODF_Template_Pack_it.oxt";
- Name (fr) = "Sun_ODF_Template_Pack_fr.oxt";
- Name (es) = "Sun_ODF_Template_Pack_es.oxt";
- Name (hu) = "Sun_ODF_Template_Pack_hu.oxt";
+ Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
+ Name (de) = "Sun-ODF-Template-Pack-de.oxt";
+ Name (it) = "Sun-ODF-Template-Pack-it.oxt";
+ Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
+ Name (es) = "Sun-ODF-Template-Pack-es.oxt";
+ Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
End
#endif
diff --git a/set_soenv.in b/set_soenv.in
index 6e99498..a21178f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,13 @@ 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( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
+ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
+ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
+ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
+ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
+ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
+ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
ToFile( "LIGHTPROOF_LANG", "@LIGHTPROOF_LANG@", "e" );
commit 014274fbb85caf07d61954108b891b6ae72516f0
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 10:25:25 2011 +0200
Fix Ligthproof extension integration
* Fix configure and download support
* Extension naming scheme is: <md5>-<extension-name>_<version>.oxt
- Renamed extensions
* Rename extension version number in download script and scp2 module
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 73e86aa..81ed085 100755
--- a/configure.in
+++ b/configure.in
@@ -7106,7 +7106,7 @@ if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; t
AC_MSG_RESULT([no integration])
else
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
- lightproof_supported_langs="hu"
+ lightproof_supported_langs="en-US hu"
if test "z$enable_ext_lightproof" = "zyes" ; then
wanted_lightproof="$lightproof_supported_langs"
else
@@ -7119,15 +7119,23 @@ else
done
fi
LIGHTPROOF_LANG=
+ LIGHTPROOF_HU_PACK=
+ LIGHTPROOF_EN_US_PACK=
# check whether the langs are requested at all
for lang in $wanted_lightproof ; do
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
+ case $lang in
+ "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
+ "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
+ esac
fi
done
AC_MSG_RESULT([$LIGHTPROOF_LANG])
fi
AC_SUBST(LIGHTPROOF_LANG)
+AC_SUBST(LIGHTPROOF_HU_PACK)
+AC_SUBST(LIGHTPROOF_EN_US_PACK)
dnl ===================================================================
dnl Test whether to include Watch Window extension
@@ -7196,7 +7204,7 @@ else
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE CT2N"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
- CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
+ CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
fi
AC_SUBST(CT2N_EXTENSION_PACK)
@@ -7224,7 +7232,7 @@ if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
- HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart-0.3.oxt"
+ HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
fi
AC_SUBST(HUNART_EXTENSION_PACK)
@@ -7238,7 +7246,7 @@ if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
- TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo-0.4.2.oxt"
+ TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
fi
AC_SUBST(TYPO_EXTENSION_PACK)
diff --git a/download b/download
index abe4c79..127be9e 100755
--- a/download
+++ b/download
@@ -298,9 +298,9 @@ 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
+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 $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK; do
check_file $TARFILE_LOCATION/$pack
- packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2 | cut --delimiter=_ --fields=1`
+ 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
diff --git a/ooo.lst.in b/ooo.lst.in
index f20a385..c4084d0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -99,4 +99,6 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@HUNART_EXTENSION_PACK@
@TYPO_EXTENSION_PACK@
@GOOGLE_DOCS_EXTENSION_PACK@
+ at LIGHTPROOF_EN_US_PACK@
+ at LIGHTPROOF_HU_PACK@
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index b8919bc..ff61178 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -112,8 +112,8 @@ File gid_File_Oxt_LightProof
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_LightProof;
- Name (en-US) = "lightproof-en-US-0.1.oxt";
- Name (hu) = "lightproof-hu-1.2.oxt";
+ Name (en-US) = "lightproof-en-US.oxt";
+ Name (hu) = "lightproof-hu.oxt";
End
#endif
diff --git a/set_soenv.in b/set_soenv.in
index 522de78..6e99498 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,9 @@ 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( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
+ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
+ToFile( "LIGHTPROOF_LANG", "@LIGHTPROOF_LANG@", "e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
More information about the Libreoffice-commits
mailing list