Merge lp:~zeller-benjamin/ubuntu-sdk-ide/remove-devkit into lp:ubuntu-sdk-ide

Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 110
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/remove-devkit
Merge into: lp:ubuntu-sdk-ide
Diff against target: 565 lines (+1/-488)
11 files modified
CMakeLists.txt (+0/-39)
create_sdk.sh (+0/-46)
debian/control (+0/-12)
debian/rules (+1/-3)
debian/ubuntu-sdk-dev.install (+0/-2)
desktop_kit_configure (+0/-57)
desktop_kit_qt.pro (+0/-81)
get_qt_sources.py (+0/-117)
getdsc.py (+0/-57)
kit_config (+0/-32)
ubuntu-sdk-shell.in (+0/-42)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/remove-devkit
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+280689@code.launchpad.net

Commit message

Remove the -dev package from the IDE build

Description of the change

Remove the -dev package from the IDE build

To post a comment you must log in.
103. By Benjamin Zeller

Merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-11-25 12:56:07 +0000
+++ CMakeLists.txt 2015-12-16 09:18:38 +0000
@@ -26,9 +26,6 @@
2626
27set (QT_VERSION "qt-everywhere-opensource-src-5.4.2")27set (QT_VERSION "qt-everywhere-opensource-src-5.4.2")
28set (QT_SOURCE_DIR "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2")28set (QT_SOURCE_DIR "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2")
29set (QT_KIT_PREFIX "${CMAKE_BINARY_DIR}/qt-api-build")
30set (QT_KIT_SOURCE_DIR "${QT_KIT_PREFIX}/qt-everywhere-opensource-src-ubuntu")
31set (QT_KIT_INSTALL_PREFIX "/usr/ubuntu-sdk-dev")
32set (QT_BUILD_DIR "${CMAKE_BINARY_DIR}/qt-build/build")29set (QT_BUILD_DIR "${CMAKE_BINARY_DIR}/qt-build/build")
33set (QT_INSTALL_DIR "${CMAKE_BINARY_DIR}/qt")30set (QT_INSTALL_DIR "${CMAKE_BINARY_DIR}/qt")
3431
@@ -136,39 +133,3 @@
136 #there is no install step required, the plugin is built directly into the installed plugins dir133 #there is no install step required, the plugin is built directly into the installed plugins dir
137 INSTALL_COMMAND sh -c "exit 0"134 INSTALL_COMMAND sh -c "exit 0"
138)135)
139
140
141ConcatStrings(QT_KIT_INSTALL_SCRIPT
142 "make qmake_all "
143 "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install "
144 "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt docs -j1 "
145 "&& make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install_docs -j1"
146)
147
148ExternalProject_Add(${QT_VERSION}-api
149 PREFIX "${QT_KIT_PREFIX}"
150 SOURCE_DIR "${QT_KIT_SOURCE_DIR}"
151 BINARY_DIR "${QT_KIT_PREFIX}/build"
152 INSTALL_DIR "${QT_KIT_PREFIX}/qt"
153 DOWNLOAD_COMMAND sh -c "cd ${QT_KIT_SOURCE_DIR} && ${CMAKE_SOURCE_DIR}/get_qt_sources.py"
154 UPDATE_COMMAND sh -c "exit 0" #nothing to update
155 PATCH_COMMAND sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure"
156 CONFIGURE_COMMAND sh -c "${QT_KIT_SOURCE_DIR}/configure -prefix ${QT_KIT_INSTALL_PREFIX} `cat ${CMAKE_SOURCE_DIR}/kit_config`"
157 BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS}"
158 INSTALL_COMMAND sh -c "${QT_KIT_INSTALL_SCRIPT}"
159)
160
161
162SET (EXTRAS_PREFIX "${CMAKE_BINARY_DIR}/qt-extras")
163ExternalProject_Add(${QT_VERSION}-extras
164 DEPENDS ${QT_VERSION}-api qtcreator_3.5.0
165 PREFIX "${EXTRAS_PREFIX}"
166 SOURCE_DIR "${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras"
167 DOWNLOAD_COMMAND sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir"
168 UPDATE_COMMAND sh -c "exit 0" #nothing to update
169 CONFIGURE_COMMAND sh -c "exit 0"
170 BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/mkspecs/features"
171 INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR} && ${CMAKE_SOURCE_DIR}/create_sdk.sh"
172)
173
174configure_file(${CMAKE_SOURCE_DIR}/ubuntu-sdk-shell.in ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/bin/ubuntu-sdk-shell @ONLY)
175136
=== removed file 'create_sdk.sh'
--- create_sdk.sh 2015-10-22 10:36:47 +0000
+++ create_sdk.sh 1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
1#!/bin/bash
2
3GCC_UID=""
4QT_UID="UbuntuSDK-API-Qt"
5
6case "$(dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)" in
7 x86_64-linux-gnu)
8 GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-x86_64-linux-gnu"
9 ./ubuntu-sdk-ide/bin/sdktool addTC \
10 --id "${GCC_UID}" \
11 --name "GCC (x86 64bit in /usr/bin/g++)" \
12 --path /usr/bin/g++ \
13 --abi x86-linux-generic-elf-64bit \
14 --supportedAbis x86-linux-generic-elf-64bit,x86-linux-generic-elf-32bit
15 ;;
16
17 i386-linux-gnu)
18 GCC_UID="ProjectExplorer.ToolChain.Gcc:UbuntuSDKGCC-x86-linux-generic-elf-32bit"
19 ./ubuntu-sdk-ide/bin/sdktool addTC \
20 --id "${GCC_UID}" \
21 --name "GCC (x86 32bit in /usr/bin/g++)" \
22 --path /usr/bin/g++ \
23 --abi x86-linux-generic-elf-32bit \
24 --supportedAbis x86-linux-generic-elf-32bit
25 ;;
26
27 *)
28 echo "Unknown architecture"
29 exit 1
30 ;;
31esac
32
33./ubuntu-sdk-ide/bin/sdktool addQt \
34 --id "${QT_UID}" \
35 --name "Ubuntu SDK Desktop Qt" \
36 --qmake /usr/ubuntu-sdk-dev/bin/qmake \
37 --type Qt4ProjectManager.QtVersion.Desktop
38
39./ubuntu-sdk-ide/bin/sdktool addKit \
40 --id "UbuntuSDK-API-Desktop-Kit" \
41 --name "Ubuntu SDK Desktop Kit" \
42 --debuggerengine 1 \
43 --debugger /usr/bin/gdb \
44 --devicetype Desktop \
45 --toolchain "${GCC_UID}" \
46 --qt "${QT_UID}"
470
=== modified file 'debian/control'
--- debian/control 2015-11-11 12:06:36 +0000
+++ debian/control 2015-12-16 09:18:38 +0000
@@ -124,15 +124,3 @@
124 deeper integration for developing applications for Ubuntu using the124 deeper integration for developing applications for Ubuntu using the
125 Ubuntu UI Toolkit. It also introduces an Ubuntu themed welcome125 Ubuntu UI Toolkit. It also introduces an Ubuntu themed welcome
126 screen.126 screen.
127
128Package: ubuntu-sdk-dev
129Architecture: any
130Multi-Arch: same
131Depends: ${misc:Depends}, ${shlibs:Depends}
132Description: Qt and Ubuntu APIs for application development
133 Qt is a cross-platform C++ application framework. Qt's primary feature
134 is its rich set of widgets that provide standard GUI functionality.
135 Qt Components for Ubuntu offers a set of reusable user interface
136 components for Qt Quick 2 / QML.
137 .
138 This package contains the Qt APIs and the Ubuntu Components QML plugin.
139127
=== modified file 'debian/rules'
--- debian/rules 2015-12-03 09:24:46 +0000
+++ debian/rules 2015-12-16 09:18:38 +0000
@@ -21,12 +21,10 @@
2121
22override_dh_auto_install:22override_dh_auto_install:
23 mkdir -p $(CURDIR)/debian/tmp/usr/23 mkdir -p $(CURDIR)/debian/tmp/usr/
24 mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
25 mkdir -p $(CURDIR)/debian/tmp/usr/bin24 mkdir -p $(CURDIR)/debian/tmp/usr/bin
26 ln -s /usr/bin/ubuntu-sdk-ide debian/tmp/usr/bin/ubuntu-sdk25 ln -s /usr/bin/ubuntu-sdk-ide debian/tmp/usr/bin/ubuntu-sdk
27 cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr26 cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr
28 cp -a $(CURDIR)/*/qt-api-build/qt/usr $(CURDIR)/debian/tmp
29 dh_auto_install --destdir=../../debian/tmp/usr27 dh_auto_install --destdir=../../debian/tmp/usr
3028
31override_dh_shlibdeps:29override_dh_shlibdeps:
32 dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib:/usr/ubuntu-sdk-dev/lib30 dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib/qtcreator/plugins:/usr/ubuntu-sdk-ide/lib
3331
=== removed file 'debian/ubuntu-sdk-dev.install'
--- debian/ubuntu-sdk-dev.install 2015-11-03 11:55:18 +0000
+++ debian/ubuntu-sdk-dev.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1usr/ubuntu-sdk-dev
2usr/ubuntu-sdk-ide/share/qtcreator/QtProject
30
=== removed file 'desktop_kit_configure'
--- desktop_kit_configure 2015-10-20 18:00:57 +0000
+++ desktop_kit_configure 1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
1#! /bin/sh
2#############################################################################
3##
4## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
5## Contact: http://www.qt-project.org/legal
6##
7## This file is part of the build tools of the Qt Toolkit.
8##
9## $QT_BEGIN_LICENSE:LGPL$
10## Commercial License Usage
11## Licensees holding valid commercial Qt licenses may use this file in
12## accordance with the commercial license agreement provided with the
13## Software or, alternatively, in accordance with the terms contained in
14## a written agreement between you and Digia. For licensing terms and
15## conditions see http://qt.digia.com/licensing. For further information
16## use the contact form at http://qt.digia.com/contact-us.
17##
18## GNU Lesser General Public License Usage
19## Alternatively, this file may be used under the terms of the GNU Lesser
20## General Public License version 2.1 as published by the Free Software
21## Foundation and appearing in the file LICENSE.LGPL included in the
22## packaging of this file. Please review the following information to
23## ensure the GNU Lesser General Public License version 2.1 requirements
24## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
25##
26## In addition, as a special exception, Digia gives you certain additional
27## rights. These rights are described in the Digia Qt LGPL Exception
28## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
29##
30## GNU General Public License Usage
31## Alternatively, this file may be used under the terms of the GNU
32## General Public License version 3.0 as published by the Free Software
33## Foundation and appearing in the file LICENSE.GPL included in the
34## packaging of this file. Please review the following information to
35## ensure the GNU General Public License version 3.0 requirements will be
36## met: http://www.gnu.org/copyleft/gpl.html.
37##
38##
39## $QT_END_LICENSE$
40##
41#############################################################################
42
43srcpath=`dirname $0`
44srcpath=`(cd "$srcpath"; /bin/pwd)`
45configure=$srcpath/qtbase/configure
46if [ ! -e "$configure" ]; then
47 echo "$configure not found. Did you forget to run \"init-repository\"?" >&2
48 exit 1
49fi
50
51mkdir -p qtbase || exit
52
53echo "+ cd qtbase"
54cd qtbase || exit
55
56echo "+ $configure -top-level $@"
57exec "$configure" -top-level "$@"
580
=== removed file 'desktop_kit_qt.pro'
--- desktop_kit_qt.pro 2015-10-20 18:00:57 +0000
+++ desktop_kit_qt.pro 1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
1# Create the super cache so modules will add themselves to it.
2cache(, super)
3
4CONFIG += build_pass # hack to disable the .qmake.super auto-add
5load(qt_build_config)
6CONFIG -= build_pass # unhack, as it confuses Qt Creator
7
8TEMPLATE = subdirs
9
10defineReplace(moduleName) {
11 return(module_$$replace(1, -, _))
12}
13
14# Arguments: module name, [mandatory deps], [optional deps], [project file]
15defineTest(addModule) {
16 contains(QT_SKIP_MODULES, $$1): return(false)
17 mod = $$moduleName($$1)
18
19 isEmpty(4) {
20 !exists($$1/$${1}.pro): return(false)
21 $${mod}.subdir = $$1
22 export($${mod}.subdir)
23 } else {
24 !exists($$1/$${4}): return(false)
25 $${mod}.file = $$1/$$4
26 $${mod}.makefile = Makefile
27 export($${mod}.file)
28 export($${mod}.makefile)
29 }
30
31 for(d, 2) {
32 dn = $$moduleName($$d)
33 !contains(SUBDIRS, $$dn): \
34 return(false)
35 $${mod}.depends += $$dn
36 }
37 for(d, 3) {
38 dn = $$moduleName($$d)
39 contains(SUBDIRS, $$dn): \
40 $${mod}.depends += $$dn
41 }
42 !isEmpty($${mod}.depends): \
43 export($${mod}.depends)
44
45 $${mod}.target = module-$$1
46 export($${mod}.target)
47
48 SUBDIRS += $$mod
49 export(SUBDIRS)
50 return(true)
51}
52
53# only qtbase is required to exist. The others may not - but it is the
54# users responsibility to ensure that all needed dependencies exist, or
55# it may not build.
56
57ANDROID_EXTRAS =
58android: ANDROID_EXTRAS = qtandroidextras
59
60addModule(qtbase)
61addModule(qtsvg, qtbase)
62addModule(qtxmlpatterns, qtbase)
63addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
64addModule(qtquickcontrols, qtdeclarative)
65addModule(qtmultimedia, qtbase, qtdeclarative)
66addModule(qt3d, qtdeclarative)
67addModule(qtsystems, qtbase, qtdeclarative)
68addModule(qtlocation, qtbase, qtsystems qtmultimedia)
69addModule(qtsensors, qtbase, qtdeclarative)
70addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
71addModule(qtfeedback, qtdeclarative, qtmultimedia)
72addModule(qtpim, qtdeclarative)
73addModule(qtwebsockets, qtbase, qtdeclarative)
74addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
75addModule(qtimageformats, qtbase)
76addModule(qtgraphicaleffects, qtdeclarative)
77addModule(qtscript, qtbase, qttools)
78addModule(qtdocgallery, qtdeclarative)
79addModule(qtserialport, qtbase)
80addModule(qtenginio, qtdeclarative)
81addModule(ubuntu-sdk,qtdeclarative qtfeedback qtpim)
820
=== removed file 'get_qt_sources.py'
--- get_qt_sources.py 2015-12-15 08:32:52 +0000
+++ get_qt_sources.py 1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
1#!/usr/bin/python
2from optparse import OptionParser
3import re
4import urlparse
5from launchpadlib.launchpad import Launchpad
6from subprocess import call
7import sys
8import os
9import glob
10
11qt_sources = ["qtsystems-opensource-src",
12 "qtbase-opensource-src",
13 "qtdeclarative-opensource-src",
14 "qtmultimedia-opensource-src",
15 "qtpim-opensource-src",
16 "ubuntu-ui-toolkit",
17 "qt3d-opensource-src",
18 "qtfeedback-opensource-src",
19 "qtlocation-opensource-src",
20 "qtscript-opensource-src",
21 "qtsensors-opensource-src",
22 "qtsvg-opensource-src",
23 "qttools-opensource-src",
24 "qtwebsockets-opensource-src",
25 "qtxmlpatterns-opensource-src",
26 "qtquickcontrols-opensource-src",
27 "qtconnectivity-opensource-src",
28 "qtimageformats-opensource-src",
29 "qtgraphicaleffects-opensource-src",
30 "qtserialport-opensource-src",
31 "qtenginio-opensource-src"
32 ]
33
34hack_set = set(['qt3d', 'qtpim', 'qtfeedback', 'qtsystems', 'ubuntu-sdk'])
35
36
37def create_webroot_url_from_self_link(self_link):
38 scheme, netloc, _, _, _ = urlparse.urlsplit(self_link)
39 netloc = netloc.lstrip("api.")
40 return u"%s://%s/" % (scheme, netloc)
41
42
43def get_dsc(archive, package, series):
44 re_version = re.compile(r"^\d+\:")
45 x = archive.getPublishedSources(exact_match=True, source_name=package,
46 distro_series=series)
47 webroot = create_webroot_url_from_self_link(archive.self_link)
48 version = x[0].source_package_version
49 version = re_version.sub("", version, 1)
50 if archive.owner.name == "ubuntu-archive":
51 yield "%subuntu/+archive/primary/+files/%s_%s.dsc" \
52 % (webroot, x[0].source_package_name, version)
53 else:
54 yield "%s/~ci-train-ppa-service/+archive/ubuntu/stable-phone-overlay/+files/%s_%s.dsc" \
55 % (webroot, x[0].source_package_name, version)
56
57
58def main():
59 parser = OptionParser(usage="usage: %prog [options] source ...")
60 parser.add_option(
61 "-l", "--launchpad", dest="launchpad_instance", default="production")
62 options, args = parser.parse_args()
63 launchpad = Launchpad.login_anonymously('just testing', options.launchpad_instance)
64 ubuntu = launchpad.distributions["ubuntu"]
65 distro_archive = ubuntu.main_archive
66 overlay_archive = launchpad.people["ci-train-ppa-service"].\
67 getPPAByName(name="stable-phone-overlay")
68 series = ubuntu.getSeries(name_or_version="xenial")
69
70 for qt_source_package in qt_sources:
71 re_version = re.compile(r"^\d+\:")
72
73 #first try the overlay archive
74 archive = overlay_archive
75 x = overlay_archive.getPublishedSources(exact_match=True,
76 source_name=qt_source_package,
77 distro_series=series)
78 if len(x) == 0:
79 archive = distro_archive
80 x = distro_archive.getPublishedSources(exact_match=True,
81 source_name=qt_source_package,
82 distro_series=series)
83 if len(x) == 0:
84 print("Could not find "+qt_source_package)
85 sys.exit(1)
86 else:
87 print(qt_source_package+" found in Archive")
88 else:
89 print(qt_source_package+" found in overlay ppa")
90
91 x = x[0].source_package_version
92
93 generator = get_dsc(archive, qt_source_package, series)
94 for i in generator:
95 if qt_source_package != 'ubuntu-ui-toolkit':
96 qt_module_name = re.sub(r'-opensource-src',
97 r'',
98 qt_source_package.rstrip())
99 else:
100 qt_module_name = re.sub(r'ubuntu-ui-toolkit',
101 r'ubuntu-sdk',
102 qt_source_package.rstrip())
103 call(["dget", i, "--quiet", "--download-only"])
104 for dsc_file in glob.glob('%s*dsc' % qt_source_package):
105 call(["dpkg-source", "-x", dsc_file])
106 for junk_files in glob.glob("*.?z"):
107 os.remove(junk_files)
108 for junk_files in glob.glob("*.dsc"):
109 os.remove(junk_files)
110 for fetched_module_directory in glob.glob('%s*' % qt_source_package):
111 os.rename(fetched_module_directory, qt_module_name)
112 if qt_module_name in hack_set:
113 git_dir = qt_module_name + "/.git"
114 if not os.path.exists(git_dir):
115 os.makedirs(git_dir)
116
117main()
1180
=== removed file 'getdsc.py'
--- getdsc.py 2015-12-15 08:32:52 +0000
+++ getdsc.py 1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
1#!/usr/bin/python
2
3from optparse import OptionParser
4import re
5import urlparse
6from launchpadlib.launchpad import Launchpad
7
8def create_webroot_url_from_self_link(self_link):
9 scheme, netloc, _, _, _ = urlparse.urlsplit(self_link)
10 netloc = netloc.lstrip("api.")
11 return u"%s://%s/" %(scheme, netloc)
12
13def get_dsc(archive, package, series):
14 re_version = re.compile(r"^\d+\:")
15 # x = archive.getPublishedSources()
16 x = archive.getPublishedSources(exact_match=True, source_name=package,
17 distro_series=series)
18 webroot = create_webroot_url_from_self_link(archive.self_link)
19 # for i in x:
20 version = x[0].source_package_version
21 version = re_version.sub("", version, 1)
22 #yield "%s~%s/+archive/primary/+files/%s_%s.dsc" \
23 yield "%subuntu/+archive/primary/+files/%s_%s.dsc" \
24 %(webroot, x[0].source_package_name, version)
25 #%(webroot, archive.owner.name, x[0].source_package_name, version)
26
27def main():
28 parser = OptionParser(usage="usage: %prog [options] source ...")
29 parser.add_option(
30 "-l", "--launchpad", dest="launchpad_instance", default="production")
31 options, args = parser.parse_args()
32 if not args:
33 parser.error("You must specify at least one soure.")
34
35 options.launchpad = Launchpad.login_with(
36 "branch-seeds", options.launchpad_instance)
37
38 launchpad = Launchpad.login_anonymously('just testing', 'production')
39 ubuntu = launchpad.distributions["ubuntu"]
40 archive = ubuntu.main_archive
41 series = ubuntu.getSeries(name_or_version="xenial")
42
43 #distro = options.launchpad.distributions["ubuntu"]
44
45 for package in args:
46 #print(package)
47 #print(series)
48 #print(archive)
49
50 re_version = re.compile(r"^\d+\:")
51 x = archive.getPublishedSources(exact_match=True, source_name=package, distro_series=series)[0].source_package_version
52
53 generator = get_dsc(archive, package, series)
54 for i in generator:
55 print(i)
56
57main()
580
=== removed file 'kit_config'
--- kit_config 2015-10-20 08:49:47 +0000
+++ kit_config 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
1-v
2-confirm-license
3-sysconfdir /etc/xdg
4-opensource
5-plugin-sql-mysql
6-plugin-sql-odbc
7-plugin-sql-psql
8-plugin-sql-sqlite
9-no-sql-sqlite2
10-plugin-sql-tds
11-system-sqlite
12-system-zlib
13-system-libjpeg
14-system-libpng
15-openssl
16-no-rpath
17-glib
18-verbose
19-optimized-qmake
20-no-strip
21-no-separate-debug-info
22-qpa xcb
23-xcb
24-icu
25-accessibility
26-no-directfb
27-nomake examples
28-nomake tests
29-skip qtenginio
30-skip qtlocation
31-dbus-linked
32-system-libjpeg
330
=== removed file 'ubuntu-sdk-shell.in'
--- ubuntu-sdk-shell.in 2015-11-25 12:09:05 +0000
+++ ubuntu-sdk-shell.in 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
1#!/bin/bash -i
2#
3# Copyright (C) 2015 Canonical Ltd.
4#
5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU Lesser General Public License as published by
7# the Free Software Foundation; version 3.
8#
9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU Lesser General Public License for more details.
13#
14# You should have received a copy of the GNU Lesser General Public License
15# along with this program. If not, see <http://www.gnu.org/licenses/>.
16
17# This script spawns a new Bash shell with all the environment variables needed
18# to run apps based on a specific Ubuntu SDK installation, as well as use the
19# dev tools from it.
20
21NAME='ubuntu-sdk-dev'
22INSTALL_PREFIX='@QT_KIT_INSTALL_PREFIX@'
23
24export PATH=${INSTALL_PREFIX}/bin${PATH:+:$PATH}
25export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
26export QML2_IMPORT_PATH=${INSTALL_PREFIX}/qml${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}
27export UBUNTU_UI_TOOLKIT_THEMES_PATH=${INSTALL_PREFIX}/qml${UBUNTU_UI_TOOLKIT_THEMES_PATH:+:$UBUNTU_UI_TOOLKIT_THEMES_PATH}
28export PYTHONPATH=${INSTALL_PREFIX}/lib/python3/dist-packages${PYTHONPATH:+:$PYTHONPATH}
29
30TEMP_FILE=`mktemp -t bashrc.XXXXXXXX`
31echo source $HOME/.bashrc >> $TEMP_FILE
32echo PS1=\'[$NAME] $PS1\' >> $TEMP_FILE
33SHELL_OPTIONS="--init-file $TEMP_FILE"
34
35echo Entering $NAME shell.
36bash $SHELL_OPTIONS
37echo Leaving $NAME shell. Have a nice day!
38
39if test ! -z "$TEMP_FILE"
40then
41 rm $TEMP_FILE
42fi

Subscribers

People subscribed via source and target branches