~ubuntu-branches/debian/sid/qbs/sid

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2015-02-18 10:11:29 UTC
  • Revision ID: package-import@ubuntu.com-20150218101129-7wh03nozemw93vno
Tags: 1.3.3+dfsg-4
* Drop no longer needed chmod calls from debian/rules, thanks Jake
  Petroules for the suggestion.
* Use qbs-config instead of modifying configuration files manually,
  thanks Jake Petroules for the suggestion.
* Mark some destructors symbols as optional to fix build with GCC 5
  (closes: #778082).

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
        mv $(CURDIR)/debian/tmp/usr/lib/*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
49
49
        mv $(CURDIR)/debian/tmp/usr/lib/qbs $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
50
50
 
51
 
        # Fix permissions
52
 
        chmod -x $(CURDIR)/debian/tmp/usr/share/qbs/modules/nsis/NSISModule.qbs
53
 
        chmod -x $(CURDIR)/debian/tmp/usr/share/qbs/imports/qbs/base/NSISSetup.qbs
54
 
 
55
51
override_dh_auto_test:
56
52
        mkdir -p $(CONFIG_DIR)/QtProject
57
53
        set -ex; \
58
54
                export LD_LIBRARY_PATH=$(CURDIR)/lib/:$$LD_LIBRARY_PATH; \
59
55
                $(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject; \
60
56
                $(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests; \
61
 
                grep baseProfile $(CONFIG_DIR)/QtProject/qbs.conf || \
62
 
                        /bin/echo "qt-project\qbs\profiles\qbs_autotests\baseProfile=gcc" \
63
 
                        >> $(CONFIG_DIR)/QtProject/qbs.conf; \
 
57
                [ -n "`$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject --list profiles.qbs_autotests.baseProfile`" ] || \
 
58
                        $(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject profiles.qbs_autotests.baseProfile gcc; \
64
59
                dh_auto_test
65
60
 
66
61
override_dh_install: