Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3368

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/3368/1

fdo#63197, Convert Zip_cfgsrvbitmapunx, Zip_cfgsrvnolang and Zip_cfgusr

Change-Id: I11064116d44f4e45676553dd26a9fe75376d923f
---
M extras/Module_extras.mk
R extras/Package_cfgsrvbitmapunx.mk
R extras/Package_cfgsrvnolang.mk
R extras/Package_cfgusr.mk
M scp2/source/ooo/file_extra_ooo.scp
5 files changed, 25 insertions(+), 18 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index cd07e66..132d7b1 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -23,9 +23,9 @@
        Package_database \
        Package_databasebiblio \
        Package_autotextuser \
-       Zip_cfgsrvbitmapunx \
-       Zip_cfgsrvnolang \
-       Zip_cfgusr \
+       Package_cfgsrvbitmapunx \
+       Package_cfgsrvnolang \
+       Package_cfgusr \
        Zip_gallbullets \
        Zip_gallhtmlexpo \
        Zip_gallroot \
diff --git a/extras/Zip_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk
similarity index 61%
rename from extras/Zip_cfgsrvbitmapunx.mk
rename to extras/Package_cfgsrvbitmapunx.mk
index 3b7ce9b..1d61796 100644
--- a/extras/Zip_cfgsrvbitmapunx.mk
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -7,9 +7,11 @@
 # 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_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
 
-$(eval $(call gb_Zip_add_files,cfgsrvbitmapunx,\
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,share/config,\
        psetupl.xpm \
        psetup.xpm \
 ))
diff --git a/extras/Zip_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
similarity index 91%
rename from extras/Zip_cfgsrvnolang.mk
rename to extras/Package_cfgsrvnolang.mk
index d15b0a6..2112a21 100644
--- a/extras/Zip_cfgsrvnolang.mk
+++ b/extras/Package_cfgsrvnolang.mk
@@ -7,9 +7,11 @@
 # 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_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
 
-$(eval $(call gb_Zip_add_files,cfgsrvnolang,\
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_cfgsrvnolang,share/config,\
        wizard/form/styles/beige.css \
        wizard/form/styles/bgr.css \
        wizard/form/styles/dark.css \
diff --git a/extras/Zip_cfgusr.mk b/extras/Package_cfgusr.mk
similarity index 63%
rename from extras/Zip_cfgusr.mk
rename to extras/Package_cfgusr.mk
index 87330c6..45ec351 100644
--- a/extras/Zip_cfgusr.mk
+++ b/extras/Package_cfgusr.mk
@@ -7,9 +7,11 @@
 # 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_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_config))
 
-$(eval $(call gb_Zip_add_files,cfgusr,\
+$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_cfgusr,presets/config,\
     autotbl.fmt \
 ))
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index bb15b33..21506e8 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -51,25 +51,26 @@
 #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
 

-- 
To view, visit https://gerrit.libreoffice.org/3368
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11064116d44f4e45676553dd26a9fe75376d923f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.