[PATCH] fdo#63197: convert psprint_config files

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3443

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3443/1

fdo#63197: convert psprint_config files

Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
---
M psprint_config/Module_psprint_config.mk
R psprint_config/Package_fontunxppds.mk
R psprint_config/Package_fontunxpsprint.mk
M scp2/source/ooo/file_extra_ooo.scp
4 files changed, 16 insertions(+), 12 deletions(-)



diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk
index 5c30c9f..0d35eb0 100644
--- a/psprint_config/Module_psprint_config.mk
+++ b/psprint_config/Module_psprint_config.mk
@@ -28,8 +28,8 @@
 $(eval $(call gb_Module_Module,psprint_config))
 
 $(eval $(call gb_Module_add_targets,psprint_config,\
-	Zip_fontunxppds \
-	Zip_fontunxpsprint \
+	Package_fontunxppds \
+	Package_fontunxpsprint \
 ))
 
 # vim: set noet sw=4:
diff --git a/psprint_config/Zip_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk
similarity index 81%
rename from psprint_config/Zip_fontunxppds.mk
rename to psprint_config/Package_fontunxppds.mk
index 3714f11..65df35d 100644
--- a/psprint_config/Zip_fontunxppds.mk
+++ b/psprint_config/Package_fontunxppds.mk
@@ -25,9 +25,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+$(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
 
-$(eval $(call gb_Zip_add_files,fontunxppds,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\
 	SGENPRT.PS \
 	SGENT42.PS \
 ))
diff --git a/psprint_config/Zip_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk
similarity index 81%
rename from psprint_config/Zip_fontunxpsprint.mk
rename to psprint_config/Package_fontunxpsprint.mk
index ec0a351..f4b8e9e 100644
--- a/psprint_config/Zip_fontunxpsprint.mk
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -25,9 +25,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+$(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
 
-$(eval $(call gb_Zip_add_files,fontunxpsprint,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\
 	psprint.conf \
 ))
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index c539732..93ebc12 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -221,10 +221,10 @@
 
 #ifndef WITHOUT_PPDS
 File gid_File_Extra_Fontunxppds
-    Dir = gid_Dir_Psprint_Driver;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxppds.zip";
+    Styles = (FILELIST);
+    Name = "psprint_config_fontunxppds.filelist";
 End
 #endif
 
@@ -233,10 +233,10 @@
 #ifdef UNX
 
 File gid_File_Extra_Fontunxpsprint
-    Dir = gid_Dir_Psprint;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE, CONFIGFILE);
-    Name = "fontunxpsprint.zip";
+    Styles = (FILELIST, DONT_OVERWRITE, CONFIGFILE);
+    Name = "psprint_config_fontunxpsprint.filelist";
 End
 
 #endif

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

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