config_host.mk.in | 12 -
configure.ac | 38 +----
desktop/Module_desktop.mk | 5
desktop/Package_branding.mk | 27 ++++
desktop/Package_branding_custom.mk | 22 +++
desktop/Package_intro.mk | 17 --
desktop/Zip_brand.mk | 60 ---------
desktop/Zip_brand_dev.mk | 60 ---------
desktop/Zip_shell.mk | 21 ---
extensions/Module_extensions.mk | 3
extensions/Package_OOoSpotlightImporter.mk | 16 ++
extensions/Package_mdibundle.mk | 20 +++
extensions/Zip_mdibundle.mk | 19 --
libexttextcat/ExternalPackage_fingerprint.mk | 172 ++++++++++++++++++++++++++
libexttextcat/Module_libexttextcat.mk | 2
libexttextcat/Zip_fingerprint.mk | 174 ---------------------------
odk/CustomTarget_check.mk | 2
odk/CustomTarget_classes.mk | 9 -
odk/Module_odk.mk | 2
odk/Package_uno_loader_classes.mk | 25 +++
odk/Zip_uno_loader_classes.mk | 20 ---
scp2/InstallModule_ooo.mk | 1
scp2/source/ooo/common_brand.scp | 23 +++
scp2/source/ooo/file_ooo.scp | 35 +++--
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/sdkoo/sdkoo.scp | 6
scripting/Module_scripting.mk | 3
scripting/Package_java.mk | 23 +++
scripting/Package_java_jars.mk | 18 ++
scripting/Zip_ScriptsJava.mk | 50 -------
30 files changed, 403 insertions(+), 483 deletions(-)
New commits:
commit 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 30 17:44:21 2013 +0200
install branding images using filelists
This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).
Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
diff --git a/config_host.mk.in b/config_host.mk.in
index 82dfd50..8696a92 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -12,7 +12,6 @@ gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
export SRC_ROOT=@SRC_ROOT@
export BUILDDIR=@BUILDDIR@
-export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
@x_AFLAGS@ export AFLAGS=@AFLAGS@
export ALLOC=@ALLOC@
export ALL_LANGS=@ALL_LANGS@
@@ -36,6 +35,7 @@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
+export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@
export BSH_JAR=@BSH_JAR@
export BUILD_PLATFORM=@build@
export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
@@ -75,6 +75,8 @@ export CROSS_COMPILING=@CROSS_COMPILING@
export CURL=@CURL@
export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@
+export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@
+export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@
export CXX=@CXX@
export CXX_FOR_BUILD=@CXX_FOR_BUILD@
export CXX_X64_BINARY=@CXX_X64_BINARY@
@@ -85,6 +87,7 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
+export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
export DEVINSTALLDIR=@DEVINSTALLDIR@
export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
@@ -168,7 +171,6 @@ export EPM_FLAGS=@EPM_FLAGS@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
export debug=@ENABLE_DEBUG@
@x_Cygwin@ export FIND=@WIN_FIND@
-export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
export FLEX=@FLEX@
export FLUTE_JAR=@FLUTE_JAR@
export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@
@@ -257,7 +259,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
export INSTDIR=@INSTDIR@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
-export INTRO_BITMAP=@INTRO_BITMAP@
export JAVACISGCJ=@JAVACISGCJ@
export JAVACISKAFFE=@JAVACISKAFFE@
export JAVACOMPILER=@JAVACOMPILER@
@@ -456,11 +457,6 @@ export SOLAR_JAVA=@SOLAR_JAVA@
export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
export SRCDIR=@SRC_ROOT@
-export STARTCENTER_LEFT_BITMAP=@STARTCENTER_LEFT_BITMAP@
-export STARTCENTER_RIGHT_BITMAP=@STARTCENTER_RIGHT_BITMAP@
-export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@
-export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@
-export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@
export STRIP=@STRIP@
export STRIP_COMPONENTS=@STRIP_COMPONENTS@
export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@
diff --git a/configure.ac b/configure.ac
index bc20dec..cd03950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11455,53 +11455,37 @@ dnl branding
dnl ===================================================================
AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays
-brand_vars="INTRO_BITMAP ABOUT_BACKGROUND_SVG FLAT_LOGO_SVG \
- STARTCENTER_LEFT_BITMAP STARTCENTER_RIGHT_BITMAP \
- STARTCENTER_RTL_LEFT_BITMAP STARTCENTER_RTL_RIGHT_BITMAP \
- STARTCENTER_SPACE_BITMAP"
-brand_files="intro.png about.svg flat_logo.svg \
+BRAND_INTRO_IMAGES="flat_logo.svg intro.png"
+brand_files="$BRAND_INTRO_IMAGES about.svg \
backing_left.png backing_right.png \
backing_rtl_left.png backing_rtl_right.png \
backing_space.png"
-brandmaxidx=0
-
-for i in $brand_vars
-do
- declare $i=
- let "brandmaxidx=$brandmaxidx + 1"
-done
if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none])
+ DEFAULT_BRAND_IMAGES="$brand_files"
else
if ! test -d $with_branding ; then
AC_MSG_ERROR([No directory $with_branding, falling back to default
branding])
else
AC_MSG_RESULT([$with_branding])
- idx=1
- while test $idx -le $brandmaxidx
+ CUSTOM_BRAND_DIR="$with_branding"
+ for lfile in $brand_files
do
- lvar=$(echo $brand_vars | cut -f$idx -d" ")
- lfile=$(echo $brand_files | cut -f$idx -d" ")
-
if ! test -f $with_branding/$lfile ; then
AC_MSG_WARN([Branded file $lfile does not exist, using the
default one])
+ DEFAULT_BRAND_IMAGES="$DEFAULT_BRAND_IMAGES $lfile"
else
- declare lvar="$with_branding/$lfile"
+ CUSTOM_BRAND_IMAGES="$CUSTOM_BRAND_IMAGES $lfile"
fi
- let "idx=$idx + 1"
done
check_for_progress="yes"
fi
fi
-AC_SUBST(INTRO_BITMAP)
-AC_SUBST(ABOUT_BACKGROUND_SVG)
-AC_SUBST(FLAT_LOGO_SVG)
-AC_SUBST(STARTCENTER_LEFT_BITMAP)
-AC_SUBST(STARTCENTER_RIGHT_BITMAP)
-AC_SUBST(STARTCENTER_RTL_LEFT_BITMAP)
-AC_SUBST(STARTCENTER_RTL_RIGHT_BITMAP)
-AC_SUBST(STARTCENTER_SPACE_BITMAP)
+AC_SUBST([BRAND_INTRO_IMAGES])
+AC_SUBST([CUSTOM_BRAND_DIR])
+AC_SUBST([CUSTOM_BRAND_IMAGES])
+AC_SUBST([DEFAULT_BRAND_IMAGES])
AC_MSG_CHECKING([for 'intro' progress settings])
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index faed6e3..751fcf7 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -19,10 +19,9 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_offacc \
Library_sofficeapp \
$(if $(ENABLE_HEADLESS),,Library_spl) \
- Package_intro \
+ Package_branding \
+ $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
UIConfig_deployment \
- Zip_brand \
- Zip_brand_dev \
))
ifeq ($(OS),LINUX)
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
new file mode 100644
index 0000000..47186bc
--- /dev/null
+++ b/desktop/Package_branding.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
+
+$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,desktop_branding,program,\
+ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
+ $(if $(filter intro.png,$(image)),\
+ $(if $(filter
TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
+ brand/$(image) \
+ ) \
+ ) \
+))
+
+$(eval $(call gb_Package_add_files,desktop_branding,program/shell,\
+ $(addprefix brand/shell/,$(filter-out
$(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Package_branding_custom.mk
b/desktop/Package_branding_custom.mk
new file mode 100644
index 0000000..c240ab7
--- /dev/null
+++ b/desktop/Package_branding_custom.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
+
+$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,desktop_branding_custom,program,\
+ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
+))
+
+$(eval $(call gb_Package_add_files,desktop_branding_custom,program/shell,\
+ $(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Package_intro.mk b/desktop/Package_intro.mk
deleted file mode 100644
index a7b3ce0..0000000
--- a/desktop/Package_intro.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# The patsubst is used to remove the trailing '/' dir produces.
-# Otherwise the package tries to depend on zip target brand//intro,
-# which is unfortunately different from brand/intro...
-$(eval $(call gb_Package_Package,desktop_intro,$(patsubst %/,%,$(dir $(call
gb_Zip_get_target,brand/intro)))))
-
-$(eval $(call gb_Package_add_file,desktop_intro,pck/intro.zip,intro.zip))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
deleted file mode 100644
index ad36639..0000000
--- a/desktop/Zip_brand.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,brand/intro,$(WORKDIR)/Zip/brand_intro))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/about.svg,\
- $(if $(ABOUT_BACKGROUND_SVG),\
- $(ABOUT_BACKGROUND_SVG),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,flat_logo.svg,\
- $(if $(FLAT_LOGO_SVG),\
- $(FLAT_LOGO_SVG),\
- $(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,intro.png,\
- $(if $(INTRO_BITMAP),\
- $(INTRO_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/intro.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_left.png,\
- $(if $(STARTCENTER_LEFT_BITMAP),\
- $(STARTCENTER_LEFT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_right.png,\
- $(if $(STARTCENTER_RIGHT_BITMAP),\
- $(STARTCENTER_RIGHT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_space.png,\
- $(if $(STARTCENTER_SPACE_BITMAP),\
- $(STARTCENTER_SPACE_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_left.png,\
- $(if $(STARTCENTER_RTL_LEFT_BITMAP),\
- $(STARTCENTER_RTL_LEFT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand/intro,shell/backing_rtl_right.png,\
- $(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
- $(STARTCENTER_RTL_RIGHT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
deleted file mode 100644
index ef9f020..0000000
--- a/desktop/Zip_brand_dev.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,brand_dev/intro,$(WORKDIR)/Zip/brand_intro_dev))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/about.svg,\
- $(if $(ABOUT_BACKGROUND_SVG),\
- $(ABOUT_BACKGROUND_SVG),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/about.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,flat_logo.svg,\
- $(if $(FLAT_LOGO_SVG),\
- $(FLAT_LOGO_SVG),\
- $(SRCDIR)/icon-themes/galaxy/brand/flat_logo.svg)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,intro.png,\
- $(if $(INTRO_BITMAP),\
- $(INTRO_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand_dev/intro.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_left.png,\
- $(if $(STARTCENTER_LEFT_BITMAP),\
- $(STARTCENTER_LEFT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_right.png,\
- $(if $(STARTCENTER_RIGHT_BITMAP),\
- $(STARTCENTER_RIGHT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_space.png,\
- $(if $(STARTCENTER_SPACE_BITMAP),\
- $(STARTCENTER_SPACE_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_left.png,\
- $(if $(STARTCENTER_RTL_LEFT_BITMAP),\
- $(STARTCENTER_RTL_LEFT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\
-))
-
-$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_right.png,\
- $(if $(STARTCENTER_RTL_RIGHT_BITMAP),\
- $(STARTCENTER_RTL_RIGHT_BITMAP),\
- $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 0462379..e37484d 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
))
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+ $(if $(CUSTOM_BRAND_DIR),-DCUSTOM_BRANDING) \
$(if $(WINDOWS_SDK_HOME),\
-DHAVE_WINDOWS_SDK \
) \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c4fe20a..28c1dca 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -60,6 +60,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Unopkg,
gid_Brand_File_Bin_Libxml2,
gid_Brand_File_Bmp_IntroAboutShell,
+ gid_Brand_File_Bmp_IntroAboutShell_custom,
gid_Brand_File_Html_Thirdpartylicensereadme,
gid_Brand_File_Lib_Dbghelp,
gid_Brand_File_Lib_Mingw_GccS,
@@ -613,9 +614,25 @@ End
File gid_Brand_File_Bmp_IntroAboutShell
TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "intro.zip";
- Styles = (ARCHIVE);
+ Dir = FILELIST_DIR;
+ Name = "desktop_branding.filelist";
+ Styles = (FILELIST);
+End
+
+#if defined CUSTOM_BRANDING
+File gid_Brand_File_Bmp_IntroAboutShell_custom
+ TXT_FILE_BODY;
+ Dir = FILELIST_DIR;
+ Name = "desktop_branding_custom.filelist";
+ Styles = (FILELIST);
+End
+#endif
+
+File gid_Brand_File_Images_Brand_Zip
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Config;
+ Name = "images_brand.zip";
+ Styles = (PACKED);
End
File gid_Brand_File_Txt_Package
commit 148c7629fc844db690075b9df62677b5e902c9f0
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 30 15:18:30 2013 +0200
deliver uno loader classes using filelist
Change-Id: I121a4ad5d7cff54b914796142fa7c50006856300
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 50a124d..6660525 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -28,7 +28,6 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
- $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
$(if $(DOXYGEN),$(call
gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \
$(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli))
\
@@ -44,6 +43,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(if $(filter MACOSX,$(OS)),$(call
gb_Package_get_target,odk_macosx)) \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
+ $(call gb_Package_get_target,odk_uno_loader_classes) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg))
\
$(call gb_PackageSet_get_target,odk_autodoc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index 82f5247..bd07f0a 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/classes))
+$(eval $(call gb_CustomTarget_CustomTarget,odk/classes))
-$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/classes,\
+$(eval $(call gb_CustomTarget_register_targets,odk/classes,\
java.done \
))
@@ -22,7 +22,10 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
odk/source/com/sun/star/lib/loader/WinRegKeyException \
))
-$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes)/java.done: $(call
gb_JavaClassSet_get_target,loader)
+$(call gb_CustomTarget_get_workdir,odk/classes)/%.class : $(call
gb_CustomTarget_get_workdir,odk/classes)/java.done
+ touch $@
+
+$(call gb_CustomTarget_get_workdir,odk/classes)/java.done: $(call
gb_JavaClassSet_get_target,loader)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
touch $@
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 94f8fc1..aab0539 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -58,8 +58,8 @@ $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_javadoc \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
Package_javadoc \
+ Package_uno_loader_classes \
Package_unowinreg \
- Zip_uno_loader_classes \
))
endif
diff --git a/odk/Package_uno_loader_classes.mk
b/odk/Package_uno_loader_classes.mk
new file mode 100644
index 0000000..86e98a2
--- /dev/null
+++ b/odk/Package_uno_loader_classes.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_uno_loader_classes,$(call
gb_CustomTarget_get_workdir,odk/classes)))
+
+$(eval $(call gb_Package_set_outdir,odk_uno_loader_classes,$(INSTDIR)))
+
+$(eval $(call
gb_Package_add_files_with_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes,\
+ com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \
+ com/sun/star/lib/loader/InstallationFinder.class \
+ com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \
+ com/sun/star/lib/loader/Loader$$Drain.class \
+ com/sun/star/lib/loader/Loader$$Drain.class \
+ com/sun/star/lib/loader/Loader.class \
+ com/sun/star/lib/loader/WinRegKey.class \
+ com/sun/star/lib/loader/WinRegKeyException.class \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Zip_uno_loader_classes.mk b/odk/Zip_uno_loader_classes.mk
deleted file mode 100644
index 6cf0bf1..0000000
--- a/odk/Zip_uno_loader_classes.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,uno_loader_classes,$(call
gb_CustomTarget_get_workdir,odk/odkcommon/classes)))
-
-$(eval $(call gb_Zip_add_commandoptions,uno_loader_classes,-r))
-
-$(eval $(call gb_Zip_add_files,uno_loader_classes,\
- com/sun/star/lib/loader \
-))
-
-$(call gb_Zip_get_target,uno_loader_classes) : $(call
gb_CustomTarget_get_target,odk/odkcommon/classes)
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index a9388af..868aed0 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -264,9 +264,9 @@ End
#if defined(SOLAR_JAVA)
File gid_File_Zip_uno_loader_classes
TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "uno_loader_classes.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ Dir = FILELIST_SDK_DIR;
+ Name = "odk_uno_loader_classes.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#endif
commit 50b18ead25453857efdc6f4bfe70980456ed91fa
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 30 14:23:50 2013 +0200
install libexttextcat fingerprint data using filelist
Change-Id: I1576b60bc511bdac964decd5a7f8c3834281f380
diff --git a/libexttextcat/ExternalPackage_fingerprint.mk
b/libexttextcat/ExternalPackage_fingerprint.mk
new file mode 100644
index 0000000..be9ce90
--- /dev/null
+++ b/libexttextcat/ExternalPackage_fingerprint.mk
@@ -0,0 +1,172 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,exttextcat))
+
+$(eval $(call
gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(INSTDIR)))
+
+$(eval $(call
gb_ExternalPackage_add_files,libexttextcat_fingerprint,share/fingerprint,\
+ langclass/fpdb.conf \
+ langclass/LM/ab.lm \
+ langclass/LM/ace.lm \
+ langclass/LM/ada.lm \
+ langclass/LM/af.lm \
+ langclass/LM/alt.lm \
+ langclass/LM/am.lm \
+ langclass/LM/ar.lm \
+ langclass/LM/arn.lm \
+ langclass/LM/ast.lm \
+ langclass/LM/ay.lm \
+ langclass/LM/az-Cyrl.lm \
+ langclass/LM/az.lm \
+ langclass/LM/ban.lm \
+ langclass/LM/be.lm \
+ langclass/LM/bem.lm \
+ langclass/LM/bg.lm \
+ langclass/LM/bho.lm \
+ langclass/LM/bi.lm \
+ langclass/LM/bik.lm \
+ langclass/LM/bm.lm \
+ langclass/LM/bn.lm \
+ langclass/LM/bo.lm \
+ langclass/LM/br.lm \
+ langclass/LM/bs.lm \
+ langclass/LM/ca.lm \
+ langclass/LM/cs.lm \
+ langclass/LM/cy.lm \
+ langclass/LM/da.lm \
+ langclass/LM/de.lm \
+ langclass/LM/dv.lm \
+ langclass/LM/ee.lm \
+ langclass/LM/el.lm \
+ langclass/LM/en.lm \
+ langclass/LM/eo.lm \
+ langclass/LM/es.lm \
+ langclass/LM/et.lm \
+ langclass/LM/eu.lm \
+ langclass/LM/fa.lm \
+ langclass/LM/fi.lm \
+ langclass/LM/fj.lm \
+ langclass/LM/fo.lm \
+ langclass/LM/fr.lm \
+ langclass/LM/fur.lm \
+ langclass/LM/fy.lm \
+ langclass/LM/ga.lm \
+ langclass/LM/gd.lm \
+ langclass/LM/gl.lm \
+ langclass/LM/grc.lm \
+ langclass/LM/gu.lm \
+ langclass/LM/gug.lm \
+ langclass/LM/gv.lm \
+ langclass/LM/ha-NG.lm \
+ langclass/LM/haw.lm \
+ langclass/LM/he.lm \
+ langclass/LM/hi.lm \
+ langclass/LM/hil.lm \
+ langclass/LM/hr.lm \
+ langclass/LM/hsb.lm \
+ langclass/LM/ht.lm \
+ langclass/LM/hu.lm \
+ langclass/LM/hy.lm \
+ langclass/LM/ia.lm \
+ langclass/LM/id.lm \
+ langclass/LM/is.lm \
+ langclass/LM/it.lm \
+ langclass/LM/ja.lm \
+ langclass/LM/ka.lm \
+ langclass/LM/kk.lm \
+ langclass/LM/kl.lm \
+ langclass/LM/km.lm \
+ langclass/LM/kn.lm \
+ langclass/LM/ko.lm \
+ langclass/LM/ktu.lm \
+ langclass/LM/ky.lm \
+ langclass/LM/la.lm \
+ langclass/LM/lb.lm \
+ langclass/LM/lg.lm \
+ langclass/LM/ln.lm \
+ langclass/LM/lo.lm \
+ langclass/LM/lt.lm \
+ langclass/LM/lv.lm \
+ langclass/LM/mai.lm \
+ langclass/LM/mi.lm \
+ langclass/LM/mk.lm \
+ langclass/LM/ml.lm \
+ langclass/LM/mn.lm \
+ langclass/LM/mos.lm \
+ langclass/LM/mr.lm \
+ langclass/LM/ms.lm \
+ langclass/LM/mt.lm \
+ langclass/LM/my.lm \
+ langclass/LM/nb.lm \
+ langclass/LM/ne.lm \
+ langclass/LM/nl.lm \
+ langclass/LM/nn.lm \
+ langclass/LM/nr.lm \
+ langclass/LM/nso.lm \
+ langclass/LM/ny.lm \
+ langclass/LM/oc.lm \
+ langclass/LM/om.lm \
+ langclass/LM/pa.lm \
+ langclass/LM/pl.lm \
+ langclass/LM/plt.lm \
+ langclass/LM/pt.lm \
+ langclass/LM/qxa.lm \
+ langclass/LM/rm.lm \
+ langclass/LM/ro.lm \
+ langclass/LM/ru.lm \
+ langclass/LM/rue.lm \
+ langclass/LM/rw.lm \
+ langclass/LM/sa.lm \
+ langclass/LM/sc.lm \
+ langclass/LM/sco.lm \
+ langclass/LM/sd.lm \
+ langclass/LM/se.lm \
+ langclass/LM/sg.lm \
+ langclass/LM/shs.lm \
+ langclass/LM/si.lm \
+ langclass/LM/sk.lm \
+ langclass/LM/sl.lm \
+ langclass/LM/so.lm \
+ langclass/LM/sq.lm \
+ langclass/LM/sr-Cyrl.lm \
+ langclass/LM/sr-Latn.lm \
+ langclass/LM/ss.lm \
+ langclass/LM/st.lm \
+ langclass/LM/sv.lm \
+ langclass/LM/sw.lm \
+ langclass/LM/ta.lm \
+ langclass/LM/tet.lm \
+ langclass/LM/tg.lm \
+ langclass/LM/th.lm \
+ langclass/LM/ti.lm \
+ langclass/LM/tk.lm \
+ langclass/LM/tl.lm \
+ langclass/LM/tn.lm \
+ langclass/LM/tpi.lm \
+ langclass/LM/tr.lm \
+ langclass/LM/ts.lm \
+ langclass/LM/tt.lm \
+ langclass/LM/ty.lm \
+ langclass/LM/ug.lm \
+ langclass/LM/uk.lm \
+ langclass/LM/ur.lm \
+ langclass/LM/uz.lm \
+ langclass/LM/ve.lm \
+ langclass/LM/vi.lm \
+ langclass/LM/wa.lm \
+ langclass/LM/xh.lm \
+ langclass/LM/yi.lm \
+ langclass/LM/yo.lm \
+ langclass/LM/zh-Hans.lm \
+ langclass/LM/zh-Hant.lm \
+ langclass/LM/zu.lm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/Module_libexttextcat.mk
b/libexttextcat/Module_libexttextcat.mk
index 43cc306..29c4815 100644
--- a/libexttextcat/Module_libexttextcat.mk
+++ b/libexttextcat/Module_libexttextcat.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,libexttextcat))
ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
$(eval $(call gb_Module_add_targets,libexttextcat,\
+ ExternalPackage_fingerprint \
UnpackedTarball_exttextcat \
- Zip_fingerprint \
))
ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,libexttextcat,\
diff --git a/libexttextcat/Zip_fingerprint.mk b/libexttextcat/Zip_fingerprint.mk
deleted file mode 100644
index da1df9a..0000000
--- a/libexttextcat/Zip_fingerprint.mk
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,fingerprint,$(call
gb_UnpackedTarball_get_dir,exttextcat)/langclass))
-
-$(eval $(call gb_Zip_use_unpacked,fingerprint,exttextcat))
-
-$(eval $(call gb_Zip_add_files,fingerprint,\
- fpdb.conf \
- LM/ab.lm \
- LM/ace.lm \
- LM/ada.lm \
- LM/af.lm \
- LM/alt.lm \
- LM/am.lm \
- LM/ar.lm \
- LM/arn.lm \
- LM/ast.lm \
- LM/ay.lm \
- LM/az-Cyrl.lm \
- LM/az.lm \
- LM/ban.lm \
- LM/be.lm \
- LM/bem.lm \
- LM/bg.lm \
- LM/bho.lm \
- LM/bik.lm \
- LM/bi.lm \
- LM/bm.lm \
- LM/bn.lm \
- LM/bo.lm \
- LM/br.lm \
- LM/bs.lm \
- LM/ca.lm \
- LM/cs.lm \
- LM/cy.lm \
- LM/da.lm \
- LM/de.lm \
- LM/dv.lm \
- LM/ee.lm \
- LM/el.lm \
- LM/en.lm \
- LM/eo.lm \
- LM/es.lm \
- LM/et.lm \
- LM/eu.lm \
- LM/fa.lm \
- LM/fi.lm \
- LM/fj.lm \
- LM/fo.lm \
- LM/fr.lm \
- LM/fur.lm \
- LM/fy.lm \
- LM/ga.lm \
- LM/gd.lm \
- LM/gl.lm \
- LM/grc.lm \
- LM/gug.lm \
- LM/gu.lm \
- LM/gv.lm \
- LM/ha-NG.lm \
- LM/haw.lm \
- LM/he.lm \
- LM/hil.lm \
- LM/hi.lm \
- LM/hr.lm \
- LM/hsb.lm \
- LM/ht.lm \
- LM/hu.lm \
- LM/hy.lm \
- LM/ia.lm \
- LM/id.lm \
- LM/is.lm \
- LM/it.lm \
- LM/ja.lm \
- LM/ka.lm \
- LM/kk.lm \
- LM/kl.lm \
- LM/km.lm \
- LM/kn.lm \
- LM/ko.lm \
- LM/ktu.lm \
- LM/ky.lm \
- LM/la.lm \
- LM/lb.lm \
- LM/lg.lm \
- LM/ln.lm \
- LM/lo.lm \
- LM/lt.lm \
- LM/lv.lm \
- LM/mai.lm \
- LM/mi.lm \
- LM/mk.lm \
- LM/ml.lm \
- LM/mn.lm \
- LM/mos.lm \
- LM/mr.lm \
- LM/ms.lm \
- LM/mt.lm \
- LM/my.lm \
- LM/nb.lm \
- LM/ne.lm \
- LM/nl.lm \
- LM/nn.lm \
- LM/nr.lm \
- LM/nso.lm \
- LM/ny.lm \
- LM/oc.lm \
- LM/om.lm \
- LM/pa.lm \
- LM/pl.lm \
- LM/plt.lm \
- LM/pt.lm \
- LM/qxa.lm \
- LM/rm.lm \
- LM/ro.lm \
- LM/rue.lm \
- LM/ru.lm \
- LM/rw.lm \
- LM/sa.lm \
- LM/sc.lm \
- LM/sco.lm \
- LM/sd.lm \
- LM/se.lm \
- LM/sg.lm \
- LM/shs.lm \
- LM/si.lm \
- LM/sk.lm \
- LM/sl.lm \
- LM/so.lm \
- LM/sq.lm \
- LM/sr-Cyrl.lm \
- LM/sr-Latn.lm \
- LM/ss.lm \
- LM/st.lm \
- LM/sv.lm \
- LM/sw.lm \
- LM/ta.lm \
- LM/tet.lm \
- LM/tg.lm \
- LM/th.lm \
- LM/ti.lm \
- LM/tk.lm \
- LM/tl.lm \
- LM/tn.lm \
- LM/tpi.lm \
- LM/tr.lm \
- LM/ts.lm \
- LM/tt.lm \
- LM/ty.lm \
- LM/ug.lm \
- LM/uk.lm \
- LM/ur.lm \
- LM/uz.lm \
- LM/ve.lm \
- LM/vi.lm \
- LM/wa.lm \
- LM/xh.lm \
- LM/yi.lm \
- LM/yo.lm \
- LM/zh-Hans.lm \
- LM/zh-Hant.lm \
- LM/zu.lm \
-))
-
-$(eval $(call gb_Zip_add_commandoptions,fingerprint,-j))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 30237c7..f073b97 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -483,10 +483,10 @@ End
// fingerprint files (lm)
File gid_File_Share_Fingerprint
- Dir = gid_Dir_Share_Fingerprint;
+ Dir = FILELIST_DIR;
TXT_FILE_BODY;
- Styles = (ARCHIVE, DONT_OVERWRITE);
- Name = "fingerprint.zip";
+ Styles = (FILELIST, DONT_OVERWRITE);
+ Name = "libexttextcat_fingerprint.filelist";
End
#endif
commit 7f2460b4b4f621ced1ad81e1beb0bf519ee67fe9
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 30 14:10:49 2013 +0200
shell.zip is unused
Change-Id: Id8e7980a97d8c0828b14c59e2e382b0efc51c9f5
diff --git a/desktop/Zip_shell.mk b/desktop/Zip_shell.mk
deleted file mode 100644
index 9a086b3..0000000
--- a/desktop/Zip_shell.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,shell,$(SRCDIR)/icon-themes/galaxy/brand/shell))
-
-$(eval $(call gb_Zip_add_files,shell,\
- about.svg \
- backing_left.png \
- backing_right.png \
- backing_space.png \
- backing_rtl_left.png \
- backing_rtl_right.png \
-))
-
-# vim: set ts=4 sw=4 et:
commit 8e31b9005257b8499b75d09004d30e0e8e123684
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 30 13:51:36 2013 +0200
install SpotlightImporter bundle using filelists
Change-Id: I01ea506b76356ce62688350d096ff77c2cddcbdf
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 060a2f1..3ab07ab 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -120,7 +120,8 @@ endif # ENABLE_NPAPI_INTO_BROWSER=YES
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,extensions,\
Library_OOoSpotlightImporter \
- Zip_mdibundle \
+ Package_mdibundle \
+ Package_OOoSpotlightImporter \
))
endif # OS=MACOSX
diff --git a/extensions/Package_OOoSpotlightImporter.mk
b/extensions/Package_OOoSpotlightImporter.mk
new file mode 100644
index 0000000..6cb662d
--- /dev/null
+++ b/extensions/Package_OOoSpotlightImporter.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_Package_Package,extensions_OOoSpotlightImporter,$(OUTDIR)/lib))
+
+$(eval $(call
gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(INSTDIR)))
+
+$(eval $(call
gb_Package_add_file,extensions_OOoSpotlightImporter,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/MacOS/OOoSpotlightImporter,$(call
gb_Library_get_runtime_filename,OOoSpotlightImporter)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk
new file mode 100644
index 0000000..b8fc9a4
--- /dev/null
+++ b/extensions/Package_mdibundle.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter))
+
+$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(INSTDIR)))
+
+$(eval $(call
gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\
+ Info.plist \
+ en.lproj/schema.strings \
+ schema.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Zip_mdibundle.mk b/extensions/Zip_mdibundle.mk
deleted file mode 100644
index e6614c0..0000000
--- a/extensions/Zip_mdibundle.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#
-
-$(eval $(call gb_Zip_Zip,mdibundle,$(WORKDIR)/Zip/mdibundle))
-
-$(eval $(call
gb_Zip_add_file,mdibundle,schema.xml,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/schema.xml))
-$(eval $(call
gb_Zip_add_file,mdibundle,Info.plist,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/Info.plist))
-$(eval $(call
gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/en.lproj/schema.strings))
-$(eval $(call
gb_Zip_add_file,mdibundle,MacOS/OOoSpotlightImporter,$(OUTDIR)/lib/libOOoSpotlightImporter.dylib))
-
-# vim:set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 2a291a9..30237c7 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1258,10 +1258,17 @@ End
#ifdef MACOSX
File gid_File_Spotlight_Bundle
- ARCHIVE_TXT_FILE_BODY;
- Dir = gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents;
- Name = "mdibundle.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ TXT_FILE_BODY;
+ Dir = FILELIST_DIR;
+ Name = "extensions_mdibundle.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Spotlight_Bundle_lib
+ TXT_FILE_BODY;
+ Dir = FILELIST_DIR;
+ Name = "extensions_OOoSpotlightImporter.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#endif
commit bf7df610a1d01bf9a5a100e58b47f962f0a493d9
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 30 13:29:00 2013 +0200
install example java scripts using filelist
Change-Id: I3f5df5be726fe0788a17d632fe1021ccaf4c1951
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 30fef1c..2a291a9 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -713,9 +713,17 @@ End
#ifdef SOLAR_JAVA
File gid_File_Scripts_Java
- Dir = gid_Dir_Share_Scripts;
- ARCHIVE_TXT_FILE_BODY;
- Name = "ScriptsJava.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "scripting_java.filelist";
+End
+
+File gid_File_Scripts_Java_jars
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "scripting_java_jars.filelist";
End
#ifndef WITHOUT_SCRIPTING_BEANSHELL
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 43ddeef..774f998 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -372,6 +372,7 @@ Module gid_Module_Root_Files_6
gid_File_Extra_Tplwizletter,
gid_File_Scripts_Beanshell,
gid_File_Scripts_Java,
+ gid_File_Scripts_Java_jars,
gid_File_Scripts_Javascript,
gid_File_Basic_Depot,
gid_File_Basic_Euro,
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 094a3ac..bfe5702 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -26,7 +26,8 @@ $(eval $(call gb_Module_add_targets,scripting,\
Jar_ScriptProviderForJavaScript \
Rdb_scriptproviderforjavascript \
) \
- Zip_ScriptsJava \
+ Package_java \
+ Package_java_jars \
) \
Package_scriptbindinglib \
Package_scriptproviderforpython \
diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk
new file mode 100644
index 0000000..a840e20
--- /dev/null
+++ b/scripting/Package_java.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java))
+
+$(eval $(call gb_Package_set_outdir,scripting_java,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,scripting_java,share/Scripts/java,\
+ HelloWorld/HelloWorld.java \
+ HelloWorld/parcel-descriptor.xml \
+ Highlight/HighlightText.java \
+ Highlight/parcel-descriptor.xml \
+ MemoryUsage/MemoryUsage.java \
+ MemoryUsage/parcel-descriptor.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
new file mode 100644
index 0000000..4e7ba203c
--- /dev/null
+++ b/scripting/Package_java_jars.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTDIR)))
+
+$(eval $(call
gb_Package_add_file,scripting_java_jars,share/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar))
+$(eval $(call
gb_Package_add_file,scripting_java_jars,share/Scripts/java/Highlight/Highlight.jar,Highlight.jar))
+$(eval $(call
gb_Package_add_file,scripting_java_jars,share/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsJava.mk b/scripting/Zip_ScriptsJava.mk
deleted file mode 100644
index 0084bf5..0000000
--- a/scripting/Zip_ScriptsJava.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Zip_Zip,ScriptsJava,$(WORKDIR)/Zip/ScriptsJava))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.jar,\
- $(OUTDIR)/bin/HelloWorld.jar \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.java,\
- $(SRCDIR)/scripting/examples/java/HelloWorld/HelloWorld.java \
-))
-
-$(eval $(call
gb_Zip_add_file,ScriptsJava,java/HelloWorld/parcel-descriptor.xml,\
- $(SRCDIR)/scripting/examples/java/HelloWorld/parcel-descriptor.xml \
-))
-
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/Highlight.jar,\
- $(OUTDIR)/bin/Highlight.jar \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/HighlightText.java,\
- $(SRCDIR)/scripting/examples/java/Highlight/HighlightText.java \
-))
-
-$(eval $(call
gb_Zip_add_file,ScriptsJava,java/Highlight/parcel-descriptor.xml,\
- $(SRCDIR)/scripting/examples/java/Highlight/parcel-descriptor.xml \
-))
-
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.jar,\
- $(OUTDIR)/bin/MemoryUsage.jar \
-))
-
-$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.java,\
- $(SRCDIR)/scripting/examples/java/MemoryUsage/MemoryUsage.java \
-))
-
-$(eval $(call
gb_Zip_add_file,ScriptsJava,java/MemoryUsage/parcel-descriptor.xml,\
- $(SRCDIR)/scripting/examples/java/MemoryUsage/parcel-descriptor.xml \
-))
-
-# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
