[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_cfgsrvbitmapunx.mk extras/Package_cfgsrvnolang.mk extras/Package_cfgusr.mk extras/Zip_cfgsrvbitmapunx.mk extras/Zip_cfgsrvnolang.mk extras/Zip_cfgusr.mk scp2/source
Julien Nabet
serval2412 at yahoo.fr
Sun Apr 14 01:54:08 PDT 2013
extras/Module_extras.mk | 12 ++---
extras/Package_cfgsrvbitmapunx.mk | 19 ++++++++
extras/Package_cfgsrvnolang.mk | 81 +++++++++++++++++++++++++++++++++++++
extras/Package_cfgusr.mk | 18 ++++++++
extras/Zip_cfgsrvbitmapunx.mk | 17 -------
extras/Zip_cfgsrvnolang.mk | 79 ------------------------------------
extras/Zip_cfgusr.mk | 16 -------
scp2/source/ooo/file_extra_ooo.scp | 19 ++++----
8 files changed, 134 insertions(+), 127 deletions(-)
New commits:
commit 712acdd7dbbaa94b299c1ae739d4081f2f057b27
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Apr 13 02:34:16 2013 +0200
fdo#63197, Convert Zip_cfgsrvbitmapunx, Zip_cfgsrvnolang and Zip_cfgusr
Change-Id: I11064116d44f4e45676553dd26a9fe75376d923f
Reviewed-on: https://gerrit.libreoffice.org/3368
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 6597afd..8df931c 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,18 +14,18 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autocorr \
CustomTarget_glade \
Package_autocorr \
+ Package_autotextuser \
+ Package_cfgsrvbitmapunx \
+ Package_cfgsrvnolang \
+ Package_cfgusr \
+ Package_database \
+ Package_databasebiblio \
Package_fonts \
Package_glade \
Package_labels \
Package_newfiles \
Package_palettes \
Package_wordbook \
- Package_database \
- Package_databasebiblio \
- Package_autotextuser \
- Zip_cfgsrvbitmapunx \
- Zip_cfgsrvnolang \
- Zip_cfgusr \
Zip_gallbullets \
Zip_gallhtmlexpo \
Zip_gallroot \
diff --git a/extras/Package_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk
new file mode 100644
index 0000000..1d61796
--- /dev/null
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -0,0 +1,19 @@
+# -*- 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,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
+
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,share/config,\
+ psetupl.xpm \
+ psetup.xpm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
new file mode 100644
index 0000000..603a444
--- /dev/null
+++ b/extras/Package_cfgsrvnolang.mk
@@ -0,0 +1,81 @@
+# -*- 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,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
+
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,share/config,\
+ wizard/form/styles/beige.css \
+ wizard/form/styles/bgr.css \
+ wizard/form/styles/dark.css \
+ wizard/form/styles/grey.css \
+ wizard/form/styles/ibg.css \
+ wizard/form/styles/ice.css \
+ wizard/form/styles/orange.css \
+ wizard/form/styles/red.css \
+ wizard/form/styles/violet.css \
+ wizard/form/styles/water.css \
+ wizard/web/images/calc.gif \
+ wizard/web/images/draw.gif \
+ wizard/web/images/fls.gif \
+ wizard/web/images/graphics.gif \
+ wizard/web/images/html.gif \
+ wizard/web/images/impress.gif \
+ wizard/web/images/media.gif \
+ wizard/web/images/other.gif \
+ wizard/web/images/pdf.gif \
+ wizard/web/images/writer.gif \
+ wizard/web/layouts/diagonal/index.html.xsl \
+ wizard/web/layouts/frame_bottom/index.html.xsl \
+ wizard/web/layouts/frame_bottom/mainframe.html \
+ wizard/web/layouts/frame_bottom/tocframe.html.xsl \
+ wizard/web/layouts/frame_left/index.html.xsl \
+ wizard/web/layouts/frame_left/mainframe.html \
+ wizard/web/layouts/frame_left/tocframe.html.xsl \
+ wizard/web/layouts/frame_right/index.html.xsl \
+ wizard/web/layouts/frame_right/mainframe.html \
+ wizard/web/layouts/frame_right/tocframe.html.xsl \
+ wizard/web/layouts/frame_top/index.html.xsl \
+ wizard/web/layouts/frame_top/mainframe.html \
+ wizard/web/layouts/frame_top/tocframe.html.xsl \
+ wizard/web/layouts/layoutF.xsl \
+ wizard/web/layouts/layout.xsl \
+ wizard/web/layouts/layoutX.xsl \
+ wizard/web/layouts/simple/index.html.xsl \
+ wizard/web/layouts/source.xml.xsl \
+ wizard/web/layouts/table_2/index.html.xsl \
+ wizard/web/layouts/table_3/index.html.xsl \
+ wizard/web/layouts/zigzag/index.html.xsl \
+ wizard/web/preview.html \
+ wizard/web/styles/beige.css \
+ wizard/web/styles/bg.css \
+ wizard/web/styles/bgr.css \
+ wizard/web/styles/bgrey.css \
+ wizard/web/styles/bwb.css \
+ wizard/web/styles/bwo.css \
+ wizard/web/styles/dark.css \
+ wizard/web/styles/dp.css \
+ wizard/web/styles/forest.css \
+ wizard/web/styles/green.css \
+ wizard/web/styles/greenred.css \
+ wizard/web/styles/grey.css \
+ wizard/web/styles/ibg.css \
+ wizard/web/styles/ice.css \
+ wizard/web/styles/marine.css \
+ wizard/web/styles/orange.css \
+ wizard/web/styles/pc_old.css \
+ wizard/web/styles/red.css \
+ wizard/web/styles/rgb.css \
+ wizard/web/styles/strange.css \
+ wizard/web/styles/violet.css \
+ wizard/web/styles/water.css \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk
new file mode 100644
index 0000000..45ec351
--- /dev/null
+++ b/extras/Package_cfgusr.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,extras_cfgusr,$(SRCDIR)/extras/source/misc_config))
+
+$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_cfgusr,presets/config,\
+ autotbl.fmt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_cfgsrvbitmapunx.mk b/extras/Zip_cfgsrvbitmapunx.mk
deleted file mode 100644
index 3b7ce9b..0000000
--- a/extras/Zip_cfgsrvbitmapunx.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/.
-#
-
-$(eval $(call gb_Zip_Zip,cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
-
-$(eval $(call gb_Zip_add_files,cfgsrvbitmapunx,\
- psetupl.xpm \
- psetup.xpm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_cfgsrvnolang.mk b/extras/Zip_cfgsrvnolang.mk
deleted file mode 100644
index d15b0a6..0000000
--- a/extras/Zip_cfgsrvnolang.mk
+++ /dev/null
@@ -1,79 +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,cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
-
-$(eval $(call gb_Zip_add_files,cfgsrvnolang,\
- wizard/form/styles/beige.css \
- wizard/form/styles/bgr.css \
- wizard/form/styles/dark.css \
- wizard/form/styles/grey.css \
- wizard/form/styles/ibg.css \
- wizard/form/styles/ice.css \
- wizard/form/styles/orange.css \
- wizard/form/styles/red.css \
- wizard/form/styles/violet.css \
- wizard/form/styles/water.css \
- wizard/web/images/calc.gif \
- wizard/web/images/draw.gif \
- wizard/web/images/fls.gif \
- wizard/web/images/graphics.gif \
- wizard/web/images/html.gif \
- wizard/web/images/impress.gif \
- wizard/web/images/media.gif \
- wizard/web/images/other.gif \
- wizard/web/images/pdf.gif \
- wizard/web/images/writer.gif \
- wizard/web/layouts/diagonal/index.html.xsl \
- wizard/web/layouts/frame_bottom/index.html.xsl \
- wizard/web/layouts/frame_bottom/mainframe.html \
- wizard/web/layouts/frame_bottom/tocframe.html.xsl \
- wizard/web/layouts/frame_left/index.html.xsl \
- wizard/web/layouts/frame_left/mainframe.html \
- wizard/web/layouts/frame_left/tocframe.html.xsl \
- wizard/web/layouts/frame_right/index.html.xsl \
- wizard/web/layouts/frame_right/mainframe.html \
- wizard/web/layouts/frame_right/tocframe.html.xsl \
- wizard/web/layouts/frame_top/index.html.xsl \
- wizard/web/layouts/frame_top/mainframe.html \
- wizard/web/layouts/frame_top/tocframe.html.xsl \
- wizard/web/layouts/layoutF.xsl \
- wizard/web/layouts/layout.xsl \
- wizard/web/layouts/layoutX.xsl \
- wizard/web/layouts/simple/index.html.xsl \
- wizard/web/layouts/source.xml.xsl \
- wizard/web/layouts/table_2/index.html.xsl \
- wizard/web/layouts/table_3/index.html.xsl \
- wizard/web/layouts/zigzag/index.html.xsl \
- wizard/web/preview.html \
- wizard/web/styles/beige.css \
- wizard/web/styles/bg.css \
- wizard/web/styles/bgr.css \
- wizard/web/styles/bgrey.css \
- wizard/web/styles/bwb.css \
- wizard/web/styles/bwo.css \
- wizard/web/styles/dark.css \
- wizard/web/styles/dp.css \
- wizard/web/styles/forest.css \
- wizard/web/styles/green.css \
- wizard/web/styles/greenred.css \
- wizard/web/styles/grey.css \
- wizard/web/styles/ibg.css \
- wizard/web/styles/ice.css \
- wizard/web/styles/marine.css \
- wizard/web/styles/orange.css \
- wizard/web/styles/pc_old.css \
- wizard/web/styles/red.css \
- wizard/web/styles/rgb.css \
- wizard/web/styles/strange.css \
- wizard/web/styles/violet.css \
- wizard/web/styles/water.css \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_cfgusr.mk b/extras/Zip_cfgusr.mk
deleted file mode 100644
index 87330c6..0000000
--- a/extras/Zip_cfgusr.mk
+++ /dev/null
@@ -1,16 +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,cfgusr,$(SRCDIR)/extras/source/misc_config))
-
-$(eval $(call gb_Zip_add_files,cfgusr,\
- autotbl.fmt \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 3f965a6..bb33bd2 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -51,25 +51,26 @@ End
#ifdef UNX
File gid_File_Extra_Cfgsrv_Bitmap_Unx
- Dir = gid_Brand_Dir_Share_Config;
- ARCHIVE_TXT_FILE_BODY;
- Name = "cfgsrvbitmapunx.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_cfgsrvbitmapunx.filelist";
End
#endif
File gid_File_Extra_Cfgusr
- Dir = gid_Dir_User_Config;
+ Dir = FILELIST_DIR;
USER_FILE_BODY;
- Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
- Name = "cfgusr.zip";
+ Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+ Name = "extras_cfgusr.filelist";
End
File gid_File_Extra_Cfgsrv
- Dir = gid_Brand_Dir_Share_Config;
+ Dir = FILELIST_DIR;
TXT_FILE_BODY;
- Styles = (ARCHIVE);
- Name = "cfgsrvnolang.zip";
+ Styles = (FILELIST);
+ Name = "extras_cfgsrvnolang.filelist";
Patchfiles = ();
End
More information about the Libreoffice-commits
mailing list