[Libreoffice-commits] core.git: psprint_config/configuration psprint_config/Makefile psprint_config/Module_psprint_config.mk psprint_config/Package_fontunxppds.mk psprint_config/Package_fontunxpsprint.mk psprint_config/README RepositoryModule_host.mk scp2/source vcl/Module_vcl.mk vcl/Package_fontunxppds.mk vcl/Package_fontunxpsprint.mk vcl/unx
Khaled Hosny
khaledhosny at eglug.org
Fri Mar 21 10:15:58 PDT 2014
RepositoryModule_host.mk | 1
psprint_config/Makefile | 7
psprint_config/Module_psprint_config.mk | 26
psprint_config/Package_fontunxppds.mk | 26
psprint_config/Package_fontunxpsprint.mk | 25
psprint_config/README | 5
psprint_config/configuration/ppds/SGENPRT.PS | 582 ------------------
psprint_config/configuration/ppds/SGENT42.PS | 24
psprint_config/configuration/psprint.conf | 99 ---
scp2/source/ooo/file_extra_ooo.scp | 8
vcl/Module_vcl.mk | 2
vcl/Package_fontunxppds.mk | 26
vcl/Package_fontunxpsprint.mk | 25
vcl/unx/generic/printer/configuration/README | 5
vcl/unx/generic/printer/configuration/ppds/SGENPRT.PS | 582 ++++++++++++++++++
vcl/unx/generic/printer/configuration/ppds/SGENT42.PS | 24
vcl/unx/generic/printer/configuration/psprint.conf | 99 +++
17 files changed, 765 insertions(+), 801 deletions(-)
New commits:
commit e3d9b3406a2013cd4f9d4baf3a7800d1d95c2d90
Author: Khaled Hosny <khaledhosny at eglug.org>
Date: Fri Mar 21 15:27:33 2014 +0200
Fold psprint_config into vcl
The files are only used by the psprint stuff in vcl, so move them closer
to it. We should kill all of this anyway, but that is for another day.
Change-Id: Ie3b893c92d556333c9d8b041859d5e97604ace10
Reviewed-on: https://gerrit.libreoffice.org/8694
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 88119fc..6e3b90b 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
oox \
package \
postprocess \
- psprint_config \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
diff --git a/psprint_config/Makefile b/psprint_config/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/psprint_config/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk
deleted file mode 100644
index 041d7d1..0000000
--- a/psprint_config/Module_psprint_config.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Module_Module,psprint_config))
-
-$(eval $(call gb_Module_add_targets,psprint_config,\
- Package_fontunxppds \
- Package_fontunxpsprint \
-))
-
-# vim: set noet sw=4:
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index ced1389..69eed78 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -81,19 +81,15 @@ File gid_File_Extra_Fontunxppds
Dir = FILELIST_DIR;
TXT_FILE_BODY;
Styles = (FILELIST);
- Name = "psprint_config_fontunxppds.filelist";
+ Name = "vcl_fontunxppds.filelist";
End
#endif
-#endif
-
-#ifdef UNX
-
File gid_File_Extra_Fontunxpsprint
Dir = FILELIST_DIR;
TXT_FILE_BODY;
Styles = (FILELIST, CONFIGFILE);
- Name = "psprint_config_fontunxpsprint.filelist";
+ Name = "vcl_fontunxpsprint.filelist";
End
#endif
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index bb2ad3b..fb5d04b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
Library_vclplug_gen \
Library_desktop_detector \
StaticLibrary_headless \
+ Package_fontunxppds \
+ Package_fontunxpsprint \
))
ifneq ($(ENABLE_GTK),)
diff --git a/psprint_config/Package_fontunxppds.mk b/vcl/Package_fontunxppds.mk
similarity index 80%
rename from psprint_config/Package_fontunxppds.mk
rename to vcl/Package_fontunxppds.mk
index 781286f..2d9ea46 100644
--- a/psprint_config/Package_fontunxppds.mk
+++ b/vcl/Package_fontunxppds.mk
@@ -16,9 +16,9 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+$(eval $(call gb_Package_Package,vcl_fontunxppds,$(SRCDIR)/vcl/unx/generic/printer/configuration/ppds))
-$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\
+$(eval $(call gb_Package_add_files,vcl_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\
SGENPRT.PS \
SGENT42.PS \
))
diff --git a/psprint_config/Package_fontunxpsprint.mk b/vcl/Package_fontunxpsprint.mk
similarity index 80%
rename from psprint_config/Package_fontunxpsprint.mk
rename to vcl/Package_fontunxpsprint.mk
index ab0aaf7..1ab2a56 100644
--- a/psprint_config/Package_fontunxpsprint.mk
+++ b/vcl/Package_fontunxpsprint.mk
@@ -16,9 +16,9 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+$(eval $(call gb_Package_Package,vcl_fontunxpsprint,$(SRCDIR)/vcl/unx/generic/printer/configuration))
-$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,$(LIBO_SHARE_FOLDER)/psprint,\
+$(eval $(call gb_Package_add_files,vcl_fontunxpsprint,$(LIBO_SHARE_FOLDER)/psprint,\
psprint.conf \
))
diff --git a/psprint_config/README b/vcl/unx/generic/printer/configuration/README
similarity index 100%
rename from psprint_config/README
rename to vcl/unx/generic/printer/configuration/README
diff --git a/psprint_config/configuration/ppds/SGENPRT.PS b/vcl/unx/generic/printer/configuration/ppds/SGENPRT.PS
similarity index 100%
rename from psprint_config/configuration/ppds/SGENPRT.PS
rename to vcl/unx/generic/printer/configuration/ppds/SGENPRT.PS
diff --git a/psprint_config/configuration/ppds/SGENT42.PS b/vcl/unx/generic/printer/configuration/ppds/SGENT42.PS
similarity index 100%
rename from psprint_config/configuration/ppds/SGENT42.PS
rename to vcl/unx/generic/printer/configuration/ppds/SGENT42.PS
diff --git a/psprint_config/configuration/psprint.conf b/vcl/unx/generic/printer/configuration/psprint.conf
similarity index 100%
rename from psprint_config/configuration/psprint.conf
rename to vcl/unx/generic/printer/configuration/psprint.conf
More information about the Libreoffice-commits
mailing list