Skip to content

Commit a39f11a

Browse files
dtardondtardon
committed
gbuildize extras
Change-Id: I190b1314a91026dcfc39df3e3e178df55d14d90a
1 parent 20f06e3 commit a39f11a

File tree

323 files changed

+8105
-6332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+8105
-6332
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ TAGS
9999
/external/*/*.txt
100100
/external/*/*.msm
101101
/moz/zipped/*.zip
102-
/extras/source/extensions
103102

104103
# links to the other repositories
105104
/binfilter

‎Makefile.top

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ embeddedobj\
6666
embedserv\
6767
eventattacher\
6868
extensions\
69+
extras\
6970
fileaccess\
7071
filter\
7172
forms\
@@ -186,7 +187,6 @@ curl\
186187
epm\
187188
expat\
188189
external\
189-
extras\
190190
fontconfig\
191191
freetype\
192192
gdk-pixbuf\

‎RepositoryModule_ooo.mk

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
6262
embedserv \
6363
eventattacher \
6464
extensions \
65+
extras \
6566
fileaccess \
6667
filter \
6768
forms \

‎config_host.mk.in

+1
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
584584
export WITH_BINFILTER=@WITH_BINFILTER@
585585
export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
586586
export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
587+
export WITH_EXTRA_EXTENSIONS=@WITH_EXTRA_EXTENSIONS@
587588
export WITH_EXTRA_FONT=@WITH_EXTRA_FONT@
588589
export WITH_EXTRA_GALLERY=@WITH_EXTRA_GALLERY@
589590
export WITH_EXTRA_SAMPLE=@WITH_EXTRA_SAMPLE@

‎configure.in

+15-3
Original file line numberDiff line numberDiff line change
@@ -10418,6 +10418,11 @@ else
1041810418
fi
1041910419
AC_SUBST(WITH_EXTENSION_INTEGRATION)
1042010420

10421+
dnl Should any extra extensions be included?
10422+
dnl There are standalone tests for each of these below.
10423+
WITH_EXTRA_EXTENSIONS=
10424+
AC_SUBST([WITH_EXTRA_EXTENSIONS])
10425+
1042110426
dnl ===================================================================
1042210427
dnl Test whether to include Watch Window extension
1042310428
dnl ===================================================================
@@ -10426,6 +10431,7 @@ WATCH_WINDOW_EXTENSION_PACK=
1042610431
if test "x$enable_ext_watch_window" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1042710432
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
1042810433
WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
10434+
WITH_EXTRA_EXTENSIONS=YES
1042910435
AC_MSG_RESULT([yes])
1043010436
else
1043110437
AC_MSG_RESULT([no])
@@ -10440,6 +10446,7 @@ DIAGRAM_EXTENSION_PACK=
1044010446
if test "x$enable_ext_diagram" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1044110447
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
1044210448
DIAGRAM_EXTENSION_PACK="8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt"
10449+
WITH_EXTRA_EXTENSIONS=YES
1044310450
AC_MSG_RESULT([yes])
1044410451
else
1044510452
AC_MSG_RESULT([no])
@@ -10454,6 +10461,7 @@ VALIDATOR_EXTENSION_PACK=
1045410461
if test "x$enable_ext_validator" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1045510462
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
1045610463
VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
10464+
WITH_EXTRA_EXTENSIONS=YES
1045710465
AC_MSG_RESULT([yes])
1045810466
else
1045910467
AC_MSG_RESULT([no])
@@ -10468,6 +10476,7 @@ BARCODE_EXTENSION_PACK=
1046810476
if test "x$enable_ext_barcode" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1046910477
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
1047010478
BARCODE_EXTENSION_PACK="3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt"
10479+
WITH_EXTRA_EXTENSIONS=YES
1047110480
AC_MSG_RESULT([yes])
1047210481
else
1047310482
AC_MSG_RESULT([no])
@@ -10478,16 +10487,13 @@ dnl ===================================================================
1047810487
dnl Test whether to include ConvertTextToNumber extension
1047910488
dnl ===================================================================
1048010489
AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
10481-
CT2N_EXTENSION_PACK=
1048210490
if test "x$enable_ext_ct2n" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1048310491
BUILD_TYPE="$BUILD_TYPE CT2N"
1048410492
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
10485-
CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
1048610493
AC_MSG_RESULT([yes])
1048710494
else
1048810495
AC_MSG_RESULT([no])
1048910496
fi
10490-
AC_SUBST(CT2N_EXTENSION_PACK)
1049110497

1049210498
dnl ===================================================================
1049310499
dnl Test whether to include Numbertext extension
@@ -10497,6 +10503,7 @@ NUMBERTEXT_EXTENSION_PACK=
1049710503
if test "x$enable_ext_numbertext" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1049810504
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
1049910505
NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt"
10506+
WITH_EXTRA_EXTENSIONS=YES
1050010507
AC_MSG_RESULT([yes])
1050110508
else
1050210509
AC_MSG_RESULT([no])
@@ -10511,6 +10518,7 @@ HUNART_EXTENSION_PACK=
1051110518
if test "x$enable_ext_hunart" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1051210519
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
1051310520
HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
10521+
WITH_EXTRA_EXTENSIONS=YES
1051410522
AC_MSG_RESULT([yes])
1051510523
else
1051610524
AC_MSG_RESULT([no])
@@ -10525,6 +10533,7 @@ TYPO_EXTENSION_PACK=
1052510533
if test "x$enable_ext_typo" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1052610534
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
1052710535
TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
10536+
WITH_EXTRA_EXTENSIONS=YES
1052810537
AC_MSG_RESULT([yes])
1052910538
else
1053010539
AC_MSG_RESULT([no])
@@ -10539,6 +10548,7 @@ GOOGLE_DOCS_EXTENSION_PACK=
1053910548
if test "x$enable_ext_google_docs" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1054010549
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
1054110550
GOOGLE_DOCS_EXTENSION_PACK="2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt"
10551+
WITH_EXTRA_EXTENSIONS=YES
1054210552
AC_MSG_RESULT([yes])
1054310553
else
1054410554
AC_MSG_RESULT([no])
@@ -10577,6 +10587,7 @@ OOOBLOGGER_EXTENSION_PACK=
1057710587
if test "x$enable_ext_oooblogger" = "xyes" -a "x$enable_extension_integration" != "xno"; then
1057810588
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
1057910589
OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
10590+
WITH_EXTRA_EXTENSIONS=YES
1058010591
AC_MSG_RESULT([yes])
1058110592
else
1058210593
AC_MSG_RESULT([no])
@@ -10625,6 +10636,7 @@ else
1062510636
esac
1062610637
fi
1062710638
done
10639+
WITH_EXTRA_EXTENSIONS=YES
1062810640
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
1062910641
fi
1063010642
AC_SUBST(SUNTEMPLATES_DE_PACK)

‎download

-16
Original file line numberDiff line numberDiff line change
@@ -258,28 +258,12 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
258258
fi
259259
fi
260260

261-
# OxygenOffice extras
262-
for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
263-
check_file $TARFILE_LOCATION/$pack
264-
echo "Unpacking OxygenOffice extra '$pack' ..."
265-
unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
266-
done
267-
268261
if [ -n "$OXYGENOFFICE_PACK" ] ; then
269262
check_file $TARFILE_LOCATION/$OXYGENOFFICE_PACK
270263
echo "Unpacking OxygenOffice '$OXYGENOFFICE_PACK' ..."
271264
unzip -o -q $TARFILE_LOCATION/$OXYGENOFFICE_PACK -d $SRC_ROOT/src
272265
fi
273266

274-
# Extensions copy
275-
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 $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
276-
check_file $TARFILE_LOCATION/$pack
277-
packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
278-
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
279-
mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
280-
cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
281-
done
282-
283267
[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
284268

285269
# Save the config.log from the main configure script

‎extras/AllLangZip_accessoriessamples.mk

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
2+
#
3+
# This file is part of the LibreOffice project.
4+
#
5+
# This Source Code Form is subject to the terms of the Mozilla Public
6+
# License, v. 2.0. If a copy of the MPL was not distributed with this
7+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
8+
#
9+
10+
$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamples,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/lang))
11+
12+
$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamples,\
13+
$(call gb_UnpackedTarball_get_target,samples-pack) \
14+
))
15+
16+
$(eval $(call gb_AllLangZip_add_files,accessoriessamples,\
17+
cs/.nametranslation.table \
18+
de/.nametranslation.table \
19+
en-US/JacketPotato.odb \
20+
en-US/.nametranslation.table \
21+
es/.nametranslation.table \
22+
fi/.nametranslation.table \
23+
fr/.nametranslation.table \
24+
hu/.nametranslation.table \
25+
hu/naptar.ods \
26+
it/.nametranslation.table \
27+
ja/.nametranslation.table \
28+
ka/.nametranslation.table \
29+
nl/.nametranslation.table \
30+
pl/dummy_samples.txt \
31+
pt-BR/.nametranslation.table \
32+
sv/.nametranslation.table \
33+
tr/.nametranslation.table \
34+
zh-CN/.nametranslation.table \
35+
))
36+
37+
# vim: set noet sw=4 ts=4:

‎extras/AllLangZip_accessoriessamplesadvertisement.mk

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
2+
#
3+
# This file is part of the LibreOffice project.
4+
#
5+
# This Source Code Form is subject to the terms of the Mozilla Public
6+
# License, v. 2.0. If a copy of the MPL was not distributed with this
7+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
8+
#
9+
10+
$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/advertisement/lang))
11+
12+
$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesadvertisement,\
13+
$(call gb_UnpackedTarball_get_target,samples-pack) \
14+
))
15+
16+
$(eval $(call gb_AllLangZip_add_files,accessoriessamplesadvertisement,\
17+
cs/dummy_samples.txt \
18+
de/dummy_samples.txt \
19+
en-US/ooo2prodflyera3en.odt \
20+
en-US/ooo2prodflyera4en.odt \
21+
en-US/ooo2prodintroen.odp \
22+
en-US/ooo2prodspeca4en.odt \
23+
es/dummy_samples.txt \
24+
fi/dummy_samples.txt \
25+
fr/dummy_samples.txt \
26+
hu/ooo2prodflyera3hu.odt \
27+
hu/ooo2prodspeca4hu.odt \
28+
hu/OOo_Ossszehasonlitas.odt \
29+
hu/OOo_Reklam4.odt \
30+
it/dummy_samples.txt \
31+
ja/dummy_samples.txt \
32+
ka/dummy_samples.txt \
33+
nl/dummy_samples.txt \
34+
pl/dummy_samples.txt \
35+
pt-BR/dummy_samples.txt \
36+
sv/dummy_samples.txt \
37+
tr/dummy_samples.txt \
38+
zh-CN/dummy_samples.txt \
39+
))
40+
41+
# vim: set noet sw=4 ts=4:

‎extras/AllLangZip_accessoriessamplesdocumentation.mk

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
2+
#
3+
# This file is part of the LibreOffice project.
4+
#
5+
# This Source Code Form is subject to the terms of the Mozilla Public
6+
# License, v. 2.0. If a copy of the MPL was not distributed with this
7+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
8+
#
9+
10+
$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesdocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/documentation/lang))
11+
12+
$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesdocumentation,\
13+
$(call gb_UnpackedTarball_get_target,samples-pack) \
14+
))
15+
16+
$(eval $(call gb_AllLangZip_add_files,accessoriessamplesdocumentation,\
17+
cs/dummy_samples.txt \
18+
de/dummy_samples.txt \
19+
en-US/Connect_to_Postgres.odt \
20+
en-US/ooo2.odt \
21+
es/dummy_samples.txt \
22+
fi/dummy_samples.txt \
23+
fr/dummy_samples.txt \
24+
hu/ooo2.odt \
25+
it/dummy_samples.txt \
26+
ja/dummy_samples.txt \
27+
ka/dummy_samples.txt \
28+
nl/dummy_samples.txt \
29+
pl/dummy_samples.txt \
30+
pt-BR/dummy_samples.txt \
31+
sv/dummy_samples.txt \
32+
tr/dummy_samples.txt \
33+
zh-CN/dummy_samples.txt \
34+
))
35+
36+
# vim: set noet sw=4 ts=4:

‎extras/AllLangZip_accessoriessamplesnonfree.mk

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
2+
#
3+
# This file is part of the LibreOffice project.
4+
#
5+
# This Source Code Form is subject to the terms of the Mozilla Public
6+
# License, v. 2.0. If a copy of the MPL was not distributed with this
7+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
8+
#
9+
10+
$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfree,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/lang))
11+
12+
$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfree,\
13+
$(call gb_UnpackedTarball_get_target,samples-pack) \
14+
))
15+
16+
$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfree,\
17+
cs/dummy_samples-nonfree.txt \
18+
de/dummy_samples-nonfree.txt \
19+
en-US/dummy_samples-nonfree.txt \
20+
es/dummy_samples-nonfree.txt \
21+
fi/dummy_samples-nonfree.txt \
22+
fr/dummy_samples-nonfree.txt \
23+
hu/dummy_samples-nonfree.txt \
24+
it/dummy_samples-nonfree.txt \
25+
ja/dummy_samples-nonfree.txt \
26+
ka/dummy_samples-nonfree.txt \
27+
nl/dummy_samples-nonfree.txt \
28+
pl/dummy_samples-nonfree.txt \
29+
pt-BR/dummy_samples-nonfree.txt \
30+
sv/dummy_samples-nonfree.txt \
31+
tr/dummy_samples-nonfree.txt \
32+
zh-CN/dummy_samples-nonfree.txt \
33+
))
34+
35+
# vim: set noet sw=4 ts=4:

‎extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
2+
#
3+
# This file is part of the LibreOffice project.
4+
#
5+
# This Source Code Form is subject to the terms of the Mozilla Public
6+
# License, v. 2.0. If a copy of the MPL was not distributed with this
7+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
8+
#
9+
10+
$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfreeadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/advertisement/lang))
11+
12+
$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfreeadvertisement,\
13+
$(call gb_UnpackedTarball_get_target,samples-pack) \
14+
))
15+
16+
$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfreeadvertisement,\
17+
cs/dummy_samples-nonfree.txt \
18+
de/dummy_samples-nonfree.txt \
19+
en-US/dummy_samples-nonfree.txt \
20+
es/dummy_samples-nonfree.txt \
21+
fi/dummy_samples-nonfree.txt \
22+
fr/dummy_samples-nonfree.txt \
23+
hu/dummy_samples-nonfree.txt \
24+
it/dummy_samples-nonfree.txt \
25+
ja/dummy_samples-nonfree.txt \
26+
ka/dummy_samples-nonfree.txt \
27+
nl/dummy_samples-nonfree.txt \
28+
pl/dummy_samples-nonfree.txt \
29+
pt-BR/dummy_samples-nonfree.txt \
30+
sv/dummy_samples-nonfree.txt \
31+
tr/dummy_samples-nonfree.txt \
32+
zh-CN/dummy_samples-nonfree.txt \
33+
))
34+
35+
# vim: set noet sw=4 ts=4:

0 commit comments

Comments
 (0)