[Libreoffice-commits] core.git: 3 commits - setup_native/CustomTarget_scripts.mk sysui/CustomTarget_slackware.mk sysui/desktop sysui/Module_sysui.mk
Michael Stahl
mstahl at redhat.com
Wed Jul 31 04:17:59 PDT 2013
setup_native/CustomTarget_scripts.mk | 5 +-
sysui/CustomTarget_slackware.mk | 61 ----------------------------------
sysui/Module_sysui.mk | 1
sysui/desktop/slackware/slack-desc | 13 -------
sysui/desktop/slackware/update-script | 8 ----
5 files changed, 3 insertions(+), 85 deletions(-)
New commits:
commit 01b47bffd84c7731634f631cd32803bbbc881ad7
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 31 13:03:56 2013 +0200
sysui: remove slackware desktop integration stuff
This is apparently not used at all currently; cloph says the
*slackware-menus*.tgz used to be bundled with RPM instsets but the last
release that contained it was apparently OOo 3.1.1; it is gone in OOo
3.2.1 RPM instset. There are no bug reports about it missing, so no
problem with removing it altogether.
Change-Id: I1b93c94c4ac5c1d1826069b05cb58fdbb30cd71f
diff --git a/sysui/CustomTarget_slackware.mk b/sysui/CustomTarget_slackware.mk
deleted file mode 100644
index f717df7..0000000
--- a/sysui/CustomTarget_slackware.mk
+++ /dev/null
@@ -1,61 +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/.
-#
-
-include $(SRCDIR)/sysui/productlist.mk
-
-slack_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/slackware)
-slack_SRCDIR := $(SRCDIR)/sysui/desktop/slackware
-
-$(eval $(call gb_CustomTarget_CustomTarget,sysui/slackware))
-
-$(eval $(call gb_CustomTarget_register_targets,sysui/slackware,\
- empty.tar \
-$(foreach product,$(PRODUCTLIST),\
- $(product)/install/doinst.sh \
- $(product)/install/slack-desc \
- $(product)$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_VERSION_PATCH).tgz) \
-))
-
-
-$(slack_WORKDIR)/empty.tar:
- mkdir $(slack_WORKDIR)/empty
- $(GNUTAR) -C $(slack_WORKDIR)/empty --owner=root $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner -cf $@ .
-
-$(slack_WORKDIR)/%/install/doinst.sh: $(slack_SRCDIR)/update-script $(call gb_CustomTarget_get_workdir,sysui/share)/%/launcherlist
- echo "( cd etc; rm -rf $(UNIXFILENAME.$*) )" > $@
- echo "( cd etc; ln -snf /opt/$(UNIXFILENAME.$*) $(UNIXFILENAME.$*) )" >> $@
- echo "( cd usr/bin; rm -rf soffice )" >> $@
- echo "( cd usr/bin; ln -sf /etc/$(UNIXFILENAME.$*)/program/soffice soffice )" >> $@
- for i in `cat $(call gb_CustomTarget_get_workdir,sysui/share)/$*/launcherlist`; do \
- echo "(cd usr/share/applications; rm -rf $(UNIXFILENAME.$*)-$$i)" >> $@; \
- echo "(cd usr/share/applications; ln -sf /etc/$(UNIXFILENAME.$*)/share/xdg/$$i $(UNIXFILENAME.$*)-$$i)" >> $@; \
- done
- cat $< >> $@
-
-$(slack_WORKDIR)/%/install/slack-desc: $(slack_SRCDIR)/slack-desc
- sed -e "s/PKGNAME/$*-slackware-menus/g" \
- -e "s/PKGVERSION/$(PKGVERSION)/g" \
- -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/g" \
- -e "s/PRODUCTNAME/$(PRODUCTNAME.$*)/g" \
- -e "s/UNIXFILENAME/$(UNIXFILENAME.$*)/g" \
- $< > $@
-
-$(slack_WORKDIR)/%$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_VERSION_PATCH).tgz: $(slack_WORKDIR)/empty.tar $(slack_WORKDIR)/%/install/doinst.sh $(slack_WORKDIR)/%/install/slack-desc $(call gb_CustomTarget_get_workdir,sysui/share)/%/create_tree.sh
- cd $(call gb_CustomTarget_get_workdir,sysui/share)/$* \
- && DESTDIR=$(slack_WORKDIR)/$* \
- ICON_PREFIX=$(UNIXFILENAME.$*) \
- KDEMAINDIR=/opt/kde \
- GNOMEDIR="" \
- ./create_tree.sh
- cp $(slack_WORKDIR)/empty.tar $@.tmp
- $(GNUTAR) -C $(slack_WORKDIR)/$* --owner=root $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner \
- -rf $@.tmp install usr opt
- gzip < $@.tmp > $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 6f7bc71..9744ba8 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -13,7 +13,6 @@ ifneq ($(OS),WNT)
ifneq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,sysui,\
CustomTarget_share \
- $(if $(filter LINUX,$(OS)),CustomTarget_slackware) \
Package_share \
Package_desktop \
$(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \
diff --git a/sysui/desktop/slackware/slack-desc b/sysui/desktop/slackware/slack-desc
deleted file mode 100755
index 38bc199..0000000
--- a/sysui/desktop/slackware/slack-desc
+++ /dev/null
@@ -1,13 +0,0 @@
-# needs to be 11 lines - variables replaced by the makefile...
- |-----handy-ruler------------------------------------------------------|
-PKGNAME: PRODUCTNAME Desktop-Integration for Slackware
-PKGNAME: Version: PKGVERSION, License: LGPLv3 with MPLv2, ALv2 and more
-PKGNAME:
-PKGNAME: Note that this package is non-functional without the main packages of
-PKGNAME: LONGPRODUCTNAME
-PKGNAME: If you did install the main packages to another location than the
-PKGNAME: default, make sure to adapt the link
-PKGNAME: /etc/UNIXFILENAME
-PKGNAME: accordingly to point to the correct location.
-PKGNAME:
-PKGNAME: This package is provided by The Document Foundation
diff --git a/sysui/desktop/slackware/update-script b/sysui/desktop/slackware/update-script
deleted file mode 100755
index f7f957a..0000000
--- a/sysui/desktop/slackware/update-script
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if (which update-desktop-database); then
- update-desktop-database -q /usr/share/applications
-fi
-
-if (which update-mime-database); then
- update-mime-database /usr/share/mime
-fi
commit d7737f8454fa5f99bc597b93f579e7ad9199d108
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 31 12:59:13 2013 +0200
sysui: build slackware stuff only on Linux
Change-Id: I1ffcbd5ebf560f9f7ba8ad4b1ec9fefdb32da487
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 62fb208..6f7bc71 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -13,7 +13,7 @@ ifneq ($(OS),WNT)
ifneq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,sysui,\
CustomTarget_share \
- CustomTarget_slackware \
+ $(if $(filter LINUX,$(OS)),CustomTarget_slackware) \
Package_share \
Package_desktop \
$(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \
commit e13c27e588545f2cbcf90b94965ef97521969216
Author: Gabriele Bulfon <gabriele.bulfon at sonicle.com>
Date: Wed Jul 31 12:12:50 2013 +0200
setup_native: fix creation of Solaris install scripts
Change-Id: I72608945b2c4183048f9fcdac8daf450e1a7fe4c
diff --git a/setup_native/CustomTarget_scripts.mk b/setup_native/CustomTarget_scripts.mk
index db9ead9..5a50a69 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -45,12 +45,13 @@ $(eval $(call gb_CustomTarget_register_targets,setup_native/scripts,\
$(scripts_WORKDIR)/getuid.so.stripped: $(call gb_Library_get_target,getuid)
cp $< $@
/usr/ccs/bin/strip $@
+
$(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_solaris.sh $(scripts_WORKDIR)/getuid.so.stripped
- $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
+ $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $^ $@
chmod 775 $@
$(scripts_WORKDIR)/uninstall: $(SRCDIR)/setup_native/scripts/uninstall_solaris.sh $(scripts_WORKDIR)/getuid.so.stripped
- $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
+ $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $^ $@
chmod 775 $@
endif
More information about the Libreoffice-commits
mailing list